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
..
boot	Merge remote-tracking branch 'agust/next' into merge	2011-11-08 14:53:55 +11:00
configs	Merge remote-tracking branch 'agust/next' into merge	2011-11-08 14:53:55 +11: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	powerpc/kvm: Fix build failure with HV KVM and CBE	2011-11-08 15:34:04 +11:00
kvm	powerpc/kvm: Fix build with older toolchains	2011-11-08 14:51:03 +11:00
lib	powerpc: various straight conversions from module.h --> export.h	2011-10-31 19:30:44 -04:00
math-emu	powerpc/math_emu/efp: Look for errata handler when type mismatches	2011-10-06 23:36:47 -05:00
mm	powerpc/numa: NUMA topology support for PowerNV	2011-11-08 14:51:46 +11:00
net	net: filter: BPF 'JIT' compiler for PPC64	2011-07-21 12:38:32 -07:00
oprofile	powerpc/oprofile: Handle events that raise an exception without overflowing	2011-05-26 13:38:57 +10:00
platforms	Merge remote-tracking branch 'agust/next' into merge	2011-11-08 14:53:55 +11:00
sysdev	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-15 14:47:28 -02:00
xmon	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
Kconfig	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
Kconfig.debug	powerpc/powernv: Support for OPAL console	2011-09-20 16:09:54 +10:00
Makefile	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-07-25 22:59:39 -07:00
relocs_check.pl	powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE	2009-09-24 15:31:40 +10:00