git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db28569 28bec7b)
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Feb 2011 22:03:41 +0000 (17:03 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Feb 2011 22:03:41 +0000 (17:03 -0500)
Conflicts:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c


Trivial merge
Pandora Kernel Repository