Linus Torvalds acff987d94 Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 ... * 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits) video: platinumfb: Add __devexit_p at necessary place drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported drivers/video: fsl-diu-fb: remove unused panel operating mode support drivers/video: fsl-diu-fb: use an enum for the AOI index drivers/video: fsl-diu-fb: add several new video modes drivers/video: fsl-diu-fb: remove broken screen blanking support drivers/video: fsl-diu-fb: move some definitions out of the header file drivers/video: fsl-diu-fb: fix some ioctls video: da8xx-fb: Increased resolution configuration of revised LCDC IP OMAPDSS: picodlp: add missing #include <linux/module.h> fb: fix au1100fb bitrot. mx3fb: fix NULL pointer dereference in screen blanking. video: irq: Remove IRQF_DISABLED smscufx: change edid data to u8 instead of char OMAPDSS: DISPC: zorder support for DSS overlays OMAPDSS: DISPC: VIDEO3 pipeline support OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting video/omap: fix build dependencies ... Fix up conflicts in: - drivers/staging/xgifb/XGI_main_26.c Changes to XGIfb_pan_var() - drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c} Removed (or in the case of apollon.c, merged into the generic DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)		2011-10-30 15:30:01 -07:00
..
alpha	Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux	2011-10-25 15:42:01 +02:00
arm	Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6	2011-10-30 15:30:01 -07:00
avr32	All Arch: remove linkage for sys_nfsservctl system call	2011-08-26 15:09:58 -07:00
blackfin	Blackfin: irq: remove IRQF_DISABLED	2011-10-26 04:22:26 -04:00
cris	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2011-10-25 13:25:22 +02:00
frv	All Arch: remove linkage for sys_nfsservctl system call	2011-08-26 15:09:58 -07:00
h8300	Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6	2011-10-29 07:27:45 -07:00
ia64	Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:11:53 +02:00
m32r	m32r: Allow use of atomic64	2011-10-17 23:29:43 -04:00
m68k	Merge branch 'for-linus' of git://github.com/gregungerer/m68knommu	2011-10-25 16:25:48 +02:00
microblaze	microblaze: add missing CONFIG_ prefixes	2011-10-13 10:39:24 +02:00
mips	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2011-10-28 14:25:01 -07:00
mn10300	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
openrisc	doc: fix broken references	2011-09-27 18:08:04 +02:00
parisc	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue	2011-10-28 10:49:34 -07:00
powerpc	Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6	2011-10-30 15:30:01 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-10-28 16:44:18 -07:00
score	modules: make arch's use default loader hooks	2011-07-24 22:06:04 +09:30
sh	net: sh_eth: move the asm/sh_eth.h to include/linux/	2011-09-28 13:41:51 -04:00
sparc	compat: sync compat_stats with statfs.	2011-10-28 14:58:53 +02:00
tile	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
um	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
unicore32	doc: fix broken references	2011-09-27 18:08:04 +02:00
x86	Merge git://github.com/rustyrussell/linux	2011-10-29 07:52:16 -07:00
xtensa	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
.gitignore
Kconfig	Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG	2011-08-03 11:12:37 -04:00