davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
393bfca19e
kernel-ark/arch
History
Linus Torvalds df6d3916f3 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
  [POWERPC] Abolish powerpc_flash_init()
  [POWERPC] Early serial debug support for PPC44x
  [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
  [POWERPC] Add device tree for Ebony
  [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
  [POWERPC] MPIC U3/U4 MSI backend
  [POWERPC] MPIC MSI allocator
  [POWERPC] Enable MSI mappings for MPIC
  [POWERPC] Tell Phyp we support MSI
  [POWERPC] RTAS MSI implementation
  [POWERPC] PowerPC MSI infrastructure
  [POWERPC] Rip out the existing powerpc msi stubs
  [POWERPC] Remove use of 4level-fixup.h for ppc32
  [POWERPC] Add powerpc PCI-E reset API implementation
  [POWERPC] Holly bootwrapper
  [POWERPC] Holly DTS
  [POWERPC] Holly defconfig
  [POWERPC] Add support for 750CL Holly board
  [POWERPC] Generalize tsi108 PCI setup
  [POWERPC] Generalize tsi108 PHY types
  ...

Fixed conflict in include/asm-powerpc/kdebug.h manually

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:50:19 -07:00
..
alpha utimensat implementation 2007-05-08 11:15:18 -07:00
arm Add IRQF_IRQPOLL flag on arm 2007-05-08 11:15:22 -07:00
arm26 header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
avr32 header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
blackfin blackfin architecture 2007-05-07 12:12:58 -07:00
cris dma_declare_coherent_memory wrong allocation 2007-05-08 11:15:14 -07:00
frv header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
h8300 header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
i386 fbdev: ignore VESA modes if framebuffer is disabled 2007-05-08 11:15:26 -07:00
ia64 Add IRQF_IRQPOLL flag on IA64 2007-05-08 11:15:22 -07:00
m32r header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
m68k header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
m68knommu header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
mips Replace deprecated SA_xxx interrupt flags 2007-05-08 11:15:08 -07:00
parisc Add IRQF_IRQPOLL flag on parisc 2007-05-08 11:15:22 -07:00
powerpc Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2007-05-08 11:50:19 -07:00
ppc Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2007-05-08 11:50:19 -07:00
s390 no longer #include <asm/kdebug.h> 2007-05-08 11:15:20 -07:00
sh Add IRQF_IRQPOLL flag on sh 2007-05-08 11:15:22 -07:00
sh64 Simplify kallsyms_lookup() 2007-05-08 11:15:08 -07:00
sparc header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
sparc64 utimensat implementation 2007-05-08 11:15:18 -07:00
um uml: pcap devices should get MACs from command line 2007-05-08 11:15:20 -07:00
v850 header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
x86_64 x86, serial: convert legacy COM ports to platform devices 2007-05-08 11:15:23 -07:00
xtensa header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00