]> spindle.queued.net Git - linux-firmware/commit
projects / linux-firmware / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 49e4e9d d9c8a3b)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 6 Nov 2009 08:55:55 +0000 (00:55 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Nov 2009 08:55:55 +0000 (00:55 -0800)
commit199a2619c5cc3e09aaff90ae8d62e9e37897eda0
tree5350b980a4b07bbf3c2cadda51bf63f7407ffb68tree | snapshot
parent49e4e9da423de28b232d531d898eab868158de37commit | diff
parentd9c8a3b8eee91d625156094e1c6095f8bbea1c7fcommit | diff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

Signed-off-by: David S. Miller <davem@davemloft.net>
WHENCE diff1 | diff2 | blob | history
linux-firmware branch with OLPC's libertas blobs included