git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a12761 adfba3c)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 5 May 2010 20:14:16 +0000 (16:14 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 5 May 2010 20:14:16 +0000 (16:14 -0400)
Conflicts:
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/main.c


Trivial merge
Pandora Kernel Repository