David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>		2011-12-23 17:13:56 -05:00
..
block	Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block	2011-11-04 17:06:58 -07:00
char	[S390] zfcpdump: Do not initialize zfcpdump in kdump mode	2011-11-14 11:19:09 +01:00
cio	[S390] cio: fix chsc_chp_vary	2011-12-01 13:32:18 +01:00
crypto	[S390] ap: Setup timer for sending messages after reset.	2011-12-01 13:32:18 +01:00
kvm	enable virtio_net to return bus_info in ethtool -i consistent with emulated NICs	2011-11-16 17:26:46 -05:00
net	qeth: recovery through asynchronous delivery	2011-12-20 14:05:04 -05:00
scsi	[SCSI] zfcp: return early from slave_destroy if slave_alloc returned early	2011-12-14 15:40:43 +04:00
Makefile