summaryrefslogtreecommitdiff
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-20 07:27:25 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-20 07:27:25 +0300
commit12fcdba1b7ae8b25696433f420b775aeb556d89b (patch)
tree2826a8e5ebce9296ae8a53f2eb35c49946aadeee /drivers/pcmcia
parent1268afe676ee9431a229fc68a2efb0dad4d5852f (diff)
parent9032160275ba018003ff390835ff8ed2b5b788b8 (diff)
downloadlinux-12fcdba1b7ae8b25696433f420b775aeb556d89b.tar.xz
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: Unify "numa=" command line option handling Revert "x86: Make relocatable kernel work with new binutils"
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions