aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds2011-11-18 22:03:31 -0200
committerLinus Torvalds2011-11-18 22:03:31 -0200
commite27fc7e476077c724f313a3ddec44ad26c49f678 (patch)
tree5d66d9694e4aa3985464e5034f1d4908ec426766 /drivers/ide
parentb6844523839779030430ff28f036f83e2a3f43e6 (diff)
parent0b64120cceb86e93cb1bda0dc055f13016646907 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Patch sun4v code sequences properly on module load. sparc: Kill custom io_remap_pfn_range(). sparc: Stash orig_i0 into %g6 instead of %g2 sparc: Fix handling of orig_i0 wrt. debugging when restarting syscalls. sparc: sigutil: Include <linux/errno.h>
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions