Paul Mundt 8c6b44d00a sh: pci: Allow register_pci_controller() to handle overlapping regions. ... Some host controllers (such as SH7786) have overlapping regions that are fixed in hardware. The resource allocator does the right thing in managing this space already, so the conflict case is non-fatal. Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2009-06-16 06:01:58 +09:00
..
alpha	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
avr32	Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2009-06-13 13:18:32 -07:00
blackfin	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
cris	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
frv	FRV: Fix interaction with new generic header stuff	2009-06-13 13:17:28 -07:00
h8300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
ia64	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
m32r	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
m68knommu	module: cleanup FIXME comments about trimming exception table entries.	2009-06-12 21:47:05 +09:30
microblaze	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
mips	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
mn10300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
parisc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
powerpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
s390	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2009-06-12 18:18:05 -07:00
sh	sh: pci: Allow register_pci_controller() to handle overlapping regions.	2009-06-16 06:01:58 +09:00
sparc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
x86	Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-13 13:14:51 -07:00
xtensa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
.gitignore
Kconfig