Linus Torvalds 773d7a09e1 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (35 commits) powerpc/5121: make clock debug output more readable powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function powerpc/5200: Update pcm030.dts to add i2c eeprom and delete cruft powerpc/5200: convert mpc52xx_psc_spi to use cs_control callback fbdev/xilinxfb: Fix improper casting and tighen up probe path usb/ps3: Add missing annotations powerpc: Add memory clobber to mtspr() powerpc: Fix invalid construct in our CPU selection Kconfig ps3rom: Use ps3_system_bus_[gs]et_drvdata() instead of direct access powerpc: Add configurable -Werror for arch/powerpc of_serial: Add UPF_FIXED_TYPE flag drivers/hvc: Add missing __devexit_p() net/ps3: gelic - Add missing annotations powerpc: Introduce macro spin_event_timeout() powerpc/warp: Fix ISA_DMA_THRESHOLD default powerpc/bootwrapper: Custom build options for XPedite52xx targets powerpc/85xx: Add defconfig for X-ES MPC85xx boards powerpc/85xx: Add dts files for X-ES MPC85xx boards powerpc/85xx: Add platform support for X-ES MPC85xx boards 83xx: add support for the kmeter1 board. ...		2009-06-19 17:40:40 -07:00
..
accessibility
acpi
amba
ata	powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function	2009-06-17 00:30:22 -06:00
atm
auxdisplay
base	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
block
bluetooth
cdrom
char	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-06-19 17:40:40 -07:00
clocksource	Merge branches 'sh/pci-express-integration', 'sh/rsk-updates', 'sh/platform-updates' and 'sh/perf_counter'	2009-06-17 16:37:26 +09:00
connector
cpufreq
cpuidle
crypto
dca
dio
dma	DMA: TXx9 Soc DMA Controller driver	2009-06-17 11:06:25 +01:00
edac	edac: Kconfig: fix the meaning of EDAC abbreviation	2009-06-18 13:03:57 -07:00
eisa	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-06-16 14:29:46 -07:00
firmware	Pull for-2.6.31 into release	2009-06-17 09:35:24 -07:00
gpio	gpio: driver for PrimeCell PL061 GPIO controller	2009-06-19 16:46:03 -07:00
gpu	drm/radeon/kms: remove the _DRM_DRIVER from the KMS paths.	2009-06-17 09:45:46 -07:00
hid
hwmon	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
i2c	Merge commit 'gcl/merge' into next	2009-06-18 11:22:08 +10:00
ide
idle
ieee1394
ieee802154
infiniband
input	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
isdn	net: fix network drivers ndo_start_xmit() return values	2009-06-17 04:31:16 -07:00
leds
lguest
macintosh
mca
md	Merge branch 'for-linus' of git://neil.brown.name/md	2009-06-18 13:11:50 -07:00
media	soc-camera: unify i2c camera device platform data	2009-06-17 16:22:34 +09:00
memstick
message	convert some DMA_nnBIT_MASK() callers	2009-06-19 16:46:06 -07:00
mfd	mfd: early init for MFD running regulators	2009-06-17 19:41:54 +02:00
misc	gru: copyright fixes	2009-06-18 13:04:04 -07:00
mmc
mtd	Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6	2009-06-17 09:48:30 -07:00
net	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-06-19 17:40:40 -07:00
nubus
of
oprofile
parisc
parport
pci	Fix pci_claim_resource	2009-06-17 14:04:42 -07:00
pcmcia	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
platform
pnp
power
pps	LinuxPPS: core support	2009-06-18 13:04:04 -07:00
ps3
rapidio
regulator
rtc	rtc: make rtc_update_irq callable with irqs enabled	2009-06-19 16:46:05 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
sbus
scsi	Merge commit 'origin/master' into next	2009-06-18 11:16:55 +10:00
serial	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-06-19 17:40:40 -07:00
sh
sn
spi	spi_mpc8xxx: s/83xx/8xxx/g	2009-06-19 16:46:05 -07:00
ssb
staging	Staging: Add octeon-ethernet driver files.	2009-06-17 11:06:30 +01:00
tc
telephony
thermal
uio
usb	Merge commit 'origin/master' into next	2009-06-18 11:16:55 +10:00
uwb
video	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-06-19 17:40:40 -07:00
virtio
vlynq	drivers: add support for the TI VLYNQ bus	2009-06-16 19:47:52 -07:00
w1	w1-gpio: add external pull-up enable callback	2009-06-18 13:03:58 -07:00
watchdog	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-06-19 17:40:40 -07:00
xen
zorro
Kconfig	LinuxPPS: core support	2009-06-18 13:04:04 -07:00
Makefile	LinuxPPS: core support	2009-06-18 13:04:04 -07:00