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
..
boards	mtd: ATMEL, AVR32: inline nand partition table access	2011-09-11 15:01:57 +03:00
boot	avr32: remove .note.gnu.build-id section when making vmlinux.bin	2008-12-17 11:44:10 +01:00
configs	rtc: fix build warnings in defconfigs	2011-06-15 20:04:02 -07:00
include/asm	net: add wireless TX status socket option	2011-11-09 16:01:02 -05:00
kernel	All Arch: remove linkage for sys_nfsservctl system call	2011-08-26 15:09:58 -07:00
lib	asm-generic: rename generic little-endian bitops functions	2011-03-23 19:46:11 -07:00
mach-at32ap	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
mm	avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:30:59 -04:00
oprofile	Add kernel support for oprofile callgraphs on AVR32	2008-09-22 09:51:01 +02:00
Kconfig	Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG	2011-08-03 11:12:37 -04:00
Kconfig.debug	[AVR32] Include instrumentation menu	2008-01-25 08:31:40 +01:00
Makefile	kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line	2010-08-03 14:09:45 +02:00