git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c68ed25 6727244)
Merge branch 'master' into for-davem
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 23 Apr 2010 18:43:45 +0000 (14:43 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 23 Apr 2010 18:43:45 +0000 (14:43 -0400)
Conflicts:
drivers/net/wireless/ath/ath9k/phy.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c


Trivial merge
Pandora Kernel Repository