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
..
appldata	[S390] mm: add ZONE_DMA to 31-bit config again	2011-05-26 09:48:25 +02:00
boot	[S390] sparse: fix sparse static warnings	2011-10-30 15:16:46 +01:00
crypto	s390: add missing module.h/export.h includes	2011-10-31 19:30:58 -04:00
hypfs	filesystems: add set_nlink()	2011-11-02 12:53:43 +01:00
include/asm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux	2011-11-22 14:05:46 -05:00
kernel	Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2011-11-06 20:20:46 -08:00
kvm	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2011-10-31 16:14:20 -07:00
lib	[S390] sparse: fix sparse warnings with __user pointers	2011-10-30 15:16:46 +01:00
math-emu	s390: change to new flag variable	2011-03-17 14:02:57 +01:00
mm	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
oprofile	[S390] sparse: fix sparse ANSI-C warnings	2011-10-30 15:16:46 +01:00
Kbuild	[S390] standardize Kbuild rules	2010-10-25 16:10:14 +02:00
Kconfig	[S390] kdump backend code	2011-10-30 15:16:42 +01:00
Kconfig.debug	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	[S390] remove redundant stack check option	2011-03-15 17:08:22 +01:00
defconfig	[S390] defconfig: switch on CONFIG_DEVTMPFS	2011-10-30 15:16:42 +01:00