]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bd481f 9b4311e)
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
authorJeff Garzik <jgarzik@pobox.com>
Thu, 30 Jun 2005 04:49:18 +0000 (00:49 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 30 Jun 2005 04:49:18 +0000 (00:49 -0400)
1  2 
include/linux/etherdevice.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/etherdevice.h
Simple merge
Linux 2.6 source tree