diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-10 15:54:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-10 15:54:50 -0800 |
| commit | 1385a7ae654264fb2d9d3c6c3c7a3df28d29ab53 (patch) | |
| tree | 153944a51d888ca98ad35625d53e4df00f006316 /arch/x86/kernel/ftrace.c | |
| parent | 1db8508cf483dc1ecf66141f90a7c03659d69512 (diff) | |
| parent | f6f35bbe7c6494e66590cf519e21da2dd8d59e01 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] AACI: timeout will reach -1
[ARM] Storage class should be before const qualifier
[ARM] pxa: stop and disable IRQ for each DMA channels at startup
[ARM] pxa: make more SSCR0 bit definitions visible on multiple processors
[ARM] pxa: fix missing of __REG() definition for ac97 registers access
[ARM] pxa: fix NAND and MMC clock initialization for pxa3xx
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
0 files changed, 0 insertions, 0 deletions