Linus Torvalds 9c837fb692 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 ... * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix show_stack() when stack argument is NULL. [SPARC]: Fix serial console node string creation. [SPARC]: Mark SBUS framebuffer ioctls as IGNORE in compat_ioctl.c [SPARC64]: asm-sparc64/floppy.h needs linux/pci.h [SPARC64]: Fix conflicts in SBUS/PCI/EBUS/ISA DMA handling. [VIDEO]: Fix OOPS in all SBUS framebuffer drivers. [SPARC64]: Handle mostek clock type in mini_rtc driver. [PARTITION]: Sun/Solaris VTOC table corrections [SPARC]: Fix floppy on some sun4c systems. [SPARC64]: Fix sun4u PCI config space accesses on sun4u. [PARTITION] MSDOS: Fix Sun num_partitions handling. [SPARC]: Update defconfig.		2007-07-30 11:06:55 -07:00
..
alpha	Remove fs.h from mm.h	2007-07-29 17:09:29 -07:00
arm	Remove fs.h from mm.h	2007-07-29 17:09:29 -07:00
arm26	take declarations of enable_irq() et.al. to linux/interrupt.h	2007-07-22 11:44:00 -07:00
avr32	Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds	2007-07-22 11:22:01 -07:00
blackfin	Blackfin arch: Initialize the exception vectors early in the boot process	2007-07-25 14:44:49 +08:00
cris	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild	2007-07-19 14:28:19 -07:00
frv	Remove fs.h from mm.h	2007-07-29 17:09:29 -07:00
h8300	PTRACE_POKEDATA consolidation	2007-07-17 10:23:03 -07:00
i386	APM support depends on CONFIG_PM_SLEEP	2007-07-30 10:52:10 -07:00
ia64	Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6	2007-07-29 17:22:03 -07:00
m32r	m32r: build fix for removing fs.h from mm.h	2007-07-30 10:52:10 -07:00
m68k	Remove fs.h from mm.h	2007-07-29 17:09:29 -07:00
m68knommu	m68knommu: use setup_irq() in 68328 timer code	2007-07-26 11:05:20 -07:00
mips	Remove fs.h from mm.h	2007-07-29 17:09:29 -07:00
parisc	Remove fs.h from mm.h	2007-07-29 17:09:29 -07:00
powerpc	Remove fs.h from mm.h	2007-07-29 17:09:29 -07:00
ppc	Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION	2007-07-29 16:45:38 -07:00
s390	Remove fs.h from mm.h	2007-07-29 17:09:29 -07:00
sh	clockevents: fix resume logic	2007-07-21 17:49:15 -07:00
sh64	sh64: Flag sh64_get_page() as __init_refok.	2007-07-20 17:46:42 +09:00
sparc	[SPARC]: Fix serial console node string creation.	2007-07-30 00:27:37 -07:00
sparc64	[SPARC64]: Fix show_stack() when stack argument is NULL.	2007-07-30 00:27:38 -07:00
um	Remove fs.h from mm.h	2007-07-29 17:09:29 -07:00
v850	PTRACE_POKEDATA consolidation	2007-07-17 10:23:03 -07:00
x86_64	Remove fs.h from mm.h	2007-07-29 17:09:29 -07:00
xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild	2007-07-19 14:28:19 -07:00