git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c16cc0b 30ff056)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 Mar 2010 03:23:06 +0000 (19:23 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Mar 2010 03:23:06 +0000 (19:23 -0800)
Conflicts:
drivers/firmware/iscsi_ibft.c


Trivial merge
Pandora Kernel Repository