diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 01:03:31 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 01:03:31 +0100 |
commit | e27fc7e476077c724f313a3ddec44ad26c49f678 (patch) | |
tree | 5d66d9694e4aa3985464e5034f1d4908ec426766 /drivers/ide/piix.c | |
parent | Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/lin... (diff) | |
parent | sparc64: Patch sun4v code sequences properly on module load. (diff) | |
download | linux-e27fc7e476077c724f313a3ddec44ad26c49f678.tar.xz linux-e27fc7e476077c724f313a3ddec44ad26c49f678.zip |
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/piix.c')
0 files changed, 0 insertions, 0 deletions