aboutsummaryrefslogtreecommitdiff
path: root/drivers/pcmcia/pxa2xx_cm_x255.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-10 16:15:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-10 16:15:59 -0700
commit595dc54a1da91408a52c4b962f3deeb1109aaca0 (patch)
tree918dd8ad8bfb44410b16fea7901c3a81111fa831 /drivers/pcmcia/pxa2xx_cm_x255.c
parent9b29e8228a5c2a169436a1a90a60b1f88cb35cd1 (diff)
parent7d96fd41cadc55f4e00231c8c71b8e25c779f122 (diff)
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: move rdtsc_barrier() into the TSC vread method
Diffstat (limited to 'drivers/pcmcia/pxa2xx_cm_x255.c')
0 files changed, 0 insertions, 0 deletions