summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-pnp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-12 09:26:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-12 09:26:32 -0700
commitdb8e7f10ed67933ca272f4030eb7057b7f13de07 (patch)
tree0e0ef8b5fc4357fc91d34b75ee4603468439d348 /drivers/ide/ide-pnp.c
parent8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff)
parent1260866a271abc84274345580f3d613d3bceff87 (diff)
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Provide _sdata in the vmlinux.lds.S file x86: handle initrd that extends into unusable memory
Diffstat (limited to 'drivers/ide/ide-pnp.c')
0 files changed, 0 insertions, 0 deletions