summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2011-11-0721-198/+1
|\
| * scsi: drop unused Kconfig symbolPaul Bolle2011-10-311-14/+0
| * pci: drop unused Kconfig symbolPaul Bolle2011-10-311-11/+0
| * stmmac: drop unused Kconfig symbolPaul Bolle2011-10-311-9/+0
| * x86: drop unused Kconfig symbolPaul Bolle2011-10-311-3/+0
| * powerpc: drop unused Kconfig symbolsPaul Bolle2011-10-315-48/+0
| * powerpc: 40x: drop unused Kconfig symbolPaul Bolle2011-10-311-5/+0
| * mips: drop unused Kconfig symbolsPaul Bolle2011-10-313-44/+0
| * openrisc: drop unused Kconfig symbolsPaul Bolle2011-10-311-12/+0
| * arm: at91: drop unused Kconfig symbolPaul Bolle2011-10-311-6/+0
| * samples: drop unused Kconfig symbolPaul Bolle2011-10-311-6/+0
| * m32r: drop unused Kconfig symbolPaul Bolle2011-10-311-7/+0
| * score: drop unused Kconfig symbolsPaul Bolle2011-10-311-19/+0
| * sh: drop unused Kconfig symbolPaul Bolle2011-10-311-4/+0
| * um: drop unused Kconfig symbolPaul Bolle2011-10-311-3/+0
| * sparc: drop unused Kconfig symbolPaul Bolle2011-10-311-6/+1
| * alpha: drop unused Kconfig symbolPaul Bolle2011-10-311-5/+0
* | Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/k...Linus Torvalds2011-11-073-2/+78
|\ \
| * | script/checkpatch.pl: warn about deprecated use of EXTRA_{A,C,CPP,LD}FLAGSArnaud Lacombe2011-08-311-0/+14
| * | tags, powerpc: Update tags.sh to support _GLOBAL symbolsIan Munsie2011-08-311-2/+2
| * | scripts: add extract-vmlinuxCorentin Chary2011-08-311-0/+62
| |/
* | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2011-11-079-112/+173
|\ \
| * | scripts/kconfig/nconf: add KEY_HOME / KEY_END for dialog_inputboxCheng Renquan2011-09-091-0/+8
| * | scripts/kconfig/nconf: fix editing long stringsCheng Renquan2011-09-091-6/+23
| * | scripts/kconfig/nconf: dynamically alloc dialog_input_resultCheng Renquan2011-09-093-17/+26
| * | scripts/kconfig/nconf: fix memmove's length argCheng Renquan2011-09-091-1/+1
| * | scripts/kconfig/nconf: fix typo: unknow => unknownCheng Renquan2011-09-091-1/+1
| * | Merge branch 'kconfig/for-next' of git://github.com/lacombar/linux-2.6 into k...Michal Marek2011-08-313-49/+89
| |\ \
| | * | kconfig: fix set but not used variablesLucas De Marchi2011-08-301-2/+1
| | * | kconfig: handle SIGINT in menuconfigDavidlohr Bueso2011-08-301-34/+52
| | * | kconfig: fix __enabled_ macros definition for invisible and un-selected symbolsArnaud Lacombe2011-08-301-13/+36
| | |/
| * | Merge branch 'master/kconfig-localmodconfig' of git://github.com/lacombar/lin...Michal Marek2011-08-192-29/+21
| |\ \
| | * | kconfig/streamline_config.pl: merge local{mod,yes}configArnaud Lacombe2011-08-081-17/+1
| | * | kconfig/streamline_config.pl: use options to determine operating modeArnaud Lacombe2011-08-082-3/+15
| | * | kconfig/streamline_config.pl: directly access LSMOD from the environmentArnaud Lacombe2011-08-082-12/+8
| | |/
| * | kconfig: factor code in menu_get_ext_help()Arnaud Lacombe2011-08-081-6/+4
| * | kbuild: Fix help text not displayed in choice option.Srinivas Kandagatla2011-08-081-4/+3
| * | kconfig/nconf: nuke unreferenced `nohelp_text'Arnaud Lacombe2011-08-081-2/+0
| |/
* | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...Linus Torvalds2011-11-0712-332/+404
|\ \
| * | Kbuild: append missing-syscalls to the default target listArnaud Lacombe2011-11-022-3/+4
| * | genksyms: Regenerate lexer and parserMichal Marek2011-10-113-306/+358
| * | genksyms: Do not expand internal typesMichal Marek2011-10-114-2/+20
| * | genksyms: Minor parser cleanupMichal Marek2011-10-111-18/+15
| * | Makefile: remove a duplicated lineAmerigo Wang2011-09-091-1/+0
| * | fixdep: fix extraneous dependenciesPeter Foley2011-09-091-0/+1
| * | scripts/Makefile.build: do not reference EXTRA_CFLAGS as CFLAGS replacementArnaud Lacombe2011-08-311-1/+1
| * | kbuild: prevent make from deleting _shipped filesPeter Foley2011-08-311-0/+4
| * | kbuild: Do not delete empty files in make distcleanMichal Marek2011-08-101-1/+1
| |/
* | hid/apple: modern macbook airs use the standard apple function key translationsLinus Torvalds2011-11-071-3/+0
* | Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-11-0710-223/+34
|\ \