git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5e818e 83f0c6d)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Jan 2013 18:54:03 +0000 (13:54 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Jan 2013 18:54:03 +0000 (13:54 -0500)
Conflicts:
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/dvm/tx.c


Trivial merge
Pandora Kernel Repository