diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-06 17:38:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-06 17:38:03 +0200 |
| commit | 325ce9e3060960488fa2c1c9eccde5ad85d75e7c (patch) | |
| tree | 836f4aebacd0741f02647986b386fdd0ac58a69d /arch/microblaze/include/asm/pci.h | |
| parent | Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px... (diff) | |
| download | linux-325ce9e3060960488fa2c1c9eccde5ad85d75e7c.tar.xz linux-325ce9e3060960488fa2c1c9eccde5ad85d75e7c.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa/colibri: fix missing #include <mach/mfp.h> in colibri.h
[ARM] pxa/spitz: fix On/off key name to fix warning during boot
[ARM] pxa: fix the incorrect cpu_is_pxa950()
[ARM] pxa: update cpuid pattern for pxa9xx in head.S
[ARM] pxa/viper: fix timeout usage for I2C
[ARM] pxa/raumfeld: fix button name
[ARM] pxa/imote2: Fix iMote2 defconfig
[ARM] pxa: add missing new line to regs-u2d.h
ARM: 6093/1: Fix kernel memory printing for sparsemem
arch/arm/include/asm/elf.h: forward-declare the task-struct
arch/arm/plat-pxa/dma.c: correct NULL test
ARM: 6076/1: SA1100: add processor check to sa1110-cpufreq driver
ARM: 6075/1: SA1100: fix wrong CPU type for h3100 and h3600
ARM: Update mach-types
ARM: 6066/1: Fix "BUG: scheduling while atomic: swapper/0/0x00000002
ARM: 6068/1: Fix build break with KPROBES enabled
mx5: Fix build error for mx51_defconfig
Diffstat (limited to 'arch/microblaze/include/asm/pci.h')
0 files changed, 0 insertions, 0 deletions