git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a147e8 cea0d76)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 12 May 2010 07:05:35 +0000 (00:05 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 May 2010 07:05:35 +0000 (00:05 -0700)
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c


Trivial merge
Pandora Kernel Repository