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

m32r: fix arch/m32r/boot/compressed/Makefile

2009-11-09 09:00:50 +09:00

configs

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08: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

m32r: export delay loop symbols

2009-10-04 12:02:36 +09:00

mm

m32r, mm: set all online nodes in N_NORMAL_MEMORY

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

oprofile

oprofile: more whitespace fixes

2008-10-15 20:55:51 +02:00

platforms

m32r: Convert genirq namespace

2011-03-24 20:35:57 +01: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

lib: consolidate DEBUG_STACK_USAGE option

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

Makefile

kbuild: allow assignment to {A,C}FLAGS_KERNEL on the command line

2010-08-03 14:09:45 +02:00