git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f0d9f4 6aee4ca)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Jun 2012 18:09:59 +0000 (14:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Jun 2012 18:11:13 +0000 (14:11 -0400)
Conflicts:
MAINTAINERS
drivers/net/wireless/iwlwifi/pcie/trans.c


Trivial merge
Pandora Kernel Repository