summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-06 13:03:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-06 13:03:52 -0700
commit0fdf86754f70e813845af4abaa805165ce57a0bb (patch)
treebafc26ec92dfe2ae430c0219882adb2c50578b1c /arch/ia64/include/asm
parent94c4fcec0144e032ef7d4ec761ab81d570b0bc2a (diff)
parent147a27460366ecd35f1425f593cb42d52166c7ff (diff)
downloadblackbird-op-linux-0fdf86754f70e813845af4abaa805165ce57a0bb.tar.gz
blackbird-op-linux-0fdf86754f70e813845af4abaa805165ce57a0bb.zip
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: fix up alignf issues
Diffstat (limited to 'arch/ia64/include/asm')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud