David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/stmmac/stmmac_main.c drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_spi.c net/core/ethtool.c net/mac80211/scan.c		2010-04-11 14:53:53 -07:00
..
basic	kbuild: move autoconf.h to include/generated	2009-12-12 13:08:15 +01:00
dtc	dtc: Mark various internal functions static	2009-11-15 15:01:41 -08:00
genksyms	genksyms: properly consider EXPORT_UNUSED_SYMBOL{,_GPL}()	2009-12-12 13:08:16 +01:00
kconfig	kconfig: Simplify LSMOD= handling	2010-02-03 11:45:25 -05:00
ksymoops	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
mod	phylib: Support phy module autoloading	2010-04-02 14:30:39 -07:00
package	scripts/package: deb-pkg: use fakeroot if available	2009-12-12 13:08:16 +01:00
rt-tester	[PATCH] rtmutex: Modify rtmutex-tester to test the setscheduler propagation	2006-06-27 17:32:47 -07:00
selinux	SELinux: header generation may hit infinite loop	2009-11-23 09:00:44 +11:00
tracing	tracing, perf: Convert the power tracer into an event tracer	2009-09-19 11:42:12 +02:00
.gitignore	kconfig: simplification of scripts/extract-ikconfig	2009-10-07 11:44:18 -04:00
bin2c.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
bloat-o-meter	fix bloat-o-meter for ppc64	2007-12-17 19:28:17 -08:00
bootgraph.pl	bootgraph: fix for use with dot symbols	2009-02-15 12:50:08 +01:00
checkincludes.pl	checkincludes.pl: add option to remove duplicates in place	2009-09-20 12:27:43 +02:00
checkkconfigsymbols.sh	kbuild,scripts: use non-builtin echo for '-e'	2009-10-11 23:21:25 +02:00
checkpatch.pl	checkpatch: warn on unnecessary spaces before quoted newlines	2010-03-06 11:26:44 -08:00
checkstack.pl	sparc: Add checkstack support	2008-10-22 21:53:49 -07:00
checksyscalls.sh	asm-generic: add a generic unistd.h	2009-06-11 21:02:16 +02:00
checkversion.pl	kbuild: introduce utsrelease.h	2006-07-03 23:30:54 +02:00
cleanfile	scripts: Make cleanfile/cleanpatch warn about long lines	2007-07-16 21:15:50 +02:00
cleanpatch	scripts: Make cleanfile/cleanpatch warn about long lines	2007-07-16 21:15:50 +02:00
config	kbuild: add generic --set-str option to scripts/config	2009-06-14 22:48:08 +02:00
conmakehash.c	Fix all -Wmissing-prototypes warnings in x86 defconfig	2009-09-23 07:39:28 -07:00
decodecode	scripts: improve the decodecode script	2008-12-03 22:36:39 +01:00
diffconfig	kconfig: add diffconfig utility	2008-07-25 22:12:41 +02:00
export_report.pl	kbuild: fix perl usage in export_report.pl	2007-10-12 21:13:50 +02:00
extract-ikconfig	kconfig: simplification of scripts/extract-ikconfig	2009-10-07 11:44:18 -04:00
gcc-version.sh	Remove bashisms from scripts	2009-06-09 22:37:54 +02:00
gcc-x86_32-has-stack-protector.sh	stackprotector: fix multi-word cross-builds	2009-02-11 12:17:29 +01:00
gcc-x86_64-has-stack-protector.sh	stackprotector: fix multi-word cross-builds	2009-02-11 12:17:29 +01:00
gen_initramfs_list.sh	kbuild: fix spurious initramfs rebuild	2009-04-11 08:18:12 +02:00
get_maintainer.pl	get_maintainer: repair STDIN usage	2010-03-24 16:31:20 -07:00
gfp-translate	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
headerdep.pl	kbuild: fix option processing for -I in headerdep	2009-04-11 08:18:07 +02:00
headers_check.pl	kbuild/headers_check: refine extern check	2009-06-09 22:37:56 +02:00
headers_install.pl	warn about use of uninstalled kernel headers	2009-10-11 23:21:25 +02:00
headers.sh	kbuild: do not check for include/asm-$ARCH	2009-12-12 13:08:14 +01:00
kallsyms.c	kallsyms: fix segfault in prefix_underscores_count()	2009-09-23 07:39:30 -07:00
Kbuild.include	kbuild: generate modules.builtin	2009-12-12 13:08:16 +01:00
kernel-doc	scripts/kernel-doc: fix fatal error on function prototype	2010-03-24 16:31:20 -07:00
Lindent	scripts/Lindent: support gnu indent v2.2.10	2008-04-29 08:06:04 -07:00
Makefile	sparc: Kill PROM console driver.	2009-09-15 17:04:38 -07:00
Makefile.build	MIPS: Tracing: Add an endian argument to scripts/recordmcount.pl	2009-12-17 01:57:22 +00:00
Makefile.clean	kbuild: fix some minor typoes	2008-04-25 20:18:48 +02:00
Makefile.fwinst	firmware: silence __fw_modbuild and __fw_modinst 'Nothing to be done' messages	2008-08-02 07:52:29 +01:00
Makefile.headersinst	kbuild: fix "Argument list too long" error for "make headers_check",	2009-06-09 22:37:56 +02:00
Makefile.host	kbuild: fix some minor typoes	2008-04-25 20:18:48 +02:00
Makefile.lib	kbuild: really fix bzImage build with non-bash sh	2010-01-13 13:27:24 +01:00
Makefile.modbuiltin	kbuild: generate modules.builtin	2009-12-12 13:08:16 +01:00
Makefile.modinst	Revert "kbuild: strip generated symbols from *.ko"	2009-01-14 21:38:20 +01:00
Makefile.modpost	tracing: Remove markers	2009-09-18 21:22:08 +02:00
makelst	kbuild: introduce ccflags-y, asflags-y and ldflags-y	2007-10-15 22:25:06 +02:00
markup_oops.pl	markup_oops.pl: fix $func_offset error with x86_64	2010-02-02 18:11:22 -08:00
mkcompile_h	kbuild: move autoconf.h to include/generated	2009-12-12 13:08:15 +01:00
mkmakefile	kbuild: teach mkmakfile to be silent	2008-12-03 21:32:02 +01:00
mksysmap	Revert "kbuild: strip generated symbols from *.ko"	2009-01-14 21:38:20 +01:00
mkuboot.sh	kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE	2007-05-02 20:58:10 +02:00
mkversion	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
module-common.lds	linker script: throw away .discard section	2009-06-24 15:13:38 +09:00
namespace.pl	x86: fixup the x86 namespace change in scripts/namespace.pl	2007-10-11 17:56:02 +02:00
patch-kernel	bugfix for scripts/patch-kernel in 2.6 sublevel stepping	2008-08-06 22:11:33 +02:00
pnmtologo.c	fbdev: work around old compiler bug	2009-06-30 18:55:59 -07:00
profile2linkerlist.pl	[PATCH] x86_64: Basic reorder infrastructure	2006-03-25 09:10:56 -08:00
recordmcount.pl	Merge commit 'v2.6.33' into tracing/core	2010-02-26 09:18:32 +01:00
setlocalversion	kbuild: fix delay in setlocalversion on readonly source	2009-06-14 22:26:00 +02:00
show_delta	kbuild: fix mode of checkstack.pl and other files.	2006-04-11 13:37:07 +02:00
tags.sh	kbuild: specify absolute paths for cscope	2009-12-12 13:08:16 +01:00
unifdef.c	unifdef: update to upstream revision 1.190	2009-12-12 13:08:16 +01:00
ver_linux	Remove bashisms from scripts	2009-06-09 22:37:54 +02:00