Linus Torvalds a1c0cad352 fbdev fixes for 3.4 ... It includes: - a compile fix for au1*fb - a fix to make kyrofb usable on x86_64 - a fix for uvesafb to prevent an oops due to NX-protection -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (GNU/Linux) iQIcBAABAgAGBQJPiFZ6AAoJECSVL5KnPj1P23cP/32/ZDNMdxmS5IJxm3dLyGX2 cXr03aetzB5nj+E4eEopKe2M5XWV1iwfKh7cR/B8drEMDsunpjy3d1WrBOQ/Dubz QtCmqV8+XpFGhJWxWEWSK+BhU0sThzlqbQszZ4r/KOYC9TLLi5GpBt3UZ2gbs+Vc EwwAMyw/yDisTxU7sy84dUKy13TYsh0fR/BlfTJE1PiI1VxvBmCMGHofJMJvpx/E RgIsUFyTfFqeGzlagoQEcIlSDrqxIuDl61YXny6e1MX4NsMIF3x2YYZ+T/6UlXCg JaU2zx5G5a2pqlry8mzqbQ9CVP7xtmjbpxdxrJk1N1eRQ1wlsTpZCqVyFKKCzUlI lw6Og5Tq7IgKpx7PL15R2cLJd+x1wJAxEcBWeov004Gx3IFkRsvBABapAvyHnGWb 5JEL/N2ipqlUNXEol6mVt9kacY+jKt/KGAf7FvE6qPnTy5EY+RNLTYziTyp1oCq9 d21Yud2dHbOl6Q2WRDgw7i/DKjsBtZrHbuqWNgIsdhbVUT0qhRIaG6U6MjVzYLb2 cxyqUWL1rnsdj5PbooaFuxqKoCpwb20B+t1LJTwS2/KBZY02I7lyrKe3fg27asGz KbBpeoG5WaKDhpQUrWz1RVg6Wadbn2GJKhsW85PFV97H9Tw2xZP9bujJbtyKKSN+ DPdT2vLcXMGmLJigtJW/ =PWxJ -----END PGP SIGNATURE----- Merge tag 'fbdev-fixes-for-3.4-1' of git://github.com/schandinat/linux-2.6 Pull fbdev fixes from Florian Tobias Schandinat: - a compile fix for au1*fb - a fix to make kyrofb usable on x86_64 - a fix for uvesafb to prevent an oops due to NX-protection "The fix for kyrofb is a bit large but it's just replacing "unsigned long" by "u32" for 64 bit compatibility." * tag 'fbdev-fixes-for-3.4-1' of git://github.com/schandinat/linux-2.6: video:uvesafb: Fix oops that uvesafb try to execute NX-protected page fbdev: fix au1*fb builds kyrofb: fix on x86_64		2012-04-13 19:42:56 -07:00
..
accessibility
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-04-06 19:56:04 -07:00
amba
ata
atm
auxdisplay
base	drivers/base: fix compiler warning in SoC export driver - idr should be ida	2012-04-09 14:54:22 -07:00
bcma	bcma: fix build error on MIPS; implicit pcibios_enable_device	2012-04-10 14:13:30 -04:00
block	Merge branch 'for-3.4/drivers' of git://git.kernel.dk/linux-block	2012-04-13 18:45:13 -07:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	2012-04-09 15:47:49 -04:00
cdrom
char	tty and serial fixes for 3.4-rc2	2012-04-12 15:36:33 -07:00
clk
clocksource	Revert "clocksource: Load the ACPI PM clocksource asynchronously"	2012-04-12 00:05:05 +02:00
connector
cpufreq	cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS	2012-04-13 17:57:40 -07:00
cpuidle	Merge branches 'idle-fix' and 'misc' into release	2012-04-06 21:48:59 -04:00
crypto
dca
devfreq
dio
dma	dmaengine-fixes for 3.4-rc3	2012-04-10 15:30:16 -07:00
edac	Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2012-04-06 17:56:20 -07:00
eisa
firewire
firmware
gpio	gpio/exynos: Fix compiler warning in gpio-samsung.c file	2012-04-10 22:15:39 -06:00
gpu	Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes	2012-04-12 17:42:01 +01:00
hid	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
hsi
hv
hwmon	hwmon: (pmbus_core) Fix compiler warning	2012-04-09 12:17:38 -07:00
hwspinlock
i2c	i2c: prevent spurious interrupt on Designware controllers	2012-04-10 08:09:03 -07:00
ide
idle	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
ieee802154
infiniband	Add a fix for a bug hit by Alexey Shvetsov in ib_srtp that hits on	2012-04-12 18:51:32 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2012-04-12 12:49:07 -07:00
iommu	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
isdn	tty and serial fixes for 3.4-rc2	2012-04-12 15:36:33 -07:00
leds
lguest
macintosh
mca
md	md/bitmap: prevent bitmap_daemon_work running while initialising bitmap	2012-04-12 16:05:06 +10:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-04-11 11:05:34 -07:00
memstick
message	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
mfd	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
misc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
mmc	mmc: use really long write timeout to deal with crappy cards	2012-04-05 20:32:34 -04:00
mtd	fix breakage in mtdchar_open(), sanitize failure exits	2012-04-09 01:38:55 -04:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-12 14:04:33 -07:00
nfc
nubus
of	gpio: Fix range check in of_gpio_simple_xlate()	2012-04-10 14:20:56 -06:00
oprofile	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
parisc	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
parport
pci	Two fixes for regressions:	2012-04-06 17:54:53 -07:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia	2012-03-29 16:00:48 -07:00
pinctrl
platform	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-03-30 16:45:39 -07:00
pnp	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-03-30 16:45:39 -07:00
power	Various small bugfixes and enhancements, plus two new drivers:	2012-03-30 16:09:02 -07:00
pps
ps3
ptp
rapidio
regulator	regulator: Fix a build warning in the anatop driver for 3.4	2012-04-10 10:26:41 -07:00
remoteproc	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
rpmsg
rtc	drivers/rtc/rtc-pl031.c: enable clock on all ST variants	2012-04-12 13:12:12 -07:00
s390	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
sbus
scsi	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
sfi
sh	SuperH updates for 3.4 merge window	2012-03-30 00:09:17 -07:00
sn
spi	SPI bug fixes on top of v3.4-rc2	2012-04-13 12:17:45 -07:00
ssb
staging	Staging tree fixes for 3.4-rc2	2012-04-12 15:35:12 -07:00
target	tcm_fc: Do not free tpg structure during wq allocation failure	2012-04-06 18:57:05 -07:00
tc
thermal
tty	tty and serial fixes for 3.4-rc2	2012-04-12 15:36:33 -07:00
uio
usb	xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI	2012-04-11 08:31:06 -07:00
uwb	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
vhost
video	video:uvesafb: Fix oops that uvesafb try to execute NX-protected page	2012-04-09 16:05:57 +00:00
virt
virtio	virtio-pci: switch to PM ops macro to initialise PM functions	2012-03-31 08:09:51 +05:30
vlynq
w1
watchdog	ARM: cleanups of io includes	2012-03-29 18:02:10 -07:00
xen	Two fixes for regressions:	2012-04-06 17:54:53 -07:00
zorro
Kconfig	Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi	2012-04-02 09:50:40 -07:00
Makefile	Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi	2012-04-02 09:50:40 -07:00