git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac178ef d2f8d7e)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Sun, 15 Feb 2009 07:12:00 +0000 (23:12 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Feb 2009 07:12:00 +0000 (23:12 -0800)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c


Trivial merge
Pandora Kernel Repository