summaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-12 09:05:35 +0200
committerDavid S. Miller <davem@davemloft.net>2010-05-12 09:05:35 +0200
commit278554bd6579206921f5d8a523649a7a57f8850d (patch)
tree4e6c527daf0910e455b3aa72e2c96b0479e430be /arch/sparc
parentar9170: fix for driver-core ABI change (diff)
parentMerge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
downloadlinux-278554bd6579206921f5d8a523649a7a57f8850d.tar.xz
linux-278554bd6579206921f5d8a523649a7a57f8850d.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ar9170/usb.c drivers/scsi/iscsi_tcp.c net/ipv4/ipmr.c
Diffstat (limited to 'arch/sparc')
0 files changed, 0 insertions, 0 deletions