git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30be52e cfcfc9e)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Nov 2011 19:05:46 +0000 (14:05 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Nov 2011 19:05:46 +0000 (14:05 -0500)
Conflicts:
drivers/net/wireless/iwlegacy/iwl-debugfs.c
drivers/net/wireless/iwlegacy/iwl-rx.c
drivers/net/wireless/iwlegacy/iwl-scan.c
drivers/net/wireless/iwlegacy/iwl-tx.c
include/net/bluetooth/bluetooth.h


Trivial merge
Pandora Kernel Repository