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
..
cpm_uart	cpm_uart: Disable CPM udbg when re-initing CPM uart, even if not the console.	2009-04-06 09:09:33 -05:00
jsm	jsm: correctly support multiple 4/8-port boards	2009-06-11 08:51:02 -07:00
8250.c	serial: add support for the TI AR7 internal UART	2009-06-11 08:51:03 -07:00
8250.h
8250_accent.c
8250_acorn.c
8250_boca.c
8250_early.c
8250_exar_st16c554.c
8250_fourport.c
8250_gsc.c	serial: 8250_gsc: fix printk format error	2009-05-29 08:40:02 -07:00
8250_hp300.c
8250_hub6.c
8250_mca.c
8250_pci.c	8250_pci: add the OXCB950 chip to the 8250 PCI driver.	2009-06-11 08:50:58 -07:00
8250_pnp.c	serial: Update PNP IDs	2009-04-06 14:36:26 -07:00
21285.c	[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h	2009-03-25 10:21:35 +00:00
68328serial.c
68328serial.h
68360serial.c
amba-pl010.c	[ARM] 5544/1: Trust PrimeCell resource sizes	2009-06-11 15:36:56 +01:00
amba-pl011.c	[ARM] 5544/1: Trust PrimeCell resource sizes	2009-06-11 15:36:56 +01:00
atmel_serial.c	atmel_serial: fix hang in set_termios when crtscts is enabled	2009-06-16 12:01:16 -07:00
bfin_5xx.c	Blackfin Serial Driver: disable dma rx interrupt only rather than all irqs	2009-06-11 08:51:05 -07:00
bfin_sport_uart.c	Blackfin SPORT UART: rewrite inline assembly	2009-06-11 08:51:04 -07:00
bfin_sport_uart.h
clps711x.c	[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h	2009-03-25 10:21:35 +00:00
crisv10.c	CRISv10: fix serial driver proc-usage	2009-05-02 15:36:09 -07:00
crisv10.h	tty: Use the generic RS485 ioctl on CRIS	2009-04-07 08:44:05 -07:00
dz.c
dz.h
icom.c	icom: fix compile errors when defining ICOM_TRACE	2009-06-11 08:51:03 -07:00
icom.h
imx.c	imx: Check for NULL pointer deref before calling tty_encode_baud_rate	2009-06-16 12:01:17 -07:00
ioc3_serial.c
ioc4_serial.c
ip22zilog.c
ip22zilog.h
Kconfig	trivial: Kconfig: .ko is normally not included in module names	2009-06-12 18:01:50 +02:00
kgdboc.c
m32r_sio.c
m32r_sio.h
m32r_sio_reg.h
Makefile	serial: Added Timberdale UART driver	2009-06-11 08:51:06 -07:00
max3100.c	tty: MAX3100	2009-04-08 14:33:38 -07:00
mcf.c	m68knommu: Fix support for console port other than ttyS0 on mcf.c	2009-03-24 15:17:43 +10:00
mpc52xx_uart.c	powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function	2009-06-17 00:30:22 -06:00
mpsc.c
mux.c
netx-serial.c
nwpserial.c	serial/nwpserial: Fix wrong register read address and add interrupt acknowledge.	2009-05-15 16:43:42 +10:00
of_serial.c	Merge commit 'origin/master' into next	2009-06-18 11:16:55 +10:00
pmac_zilog.c	powerpc/pmac: Fix internal modem IRQ on Wallstreet PowerBook	2009-04-07 15:07:43 +10:00
pmac_zilog.h
pnx8xxx_uart.c	When a break signal is detected, the next character should be ignored.	2009-01-15 12:48:36 -08:00
pxa.c	[ARM] pxa: remove machine class specific stuffs from serial driver	2009-03-09 21:22:38 +08:00
s3c24a0.c
s3c2400.c
s3c2410.c
s3c2412.c
s3c2440.c
s3c6400.c	[ARM] S3C: Add UDIVSLOT support for newer UARTS	2009-05-01 12:28:16 +01:00
sa1100.c	[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h	2009-03-25 10:21:35 +00:00
samsung.c	[ARM] S3C: Add UDIVSLOT support for newer UARTS	2009-05-01 12:28:16 +01:00
samsung.h	[ARM] S3C: Add UDIVSLOT support for newer UARTS	2009-05-01 12:28:16 +01:00
sb1250-duart.c
sc26xx.c
serial_core.c	serial: fixup /proc/tty/driver/serial after proc_fops conversion	2009-04-01 14:50:48 -07:00
serial_cs.c	3c589_cs: add cis(firmware) of 3Com multifunction pcmcia card	2009-05-01 19:21:26 -07:00
serial_ks8695.c
serial_lh7a40x.c
serial_txx9.c
sh-sci.c	serial: sh-sci: Move over to dev_pm_ops.	2009-06-15 07:07:38 +09:00
sh-sci.h	sh: Fix up the sh64 earlyprintk build.	2009-05-09 14:31:37 +09:00
sn_console.c
suncore.c
suncore.h
sunhv.c
sunsab.c
sunsab.h
sunsu.c	serial: sunsu: sunsu_kbd_ms_init needs to be __devinit	2009-04-08 03:29:03 -07:00
sunzilog.c	serial: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:21 -07:00
sunzilog.h
timbuart.c	timbuart: Fix the termios logic	2009-06-11 08:51:06 -07:00
timbuart.h	serial: Added Timberdale UART driver	2009-06-11 08:51:06 -07:00
uartlite.c
ucc_uart.c	serial: Make ucc_uart work in HW UART mode	2009-06-15 21:45:31 -05:00
vr41xx_siu.c
zs.c
zs.h