firmware: dispmanx: Add stereoscopic flags to transform

firmware: Fix MMAL annotate V3 handling See: http://www.raspberrypi.org/forums/viewtopic.php?f=43&t=97929 firmware: arm_loader: Populate DT with HAT vendor info firmware: arm_loader: Support boolean parameters and '.dtbo' extensions See: http://www.raspberrypi.org/forums/viewtopic.php?f=29&t=93015&start=325#p716663 kernel: config: Remove CONFIG_USB_UAS as it does not work See: raspberrypi/linux#875 kernel: Add support for 3.5 display by tinylcd.com See: raspberrypi/linux#880
Hexxeh · Mar 15, 2015 · db5994e · db5994e
1 parent 1431f38
commit db5994e
Show file tree

Hide file tree

Showing 90 changed files with 145 additions and 47 deletions.
diff --git a/Module.symvers b/Module.symvers
@@ -1419,7 +1419,7 @@
 0x9f97baeb	ar9003_paprd_create_curve	drivers/net/wireless/ath/ath9k/ath9k_hw	EXPORT_SYMBOL
 0x2abd9662	screen_glyph	vmlinux	EXPORT_SYMBOL_GPL
 0xb92b36dd	srcu_notifier_call_chain	vmlinux	EXPORT_SYMBOL_GPL
-0x2e27d64d	fill_inquiry_response	vmlinux	EXPORT_SYMBOL_GPL
+0xb5825cf3	fill_inquiry_response	vmlinux	EXPORT_SYMBOL_GPL
 0x4e0643ff	usb_match_one_id	vmlinux	EXPORT_SYMBOL_GPL
 0x3d152f2f	rpc_proc_unregister	vmlinux	EXPORT_SYMBOL_GPL
 0xf7802486	__aeabi_uidivmod	vmlinux	EXPORT_SYMBOL
@@ -6345,9 +6345,9 @@
 0x8017d205	ar9003_hw_bb_watchdog_dbg_info	drivers/net/wireless/ath/ath9k/ath9k_hw	EXPORT_SYMBOL
 0x5a770461	tda8083_attach	drivers/media/dvb-frontends/tda8083	EXPORT_SYMBOL
 0x84d2fba4	neigh_proc_dointvec_jiffies	vmlinux	EXPORT_SYMBOL
-0x6d5d065b	usb_stor_probe1	vmlinux	EXPORT_SYMBOL_GPL
+0x0d8ebb2f	usb_stor_probe1	vmlinux	EXPORT_SYMBOL_GPL
 0x661601de	sprint_symbol	vmlinux	EXPORT_SYMBOL_GPL
-0xc1b6c69f	usb_stor_probe2	vmlinux	EXPORT_SYMBOL_GPL
+0xec91b92c	usb_stor_probe2	vmlinux	EXPORT_SYMBOL_GPL
 0xe7d510ee	update_region	vmlinux	EXPORT_SYMBOL
 0x9a4d2033	nfs_show_options	vmlinux	EXPORT_SYMBOL_GPL
 0x04f4beed	hci_get_route	net/bluetooth/bluetooth	EXPORT_SYMBOL
@@ -7089,7 +7089,7 @@
 0xb54533f7	usecs_to_jiffies	vmlinux	EXPORT_SYMBOL
 0xb6fe4ed4	user_free_preparse	vmlinux	EXPORT_SYMBOL_GPL
 0x1baeaed4	proc_dostring	vmlinux	EXPORT_SYMBOL
-0xb475f2fc	usb_stor_adjust_quirks	vmlinux	EXPORT_SYMBOL_GPL
+0xf5ac189b	usb_stor_adjust_quirks	vmlinux	EXPORT_SYMBOL_GPL
 0xb052a93d	devres_find	vmlinux	EXPORT_SYMBOL_GPL
 0xd70b0bc8	of_find_node_by_path	vmlinux	EXPORT_SYMBOL
 0xf638a6bb	of_find_node_by_type	vmlinux	EXPORT_SYMBOL

diff --git a/Module7.symvers b/Module7.symvers
@@ -1435,7 +1435,7 @@
 0xdd5d779c	ar9003_paprd_create_curve	drivers/net/wireless/ath/ath9k/ath9k_hw	EXPORT_SYMBOL
 0x5152442d	screen_glyph	vmlinux	EXPORT_SYMBOL_GPL
 0xa76d63a8	srcu_notifier_call_chain	vmlinux	EXPORT_SYMBOL_GPL
-0x5ae17b70	fill_inquiry_response	vmlinux	EXPORT_SYMBOL_GPL
+0x648739a4	fill_inquiry_response	vmlinux	EXPORT_SYMBOL_GPL
 0x49659083	usb_match_one_id	vmlinux	EXPORT_SYMBOL_GPL
 0x77707b76	rpc_proc_unregister	vmlinux	EXPORT_SYMBOL_GPL
 0xf7802486	__aeabi_uidivmod	vmlinux	EXPORT_SYMBOL
@@ -6408,9 +6408,9 @@
 0x709037e1	ar9003_hw_bb_watchdog_dbg_info	drivers/net/wireless/ath/ath9k/ath9k_hw	EXPORT_SYMBOL
 0x8ffeb558	tda8083_attach	drivers/media/dvb-frontends/tda8083	EXPORT_SYMBOL
 0x58d633c7	neigh_proc_dointvec_jiffies	vmlinux	EXPORT_SYMBOL
-0x7e3d567f	usb_stor_probe1	vmlinux	EXPORT_SYMBOL_GPL
+0xf8c29985	usb_stor_probe1	vmlinux	EXPORT_SYMBOL_GPL
 0x661601de	sprint_symbol	vmlinux	EXPORT_SYMBOL_GPL
-0xd048315b	usb_stor_probe2	vmlinux	EXPORT_SYMBOL_GPL
+0xd67ec529	usb_stor_probe2	vmlinux	EXPORT_SYMBOL_GPL
 0x099fbc1d	update_region	vmlinux	EXPORT_SYMBOL
 0x83585b2d	nfs_show_options	vmlinux	EXPORT_SYMBOL_GPL
 0xd2a81f4f	hci_get_route	net/bluetooth/bluetooth	EXPORT_SYMBOL
@@ -7157,7 +7157,7 @@
 0xb54533f7	usecs_to_jiffies	vmlinux	EXPORT_SYMBOL
 0xb6fe4ed4	user_free_preparse	vmlinux	EXPORT_SYMBOL_GPL
 0xeed3635b	proc_dostring	vmlinux	EXPORT_SYMBOL
-0x89be878b	usb_stor_adjust_quirks	vmlinux	EXPORT_SYMBOL_GPL
+0xa2874c87	usb_stor_adjust_quirks	vmlinux	EXPORT_SYMBOL_GPL
 0xdd6dd7e0	devres_find	vmlinux	EXPORT_SYMBOL_GPL
 0xbe3b7d7c	of_find_node_by_path	vmlinux	EXPORT_SYMBOL
 0x6c243484	of_find_node_by_type	vmlinux	EXPORT_SYMBOL

diff --git a/fixup.dat b/fixup.dat
diff --git a/fixup_cd.dat b/fixup_cd.dat
diff --git a/fixup_x.dat b/fixup_x.dat
diff --git a/git_hash b/git_hash
@@ -1 +1 @@
-780e68130fba82a525b89e85f051c91b7a508e52
+5e3fb8358a4918c1c6c3ad0706da28c90ef7f737
diff --git a/kernel.img b/kernel.img
diff --git a/kernel7.img b/kernel7.img
diff --git a/modules/3.18.9+/kernel/drivers/input/keyboard/gpio_keys.ko b/modules/3.18.9+/kernel/drivers/input/keyboard/gpio_keys.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/uas.ko b/modules/3.18.9+/kernel/drivers/usb/storage/uas.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-alauda.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-alauda.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-cypress.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-cypress.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-datafab.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-datafab.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-eneub6250.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-eneub6250.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-freecom.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-freecom.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-isd200.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-isd200.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-jumpshot.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-jumpshot.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-karma.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-karma.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-onetouch.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-onetouch.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-realtek.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-realtek.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-sddr09.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-sddr09.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-sddr55.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-sddr55.ko
diff --git a/modules/3.18.9+/kernel/drivers/usb/storage/ums-usbat.ko b/modules/3.18.9+/kernel/drivers/usb/storage/ums-usbat.ko
diff --git a/modules/3.18.9+/modules.alias b/modules/3.18.9+/modules.alias
@@ -1765,23 +1765,6 @@ alias usb:v8087p07D7d*dc*dsc*dp*ic*isc*ip*in* i2400m_usb
 alias usb:v8087p07D6d*dc*dsc*dp*ic*isc*ip*in* i2400m_usb
 alias usb:v8086p0188d*dc*dsc*dp*ic*isc*ip*in* i2400m_usb
 alias usb:v8086p0186d*dc*dsc*dp*ic*isc*ip*in* i2400m_usb
-alias usb:v*p*d*dc*dsc*dp*ic08isc06ip62in* uas
-alias usb:v*p*d*dc*dsc*dp*ic08isc06ip50in* uas
-alias usb:v4971p8017d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v4971p1012d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v357Dp7788d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v2109p0711d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v174Cp5106d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v152Dp0567d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pAB2Ad*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pAB21d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pAB20d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pA0A4d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pA013d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pA003d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2p3320d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2p3312d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2p2312d*dc*dsc*dp*ic*isc*ip*in* uas
 alias usb:v07B4p010Ad0102dc*dsc*dp*ic*isc*ip*in* ums_alauda
 alias usb:v0584p0008d0102dc*dsc*dp*ic*isc*ip*in* ums_alauda
 alias usb:v14CDp6116d0160dc*dsc*dp*ic*isc*ip*in* ums_cypress
@@ -5005,6 +4988,8 @@ alias usb:v1110p900Fd*dc*dsc*dp*ic*isc*ip*in* ueagle_atm
 alias usb:v1110p9010d*dc*dsc*dp*ic*isc*ip*in* ueagle_atm
 alias usb:v1110p9000d*dc*dsc*dp*ic*isc*ip*in* ueagle_atm
 alias usb:v1110p9001d*dc*dsc*dp*ic*isc*ip*in* ueagle_atm
+alias platform:gpio-keys gpio_keys
+alias of:N*T*Cgpio-keys* gpio_keys
 alias usb:v06F8pA302d*dc*dsc*dp*ic*isc*ip*in* iforce
 alias usb:v06F8p0004d*dc*dsc*dp*ic*isc*ip*in* iforce
 alias usb:v06F8p0003d*dc*dsc*dp*ic*isc*ip*in* iforce

diff --git a/modules/3.18.9+/modules.alias.bin b/modules/3.18.9+/modules.alias.bin
diff --git a/modules/3.18.9+/modules.dep b/modules/3.18.9+/modules.dep
@@ -242,7 +242,6 @@ kernel/drivers/net/slip/slhc.ko:
 kernel/drivers/net/wimax/i2400m/i2400m.ko: kernel/net/wimax/wimax.ko kernel/net/rfkill/rfkill.ko
 kernel/drivers/net/wimax/i2400m/i2400m-usb.ko: kernel/drivers/net/wimax/i2400m/i2400m.ko kernel/net/wimax/wimax.ko kernel/net/rfkill/rfkill.ko
 kernel/drivers/cdrom/cdrom.ko:
-kernel/drivers/usb/storage/uas.ko:
 kernel/drivers/usb/storage/ums-alauda.ko:
 kernel/drivers/usb/storage/ums-cypress.ko:
 kernel/drivers/usb/storage/ums-datafab.ko:
@@ -338,6 +337,7 @@ kernel/drivers/usb/atm/xusbatm.ko: kernel/drivers/usb/atm/usbatm.ko kernel/net/a
 kernel/drivers/usb/usbip/usbip-core.ko:
 kernel/drivers/usb/usbip/vhci-hcd.ko: kernel/drivers/usb/usbip/usbip-core.ko
 kernel/drivers/usb/usbip/usbip-host.ko: kernel/drivers/usb/usbip/usbip-core.ko
+kernel/drivers/input/keyboard/gpio_keys.ko:
 kernel/drivers/input/joystick/iforce/iforce.ko:
 kernel/drivers/input/joystick/xpad.ko: kernel/drivers/input/ff-memless.ko
 kernel/drivers/input/touchscreen/ads7846.ko:

diff --git a/modules/3.18.9+/modules.dep.bin b/modules/3.18.9+/modules.dep.bin
diff --git a/modules/3.18.9+/modules.order b/modules/3.18.9+/modules.order
@@ -242,7 +242,6 @@ kernel/drivers/net/slip/slhc.ko
 kernel/drivers/net/wimax/i2400m/i2400m.ko
 kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
 kernel/drivers/cdrom/cdrom.ko
-kernel/drivers/usb/storage/uas.ko
 kernel/drivers/usb/storage/ums-alauda.ko
 kernel/drivers/usb/storage/ums-cypress.ko
 kernel/drivers/usb/storage/ums-datafab.ko
@@ -338,6 +337,7 @@ kernel/drivers/usb/atm/xusbatm.ko
 kernel/drivers/usb/usbip/usbip-core.ko
 kernel/drivers/usb/usbip/vhci-hcd.ko
 kernel/drivers/usb/usbip/usbip-host.ko
+kernel/drivers/input/keyboard/gpio_keys.ko
 kernel/drivers/input/joystick/iforce/iforce.ko
 kernel/drivers/input/joystick/xpad.ko
 kernel/drivers/input/touchscreen/ads7846.ko

diff --git a/modules/3.18.9+/modules.symbols.bin b/modules/3.18.9+/modules.symbols.bin
diff --git a/modules/3.18.9-v7+/kernel/drivers/input/keyboard/gpio_keys.ko b/modules/3.18.9-v7+/kernel/drivers/input/keyboard/gpio_keys.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/uas.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/uas.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-alauda.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-alauda.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-cypress.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-cypress.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-datafab.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-datafab.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-eneub6250.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-eneub6250.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-freecom.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-freecom.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-isd200.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-isd200.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-jumpshot.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-jumpshot.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-karma.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-karma.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-onetouch.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-onetouch.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-realtek.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-realtek.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-sddr09.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-sddr09.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-sddr55.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-sddr55.ko
diff --git a/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-usbat.ko b/modules/3.18.9-v7+/kernel/drivers/usb/storage/ums-usbat.ko
diff --git a/modules/3.18.9-v7+/modules.alias b/modules/3.18.9-v7+/modules.alias
@@ -1771,23 +1771,6 @@ alias usb:v8087p07D7d*dc*dsc*dp*ic*isc*ip*in* i2400m_usb
 alias usb:v8087p07D6d*dc*dsc*dp*ic*isc*ip*in* i2400m_usb
 alias usb:v8086p0188d*dc*dsc*dp*ic*isc*ip*in* i2400m_usb
 alias usb:v8086p0186d*dc*dsc*dp*ic*isc*ip*in* i2400m_usb
-alias usb:v*p*d*dc*dsc*dp*ic08isc06ip62in* uas
-alias usb:v*p*d*dc*dsc*dp*ic08isc06ip50in* uas
-alias usb:v4971p8017d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v4971p1012d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v357Dp7788d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v2109p0711d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v174Cp5106d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v152Dp0567d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pAB2Ad*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pAB21d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pAB20d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pA0A4d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pA013d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2pA003d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2p3320d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2p3312d*dc*dsc*dp*ic*isc*ip*in* uas
-alias usb:v0BC2p2312d*dc*dsc*dp*ic*isc*ip*in* uas
 alias usb:v07B4p010Ad0102dc*dsc*dp*ic*isc*ip*in* ums_alauda
 alias usb:v0584p0008d0102dc*dsc*dp*ic*isc*ip*in* ums_alauda
 alias usb:v14CDp6116d0160dc*dsc*dp*ic*isc*ip*in* ums_cypress
@@ -5011,6 +4994,8 @@ alias usb:v1110p900Fd*dc*dsc*dp*ic*isc*ip*in* ueagle_atm
 alias usb:v1110p9010d*dc*dsc*dp*ic*isc*ip*in* ueagle_atm
 alias usb:v1110p9000d*dc*dsc*dp*ic*isc*ip*in* ueagle_atm
 alias usb:v1110p9001d*dc*dsc*dp*ic*isc*ip*in* ueagle_atm
+alias platform:gpio-keys gpio_keys
+alias of:N*T*Cgpio-keys* gpio_keys
 alias usb:v06F8pA302d*dc*dsc*dp*ic*isc*ip*in* iforce
 alias usb:v06F8p0004d*dc*dsc*dp*ic*isc*ip*in* iforce
 alias usb:v06F8p0003d*dc*dsc*dp*ic*isc*ip*in* iforce

diff --git a/modules/3.18.9-v7+/modules.alias.bin b/modules/3.18.9-v7+/modules.alias.bin
diff --git a/modules/3.18.9-v7+/modules.dep b/modules/3.18.9-v7+/modules.dep
@@ -246,7 +246,6 @@ kernel/drivers/net/slip/slhc.ko:
 kernel/drivers/net/wimax/i2400m/i2400m.ko: kernel/net/wimax/wimax.ko kernel/net/rfkill/rfkill.ko
 kernel/drivers/net/wimax/i2400m/i2400m-usb.ko: kernel/drivers/net/wimax/i2400m/i2400m.ko kernel/net/wimax/wimax.ko kernel/net/rfkill/rfkill.ko
 kernel/drivers/cdrom/cdrom.ko:
-kernel/drivers/usb/storage/uas.ko:
 kernel/drivers/usb/storage/ums-alauda.ko:
 kernel/drivers/usb/storage/ums-cypress.ko:
 kernel/drivers/usb/storage/ums-datafab.ko:
@@ -342,6 +341,7 @@ kernel/drivers/usb/atm/xusbatm.ko: kernel/drivers/usb/atm/usbatm.ko kernel/net/a
 kernel/drivers/usb/usbip/usbip-core.ko:
 kernel/drivers/usb/usbip/vhci-hcd.ko: kernel/drivers/usb/usbip/usbip-core.ko
 kernel/drivers/usb/usbip/usbip-host.ko: kernel/drivers/usb/usbip/usbip-core.ko
+kernel/drivers/input/keyboard/gpio_keys.ko:
 kernel/drivers/input/joystick/iforce/iforce.ko:
 kernel/drivers/input/joystick/xpad.ko: kernel/drivers/input/ff-memless.ko
 kernel/drivers/input/touchscreen/ads7846.ko:

diff --git a/modules/3.18.9-v7+/modules.dep.bin b/modules/3.18.9-v7+/modules.dep.bin
diff --git a/modules/3.18.9-v7+/modules.order b/modules/3.18.9-v7+/modules.order
@@ -246,7 +246,6 @@ kernel/drivers/net/slip/slhc.ko
 kernel/drivers/net/wimax/i2400m/i2400m.ko
 kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
 kernel/drivers/cdrom/cdrom.ko
-kernel/drivers/usb/storage/uas.ko
 kernel/drivers/usb/storage/ums-alauda.ko
 kernel/drivers/usb/storage/ums-cypress.ko
 kernel/drivers/usb/storage/ums-datafab.ko
@@ -342,6 +341,7 @@ kernel/drivers/usb/atm/xusbatm.ko
 kernel/drivers/usb/usbip/usbip-core.ko
 kernel/drivers/usb/usbip/vhci-hcd.ko
 kernel/drivers/usb/usbip/usbip-host.ko
+kernel/drivers/input/keyboard/gpio_keys.ko
 kernel/drivers/input/joystick/iforce/iforce.ko
 kernel/drivers/input/joystick/xpad.ko
 kernel/drivers/input/touchscreen/ads7846.ko

diff --git a/modules/3.18.9-v7+/modules.symbols.bin b/modules/3.18.9-v7+/modules.symbols.bin
diff --git a/overlays/README b/overlays/README
@@ -165,6 +165,44 @@ Load:   dtoverlay=hifiberry-digi
 Params: <None>
 
 
+File:   hy28a-overlay.dtb
+Info:   HY28A - 2.8" TFT LCD Display Module by HAOYU Electronics
+        Default values match Texy's display shield
+Load:   dtoverlay=hy28a,<param>=<val>
+Params: speed                    Display SPI bus speed
+
+        rotate                   Display rotation {0,90,180,270}
+
+        fps                      Delay between frame updates
+
+        debug                    Debug output level {0-7}
+
+        xohms                    Touchpanel sensitivity (X-plate resistance)
+
+        resetgpio                GPIO used to reset controller
+
+        ledgpio                  GPIO used to control backlight
+
+
+File:   hy28b-overlay.dtb
+Info:   HY28B - 2.8" TFT LCD Display Module by HAOYU Electronics
+        Default values match Texy's display shield
+Load:   dtoverlay=hy28b,<param>=<val>
+Params: speed                    Display SPI bus speed
+
+        rotate                   Display rotation {0,90,180,270}
+
+        fps                      Delay between frame updates
+
+        debug                    Debug output level {0-7}
+
+        xohms                    Touchpanel sensitivity (X-plate resistance)
+
+        resetgpio                GPIO used to reset controller
+
+        ledgpio                  GPIO used to control backlight
+
+
 File:   i2c-rtc-overlay.dtb
 Info:   Adds support for a number of I2C Real Time Clock devices
 Load:   dtoverlay=i2c-rtc,<param>
@@ -215,6 +253,20 @@ Params: gpio_out_pin             GPIO pin for output (default "17")
                                  (default "off")
 
 
+File:   mz61581-overlay.dtb
+Info:   MZ61581 display by Tontec
+Load:   dtoverlay=mz61581,<param>=<val>
+Params: speed                    Display SPI bus speed
+
+        rotate                   Display rotation {0,90,180,270}
+
+        fps                      Delay between frame updates
+
+        debug                    Debug output level {0-7}
+
+        xohms                    Touchpanel sensitivity (X-plate resistance)
+
+
 File:   pcf2127-rtc-overlay.dtb
 Info:   This overlay is now deprecated and will be deleted. Use i2c-rtc instead.
 
@@ -223,12 +275,81 @@ File:   pcf8523-rtc-overlay.dtb
 Info:   This overlay is now deprecated and will be deleted. Use i2c-rtc instead.
 
 
+File:   piscreen-overlay.dtb
+Info:   PiScreen display by OzzMaker.com
+Load:   dtoverlay=piscreen,<param>=<val>
+Params: speed                    Display SPI bus speed
+
+        rotate                   Display rotation {0,90,180,270}
+
+        fps                      Delay between frame updates
+
+        debug                    Debug output level {0-7}
+
+
+File:   pitft28-resistive-overlay.dtb
+Info:   Adafruit PiTFT 2.8" resistive touch screen
+Load:   dtoverlay=pitft28-resistive,<param>=<val>
+Params: speed                    Display SPI bus speed
+
+        rotate                   Display rotation {0,90,180,270}
+
+        fps                      Delay between frame updates
+
+        debug                    Debug output level {0-7}
+
+
 File:   pps-gpio-overlay.dtb
 Info:   Configures the pps-gpio (pulse-per-second time signal via GPIO).
 Load:   dtoverlay=pps-gpio,<param>=<val>
 Params: gpiopin                  GPIO input pin (default "18")
 
 
+File:   rpi-display-overlay.dtb
+Info:   RPi-Display - 2.8" Touch Display by Watterott
+Load:   dtoverlay=rpi-display,<param>=<val>
+Params: speed                    Display SPI bus speed
+
+        rotate                   Display rotation {0,90,180,270}
+
+        fps                      Delay between frame updates
+
+        debug                    Debug output level {0-7}
+
+        xohms                    Touchpanel sensitivity (X-plate resistance)
+
+
+File:   tinylcd35-overlay.dtb
+Info:   3.5" Color TFT Display by www.tinlylcd.com
+        Options: Touch, RTC, keypad
+Load:   dtoverlay=tinylcd35,<param>=<val>
+Params: speed                    Display SPI bus speed
+
+        rotate                   Display rotation {0,90,180,270}
+
+        fps                      Delay between frame updates
+
+        debug                    Debug output level {0-7}
+
+        touch                    Enable touch panel
+
+        touchgpio                Touch controller IRQ GPIO
+
+        xohms                    Touchpanel: Resistance of X-plate in ohms
+
+        rtc-pcf                  PCF8563 Real Time Clock
+
+        rtc-ds                   DS1307 Real Time Clock
+
+        keypad                   Enable keypad
+
+        Examples:
+            Display with touchpanel, PCF8563 RTC and keypad:
+                dtoverlay=tinylcd35,touch,rtc-pcf,keypad
+            Old touch display:
+                dtoverlay=tinylcd35,touch,touchgpio=3
+
+
 File:   w1-gpio-overlay.dtb
 Info:   Configures the w1-gpio Onewire interface module.
         Use this overlay if you *don't* need a pin to drive an external pullup.

diff --git a/overlays/tinylcd35-overlay.dtb b/overlays/tinylcd35-overlay.dtb
diff --git a/start.elf b/start.elf
diff --git a/start_cd.elf b/start_cd.elf
diff --git a/start_x.elf b/start_x.elf
diff --git a/vc/hardfp/opt/vc/bin/raspistill b/vc/hardfp/opt/vc/bin/raspistill
diff --git a/vc/hardfp/opt/vc/bin/raspivid b/vc/hardfp/opt/vc/bin/raspivid
diff --git a/vc/hardfp/opt/vc/bin/raspividyuv b/vc/hardfp/opt/vc/bin/raspividyuv
diff --git a/vc/hardfp/opt/vc/bin/raspiyuv b/vc/hardfp/opt/vc/bin/raspiyuv
diff --git a/vc/hardfp/opt/vc/lib/libEGL.so b/vc/hardfp/opt/vc/lib/libEGL.so
diff --git a/vc/hardfp/opt/vc/lib/libEGL_static.a b/vc/hardfp/opt/vc/lib/libEGL_static.a
diff --git a/vc/hardfp/opt/vc/lib/libGLESv2.so b/vc/hardfp/opt/vc/lib/libGLESv2.so
diff --git a/vc/hardfp/opt/vc/lib/libGLESv2_static.a b/vc/hardfp/opt/vc/lib/libGLESv2_static.a
diff --git a/vc/hardfp/opt/vc/lib/libWFC.so b/vc/hardfp/opt/vc/lib/libWFC.so
diff --git a/vc/hardfp/opt/vc/lib/libbcm_host.so b/vc/hardfp/opt/vc/lib/libbcm_host.so
diff --git a/vc/hardfp/opt/vc/lib/libdebug_sym_static.a b/vc/hardfp/opt/vc/lib/libdebug_sym_static.a
diff --git a/vc/hardfp/opt/vc/lib/libkhrn_client.a b/vc/hardfp/opt/vc/lib/libkhrn_client.a
diff --git a/vc/hardfp/opt/vc/lib/libkhrn_static.a b/vc/hardfp/opt/vc/lib/libkhrn_static.a
diff --git a/vc/hardfp/opt/vc/lib/libvcfiled_check.a b/vc/hardfp/opt/vc/lib/libvcfiled_check.a
diff --git a/vc/hardfp/opt/vc/lib/libvchostif.a b/vc/hardfp/opt/vc/lib/libvchostif.a
diff --git a/vc/hardfp/opt/vc/lib/libvcilcs.a b/vc/hardfp/opt/vc/lib/libvcilcs.a
diff --git a/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a b/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a
diff --git a/vc/sdk/opt/vc/include/interface/vmcs_host/vc_dispmanx_types.h b/vc/sdk/opt/vc/include/interface/vmcs_host/vc_dispmanx_types.h
@@ -80,6 +80,13 @@ typedef enum {
   DISPMANX_FLIP_HRIZ = 1 << 16,
   DISPMANX_FLIP_VERT = 1 << 17,
 
+  /* extra flags for controlling 3d duplication behaviour */
+  DISPMANX_STEREOSCOPIC_NONE = 0 << 20,
+  DISPMANX_STEREOSCOPIC_MONO = 1 << 20,
+  DISPMANX_STEREOSCOPIC_SBS  = 2 << 20,
+  DISPMANX_STEREOSCOPIC_TB   = 3 << 20,
+  DISPMANX_STEREOSCOPIC_MASK = 3 << 20,
+
   /* extra flags for controlling snapshot behaviour */
   DISPMANX_SNAPSHOT_NO_YUV = 1 << 24,
   DISPMANX_SNAPSHOT_NO_RGB = 1 << 25,

diff --git a/vc/softfp/opt/vc/bin/raspistill b/vc/softfp/opt/vc/bin/raspistill
diff --git a/vc/softfp/opt/vc/bin/raspivid b/vc/softfp/opt/vc/bin/raspivid
diff --git a/vc/softfp/opt/vc/bin/raspividyuv b/vc/softfp/opt/vc/bin/raspividyuv
diff --git a/vc/softfp/opt/vc/bin/raspiyuv b/vc/softfp/opt/vc/bin/raspiyuv
diff --git a/vc/softfp/opt/vc/lib/libEGL.so b/vc/softfp/opt/vc/lib/libEGL.so
diff --git a/vc/softfp/opt/vc/lib/libEGL_static.a b/vc/softfp/opt/vc/lib/libEGL_static.a
diff --git a/vc/softfp/opt/vc/lib/libGLESv2.so b/vc/softfp/opt/vc/lib/libGLESv2.so
diff --git a/vc/softfp/opt/vc/lib/libGLESv2_static.a b/vc/softfp/opt/vc/lib/libGLESv2_static.a
diff --git a/vc/softfp/opt/vc/lib/libWFC.so b/vc/softfp/opt/vc/lib/libWFC.so
diff --git a/vc/softfp/opt/vc/lib/libbcm_host.so b/vc/softfp/opt/vc/lib/libbcm_host.so
diff --git a/vc/softfp/opt/vc/lib/libdebug_sym_static.a b/vc/softfp/opt/vc/lib/libdebug_sym_static.a
diff --git a/vc/softfp/opt/vc/lib/libkhrn_client.a b/vc/softfp/opt/vc/lib/libkhrn_client.a
diff --git a/vc/softfp/opt/vc/lib/libkhrn_static.a b/vc/softfp/opt/vc/lib/libkhrn_static.a
diff --git a/vc/softfp/opt/vc/lib/libvcfiled_check.a b/vc/softfp/opt/vc/lib/libvcfiled_check.a
diff --git a/vc/softfp/opt/vc/lib/libvchostif.a b/vc/softfp/opt/vc/lib/libvchostif.a
diff --git a/vc/softfp/opt/vc/lib/libvcilcs.a b/vc/softfp/opt/vc/lib/libvcilcs.a
diff --git a/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a b/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		780e68130fba82a525b89e85f051c91b7a508e52
		5e3fb8358a4918c1c6c3ad0706da28c90ef7f737