David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/mac80211/sta_info.c net/wireless/core.h Two minor conflicts in wireless. Overlapping additions of extern declarations in net/wireless/core.h and a bug fix overlapping with the addition of a boolean parameter to __ieee80211_key_free(). Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-01 13:36:50 -04:00
..
configs	[IA64] defconfig: Remove CONFIG_MISC_DEVICES	2012-08-20 13:04:29 -07:00
dig	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
hp	tty/serial patches for 3.9-rc1	2013-02-21 13:41:04 -08:00
include	net: add option to enable error queue packets waking select	2013-03-31 19:44:20 -04:00
kernel	ia64 idle: delete stale (*idle)() function pointer	2013-03-29 11:12:25 -07:00
kvm	Merge tag 'kvm-3.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2013-02-24 13:07:18 -08:00
lib
mm	ia64 vm patch series that was cooking in -mm tree	2013-02-25 15:47:03 -08:00
oprofile	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
pci	PCI changes for the v3.9 merge window:	2013-02-25 21:18:18 -08:00
scripts
sn	IA64: drivers: remove __dev* attributes.	2013-01-03 15:57:13 -08:00
uv
xen	arch/ia64/xen: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:04 -08:00
install.sh
Kconfig	Select VIRT_TO_BUS directly where needed	2013-03-12 11:16:40 -07:00
Kconfig.debug
Makefile
module.lds