diff -Nru linux-3.12-3.12.9/debian/changelog linux-3.12-3.12.9/debian/changelog
--- linux-3.12-3.12.9/debian/changelog	2014-12-17 00:37:00.000000000 +0000
+++ linux-3.12-3.12.9/debian/changelog	2015-01-04 10:26:02.000000000 +0000
@@ -1,3 +1,18 @@
+linux-3.12 (3.12.9-1+rpi3) wheezy-staging; urgency=low
+
+  * optimise update-rpi-patches script a bit (reduce the number of calls to
+    quilt refresh).
+  * update rpi patches including fix for i2c kernel panic (LP: 1406037)
+  * apply GPIO related configuration changes requested by Diederik
+    (LP: 1403865)
+  * Remove the following patches from series-rt as they conflict
+    with the rpi/newer upstream patches and we don't build any rt kernels.
+    anyway.
+    + features/all/rt/fix-rt-int3-x86_32-3.2-rt.patch
+    + features/all/rt/x86-disable-debug-stack.patch
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 03 Jan 2015 00:46:40 +0000
+
 linux-3.12 (3.12.9-1+rpi2) wheezy-staging; urgency=low
 
   * Update rpi patches (including changes from newer upstream versions of the
diff -Nru linux-3.12-3.12.9/debian/config/armhf/config.rpi linux-3.12-3.12.9/debian/config/armhf/config.rpi
--- linux-3.12-3.12.9/debian/config/armhf/config.rpi	2014-12-17 00:30:11.000000000 +0000
+++ linux-3.12-3.12.9/debian/config/armhf/config.rpi	2015-01-03 01:13:23.000000000 +0000
@@ -202,3 +202,59 @@
 CONFIG_DMA_BCM2708=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_USB_SN9C102=m
+
+#  1-wire serial bus support requested by Diederik
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS28E04=m
+
+# Lirc (infra red remote) support requested by Diederik
+CONFIG_STAGING_MEDIA=y
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_RPI=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+
+#I2C device drivers requested by Diederik
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_ADXL34X_I2C=m
+
+#SPI drivers requested by Diederik
+CONFIG_REGMAP_SPI=m
+CONFIG_REGMAP_MMIO=m
+
+#RPI camera related drivers requested by Diederik
+CONFIG_VIDEO_BCM2835=y
+CONFIG_VIDEO_BCM2835_MMAL=m
+CONFIG_BRCM_CHAR_DRIVERS=y
+CONFIG_BCM_VC_CMA=y
+CONFIG_BCM_VC_SM=y
+
+
+#I2S stuff proposed by Diederik, not enabled yet due to hardware conflict
+#concerns, will revisit this once we have device tree (likely when we move to 
+#3.18)
+#
+#CONFIG_SND_SOC=m
+#CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+#CONFIG_SND_BCM2708_SOC_I2S=m
+#CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
+#CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
+#CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
+#CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
+#CONFIG_SND_BCM2708_SOC_RPI_DAC=m
+#CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
+#CONFIG_SND_SOC_I2C_AND_SPI=m
+#CONFIG_SND_SOC_PCM1794A=m
+#CONFIG_SND_SOC_PCM5102A=m
+#CONFIG_SND_SOC_PCM512x=m
+#CONFIG_SND_SOC_TAS5713=m
+#CONFIG_SND_SOC_WM8804=m
+#CONFIG_SND_SIMPLE_CARD=m
diff -Nru linux-3.12-3.12.9/debian/update-rpi-patches linux-3.12-3.12.9/debian/update-rpi-patches
--- linux-3.12-3.12.9/debian/update-rpi-patches	2014-12-14 13:49:54.000000000 +0000
+++ linux-3.12-3.12.9/debian/update-rpi-patches	2015-01-03 04:49:02.000000000 +0000
@@ -79,7 +79,11 @@
 
 cd linuxtest
 export QUILT_PATCHES=../debian/patches
-while quilt push -f || [ $? == 1 ]; do quilt refresh; done
+quilt push -a || true
+while quilt push -f || [ $? == 1 ]; do 
+	quilt refresh
+	quilt push -a || true
+done
 cd ..
 
 diff -urN linuxclean linuxtest | filterdiff -p1 -x '.pc/*' -x 'dummy/*' --clean > patched.diff || [ $? == 1 ]
@@ -94,8 +98,11 @@
 
 
 export QUILT_PATCHES=debian/patches
-
-while quilt push; do quilt refresh; done
+quilt push -a --fuzz 0 || true
+while quilt push; do
+	quilt refresh
+	quilt push -a --fuzz 0 || true
+done
 
 rm -rf linuxgit linuxclean linuxtest
 rm merged.diff patched.diff