diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 02:12:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 02:12:10 +0200 |
| commit | 3960ef326a1838971466193ffa008ff37c1d978d (patch) | |
| tree | 282b74377bccb9fa79639ce4df2dcb48652dbdec /lib/parser.c | |
| parent | Merge branch 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff) | |
| parent | Merge branch 'cross-platform/clkdev' into next/cross-platform (diff) | |
| download | linux-3960ef326a1838971466193ffa008ff37c1d978d.tar.xz linux-3960ef326a1838971466193ffa008ff37c1d978d.zip | |
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
ARM: Consolidate the clkdev header files
ARM: set vga memory base at run-time
ARM: convert PCI defines to variables
ARM: pci: make pcibios_assign_all_busses use pci_has_flag
ARM: remove unnecessary mach/hardware.h includes
pci: move microblaze and powerpc pci flag functions into asm-generic
powerpc: rename ppc_pci_*_flags to pci_*_flags
Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h
Diffstat (limited to 'lib/parser.c')
0 files changed, 0 insertions, 0 deletions