diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-04 19:07:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-04 19:07:35 -0700 |
commit | d7526f271f2111684211fc7d27814e86a36336c9 (patch) | |
tree | e84866e500702e8ff26c2591a7b53ae9f4a84bd5 /arch/m68k/include/asm/amipcmcia.h | |
parent | 67bff7c087f91f79dfa97a33a3aeb147eb467093 (diff) | |
parent | b810e94c9d8e3fff6741b66cd5a6f099a7887871 (diff) |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
powernow-k8: Fix frequency reporting
x86: Fix parse_reservetop() build failure on certain configs
x86: Fix NULL pointer access in irq_force_complete_move() for Xen guests
x86: Fix 'reservetop=' functionality
Diffstat (limited to 'arch/m68k/include/asm/amipcmcia.h')
0 files changed, 0 insertions, 0 deletions