]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 817bc4d ef85004)
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Sun, 23 Mar 2008 01:22:42 +0000 (18:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 23 Mar 2008 01:22:42 +0000 (18:22 -0700)
commit76fef2b6bffa13ad7ccd54c0493b053295721b9a
treef4509477d413398b7155fb3c35453ab26bd81bcetree | snapshot
parent817bc4db7794d6dc6594265ddea88d2b839cf2f8commit | diff
parentef8500457b29eed13d03ff19af36d810308e57b7commit | diff
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Conflicts:

drivers/s390/net/qeth_main.c
Documentation/feature-removal-schedule.txt diff1 | diff2 | blob | history
drivers/net/atlx/atl1.c diff1 | diff2 | blob | history
drivers/s390/net/qeth_l3_main.c | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.