git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca44d6e 45e3e19)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 15 Jun 2009 10:02:23 +0000 (03:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Jun 2009 10:02:23 +0000 (03:02 -0700)
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c


Trivial merge
Pandora Kernel Repository