diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-26 15:10:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-26 15:10:56 -0700 |
| commit | f3845f3f6081b97ebc4dc905e097c07e868017b5 (patch) | |
| tree | 03825cf80cfc678b70ca94a9c8f364b27b5374e8 /drivers/pcmcia/pxa2xx_base.c | |
| parent | 054319b5e255c0671012a5a89b344a7d55cda80c (diff) | |
| parent | 035a02c1e1de31888e8b6adac0ff667971ac04db (diff) | |
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, amd: Restrict usage of c1e_idle()
x86: Fix placement of FIX_OHCI1394_BASE
x86: Handle legacy PIC interrupts on all the cpu's
Diffstat (limited to 'drivers/pcmcia/pxa2xx_base.c')
0 files changed, 0 insertions, 0 deletions