git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8271195 8a5b33f)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Jan 2010 22:22:54 +0000 (17:22 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Jan 2010 22:26:13 +0000 (17:26 -0500)
Conflicts:
net/mac80211/scan.c
net/mac80211/wme.c


Trivial merge
Pandora Kernel Repository