summaryrefslogtreecommitdiffstats
path: root/drivers/dio
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-20 07:58:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-20 07:58:58 -0700
commitbf7cf6ee1bd00679bbe93b6ae73f80032759b8df (patch)
tree765c7e4ee581badf9e7230025b91ca43172695fd /drivers/dio
parent0b699e36b2d43c1b4288992683e5913d347b5b78 (diff)
parent2784f40e2774b61d68d232bcf92a9484e99f22b8 (diff)
downloadblackbird-op-linux-bf7cf6ee1bd00679bbe93b6ae73f80032759b8df.tar.gz
blackbird-op-linux-bf7cf6ee1bd00679bbe93b6ae73f80032759b8df.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: __NR_sys_splice --> __NR_splice
Diffstat (limited to 'drivers/dio')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud