diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 18:16:40 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 18:16:40 (GMT) |
| commit | 44bc40e1489622234169786b0ad5a1f4a01e1090 (patch) | |
| tree | cd247a6f130b8993e92ac62f76ced2b023491d09 /arch/openrisc | |
| parent | 02171b4a7c5b555d08c3321332e0c45776518276 (diff) | |
| parent | ead91d4b8c3b1fb08a73aaa4a191230ecf717ee0 (diff) | |
| download | linux-fsl-qoriq-44bc40e1489622234169786b0ad5a1f4a01e1090.tar.xz | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform changes from Ingo Molnar:
"This tree includes assorted platform driver updates and a preparatory
series for a platform with custom DMA remapping semantics (sta2x11 I/O
hub)."
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/vsmp: Fix number of CPUs when vsmp is disabled
keyboard: Use BIOS Keyboard variable to set Numlock
x86/olpc/xo1/sci: Report RTC wakeup events
x86/olpc/xo1/sci: Produce wakeup events for buttons and switches
x86, platform: Initial support for sta2x11 I/O hub
x86: Introduce CONFIG_X86_DMA_REMAP
x86-32: Introduce CONFIG_X86_DEV_DMA_OPS
Diffstat (limited to 'arch/openrisc')
0 files changed, 0 insertions, 0 deletions