黄涛 7cd3739f32 Merge remote-tracking branch 'linux-2.6.32.y/master' into develop ...

Merge Linux 2.6.32.41
Conflicts:
	Makefile
	drivers/mmc/core/core.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/regd_common.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/dma.h
	drivers/net/wireless/b43/sdio.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/cmd.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/usb/serial/option.c
	mm/shmem.c

2011-06-16 11:56:59 +08:00

..

basic

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

2009-09-23 15:37:02 -07:00

dtc

dtc: Mark various internal functions static

2009-11-15 15:01:41 -08:00

genksyms

genksyms: Mark is_reserved_word static

2009-11-15 15:01:22 -08:00

kconfig

kconfig: Avoid buffer underrun in choice input

2011-05-09 15:54:49 -07:00

ksymoops

…

mod

kbuild: Fix modpost segfault

2010-08-02 10:21:29 -07:00

package

kbuild: fix the binrpm-pkg target to work with KBUILD_OUTPUT set

2009-10-11 23:21:24 +02:00

rt-tester

…

selinux

Fix all -Wmissing-prototypes warnings in x86 defconfig

2009-09-23 07:39:28 -07:00

tracing

tracing, perf: Convert the power tracer into an event tracer

2009-09-19 11:42:12 +02:00

.gitignore

gitignore: ignore scripts/ihex2fw

2009-06-27 00:17:48 +02:00

bin2c.c

…

binoffset.c

…

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: version 0.30

2009-10-29 07:39:31 -07: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

…

cleanfile

…

cleanpatch

…

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

…

extract-ikconfig

kconfig: have extract-ikconfig read ELF files

2009-08-18 22:00: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: fix usage comment

2009-11-12 07:25:56 -08:00

gfp-translate

mm: add a gfp-translate script to help understand page allocation failure reports

2009-06-16 19:47:44 -07: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: clean up scripts/headers.sh

2009-06-09 22:37:43 +02:00

kallsyms.c

kallsyms: fix segfault in prefix_underscores_count()

2009-09-23 07:39:30 -07:00

Kbuild.include

kbuild,scripts: use non-builtin echo for '-e'

2009-10-11 23:21:25 +02:00

kernel-doc

kernel-doc: allow multi-line declaration purpose descriptions

2009-09-18 09:48:52 -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

support build uu -> o

2010-12-17 22:03:17 +08: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: Fix size_append issue for bzip2/lzma kernel

2009-10-11 23:21:25 +02: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: use modinfo to avoid confusion with underscored module names

2009-09-20 12:27:43 +02:00

mkcompile_h

kbuild: mkcompile_h: trivial cleanups

2009-10-11 23:21:25 +02:00

mkmakefile

fixes for using make 3.82

2010-08-26 16:41:55 -07:00

mksysmap

Revert "kbuild: strip generated symbols from *.ko"

2009-01-14 21:38:20 +01:00

mkuboot.sh

…

mkversion

…

module-common.lds

linker script: throw away .discard section

2009-06-24 15:13:38 +09:00

namespace.pl

…

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

…

recordmcount.pl

Merge branch 'linus' into tracing/core

2009-08-11 14:19:09 +02:00

setlocalversion

kbuild: fix delay in setlocalversion on readonly source

2009-06-14 22:26:00 +02:00

show_delta

…

tags.sh

ctags: usability fix

2009-09-20 12:27:43 +02:00

unifdef.c

kbuild: fix headers_exports with boolean expression

2009-06-09 22:37:57 +02:00

ver_linux

Remove bashisms from scripts

2009-06-09 22:37:54 +02:00