John W. Linville 515db09338 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ...

Conflicts:
	drivers/net/wireless/iwlegacy/iwl-debugfs.c
	drivers/net/wireless/iwlegacy/iwl-rx.c
	drivers/net/wireless/iwlegacy/iwl-scan.c
	drivers/net/wireless/iwlegacy/iwl-tx.c
	include/net/bluetooth/bluetooth.h

2011-11-22 14:05:46 -05:00

..

arch-v10

kgdb: follow rename pack_hex_byte() to hex_byte_pack()

2011-10-31 17:30:56 -07:00

arch-v32

Merge git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08:00

boot

Fix common misspellings

2011-03-31 11:26:23 -03:00

configs

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

include

net: add wireless TX status socket option

2011-11-09 16:01:02 -05:00

kernel

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

mm

mm: now that all old mmu_gather code is gone, remove the storage

2011-05-25 08:39:16 -07:00

Kconfig

Fix file references in Kconfig files

2011-10-11 15:24:17 +02:00

Kconfig.debug

CRIS: Add config for pausing a seg-faulting process

2010-08-04 18:28:48 +02:00

Makefile

arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0

2009-09-20 12:28:22 +02:00