git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9459d59 562db53)
Merge branch 'wireless-2.6' into wireless-next-2.6
authorReinette Chatre <reinette.chatre@intel.com>
Mon, 10 May 2010 22:08:11 +0000 (15:08 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Mon, 10 May 2010 22:08:11 +0000 (15:08 -0700)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-dev.h


Trivial merge
Pandora Kernel Repository