You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		13 years ago
..
block	Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block	13 years ago
char	[S390] zfcpdump: Do not initialize zfcpdump in kdump mode	13 years ago
cio	[S390] cio: fix chsc_chp_vary	13 years ago
crypto	[S390] ap: Setup timer for sending messages after reset.	13 years ago
kvm	enable virtio_net to return bus_info in ethtool -i consistent with emulated NICs	13 years ago
net	qeth: recovery through asynchronous delivery	13 years ago
scsi	[SCSI] zfcp: return early from slave_destroy if slave_alloc returned early	13 years ago
Makefile	…