| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db | [log] [tgz] |
|---|---|---|
| author | David Howells <dhowells@redhat.com> | Tue Dec 05 14:37:56 2006 +0000 |
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | Tue Dec 05 14:37:56 2006 +0000 |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 [diff] | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/infiniband/core/iwcm.c drivers/net/chelsio/cxgb2.c drivers/net/wireless/bcm43xx/bcm43xx_main.c drivers/net/wireless/prism54/islpci_eth.c drivers/usb/core/hub.h drivers/usb/input/hid-core.c net/core/netpoll.c Fix up merge failures with Linus's head and fix new compilation failures. Signed-Off-By: David Howells <dhowells@redhat.com>