git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b5cca3 0572e3d)
Merge upstream into ieee80211.
authorJeff Garzik <jgarzik@pobox.com>
Wed, 24 Aug 2005 05:02:04 +0000 (01:02 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 24 Aug 2005 05:02:04 +0000 (01:02 -0400)
Hand-fix merge conflict in drivers/usb/net/zd1201.c.


Trivial merge
Pandora Kernel Repository