summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2015-02-1933-99/+105
|\
| * kconfig: use va_end to match corresponding va_startColin Ian King2015-01-271-0/+1
| * merge_config.sh: Display usage if given too few argumentsOlof Johansson2015-01-071-0/+5
| * kconfig: use bool instead of boolean for type definition attributesChristoph Jaeger2015-01-0731-99/+99
* | Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/k...Linus Torvalds2015-02-193-11/+21
|\ \
| * | kbuild: trivial - fix the help doc of CONFIG_CC_OPTIMIZE_FOR_SIZEMasahiro Yamada2015-01-081-2/+2
| * | kbuild: Update documentation of clean-files and clean-dirsMichal Marek2015-01-081-6/+5
| * | builddeb: Try to determine distributionSedat Dilek2015-01-061-1/+12
| * | builddeb: Update year and git repository URL in debian/copyrightSedat Dilek2015-01-021-2/+2
| |/
* | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...Linus Torvalds2015-02-199-90/+40
|\ \
| * | kbuild,gcov: simplify kernel/gcov/Makefile moreMasahiro Yamada2015-01-091-19/+4
| * | kbuild: allow cc-ifversion to have the argument for false conditionMasahiro Yamada2015-01-092-4/+5
| * | kbuild,gcov: simplify kernel/gcov/MakefileMasahiro Yamada2015-01-091-3/+3
| * | kbuild,gcov: remove unnecessary workaroundMasahiro Yamada2015-01-091-12/+1
| * | kbuild: do not add $(call ...) to invoke cc-version or cc-fullversionMasahiro Yamada2015-01-096-13/+10
| * | kbuild: fix cc-ifversion macroMasahiro Yamada2015-01-091-1/+1
| * | kbuild: drop $(version_h) from MRPROPER_FILESMasahiro Yamada2015-01-081-1/+1
| * | kbuild: use mixed-targets when two or more config targets are givenMasahiro Yamada2015-01-081-1/+1
| * | kbuild: remove redundant line from bounds.h/asm-offsets.hMasahiro Yamada2015-01-051-1/+0
| * | kbuild: merge bounds.h and asm-offsets.h rulesMasahiro Yamada2015-01-051-39/+21
| * | kbuild: Drop support for clean-ruleMichal Marek2015-01-021-3/+0
| |/
* | Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linuxLinus Torvalds2015-02-184-49/+36
|\ \
| * | locks: fix list insertion when lock is split in twoJeff Layton2015-02-171-0/+1
| * | locks: remove conditional lock release in middle of flock_lock_fileJeff Layton2015-02-171-10/+0
| * | locks: only remove leases associated with the file being closedJeff Layton2015-02-171-1/+2
| * | Revert "locks: keep a count of locks on the flctx lists"Jeff Layton2015-02-164-38/+33
* | | Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2015-02-1819-499/+582
|\ \ \
| * \ \ Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel...Arnd Bergmann2015-01-1421-614/+700
| |\ \ \
| | * | | sparc32: nocheck uaccess coding style tweaksMichael S. Tsirkin2015-01-131-61/+35
| | * | | sparc64: nocheck uaccess coding style tweaksMichael S. Tsirkin2015-01-131-63/+37
| | * | | xtensa: macro whitespace fixesMichael S. Tsirkin2015-01-131-45/+45
| | * | | sh: macro whitespace fixesMichael S. Tsirkin2015-01-131-1/+1
| | * | | parisc: macro whitespace fixesMichael S. Tsirkin2015-01-131-58/+58
| | * | | m68k: macro whitespace fixesMichael S. Tsirkin2015-01-131-1/+1
| | * | | m32r: macro whitespace fixesMichael S. Tsirkin2015-01-131-42/+42
| | * | | frv: macro whitespace fixesMichael S. Tsirkin2015-01-131-1/+1
| | * | | cris: macro whitespace fixesMichael S. Tsirkin2015-01-131-55/+58
| | * | | avr32: macro whitespace fixesMichael S. Tsirkin2015-01-131-9/+9
| | * | | arm64: macro whitespace fixesMichael S. Tsirkin2015-01-131-1/+1
| | * | | arm: macro whitespace fixesMichael S. Tsirkin2015-01-131-46/+46
| | * | | alpha: macro whitespace fixesMichael S. Tsirkin2015-01-131-41/+41
| | * | | blackfin: macro whitespace fixesMichael S. Tsirkin2015-01-131-11/+11
| | * | | sparc64: uaccess_64 macro whitespace fixesMichael S. Tsirkin2015-01-131-104/+144
| | * | | sparc32: uaccess_32 macro whitespace fixesMichael S. Tsirkin2015-01-131-138/+227
| | * | | avr32: whitespace fixMichael S. Tsirkin2015-01-131-1/+1
| | * | | sh: fix put_user sparse errorsMichael S. Tsirkin2015-01-131-4/+4
| | * | | metag: fix put_user sparse errorsMichael S. Tsirkin2015-01-131-8/+13
| | * | | ia64: fix put_user sparse errorsMichael S. Tsirkin2015-01-131-4/+5
| | * | | blackfin: fix put_user sparse errorsMichael S. Tsirkin2015-01-131-4/+4
| | * | | arm: fix put_user sparse errorsMichael S. Tsirkin2015-01-131-2/+2
OpenPOWER on IntegriCloud