Linus Torvalds 4964e0664c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits) MIPS: Delete unused function add_temporary_entry. MIPS: Set default pci cache line size. MIPS: Flush huge TLB MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM. MIPS: Octeon: Add support for OCTEON II PCIe MIPS: Octeon: Update PCI Latency timer and enable more error reporting. MIPS: Alchemy: Update cpu-feature-overrides MIPS: Alchemy: db1200: Improve PB1200 detection. MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code. MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller MIPS: Alchemy: irq: register pm at irq init time MIPS: Alchemy: Touchscreen support on DB1100 MIPS: Alchemy: Hook up IrDA on DB1000/DB1100 net/irda: convert au1k_ir to platform driver. MIPS: Alchemy: remove unused board headers MTD: nand: make au1550nd.c a platform_driver MIPS: Netlogic: Mark Netlogic chips as SMT capable MIPS: Netlogic: Add support for XLP 3XX cores MIPS: Netlogic: Merge some of XLR/XLP wakup code MIPS: Netlogic: Add default XLP config. ... Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c, traps.c} and drivers/tty/serial/Makefile		2012-01-14 13:05:21 -08:00
..
Kconfig	Kconfig: remove a few puzzling comments	2011-10-31 10:58:48 +01:00
Makefile	sparc: Kill PROM console driver.	2009-09-15 17:04:38 -07:00
bitblit.c	fbcon: uninline four foo_update_attr() functions	2010-08-11 08:59:09 -07:00
dummycon.c	Remove magic macros for screen_info structure members	2007-10-16 22:57:17 -07:00
fbcon.c	fbcon: Remove unused 'display *p' variable from fb_flashcursor()	2011-03-31 13:48:54 +09:00
fbcon.h	fb: add hooks to handle KDB enter/exit	2010-08-05 09:22:31 -05:00
fbcon_ccw.c	fbcon: uninline four foo_update_attr() functions	2010-08-11 08:59:09 -07:00
fbcon_cw.c	fbcon: uninline four foo_update_attr() functions	2010-08-11 08:59:09 -07:00
fbcon_rotate.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
fbcon_rotate.h	fbcon: fix rotate upside down crash	2009-08-07 10:39:55 -07:00
fbcon_ud.c	fbcon: uninline four foo_update_attr() functions	2010-08-11 08:59:09 -07:00
font_6x11.c	fbcon: Convert struct font_desc to use ISO C initializers	2007-10-16 09:43:17 -07:00
font_7x14.c	fbcon: Convert struct font_desc to use ISO C initializers	2007-10-16 09:43:17 -07:00
font_8x8.c	fbcon: Convert struct font_desc to use ISO C initializers	2007-10-16 09:43:17 -07:00
font_8x16.c	export font_vga_8x16	2007-10-16 09:43:19 -07:00
font_10x18.c	fbcon: Convert struct font_desc to use ISO C initializers	2007-10-16 09:43:17 -07:00
font_acorn_8x8.c	fbcon: Convert struct font_desc to use ISO C initializers	2007-10-16 09:43:17 -07:00
font_mini_4x6.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
font_pearl_8x8.c	fbcon: Convert struct font_desc to use ISO C initializers	2007-10-16 09:43:17 -07:00
font_sun8x16.c	fbcon: Convert struct font_desc to use ISO C initializers	2007-10-16 09:43:17 -07:00
font_sun12x22.c	fbcon: Convert struct font_desc to use ISO C initializers	2007-10-16 09:43:17 -07:00
fonts.c	cleanup after APUS removal	2008-02-06 10:41:01 -08:00
mdacon.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
newport_con.c	MIPS: GIO bus support for SGI IP22/28	2011-12-07 22:03:44 +00:00
softcursor.c	fbdev: change asm/uaccess.h to linux/uaccess.h	2007-10-16 09:43:17 -07:00
sticon.c	Revert "vt: fix background color on line feed"	2008-10-14 12:12:02 -07:00
sticore.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
tileblit.c	fbcon: Bugfix soft cursor detection in Tile Blitting	2011-03-22 16:41:08 +09:00
vgacon.c	locking, video: Annotate vga console lock as raw	2011-09-13 11:12:04 +02:00