]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a1abd0 7379efe)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Nov 2010 06:15:31 +0000 (22:15 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Nov 2010 06:15:31 +0000 (22:15 -0800)

Trivial merge
Clone of davem's net-next-2.6 tree