git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec8eb9a bcb7ad7)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jun 2012 19:35:35 +0000 (15:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jun 2012 19:35:35 +0000 (15:35 -0400)
Conflicts:
drivers/net/wireless/ath/ath9k/main.c
net/bluetooth/hci_event.c


Trivial merge
Pandora Kernel Repository