diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 08:08:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 08:08:40 -0800 |
| commit | 3568834e813e0dd7547035b3148b2f2a2b48ee4e (patch) | |
| tree | 19dfbffbaba9c1b021f4ef2df783c3a3513a0891 /drivers/pcmcia/sa1100_assabet.c | |
| parent | 8234b65afa92215ae0ed965811ac20c8b3a1806a (diff) | |
| parent | 8ee291f87c5dcebcf9c3a0ee4e021586897db364 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix RTC_AIE with CONFIG_HPET_EMULATE_RTC
x86: asm-x86/msr.h: pull in linux/types.h
x86: fix boot crash on HIGHMEM4G && SPARSEMEM
Diffstat (limited to 'drivers/pcmcia/sa1100_assabet.c')
0 files changed, 0 insertions, 0 deletions