git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5e944f f2fa1b0)
Merge branch 'wireless-2.6' into wireless-next-2.6
authorReinette Chatre <reinette.chatre@intel.com>
Fri, 16 Apr 2010 20:43:40 +0000 (13:43 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Fri, 16 Apr 2010 20:43:40 +0000 (13:43 -0700)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c


Trivial merge
Pandora Kernel Repository