2 Wednesday 3 October 10:52:45 EST 2012
5 $ git reset --hard stable
6 HEAD is now at 797b9e5 Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
7 Merging origin/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
8 $ git merge origin/master
9 Updating 797b9e5..7fe0b14
11 Documentation/ABI/testing/sysfs-ptp | 6 +-
12 Documentation/arm/Marvell/README | 232 ++
13 Documentation/arm/Samsung-S3C24XX/GPIO.txt | 82 +-
14 Documentation/arm/Samsung/GPIO.txt | 8 +-
15 Documentation/arm/memory.txt | 3 +
16 Documentation/cgroups/cgroups.txt | 92 +-
17 Documentation/devicetree/bindings/arm/bcm2835.txt | 8 +
18 .../devicetree/bindings/arm/mrvl/tauros2.txt | 17 +
19 .../devicetree/bindings/arm/msm/timer.txt | 38 +
20 .../devicetree/bindings/arm/omap/omap.txt | 3 +
21 Documentation/devicetree/bindings/arm/pmu.txt | 4 +
22 Documentation/devicetree/bindings/arm/vt8500.txt | 14 +
23 .../bindings/arm/vt8500/via,vt8500-intc.txt | 16 +
24 .../bindings/arm/vt8500/via,vt8500-pmc.txt | 13 +
25 .../bindings/arm/vt8500/via,vt8500-timer.txt | 15 +
26 .../devicetree/bindings/bus/omap-ocp2scp.txt | 10 +
27 .../devicetree/bindings/clock/imx23-clock.txt | 76 +
28 .../devicetree/bindings/clock/imx28-clock.txt | 99 +
29 .../devicetree/bindings/clock/imx6q-clock.txt | 222 ++
30 Documentation/devicetree/bindings/clock/vt8500.txt | 72 +
31 Documentation/devicetree/bindings/dma/mmp-dma.txt | 74 +
32 .../devicetree/bindings/gpio/gpio-74x164.txt | 22 +
33 .../devicetree/bindings/gpio/gpio-adnp.txt | 34 +
34 .../devicetree/bindings/gpio/gpio-samsung.txt | 43 +
35 .../devicetree/bindings/gpio/gpio-twl4030.txt | 6 +
36 .../devicetree/bindings/gpio/gpio-vt8500.txt | 24 +
37 Documentation/devicetree/bindings/gpio/led.txt | 2 +-
38 .../devicetree/bindings/i2c/trivial-devices.txt | 1 +
39 .../devicetree/bindings/input/gpio-keys-polled.txt | 38 +
40 .../devicetree/bindings/input/rotary-encoder.txt | 36 +
41 .../brcm,bcm2835-armctrl-ic.txt | 110 +
42 .../devicetree/bindings/lpddr2/lpddr2-timings.txt | 52 +
43 .../devicetree/bindings/lpddr2/lpddr2.txt | 102 +
44 .../devicetree/bindings/media/exynos5-gsc.txt | 30 +
45 .../bindings/memory-controllers/ti/emif.txt | 55 +
46 Documentation/devicetree/bindings/mfd/ab8500.txt | 15 +
47 .../devicetree/bindings/mtd/pxa3xx-nand.txt | 31 +
48 .../devicetree/bindings/net/can/c_can.txt | 49 +
49 Documentation/devicetree/bindings/net/cpsw.txt | 109 +
50 .../devicetree/bindings/net/davinci-mdio.txt | 33 +
51 .../devicetree/bindings/net/mdio-mux-mmioreg.txt | 75 +
52 .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 74 +
53 .../bindings/pinctrl/fsl,imx35-pinctrl.txt | 984 ++++++
54 .../devicetree/bindings/pinctrl/pinctrl-single.txt | 41 +-
55 .../bindings/pinctrl/samsung-pinctrl.txt | 196 ++
56 Documentation/devicetree/bindings/rtc/pxa-rtc.txt | 14 +
57 .../devicetree/bindings/rtc/via,vt8500-rtc.txt | 15 +
58 .../devicetree/bindings/sound/ux500-mop500.txt | 39 +
59 .../devicetree/bindings/sound/ux500-msp.txt | 43 +
60 Documentation/devicetree/bindings/spi/mxs-spi.txt | 22 +
61 Documentation/devicetree/bindings/spi/spi-bus.txt | 3 +
62 Documentation/devicetree/bindings/spi/spi-gpio.txt | 29 +
63 .../devicetree/bindings/spi/spi-sc18is602.txt | 23 +
64 .../devicetree/bindings/spi/spi_pl022.txt | 22 +
65 .../bindings/timer/brcm,bcm2835-system-timer.txt | 22 +
66 .../bindings/tty/serial/via,vt8500-uart.txt | 17 +
67 .../devicetree/bindings/usb/platform-uhci.txt | 21 +-
68 .../devicetree/bindings/usb/via,vt8500-ehci.txt | 15 +
69 .../devicetree/bindings/vendor-prefixes.txt | 3 +
70 .../devicetree/bindings/video/via,vt8500-fb.txt | 62 +
71 .../devicetree/bindings/video/wm,prizm-ge-rops.txt | 13 +
72 .../devicetree/bindings/video/wm,wm8505-fb.txt | 23 +
73 Documentation/filesystems/nfs/nfsroot.txt | 10 +-
74 Documentation/infiniband/ipoib.txt | 3 +
75 Documentation/networking/batman-adv.txt | 7 +-
76 Documentation/networking/bonding.txt | 30 +-
77 Documentation/networking/ip-sysctl.txt | 37 +-
78 Documentation/networking/stmmac.txt | 5 -
79 Documentation/networking/vxlan.txt | 47 +
80 Documentation/pinctrl.txt | 60 +-
81 Documentation/spi/ep93xx_spi | 2 +-
82 Documentation/spi/spi-sc18is602 | 36 +
84 arch/alpha/kernel/osf_sys.c | 4 +-
85 arch/arm/Kconfig | 283 +-
86 arch/arm/Kconfig.debug | 47 +
87 arch/arm/Makefile | 149 +-
88 arch/arm/boot/Makefile | 2 +
89 arch/arm/boot/compressed/misc.c | 6 +
90 arch/arm/boot/dts/Makefile | 101 +
91 arch/arm/boot/dts/am335x-bone.dts | 60 +
92 arch/arm/boot/dts/am335x-evm.dts | 100 +
93 arch/arm/boot/dts/am33xx.dtsi | 71 +-
94 arch/arm/boot/dts/bcm2835-rpi-b.dts | 12 +
95 arch/arm/boot/dts/bcm2835.dtsi | 39 +
96 arch/arm/boot/dts/{db8500.dtsi => dbx5x0.dtsi} | 71 +-
97 arch/arm/boot/dts/ea3250.dts | 109 +-
98 arch/arm/boot/dts/elpida_ecb240abacn.dtsi | 67 +
99 arch/arm/boot/dts/exynos4.dtsi | 248 ++
100 arch/arm/boot/dts/exynos4210-origen.dts | 77 +-
101 arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 457 +++
102 arch/arm/boot/dts/exynos4210-smdkv310.dts | 54 +-
103 arch/arm/boot/dts/exynos4210-trats.dts | 237 ++
104 arch/arm/boot/dts/exynos4210.dtsi | 201 +-
105 arch/arm/boot/dts/exynos5250-smdk5250.dts | 59 +-
106 arch/arm/boot/dts/exynos5250.dtsi | 60 +
107 arch/arm/boot/dts/hrefv60plus.dts | 95 +
108 arch/arm/boot/dts/imx23-evk.dts | 3 +-
109 arch/arm/boot/dts/imx23-olinuxino.dts | 57 +
110 arch/arm/boot/dts/imx23-stmp378x_devb.dts | 2 +-
111 arch/arm/boot/dts/imx23.dtsi | 43 +-
112 arch/arm/boot/dts/imx27-phytec-phycore.dts | 6 +-
113 arch/arm/boot/dts/imx27.dtsi | 1 -
114 arch/arm/boot/dts/imx28-apx4devkit.dts | 2 +-
115 arch/arm/boot/dts/imx28-cfa10049.dts | 99 +
116 arch/arm/boot/dts/imx28-evk.dts | 29 +-
117 arch/arm/boot/dts/imx28-m28evk.dts | 83 +-
118 arch/arm/boot/dts/imx28-tx28.dts | 23 +-
119 arch/arm/boot/dts/imx28.dtsi | 128 +-
120 arch/arm/boot/dts/imx51-babbage.dts | 44 +-
121 arch/arm/boot/dts/imx51.dtsi | 146 +-
122 arch/arm/boot/dts/imx53-ard.dts | 59 +-
123 arch/arm/boot/dts/imx53-evk.dts | 39 +-
124 arch/arm/boot/dts/imx53-qsb.dts | 42 +-
125 arch/arm/boot/dts/imx53-smd.dts | 46 +-
126 arch/arm/boot/dts/imx53.dtsi | 199 +-
127 arch/arm/boot/dts/imx6q-arm2.dts | 21 +
128 arch/arm/boot/dts/imx6q-sabrelite.dts | 31 +-
129 arch/arm/boot/dts/imx6q-sabresd.dts | 25 +-
130 arch/arm/boot/dts/imx6q.dtsi | 316 +-
131 arch/arm/boot/dts/mmp2.dtsi | 5 +
132 arch/arm/boot/dts/msm8660-surf.dts | 19 +-
133 arch/arm/boot/dts/msm8960-cdp.dts | 41 +
134 arch/arm/boot/dts/omap2420-h4.dts | 2 +-
135 arch/arm/boot/dts/omap2420.dtsi | 48 +
136 arch/arm/boot/dts/omap2430.dtsi | 92 +
137 .../dts/{omap3-beagle.dts => omap3-beagle-xm.dts} | 54 +-
138 arch/arm/boot/dts/omap3-evm.dts | 13 +
139 arch/arm/boot/dts/omap3-overo.dtsi | 57 +
140 arch/arm/boot/dts/omap3-tobi.dts | 35 +
141 arch/arm/boot/dts/omap3.dtsi | 94 +-
142 arch/arm/boot/dts/omap36xx.dtsi | 25 +
143 arch/arm/boot/dts/omap4-panda.dts | 11 +
144 arch/arm/boot/dts/omap4-sdp.dts | 127 +-
145 arch/arm/boot/dts/omap4.dtsi | 203 +-
146 arch/arm/boot/dts/omap5-evm.dts | 64 +
147 arch/arm/boot/dts/omap5.dtsi | 139 +
148 arch/arm/boot/dts/phy3250.dts | 16 +-
149 arch/arm/boot/dts/prima2-cb.dts | 424 ---
150 arch/arm/boot/dts/prima2-evb.dts | 37 +
151 arch/arm/boot/dts/prima2.dtsi | 640 ++++
152 arch/arm/boot/dts/pxa27x.dtsi | 14 +
153 arch/arm/boot/dts/pxa2xx.dtsi | 132 +
154 arch/arm/boot/dts/pxa3xx.dtsi | 32 +
155 arch/arm/boot/dts/pxa910.dtsi | 5 +
156 arch/arm/boot/dts/snowball.dts | 19 +-
157 arch/arm/boot/dts/tegra20-harmony.dts | 220 ++
158 arch/arm/boot/dts/tegra20-medcom-wide.dts | 58 +
159 arch/arm/boot/dts/tegra20-paz00.dts | 173 +
160 arch/arm/boot/dts/tegra20-plutux.dts | 50 +
161 arch/arm/boot/dts/tegra20-seaboard.dts | 186 ++
162 arch/arm/boot/dts/tegra20-tamonten.dtsi | 449 +++
163 arch/arm/boot/dts/tegra20-tec.dts | 53 +
164 arch/arm/boot/dts/tegra20-ventana.dts | 206 ++
165 arch/arm/boot/dts/tegra20-whistler.dts | 295 ++
166 arch/arm/boot/dts/tegra20.dtsi | 2 +-
167 arch/arm/boot/dts/tegra30-cardhu-a02.dts | 87 +
168 arch/arm/boot/dts/tegra30-cardhu-a04.dts | 98 +
169 arch/arm/boot/dts/tegra30-cardhu.dts | 171 -
170 arch/arm/boot/dts/tegra30-cardhu.dtsi | 475 +++
171 arch/arm/boot/dts/tegra30.dtsi | 2 +-
172 arch/arm/boot/dts/tps65217.dtsi | 56 +
173 arch/arm/boot/dts/tps65910.dtsi | 86 +
174 arch/arm/boot/dts/twl4030.dtsi | 6 +-
175 arch/arm/boot/dts/twl6030.dtsi | 26 +-
176 arch/arm/boot/dts/vt8500-bv07.dts | 36 +
177 arch/arm/boot/dts/vt8500.dtsi | 116 +
178 arch/arm/boot/dts/wm8505-ref.dts | 36 +
179 arch/arm/boot/dts/wm8505.dtsi | 143 +
180 arch/arm/boot/dts/wm8650-mid.dts | 36 +
181 arch/arm/boot/dts/wm8650.dtsi | 147 +
182 arch/arm/configs/afeb9260_defconfig | 1 -
183 arch/arm/configs/armadillo800eva_defconfig | 3 +
184 arch/arm/configs/at91rm9200_defconfig | 2 +-
185 arch/arm/configs/at91sam9261_defconfig | 2 +-
186 arch/arm/configs/at91sam9263_defconfig | 3 +-
187 arch/arm/configs/at91sam9g20_defconfig | 2 +-
188 arch/arm/configs/at91sam9rl_defconfig | 2 +-
189 arch/arm/configs/bcm2835_defconfig | 95 +
190 arch/arm/configs/bcmring_defconfig | 79 -
191 arch/arm/configs/cpu9260_defconfig | 2 +-
192 arch/arm/configs/cpu9g20_defconfig | 2 +-
193 arch/arm/configs/imx_v6_v7_defconfig | 4 +-
194 arch/arm/configs/kzm9d_defconfig | 1 +
195 arch/arm/configs/kzm9g_defconfig | 3 +-
196 arch/arm/configs/marzen_defconfig | 2 +
197 arch/arm/configs/mmp2_defconfig | 5 +-
198 arch/arm/configs/multi_v7_defconfig | 57 +
199 arch/arm/configs/mxs_defconfig | 6 -
200 arch/arm/configs/omap2plus_defconfig | 1 +
201 arch/arm/configs/pnx4008_defconfig | 472 ---
202 arch/arm/configs/prima2_defconfig | 7 +-
203 arch/arm/configs/pxa910_defconfig | 4 +-
204 arch/arm/configs/qil-a9260_defconfig | 3 +-
205 arch/arm/configs/stamp9g20_defconfig | 1 -
206 arch/arm/configs/tegra_defconfig | 2 +
207 arch/arm/configs/usb-a9260_defconfig | 1 -
208 arch/arm/include/asm/gpio.h | 2 +
209 arch/arm/include/asm/hardware/cache-tauros2.h | 5 +-
210 arch/arm/include/asm/hardware/iop3xx.h | 12 +-
211 arch/arm/include/asm/io.h | 8 +
212 arch/arm/include/asm/leds.h | 50 -
213 arch/arm/include/asm/mach/arch.h | 7 +
214 arch/arm/include/asm/mach/map.h | 8 +
215 arch/arm/include/asm/mach/pci.h | 13 +
216 arch/arm/include/asm/perf_event.h | 9 +-
217 arch/arm/include/asm/pmu.h | 77 +-
218 arch/arm/include/asm/smp.h | 48 +-
219 arch/arm/include/asm/timex.h | 4 +
220 .../debug-macro.S => include/debug/highbank.S} | 6 +-
221 arch/arm/include/debug/icedcc.S | 90 +
222 .../mach/debug-macro.S => include/debug/mvebu.S} | 3 +-
223 .../debug-macro.S => include/debug/picoxcell.S} | 4 +-
224 .../mach/debug-macro.S => include/debug/socfpga.S} | 0
225 .../debug-macro.S => include/debug/vexpress.S} | 0
226 arch/arm/kernel/Makefile | 4 +-
227 arch/arm/kernel/bios32.c | 54 +-
228 arch/arm/kernel/debug.S | 87 +-
229 arch/arm/kernel/head.S | 4 +-
230 arch/arm/kernel/leds.c | 121 -
231 arch/arm/kernel/perf_event.c | 347 +-
232 arch/arm/kernel/perf_event_cpu.c | 295 ++
233 arch/arm/kernel/perf_event_v6.c | 12 +-
234 arch/arm/kernel/perf_event_v7.c | 32 +-
235 arch/arm/kernel/perf_event_xscale.c | 10 +-
236 arch/arm/kernel/pmu.c | 36 -
237 arch/arm/kernel/process.c | 6 +-
238 arch/arm/kernel/setup.c | 4 +-
239 arch/arm/kernel/smp.c | 72 +-
240 arch/arm/kernel/time.c | 17 -
241 arch/arm/mach-at91/Makefile.boot | 24 -
242 arch/arm/mach-at91/at91rm9200_devices.c | 92 +-
243 arch/arm/mach-at91/at91sam9260_devices.c | 84 +-
244 arch/arm/mach-at91/at91sam9261_devices.c | 60 +-
245 arch/arm/mach-at91/at91sam9263.c | 4 +-
246 arch/arm/mach-at91/at91sam9263_devices.c | 161 +-
247 arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
248 arch/arm/mach-at91/at91sam9rl_devices.c | 62 +-
249 arch/arm/mach-at91/at91x40.c | 2 +-
250 arch/arm/mach-at91/at91x40_time.c | 4 +-
251 arch/arm/mach-at91/board-afeb-9260v1.c | 14 +-
252 arch/arm/mach-at91/board-carmeva.c | 14 +-
253 arch/arm/mach-at91/board-cpu9krea.c | 17 +-
254 arch/arm/mach-at91/board-cpuat91.c | 13 +-
255 arch/arm/mach-at91/board-csb337.c | 16 +-
256 arch/arm/mach-at91/board-eb9200.c | 14 +-
257 arch/arm/mach-at91/board-ecbat91.c | 32 +-
258 arch/arm/mach-at91/board-eco920.c | 36 +-
259 arch/arm/mach-at91/board-flexibity.c | 14 +-
260 arch/arm/mach-at91/board-foxg20.c | 16 +-
261 arch/arm/mach-at91/board-kafa.c | 17 +-
262 arch/arm/mach-at91/board-kb9202.c | 37 +-
263 arch/arm/mach-at91/board-neocore926.c | 13 +-
264 arch/arm/mach-at91/board-picotux200.c | 14 +-
265 arch/arm/mach-at91/board-qil-a9260.c | 14 +-
266 arch/arm/mach-at91/board-rm9200dk.c | 17 +-
267 arch/arm/mach-at91/board-rm9200ek.c | 17 +-
268 arch/arm/mach-at91/board-rsi-ews.c | 16 +-
269 arch/arm/mach-at91/board-sam9-l9260.c | 39 +-
270 arch/arm/mach-at91/board-sam9260ek.c | 16 +-
271 arch/arm/mach-at91/board-sam9261ek.c | 16 +-
272 arch/arm/mach-at91/board-sam9263ek.c | 13 +-
273 arch/arm/mach-at91/board-sam9g20ek.c | 16 +-
274 arch/arm/mach-at91/board-sam9rlek.c | 13 +-
275 arch/arm/mach-at91/board-stamp9g20.c | 14 -
276 arch/arm/mach-at91/board-usb-a926x.c | 2 -
277 arch/arm/mach-at91/board-yl-9200.c | 16 +-
278 arch/arm/mach-at91/include/mach/atmel-mci.h | 2 +-
279 arch/arm/mach-at91/include/mach/board.h | 1 -
280 arch/arm/mach-at91/include/mach/hardware.h | 4 +-
281 arch/arm/mach-at91/include/mach/uncompress.h | 6 +-
282 arch/arm/mach-at91/leds.c | 105 -
283 arch/arm/mach-at91/setup.c | 4 +-
284 arch/arm/mach-bcm2835/Makefile | 1 +
285 arch/arm/mach-bcm2835/Makefile.boot | 3 +
286 arch/arm/mach-bcm2835/bcm2835.c | 64 +
287 .../include/mach/bcm2835_soc.h} | 24 +-
288 arch/arm/mach-bcm2835/include/mach/debug-macro.S | 21 +
289 .../param.h => mach-bcm2835/include/mach/timex.h} | 11 +-
290 arch/arm/mach-bcm2835/include/mach/uncompress.h | 45 +
291 arch/arm/mach-bcmring/Kconfig | 19 -
292 arch/arm/mach-bcmring/Makefile | 8 -
293 arch/arm/mach-bcmring/Makefile.boot | 6 -
294 arch/arm/mach-bcmring/arch.c | 199 --
295 arch/arm/mach-bcmring/clock.c | 223 --
296 arch/arm/mach-bcmring/clock.h | 33 -
297 arch/arm/mach-bcmring/core.c | 228 --
298 arch/arm/mach-bcmring/core.h | 31 -
299 arch/arm/mach-bcmring/csp/Makefile | 3 -
300 arch/arm/mach-bcmring/csp/chipc/Makefile | 1 -
301 arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 776 -----
302 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c | 293 --
303 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c | 124 -
304 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c | 64 -
305 arch/arm/mach-bcmring/csp/dmac/Makefile | 1 -
306 arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 917 ------
307 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 1017 ------
308 arch/arm/mach-bcmring/csp/tmr/Makefile | 1 -
309 arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 576 ----
310 arch/arm/mach-bcmring/dma.c | 1518 ---------
311 arch/arm/mach-bcmring/dma_device.c | 593 ----
312 arch/arm/mach-bcmring/include/cfg_global.h | 13 -
313 arch/arm/mach-bcmring/include/cfg_global_defines.h | 40 -
314 arch/arm/mach-bcmring/include/csp/cache.h | 35 -
315 arch/arm/mach-bcmring/include/csp/delay.h | 36 -
316 arch/arm/mach-bcmring/include/csp/dmacHw.h | 596 ----
317 arch/arm/mach-bcmring/include/csp/errno.h | 32 -
318 arch/arm/mach-bcmring/include/csp/intcHw.h | 40 -
319 arch/arm/mach-bcmring/include/csp/module.h | 32 -
320 arch/arm/mach-bcmring/include/csp/reg.h | 114 -
321 arch/arm/mach-bcmring/include/csp/secHw.h | 65 -
322 arch/arm/mach-bcmring/include/csp/stdint.h | 30 -
323 arch/arm/mach-bcmring/include/csp/string.h | 34 -
324 arch/arm/mach-bcmring/include/csp/tmrHw.h | 263 --
325 arch/arm/mach-bcmring/include/mach/csp/cap.h | 63 -
326 .../arm/mach-bcmring/include/mach/csp/cap_inline.h | 409 ---
327 .../mach-bcmring/include/mach/csp/chipcHw_def.h | 1123 -------
328 .../mach-bcmring/include/mach/csp/chipcHw_inline.h | 1673 ----------
329 .../mach-bcmring/include/mach/csp/chipcHw_reg.h | 530 ---
330 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h | 872 -----
331 .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 145 -
332 .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 406 ---
333 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h | 73 -
334 .../arm/mach-bcmring/include/mach/csp/intcHw_reg.h | 246 --
335 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h | 101 -
336 arch/arm/mach-bcmring/include/mach/csp/mm_io.h | 147 -
337 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h | 100 -
338 .../mach-bcmring/include/mach/csp/secHw_inline.h | 79 -
339 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h | 82 -
340 arch/arm/mach-bcmring/include/mach/dma.h | 630 ----
341 arch/arm/mach-bcmring/include/mach/entry-macro.S | 76 -
342 arch/arm/mach-bcmring/include/mach/hardware.h | 57 -
343 arch/arm/mach-bcmring/include/mach/irqs.h | 132 -
344 .../mach-bcmring/include/mach/memory_settings.h | 67 -
345 arch/arm/mach-bcmring/include/mach/reg_nand.h | 66 -
346 arch/arm/mach-bcmring/include/mach/reg_umi.h | 237 --
347 arch/arm/mach-bcmring/include/mach/timer.h | 77 -
348 arch/arm/mach-bcmring/include/mach/timex.h | 25 -
349 arch/arm/mach-bcmring/include/mach/uncompress.h | 43 -
350 arch/arm/mach-bcmring/irq.c | 126 -
351 arch/arm/mach-bcmring/mm.c | 60 -
352 arch/arm/mach-bcmring/timer.c | 61 -
353 arch/arm/mach-clps711x/Kconfig | 6 -
354 arch/arm/mach-clps711x/Makefile | 3 -
355 arch/arm/mach-clps711x/ceiva.c | 64 -
356 arch/arm/mach-clps711x/common.c | 89 +-
357 arch/arm/mach-clps711x/include/mach/clps711x.h | 9 +-
358 arch/arm/mach-clps711x/include/mach/debug-macro.S | 8 +-
359 arch/arm/mach-clps711x/include/mach/hardware.h | 48 -
360 arch/arm/mach-clps711x/include/mach/timex.h | 23 +-
361 arch/arm/mach-clps711x/p720t-leds.c | 63 -
362 arch/arm/mach-clps711x/p720t.c | 62 +
363 arch/arm/mach-davinci/aemif.c | 2 +-
364 arch/arm/mach-davinci/board-da830-evm.c | 8 +-
365 arch/arm/mach-davinci/board-da850-evm.c | 6 +-
366 arch/arm/mach-davinci/board-dm355-evm.c | 8 +-
367 arch/arm/mach-davinci/board-dm355-leopard.c | 8 +-
368 arch/arm/mach-davinci/board-dm365-evm.c | 8 +-
369 arch/arm/mach-davinci/board-dm644x-evm.c | 10 +-
370 arch/arm/mach-davinci/board-dm646x-evm.c | 6 +-
371 arch/arm/mach-davinci/board-mityomapl138.c | 4 +-
372 arch/arm/mach-davinci/board-neuros-osd2.c | 8 +-
373 arch/arm/mach-davinci/board-sffsdr.c | 4 +-
374 arch/arm/mach-davinci/davinci.h | 2 +-
375 arch/arm/mach-davinci/devices.c | 4 +-
376 arch/arm/mach-davinci/dm355.c | 2 +-
377 arch/arm/mach-davinci/dm365.c | 4 +-
378 arch/arm/mach-davinci/include/mach/da8xx.h | 8 +-
379 arch/arm/mach-davinci/include/mach/tnetv107x.h | 4 +-
380 arch/arm/mach-davinci/usb.c | 2 +-
381 arch/arm/mach-dove/common.c | 14 +-
382 arch/arm/mach-dove/include/mach/dove.h | 8 +-
383 arch/arm/mach-dove/include/mach/gpio.h | 9 -
384 arch/arm/mach-dove/include/mach/io.h | 19 -
385 arch/arm/mach-dove/irq.c | 1 +
386 arch/arm/mach-dove/mpp.c | 1 +
387 arch/arm/mach-dove/pcie.c | 43 +-
388 arch/arm/mach-ebsa110/Makefile | 4 +-
389 arch/arm/mach-ebsa110/core.c | 8 +-
390 arch/arm/mach-ebsa110/core.h | 12 +-
391 arch/arm/mach-ebsa110/leds.c | 81 +-
392 arch/arm/mach-ep93xx/adssphere.c | 1 +
393 arch/arm/mach-ep93xx/core.c | 6 +-
394 arch/arm/mach-ep93xx/dma.c | 2 +-
395 arch/arm/mach-ep93xx/edb93xx.c | 4 +-
396 arch/arm/mach-ep93xx/gesbc9312.c | 1 +
397 arch/arm/mach-ep93xx/include/mach/gpio.h | 1 -
398 arch/arm/mach-ep93xx/simone.c | 2 +-
399 arch/arm/mach-ep93xx/snappercl15.c | 2 +-
400 arch/arm/mach-ep93xx/ts72xx.c | 12 +-
401 arch/arm/mach-ep93xx/{include/mach => }/ts72xx.h | 10 +-
402 arch/arm/mach-ep93xx/vision_ep9307.c | 4 +-
403 arch/arm/mach-exynos/Kconfig | 9 +-
404 arch/arm/mach-exynos/Makefile.boot | 3 -
405 arch/arm/mach-exynos/clock-exynos4.c | 31 +
406 arch/arm/mach-exynos/clock-exynos5.c | 172 +-
407 arch/arm/mach-exynos/common.c | 26 +
408 arch/arm/mach-exynos/common.h | 5 +
409 arch/arm/mach-exynos/dev-audio.c | 2 +-
410 arch/arm/mach-exynos/dev-ohci.c | 2 +-
411 arch/arm/mach-exynos/hotplug.c | 18 +-
412 arch/arm/mach-exynos/include/mach/map.h | 12 +-
413 arch/arm/mach-exynos/include/mach/sysmmu.h | 2 +-
414 arch/arm/mach-exynos/mach-armlex4210.c | 1 +
415 arch/arm/mach-exynos/mach-exynos4-dt.c | 32 +-
416 arch/arm/mach-exynos/mach-exynos5-dt.c | 17 +
417 arch/arm/mach-exynos/mach-nuri.c | 7 +-
418 arch/arm/mach-exynos/mach-origen.c | 13 +-
419 arch/arm/mach-exynos/mach-smdk4x12.c | 10 +-
420 arch/arm/mach-exynos/mach-smdkv310.c | 15 +-
421 arch/arm/mach-exynos/mach-universal_c210.c | 5 +-
422 arch/arm/mach-exynos/platsmp.c | 27 +-
423 arch/arm/mach-exynos/setup-i2c0.c | 2 +-
424 arch/arm/mach-exynos/setup-i2c1.c | 2 +-
425 arch/arm/mach-exynos/setup-i2c2.c | 2 +-
426 arch/arm/mach-exynos/setup-i2c3.c | 2 +-
427 arch/arm/mach-exynos/setup-i2c4.c | 2 +-
428 arch/arm/mach-exynos/setup-i2c5.c | 2 +-
429 arch/arm/mach-exynos/setup-i2c6.c | 2 +-
430 arch/arm/mach-exynos/setup-i2c7.c | 2 +-
431 arch/arm/mach-footbridge/Makefile | 4 -
432 arch/arm/mach-footbridge/common.c | 12 +-
433 arch/arm/mach-footbridge/dc21285.c | 16 +-
434 arch/arm/mach-footbridge/ebsa285-leds.c | 138 -
435 arch/arm/mach-footbridge/ebsa285.c | 81 +
436 .../arm/mach-footbridge/include/mach/debug-macro.S | 3 +-
437 arch/arm/mach-footbridge/include/mach/io.h | 12 +-
438 arch/arm/mach-footbridge/netwinder-hw.c | 112 +-
439 arch/arm/mach-footbridge/netwinder-leds.c | 138 -
440 arch/arm/mach-highbank/Kconfig | 15 +
441 arch/arm/mach-highbank/Makefile.boot | 1 -
442 arch/arm/mach-highbank/core.h | 9 +
443 arch/arm/mach-highbank/highbank.c | 2 +
444 arch/arm/mach-highbank/hotplug.c | 16 +-
445 arch/arm/mach-highbank/include/mach/gpio.h | 1 -
446 arch/arm/mach-highbank/include/mach/timex.h | 6 -
447 arch/arm/mach-highbank/include/mach/uncompress.h | 9 -
448 arch/arm/mach-highbank/platsmp.c | 18 +-
449 arch/arm/mach-highbank/pm.c | 4 +-
450 arch/arm/mach-imx/Kconfig | 107 +-
451 arch/arm/mach-imx/Makefile | 11 +-
452 arch/arm/mach-imx/Makefile.boot | 7 -
453 arch/arm/mach-imx/clk-imx21.c | 1 -
454 arch/arm/mach-imx/clk-imx35.c | 11 +-
455 arch/arm/mach-imx/clk-imx51-imx53.c | 18 +-
456 arch/arm/mach-imx/clk-imx6q.c | 51 +-
457 arch/arm/mach-imx/clk-pllv1.c | 49 +-
458 arch/arm/mach-imx/clk.c | 3 +
459 arch/arm/mach-imx/clk.h | 3 +-
460 arch/arm/mach-imx/devices-imx53.h | 48 -
461 arch/arm/mach-imx/efika.h | 10 -
462 arch/arm/mach-imx/ehci-imx25.c | 2 +-
463 arch/arm/mach-imx/ehci-imx27.c | 2 +-
464 arch/arm/mach-imx/ehci-imx31.c | 2 +-
465 arch/arm/mach-imx/ehci-imx35.c | 2 +-
466 arch/arm/mach-imx/ehci-imx5.c | 2 +-
467 arch/arm/mach-imx/hotplug.c | 16 +-
468 arch/arm/mach-imx/imx51-dt.c | 21 -
469 arch/arm/mach-imx/{imx53-dt.c => mach-imx53.c} | 27 -
470 arch/arm/mach-imx/mach-imx6q.c | 12 +-
471 arch/arm/mach-imx/mach-kzm_arm11_01.c | 5 +-
472 arch/arm/mach-imx/mach-mx27_3ds.c | 21 +-
473 arch/arm/mach-imx/mach-mx31ads.c | 2 +-
474 arch/arm/mach-imx/mach-mx31lite.c | 2 +-
475 arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
476 arch/arm/mach-imx/mach-mx51_efikamx.c | 300 --
477 arch/arm/mach-imx/mach-mx51_efikasb.c | 296 --
478 arch/arm/mach-imx/mach-mx53_ard.c | 272 --
479 arch/arm/mach-imx/mach-mx53_evk.c | 179 -
480 arch/arm/mach-imx/mach-mx53_loco.c | 321 --
481 arch/arm/mach-imx/mach-mx53_smd.c | 168 -
482 arch/arm/mach-imx/mm-imx5.c | 47 -
483 arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 2 +-
484 arch/arm/mach-imx/mx51_efika.c | 633 ----
485 arch/arm/mach-imx/platsmp.c | 18 +-
486 arch/arm/mach-integrator/Makefile | 3 +-
487 arch/arm/mach-integrator/core.c | 7 +-
488 arch/arm/mach-integrator/cpu.c | 8 +-
489 arch/arm/mach-integrator/include/mach/cm.h | 2 +
490 arch/arm/mach-integrator/include/mach/io.h | 33 -
491 arch/arm/mach-integrator/include/mach/platform.h | 4 +
492 arch/arm/mach-integrator/integrator_ap.c | 21 +-
493 arch/arm/mach-integrator/integrator_cp.c | 6 +-
494 arch/arm/mach-integrator/leds.c | 161 +-
495 arch/arm/mach-integrator/pci_v3.c | 62 +-
496 arch/arm/mach-iop13xx/include/mach/io.h | 28 -
497 arch/arm/mach-iop13xx/include/mach/iop13xx.h | 48 +-
498 arch/arm/mach-iop13xx/include/mach/memory.h | 14 +-
499 arch/arm/mach-iop13xx/io.c | 35 +-
500 arch/arm/mach-iop13xx/pci.c | 53 +-
501 arch/arm/mach-iop13xx/pci.h | 4 +-
502 arch/arm/mach-iop13xx/setup.c | 20 +-
503 arch/arm/mach-iop32x/glantank.c | 2 +-
504 arch/arm/mach-iop32x/include/mach/io.h | 19 -
505 arch/arm/mach-iop33x/include/mach/io.h | 19 -
506 arch/arm/mach-ixp4xx/common.c | 8 +-
507 arch/arm/mach-ixp4xx/include/mach/cpu.h | 5 +-
508 arch/arm/mach-ixp4xx/include/mach/gpio.h | 2 -
509 arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 10 +-
510 arch/arm/mach-kirkwood/Makefile.boot | 11 -
511 arch/arm/mach-kirkwood/board-dreamplug.c | 2 +-
512 arch/arm/mach-kirkwood/board-goflexnet.c | 2 +-
513 arch/arm/mach-kirkwood/common.c | 20 +-
514 arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
515 arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +-
516 arch/arm/mach-kirkwood/dockstar-setup.c | 2 +-
517 arch/arm/mach-kirkwood/guruplug-setup.c | 2 +-
518 arch/arm/mach-kirkwood/include/mach/gpio.h | 9 -
519 arch/arm/mach-kirkwood/include/mach/io.h | 24 -
520 arch/arm/mach-kirkwood/include/mach/kirkwood.h | 8 +-
521 arch/arm/mach-kirkwood/irq.c | 1 +
522 arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +-
523 arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +-
524 arch/arm/mach-kirkwood/openrd-setup.c | 2 +-
525 arch/arm/mach-kirkwood/pcie.c | 44 +-
526 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 1 +
527 arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +-
528 arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 +-
529 arch/arm/mach-ks8695/Kconfig | 61 +
530 arch/arm/mach-ks8695/Makefile | 11 +-
531 arch/arm/mach-ks8695/board-og.c | 199 ++
532 arch/arm/mach-ks8695/board-sg.c | 121 +
533 arch/arm/mach-ks8695/cpu.c | 2 +-
534 arch/arm/mach-ks8695/devices.c | 21 -
535 arch/arm/mach-ks8695/include/mach/devices.h | 5 -
536 arch/arm/mach-ks8695/include/mach/hardware.h | 2 +-
537 arch/arm/mach-ks8695/include/mach/regs-timer.h | 40 -
538 arch/arm/mach-ks8695/include/mach/uncompress.h | 6 +-
539 arch/arm/mach-ks8695/leds.c | 92 -
540 arch/arm/mach-ks8695/time.c | 133 +-
541 arch/arm/mach-lpc32xx/Makefile.boot | 2 -
542 arch/arm/mach-lpc32xx/common.c | 8 +-
543 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h | 2 +-
544 arch/arm/mach-lpc32xx/include/mach/hardware.h | 2 +-
545 arch/arm/mach-lpc32xx/irq.c | 7 +-
546 arch/arm/mach-lpc32xx/phy3250.c | 42 +-
547 arch/arm/mach-mmp/Makefile | 8 +-
548 arch/arm/mach-mmp/aspenite.c | 2 +-
549 arch/arm/mach-mmp/clock-mmp2.c | 111 +
550 arch/arm/mach-mmp/clock-pxa168.c | 91 +
551 arch/arm/mach-mmp/clock-pxa910.c | 67 +
552 arch/arm/mach-mmp/common.h | 3 +
553 arch/arm/mach-mmp/include/mach/debug-macro.S | 12 +-
554 arch/arm/mach-mmp/include/mach/mmp2.h | 2 +-
555 arch/arm/mach-mmp/include/mach/pxa168.h | 4 +-
556 arch/arm/mach-mmp/include/mach/pxa910.h | 2 +-
557 arch/arm/mach-mmp/include/mach/regs-apbc.h | 95 -
558 arch/arm/mach-mmp/include/mach/regs-apmu.h | 15 -
559 arch/arm/mach-mmp/irq.c | 4 +-
560 arch/arm/mach-mmp/mmp2.c | 73 +-
561 arch/arm/mach-mmp/pxa168.c | 58 +-
562 arch/arm/mach-mmp/pxa910.c | 44 +-
563 arch/arm/mach-mmp/sram.c | 2 +-
564 arch/arm/mach-mmp/teton_bga.c | 2 +-
565 arch/arm/mach-mmp/ttc_dkb.c | 10 +
566 arch/arm/mach-msm/Kconfig | 49 +-
567 arch/arm/mach-msm/Makefile | 8 +-
568 arch/arm/mach-msm/acpuclock-arm11.c | 525 ---
569 arch/arm/mach-msm/acpuclock.h | 32 -
570 arch/arm/mach-msm/board-dt-8660.c | 64 +
571 arch/arm/mach-msm/board-dt-8960.c | 50 +
572 arch/arm/mach-msm/board-halibut.c | 5 +-
573 arch/arm/mach-msm/board-mahimahi.c | 1 -
574 arch/arm/mach-msm/board-msm7x27.c | 170 -
575 arch/arm/mach-msm/board-msm7x30.c | 9 +-
576 arch/arm/mach-msm/board-msm8960.c | 122 -
577 arch/arm/mach-msm/board-msm8x60.c | 166 -
578 arch/arm/mach-msm/board-qsd8x50.c | 9 +-
579 arch/arm/mach-msm/board-sapphire.c | 1 -
580 arch/arm/mach-msm/board-trout-mmc.c | 2 +-
581 arch/arm/mach-msm/board-trout-panel.c | 2 +-
582 arch/arm/mach-msm/board-trout.c | 5 +-
583 arch/arm/mach-msm/clock-pcom.c | 18 +-
584 arch/arm/mach-msm/common.h | 32 +
585 arch/arm/mach-msm/core.h | 2 +
586 arch/arm/mach-msm/devices-msm7x00.c | 2 +-
587 arch/arm/mach-msm/devices-msm7x30.c | 2 +-
588 arch/arm/mach-msm/devices-msm8960.c | 85 -
589 arch/arm/mach-msm/devices-qsd8x50.c | 2 +-
590 arch/arm/mach-msm/dma.c | 3 +-
591 arch/arm/mach-msm/hotplug.c | 18 +-
592 arch/arm/mach-msm/idle.c | 49 -
593 arch/arm/mach-msm/include/mach/board.h | 15 +-
594 arch/arm/mach-msm/include/mach/gpio.h | 1 -
595 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 7 -
596 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 -
597 arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 6 +-
598 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 -
599 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 17 +-
600 arch/arm/mach-msm/include/mach/msm_iomap.h | 3 +-
601 arch/arm/mach-msm/include/mach/system.h | 19 -
602 arch/arm/mach-msm/io.c | 32 +-
603 arch/arm/mach-msm/platsmp.c | 32 +-
604 arch/arm/mach-msm/proc_comm.c | 1 -
605 arch/arm/mach-msm/smd.c | 26 +-
606 arch/arm/mach-msm/timer.c | 188 +-
607 arch/arm/mach-mv78xx0/addr-map.c | 3 +-
608 arch/arm/mach-mv78xx0/common.c | 9 +-
609 arch/arm/mach-mv78xx0/include/mach/io.h | 24 -
610 arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 21 +-
611 arch/arm/mach-mv78xx0/irq.c | 1 +
612 arch/arm/mach-mv78xx0/pcie.c | 110 +-
613 arch/arm/mach-mvebu/Kconfig | 10 +
614 arch/arm/mach-mvebu/Makefile | 2 +
615 arch/arm/mach-mvebu/Makefile.boot | 3 -
616 arch/arm/mach-mvebu/armada-370-xp.c | 2 +-
617 .../mach-mvebu/{include/mach => }/armada-370-xp.h | 0
618 arch/arm/mach-mvebu/include/mach/timex.h | 13 -
619 arch/arm/mach-mvebu/include/mach/uncompress.h | 43 -
620 arch/arm/mach-mxs/Kconfig | 89 -
621 arch/arm/mach-mxs/Makefile | 11 +-
622 arch/arm/mach-mxs/Makefile.boot | 9 -
623 arch/arm/mach-mxs/devices-mx23.h | 43 -
624 arch/arm/mach-mxs/devices-mx28.h | 63 -
625 arch/arm/mach-mxs/devices.c | 87 -
626 arch/arm/mach-mxs/devices/Kconfig | 33 -
627 arch/arm/mach-mxs/devices/Makefile | 12 -
628 arch/arm/mach-mxs/devices/platform-auart.c | 65 -
629 arch/arm/mach-mxs/devices/platform-dma.c | 31 -
630 arch/arm/mach-mxs/devices/platform-fec.c | 52 -
631 arch/arm/mach-mxs/devices/platform-flexcan.c | 51 -
632 arch/arm/mach-mxs/devices/platform-gpio-mxs.c | 33 -
633 arch/arm/mach-mxs/devices/platform-gpmi-nand.c | 81 -
634 arch/arm/mach-mxs/devices/platform-mxs-i2c.c | 52 -
635 arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 76 -
636 arch/arm/mach-mxs/devices/platform-mxs-pwm.c | 22 -
637 arch/arm/mach-mxs/devices/platform-mxs-saif.c | 61 -
638 arch/arm/mach-mxs/devices/platform-mxsfb.c | 47 -
639 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 -
640 arch/arm/mach-mxs/icoll.c | 63 +-
641 arch/arm/mach-mxs/include/mach/common.h | 12 +-
642 arch/arm/mach-mxs/include/mach/devices-common.h | 114 -
643 arch/arm/mach-mxs/include/mach/entry-macro.S | 35 -
644 arch/arm/mach-mxs/include/mach/gpio.h | 1 -
645 arch/arm/mach-mxs/include/mach/iomux-mx23.h | 355 --
646 arch/arm/mach-mxs/include/mach/iomux-mx28.h | 537 ---
647 arch/arm/mach-mxs/include/mach/iomux.h | 168 -
648 arch/arm/mach-mxs/include/mach/irqs.h | 32 -
649 arch/arm/mach-mxs/iomux.c | 101 -
650 arch/arm/mach-mxs/mach-apx4devkit.c | 273 --
651 arch/arm/mach-mxs/mach-m28evk.c | 366 ---
652 arch/arm/mach-mxs/mach-mx23evk.c | 190 --
653 arch/arm/mach-mxs/mach-mx28evk.c | 477 ---
654 arch/arm/mach-mxs/mach-mxs.c | 169 +-
655 arch/arm/mach-mxs/mach-stmp378x_devb.c | 123 -
656 arch/arm/mach-mxs/mach-tx28.c | 184 --
657 arch/arm/mach-mxs/mm.c | 39 -
658 arch/arm/mach-mxs/module-tx28.c | 160 -
659 arch/arm/mach-mxs/module-tx28.h | 10 -
660 arch/arm/mach-mxs/timer.c | 13 +-
661 arch/arm/mach-netx/nxdb500.c | 2 +-
662 arch/arm/mach-netx/nxdkn.c | 2 +-
663 arch/arm/mach-netx/nxeb500hmi.c | 2 +-
664 arch/arm/mach-nomadik/board-nhk8815.c | 41 +-
665 arch/arm/mach-nomadik/cpu-8815.c | 13 +
666 arch/arm/mach-nomadik/include/mach/gpio.h | 4 -
667 arch/arm/mach-nomadik/include/mach/hardware.h | 2 +-
668 arch/arm/mach-nomadik/include/mach/uncompress.h | 8 +-
669 arch/arm/mach-omap1/Makefile | 8 -
670 arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +-
671 arch/arm/mach-omap1/ams-delta-fiq.c | 2 +-
672 arch/arm/mach-omap1/board-ams-delta.c | 8 +-
673 arch/arm/mach-omap1/board-fsample.c | 7 +-
674 arch/arm/mach-omap1/board-generic.c | 8 +-
675 arch/arm/mach-omap1/board-h2.c | 41 +-
676 arch/arm/mach-omap1/board-h3.c | 39 +-
677 arch/arm/mach-omap1/board-htcherald.c | 8 +-
678 arch/arm/mach-omap1/board-innovator.c | 6 +-
679 arch/arm/mach-omap1/board-nokia770.c | 8 +-
680 arch/arm/mach-omap1/board-osk.c | 41 +-
681 arch/arm/mach-omap1/board-palmte.c | 10 +-
682 arch/arm/mach-omap1/board-palmtt.c | 10 +-
683 arch/arm/mach-omap1/board-palmz71.c | 10 +-
684 arch/arm/mach-omap1/board-perseus2.c | 7 +-
685 arch/arm/mach-omap1/board-sx1-mmc.c | 2 +-
686 arch/arm/mach-omap1/board-sx1.c | 11 +-
687 arch/arm/mach-omap1/board-voiceblue.c | 12 +-
688 arch/arm/mach-omap1/clock.c | 4 +-
689 arch/arm/mach-omap1/clock_data.c | 21 +-
690 arch/arm/mach-omap1/devices.c | 5 +-
691 arch/arm/mach-omap1/dma.c | 8 +-
692 arch/arm/mach-omap1/flash.c | 2 +-
693 arch/arm/mach-omap1/gpio15xx.c | 1 +
694 arch/arm/mach-omap1/gpio16xx.c | 1 +
695 arch/arm/mach-omap1/gpio7xx.c | 1 +
696 arch/arm/mach-omap1/i2c.c | 2 +-
697 arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | 2 -
698 .../include/mach}/board-ams-delta.h | 0
699 .../plat => mach-omap1/include/mach}/board-sx1.h | 0
700 .../include/mach}/board-voiceblue.h | 0
701 .../plat => mach-omap1/include/mach}/flash.h | 0
702 arch/arm/mach-omap1/include/mach/gpio.h | 2 -
703 arch/arm/mach-omap1/include/mach/hardware.h | 285 +-
704 .../plat => mach-omap1/include/mach}/irda.h | 0
705 arch/arm/mach-omap1/include/mach/irqs.h | 267 +-
706 .../include/plat => mach-omap1/include/mach}/mux.h | 0
707 .../plat => mach-omap1/include/mach}/omap1510.h | 3 +-
708 .../plat => mach-omap1/include/mach}/omap16xx.h | 3 +-
709 .../plat => mach-omap1/include/mach}/omap7xx.h | 3 +-
710 arch/arm/mach-omap1/include/mach/smp.h | 5 -
711 arch/arm/mach-omap1/io.c | 2 +-
712 arch/arm/mach-omap1/lcd_dma.c | 6 +-
713 arch/arm/mach-omap1/leds-h2p2-debug.c | 166 -
714 arch/arm/mach-omap1/leds-innovator.c | 98 -
715 arch/arm/mach-omap1/leds-osk.c | 113 -
716 arch/arm/mach-omap1/leds.c | 69 -
717 arch/arm/mach-omap1/leds.h | 3 -
718 arch/arm/mach-omap1/mcbsp.c | 4 +-
719 arch/arm/mach-omap1/mux.c | 58 +-
720 arch/arm/mach-omap1/pm.c | 2 +-
721 arch/arm/mach-omap1/serial.c | 3 +-
722 arch/arm/mach-omap1/time.c | 1 -
723 arch/arm/mach-omap1/timer32k.c | 1 -
724 arch/arm/mach-omap1/usb.c | 2 +-
725 arch/arm/mach-omap2/Kconfig | 8 +
726 arch/arm/mach-omap2/Makefile | 114 +-
727 .../include/plat => mach-omap2}/am33xx.h | 0
728 arch/arm/mach-omap2/am35xx-emac.c | 2 +-
729 arch/arm/mach-omap2/{include/mach => }/am35xx.h | 0
730 arch/arm/mach-omap2/board-2430sdp.c | 8 +-
731 arch/arm/mach-omap2/board-3430sdp.c | 14 +-
732 arch/arm/mach-omap2/board-3630sdp.c | 8 +-
733 arch/arm/mach-omap2/board-4430sdp.c | 19 +-
734 arch/arm/mach-omap2/board-am3517crane.c | 10 -
735 arch/arm/mach-omap2/board-am3517evm.c | 13 +-
736 arch/arm/mach-omap2/board-apollon.c | 2 -
737 arch/arm/mach-omap2/board-cm-t35.c | 16 +-
738 arch/arm/mach-omap2/board-cm-t3517.c | 13 +-
739 arch/arm/mach-omap2/board-devkit8000.c | 13 +-
740 arch/arm/mach-omap2/board-flash.c | 8 +-
741 arch/arm/mach-omap2/board-generic.c | 4 +-
742 arch/arm/mach-omap2/board-h4.c | 5 +-
743 arch/arm/mach-omap2/board-igep0020.c | 9 +-
744 arch/arm/mach-omap2/board-ldp.c | 11 +-
745 arch/arm/mach-omap2/board-n8x0.c | 16 +-
746 arch/arm/mach-omap2/board-omap3beagle.c | 7 +-
747 arch/arm/mach-omap2/board-omap3evm.c | 29 +-
748 arch/arm/mach-omap2/board-omap3logic.c | 18 +-
749 arch/arm/mach-omap2/board-omap3pandora.c | 9 +-
750 arch/arm/mach-omap2/board-omap3stalker.c | 21 +-
751 arch/arm/mach-omap2/board-omap3touchbook.c | 9 +-
752 arch/arm/mach-omap2/board-omap4panda.c | 17 +-
753 arch/arm/mach-omap2/board-overo.c | 19 +-
754 arch/arm/mach-omap2/board-rm680.c | 8 +-
755 arch/arm/mach-omap2/board-rx51-peripherals.c | 15 +-
756 arch/arm/mach-omap2/board-rx51-video.c | 4 +-
757 arch/arm/mach-omap2/board-rx51.c | 4 +-
758 .../arm/mach-omap2/{include/mach => }/board-rx51.h | 0
759 arch/arm/mach-omap2/board-ti8168evm.c | 8 -
760 arch/arm/mach-omap2/board-zoom-debugboard.c | 12 +-
761 arch/arm/mach-omap2/board-zoom-display.c | 4 +-
762 arch/arm/mach-omap2/board-zoom-peripherals.c | 6 +-
763 arch/arm/mach-omap2/board-zoom.c | 1 -
764 arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 2 +-
765 arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 10 +-
766 arch/arm/mach-omap2/clkt_clksel.c | 28 +-
767 arch/arm/mach-omap2/clkt_dpll.c | 14 +-
768 arch/arm/mach-omap2/clock.c | 28 +-
769 arch/arm/mach-omap2/clock2420_data.c | 2 +-
770 arch/arm/mach-omap2/clock2430.c | 2 +-
771 arch/arm/mach-omap2/clock2430_data.c | 3 +-
772 arch/arm/mach-omap2/clock2xxx.c | 2 +-
773 arch/arm/mach-omap2/clock33xx_data.c | 4 +-
774 arch/arm/mach-omap2/clock3xxx.c | 5 +-
775 arch/arm/mach-omap2/clock3xxx_data.c | 3 +-
776 arch/arm/mach-omap2/clock44xx_data.c | 2 +-
777 arch/arm/mach-omap2/clockdomain.c | 74 +-
778 arch/arm/mach-omap2/cm2xxx_3xxx.c | 3 +-
779 arch/arm/mach-omap2/common-board-devices.c | 8 +-
780 arch/arm/mach-omap2/common.c | 4 +-
781 arch/arm/mach-omap2/common.h | 14 +-
782 arch/arm/mach-omap2/control.c | 2 +-
783 arch/arm/mach-omap2/control.h | 10 +-
784 arch/arm/mach-omap2/cpuidle34xx.c | 1 -
785 .../{include/mach => }/ctrl_module_core_44xx.h | 0
786 .../{include/mach => }/ctrl_module_pad_core_44xx.h | 0
787 .../{include/mach => }/ctrl_module_pad_wkup_44xx.h | 0
788 .../{include/mach => }/ctrl_module_wkup_44xx.h | 0
789 arch/arm/mach-omap2/debug-devices.h | 9 +
790 arch/arm/mach-omap2/devices.c | 31 +-
791 arch/arm/mach-omap2/dpll3xxx.c | 13 +-
792 arch/arm/mach-omap2/dpll44xx.c | 2 +-
793 arch/arm/mach-omap2/dsp.c | 2 +-
794 arch/arm/mach-omap2/emu.c | 3 +-
795 arch/arm/mach-omap2/gpio.c | 3 +
796 arch/arm/mach-omap2/gpmc-nand.c | 34 +-
797 arch/arm/mach-omap2/gpmc-onenand.c | 29 +-
798 arch/arm/mach-omap2/gpmc-smc91x.c | 5 +-
799 .../include/plat => mach-omap2}/gpmc-smc91x.h | 0
800 arch/arm/mach-omap2/gpmc-smsc911x.c | 3 +-
801 .../include/plat => mach-omap2}/gpmc-smsc911x.h | 0
802 arch/arm/mach-omap2/gpmc.c | 169 +-
803 arch/arm/mach-omap2/hdq1w.c | 2 +-
804 .../{plat-omap/include/plat => mach-omap2}/hdq1w.h | 0
805 arch/arm/mach-omap2/hsmmc.c | 3 +-
806 arch/arm/mach-omap2/i2c.c | 1 -
807 arch/arm/mach-omap2/id.c | 9 +-
808 arch/arm/mach-omap2/{include/mach => }/id.h | 0
809 arch/arm/mach-omap2/include/mach/gpio.h | 2 -
810 arch/arm/mach-omap2/include/mach/hardware.h | 2 -
811 arch/arm/mach-omap2/include/mach/irqs.h | 2 -
812 arch/arm/mach-omap2/include/mach/smp.h | 5 -
813 arch/arm/mach-omap2/io.c | 3 +
814 arch/arm/mach-omap2/irq.c | 10 +-
815 .../include/plat => mach-omap2}/l3_2xxx.h | 0
816 .../include/plat => mach-omap2}/l3_3xxx.h | 0
817 .../include/plat => mach-omap2}/l4_2xxx.h | 0
818 .../include/plat => mach-omap2}/l4_3xxx.h | 0
819 arch/arm/mach-omap2/mailbox.c | 4 +-
820 arch/arm/mach-omap2/mcbsp.c | 4 +-
821 arch/arm/mach-omap2/msdi.c | 1 +
822 arch/arm/mach-omap2/omap-hotplug.c | 18 +-
823 arch/arm/mach-omap2/omap-iommu.c | 12 +-
824 arch/arm/mach-omap2/omap-mpuss-lowpower.c | 3 +-
825 arch/arm/mach-omap2/omap-secure.c | 2 +-
826 .../mach-omap2/{include/mach => }/omap-secure.h | 0
827 arch/arm/mach-omap2/omap-smp.c | 24 +-
828 arch/arm/mach-omap2/omap-wakeupgen.c | 13 +-
829 .../mach-omap2/{include/mach => }/omap-wakeupgen.h | 0
830 .../include/plat => mach-omap2}/omap24xx.h | 2 -
831 .../include/plat => mach-omap2}/omap34xx.h | 2 -
832 arch/arm/mach-omap2/omap4-common.c | 16 +-
833 .../include/plat => mach-omap2}/omap4-keypad.h | 2 +
834 .../include/plat => mach-omap2}/omap44xx.h | 2 +-
835 .../include/plat => mach-omap2}/omap54xx.h | 0
836 arch/arm/mach-omap2/omap_hwmod.c | 229 +-
837 arch/arm/mach-omap2/omap_hwmod_2420_data.c | 32 +-
838 arch/arm/mach-omap2/omap_hwmod_2430_data.c | 80 +-
839 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 110 +-
840 .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 4 +-
841 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 10 +-
842 arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 3381 +++++++++++++++++++
843 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 160 +-
844 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 7 +-
845 arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 +
846 arch/arm/mach-omap2/omap_phy_internal.c | 2 +
847 arch/arm/mach-omap2/opp.c | 15 +-
848 arch/arm/mach-omap2/opp2420_data.c | 2 +-
849 arch/arm/mach-omap2/opp2430_data.c | 2 +-
850 arch/arm/mach-omap2/opp3xxx_data.c | 2 -
851 arch/arm/mach-omap2/opp4xxx_data.c | 3 +-
852 arch/arm/mach-omap2/pm-debug.c | 1 -
853 arch/arm/mach-omap2/pm.c | 4 +-
854 arch/arm/mach-omap2/pm24xx.c | 14 +-
855 arch/arm/mach-omap2/pm34xx.c | 10 +-
856 arch/arm/mach-omap2/pm44xx.c | 8 +-
857 arch/arm/mach-omap2/powerdomain.c | 42 +-
858 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 4 +-
859 arch/arm/mach-omap2/powerdomain44xx.c | 4 +-
860 arch/arm/mach-omap2/powerdomains3xxx_data.c | 4 +-
861 arch/arm/mach-omap2/prcm.c | 9 +-
862 arch/arm/mach-omap2/prm2xxx_3xxx.c | 7 +-
863 arch/arm/mach-omap2/prm44xx.c | 5 +-
864 arch/arm/mach-omap2/prm_common.c | 1 -
865 arch/arm/mach-omap2/sdrc2xxx.c | 2 +-
866 arch/arm/mach-omap2/serial.c | 14 +-
867 arch/arm/mach-omap2/sleep24xx.S | 3 +-
868 arch/arm/mach-omap2/sleep34xx.S | 2 +-
869 arch/arm/mach-omap2/sleep44xx.S | 4 +-
870 arch/arm/mach-omap2/soc.h | 7 +
871 arch/arm/mach-omap2/sr_device.c | 13 +-
872 arch/arm/mach-omap2/sram242x.S | 3 +-
873 arch/arm/mach-omap2/sram243x.S | 3 +-
874 arch/arm/mach-omap2/sram34xx.S | 3 +-
875 .../include/plat => mach-omap2}/ti81xx.h | 0
876 arch/arm/mach-omap2/timer.c | 114 +-
877 arch/arm/mach-omap2/twl-common.c | 38 +-
878 arch/arm/mach-omap2/twl-common.h | 9 +-
879 arch/arm/mach-omap2/usb-host.c | 2 -
880 arch/arm/mach-omap2/usb-musb.c | 7 +-
881 arch/arm/mach-omap2/vc.c | 8 +-
882 arch/arm/mach-omap2/voltage.c | 12 +-
883 arch/arm/mach-omap2/voltage.h | 2 +-
884 arch/arm/mach-omap2/voltagedomains3xxx_data.c | 3 +-
885 arch/arm/mach-omap2/vp.c | 16 +-
886 arch/arm/mach-orion5x/common.c | 14 +-
887 arch/arm/mach-orion5x/d2net-setup.c | 1 +
888 arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-
889 arch/arm/mach-orion5x/dns323-setup.c | 1 +
890 arch/arm/mach-orion5x/include/mach/gpio.h | 9 -
891 arch/arm/mach-orion5x/include/mach/io.h | 22 -
892 arch/arm/mach-orion5x/include/mach/orion5x.h | 20 +-
893 arch/arm/mach-orion5x/irq.c | 1 +
894 arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +-
895 arch/arm/mach-orion5x/net2big-setup.c | 1 +
896 arch/arm/mach-orion5x/pci.c | 56 +-
897 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 1 -
898 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 1 -
899 arch/arm/mach-orion5x/rd88f5182-setup.c | 72 +-
900 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 -
901 arch/arm/mach-orion5x/ts78xx-setup.c | 12 +-
902 arch/arm/mach-picoxcell/Kconfig | 14 +
903 arch/arm/mach-picoxcell/Makefile.boot | 1 -
904 arch/arm/mach-picoxcell/common.c | 13 +-
905 arch/arm/mach-picoxcell/include/mach/gpio.h | 1 -
906 .../mach-picoxcell/include/mach/picoxcell_soc.h | 25 -
907 arch/arm/mach-picoxcell/include/mach/timex.h | 25 -
908 arch/arm/mach-picoxcell/include/mach/uncompress.h | 21 -
909 arch/arm/mach-pnx4008/Makefile | 12 -
910 arch/arm/mach-pnx4008/Makefile.boot | 4 -
911 arch/arm/mach-pnx4008/clock.c | 1001 ------
912 arch/arm/mach-pnx4008/clock.h | 43 -
913 arch/arm/mach-pnx4008/core.c | 290 --
914 arch/arm/mach-pnx4008/dma.c | 1105 -------
915 arch/arm/mach-pnx4008/gpio.c | 328 --
916 arch/arm/mach-pnx4008/i2c.c | 86 -
917 arch/arm/mach-pnx4008/include/mach/clock.h | 62 -
918 arch/arm/mach-pnx4008/include/mach/debug-macro.S | 21 -
919 arch/arm/mach-pnx4008/include/mach/dma.h | 160 -
920 arch/arm/mach-pnx4008/include/mach/entry-macro.S | 116 -
921 arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h | 241 --
922 arch/arm/mach-pnx4008/include/mach/hardware.h | 32 -
923 arch/arm/mach-pnx4008/include/mach/irq.h | 42 -
924 arch/arm/mach-pnx4008/include/mach/irqs.h | 215 --
925 arch/arm/mach-pnx4008/include/mach/platform.h | 69 -
926 arch/arm/mach-pnx4008/include/mach/pm.h | 33 -
927 arch/arm/mach-pnx4008/include/mach/timex.h | 19 -
928 arch/arm/mach-pnx4008/include/mach/uncompress.h | 46 -
929 arch/arm/mach-pnx4008/irq.c | 121 -
930 arch/arm/mach-pnx4008/pm.c | 153 -
931 arch/arm/mach-pnx4008/serial.c | 67 -
932 arch/arm/mach-pnx4008/sleep.S | 195 --
933 arch/arm/mach-pnx4008/time.c | 134 -
934 arch/arm/mach-pnx4008/time.h | 70 -
935 arch/arm/mach-prima2/Kconfig | 19 +
936 arch/arm/mach-prima2/Makefile | 4 +-
937 arch/arm/mach-prima2/{prima2.c => common.c} | 11 +-
938 arch/arm/mach-prima2/include/mach/uncompress.h | 4 +-
939 arch/arm/mach-prima2/irq.c | 2 +-
940 arch/arm/mach-pxa/Kconfig | 12 +
941 arch/arm/mach-pxa/Makefile | 11 +-
942 arch/arm/mach-pxa/am200epd.c | 2 +-
943 arch/arm/mach-pxa/am300epd.c | 2 +-
944 arch/arm/mach-pxa/balloon3.c | 8 +-
945 arch/arm/mach-pxa/clock-pxa3xx.c | 8 +-
946 arch/arm/mach-pxa/cm-x270.c | 4 +-
947 arch/arm/mach-pxa/cm-x2xx.c | 2 +-
948 arch/arm/mach-pxa/cm-x300.c | 10 +-
949 arch/arm/mach-pxa/colibri-evalboard.c | 4 +-
950 arch/arm/mach-pxa/colibri-pxa270-income.c | 6 +-
951 arch/arm/mach-pxa/colibri-pxa300.c | 4 +-
952 arch/arm/mach-pxa/colibri-pxa320.c | 4 +-
953 arch/arm/mach-pxa/colibri-pxa3xx.c | 6 +-
954 arch/arm/mach-pxa/corgi.c | 4 +-
955 arch/arm/mach-pxa/csb726.c | 4 +-
956 arch/arm/mach-pxa/devices.c | 34 +-
957 arch/arm/mach-pxa/em-x270.c | 10 +-
958 arch/arm/mach-pxa/eseries.c | 4 +-
959 arch/arm/mach-pxa/ezx.c | 8 +-
960 arch/arm/mach-pxa/gumstix.c | 2 +-
961 arch/arm/mach-pxa/hx4700.c | 2 +-
962 arch/arm/mach-pxa/idp.c | 85 +-
963 arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 1 +
964 arch/arm/mach-pxa/irq.c | 131 +-
965 arch/arm/mach-pxa/leds-idp.c | 115 -
966 arch/arm/mach-pxa/leds-lubbock.c | 124 -
967 arch/arm/mach-pxa/leds-mainstone.c | 119 -
968 arch/arm/mach-pxa/leds.c | 32 -
969 arch/arm/mach-pxa/leds.h | 13 -
970 arch/arm/mach-pxa/littleton.c | 8 +-
971 arch/arm/mach-pxa/lpd270.c | 8 +-
972 arch/arm/mach-pxa/lubbock.c | 101 +-
973 arch/arm/mach-pxa/magician.c | 8 +-
974 arch/arm/mach-pxa/mainstone.c | 104 +-
975 arch/arm/mach-pxa/mioa701.c | 8 +-
976 arch/arm/mach-pxa/mxm8x10.c | 8 +-
977 arch/arm/mach-pxa/palm27x.c | 8 +-
978 arch/arm/mach-pxa/palmld.c | 10 +-
979 arch/arm/mach-pxa/palmt5.c | 10 +-
980 arch/arm/mach-pxa/palmtc.c | 6 +-
981 arch/arm/mach-pxa/palmte2.c | 8 +-
982 arch/arm/mach-pxa/palmtreo.c | 14 +-
983 arch/arm/mach-pxa/palmtx.c | 10 +-
984 arch/arm/mach-pxa/palmz72.c | 12 +-
985 arch/arm/mach-pxa/pcm990-baseboard.c | 8 +-
986 arch/arm/mach-pxa/poodle.c | 6 +-
987 arch/arm/mach-pxa/pxa-dt.c | 63 +
988 arch/arm/mach-pxa/pxa27x.c | 2 +-
989 arch/arm/mach-pxa/pxa2xx.c | 2 +-
990 arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 +-
991 arch/arm/mach-pxa/pxa3xx.c | 25 +-
992 arch/arm/mach-pxa/raumfeld.c | 8 +-
993 arch/arm/mach-pxa/saar.c | 2 +-
994 arch/arm/mach-pxa/sharpsl_pm.c | 34 +-
995 arch/arm/mach-pxa/spitz.c | 8 +-
996 arch/arm/mach-pxa/stargate2.c | 2 +-
997 arch/arm/mach-pxa/tavorevb.c | 4 +-
998 arch/arm/mach-pxa/tosa.c | 4 +-
999 arch/arm/mach-pxa/trizeps4.c | 8 +-
1000 arch/arm/mach-pxa/viper.c | 4 +-
1001 arch/arm/mach-pxa/vpac270.c | 8 +-
1002 arch/arm/mach-pxa/z2.c | 6 +-
1003 arch/arm/mach-pxa/zeus.c | 8 +-
1004 arch/arm/mach-pxa/zylonite.c | 10 +-
1005 arch/arm/mach-realview/core.c | 39 -
1006 arch/arm/mach-realview/core.h | 5 +-
1007 arch/arm/mach-realview/hotplug.c | 18 +-
1008 arch/arm/mach-realview/include/mach/gpio.h | 1 -
1009 arch/arm/mach-realview/platsmp.c | 18 +-
1010 arch/arm/mach-realview/realview_eb.c | 8 +-
1011 arch/arm/mach-realview/realview_pb1176.c | 8 +-
1012 arch/arm/mach-realview/realview_pb11mp.c | 9 +-
1013 arch/arm/mach-realview/realview_pba8.c | 8 +-
1014 arch/arm/mach-realview/realview_pbx.c | 9 +-
1015 arch/arm/mach-s3c24xx/clock-s3c2440.c | 14 +
1016 arch/arm/mach-s3c24xx/common-smdk.c | 4 +-
1017 arch/arm/mach-s3c24xx/h1940-bluetooth.c | 14 +-
1018 arch/arm/mach-s3c24xx/mach-amlm5900.c | 2 +-
1019 arch/arm/mach-s3c24xx/mach-anubis.c | 9 +-
1020 arch/arm/mach-s3c24xx/mach-at2440evb.c | 6 +-
1021 arch/arm/mach-s3c24xx/mach-bast.c | 8 +-
1022 arch/arm/mach-s3c24xx/mach-gta02.c | 10 +-
1023 arch/arm/mach-s3c24xx/mach-h1940.c | 12 +-
1024 arch/arm/mach-s3c24xx/mach-jive.c | 18 +-
1025 arch/arm/mach-s3c24xx/mach-mini2440.c | 14 +-
1026 arch/arm/mach-s3c24xx/mach-n30.c | 8 +-
1027 arch/arm/mach-s3c24xx/mach-nexcoder.c | 24 +-
1028 arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 13 +-
1029 arch/arm/mach-s3c24xx/mach-osiris.c | 11 +-
1030 arch/arm/mach-s3c24xx/mach-otom.c | 2 +-
1031 arch/arm/mach-s3c24xx/mach-qt2410.c | 8 +-
1032 arch/arm/mach-s3c24xx/mach-rx1950.c | 10 +-
1033 arch/arm/mach-s3c24xx/mach-rx3715.c | 2 +-
1034 arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 +-
1035 arch/arm/mach-s3c24xx/mach-smdk2413.c | 4 +-
1036 arch/arm/mach-s3c24xx/mach-smdk2416.c | 8 +-
1037 arch/arm/mach-s3c24xx/mach-smdk2440.c | 2 +-
1038 arch/arm/mach-s3c24xx/mach-smdk2443.c | 2 +-
1039 arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 +-
1040 arch/arm/mach-s3c24xx/mach-vr1000.c | 6 +-
1041 arch/arm/mach-s3c24xx/mach-vstms.c | 4 +-
1042 arch/arm/mach-s3c24xx/setup-i2c.c | 2 +-
1043 arch/arm/mach-s3c24xx/simtec-audio.c | 2 +-
1044 arch/arm/mach-s3c24xx/simtec-usb.c | 2 +-
1045 arch/arm/mach-s3c64xx/dev-audio.c | 2 +-
1046 arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
1047 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 38 +-
1048 arch/arm/mach-s3c64xx/mach-crag6410.c | 16 +-
1049 arch/arm/mach-s3c64xx/mach-hmt.c | 4 +-
1050 arch/arm/mach-s3c64xx/mach-mini6410.c | 4 +-
1051 arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
1052 arch/arm/mach-s3c64xx/mach-real6410.c | 4 +-
1053 arch/arm/mach-s3c64xx/mach-smartq.c | 8 +-
1054 arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
1055 arch/arm/mach-s3c64xx/mach-smdk6410.c | 6 +-
1056 arch/arm/mach-s3c64xx/setup-i2c0.c | 2 +-
1057 arch/arm/mach-s3c64xx/setup-i2c1.c | 2 +-
1058 arch/arm/mach-s3c64xx/setup-ide.c | 2 +-
1059 arch/arm/mach-s5p64x0/dev-audio.c | 2 +-
1060 arch/arm/mach-s5p64x0/mach-smdk6440.c | 4 +-
1061 arch/arm/mach-s5p64x0/mach-smdk6450.c | 4 +-
1062 arch/arm/mach-s5p64x0/setup-i2c0.c | 2 +-
1063 arch/arm/mach-s5p64x0/setup-i2c1.c | 2 +-
1064 arch/arm/mach-s5pc100/dev-audio.c | 2 +-
1065 arch/arm/mach-s5pc100/mach-smdkc100.c | 8 +-
1066 arch/arm/mach-s5pc100/setup-i2c0.c | 2 +-
1067 arch/arm/mach-s5pc100/setup-i2c1.c | 2 +-
1068 arch/arm/mach-s5pv210/dev-audio.c | 2 +-
1069 arch/arm/mach-s5pv210/mach-goni.c | 2 +-
1070 arch/arm/mach-s5pv210/mach-smdkc110.c | 4 +-
1071 arch/arm/mach-s5pv210/mach-smdkv210.c | 6 +-
1072 arch/arm/mach-s5pv210/mach-torbreck.c | 2 +-
1073 arch/arm/mach-s5pv210/setup-i2c0.c | 2 +-
1074 arch/arm/mach-s5pv210/setup-i2c1.c | 2 +-
1075 arch/arm/mach-s5pv210/setup-i2c2.c | 2 +-
1076 arch/arm/mach-sa1100/Makefile | 9 -
1077 arch/arm/mach-sa1100/assabet.c | 87 +-
1078 arch/arm/mach-sa1100/badge4.c | 30 +
1079 arch/arm/mach-sa1100/cerf.c | 44 +-
1080 arch/arm/mach-sa1100/collie.c | 2 +-
1081 arch/arm/mach-sa1100/hackkit.c | 32 +
1082 arch/arm/mach-sa1100/include/mach/simpad.h | 2 +-
1083 arch/arm/mach-sa1100/lart.c | 28 +-
1084 arch/arm/mach-sa1100/leds-assabet.c | 113 -
1085 arch/arm/mach-sa1100/leds-badge4.c | 110 -
1086 arch/arm/mach-sa1100/leds-cerf.c | 110 -
1087 arch/arm/mach-sa1100/leds-hackkit.c | 112 -
1088 arch/arm/mach-sa1100/leds-lart.c | 101 -
1089 arch/arm/mach-sa1100/leds.c | 50 -
1090 arch/arm/mach-sa1100/leds.h | 13 -
1091 arch/arm/mach-sa1100/shannon.c | 2 +-
1092 arch/arm/mach-sa1100/simpad.c | 4 +-
1093 arch/arm/mach-shark/Makefile | 4 +-
1094 arch/arm/mach-shark/core.c | 19 -
1095 arch/arm/mach-shark/include/mach/debug-macro.S | 7 +-
1096 arch/arm/mach-shark/include/mach/entry-macro.S | 3 +-
1097 arch/arm/mach-shark/include/mach/io.h | 18 -
1098 arch/arm/mach-shark/leds.c | 220 +-
1099 arch/arm/mach-shark/pci.c | 5 +
1100 arch/arm/mach-shmobile/board-ag5evm.c | 2 +-
1101 arch/arm/mach-shmobile/board-ap4evb.c | 14 +-
1102 arch/arm/mach-shmobile/board-armadillo800eva.c | 33 +-
1103 arch/arm/mach-shmobile/board-bonito.c | 8 +-
1104 arch/arm/mach-shmobile/board-g3evm.c | 12 +-
1105 arch/arm/mach-shmobile/board-g4evm.c | 32 +-
1106 arch/arm/mach-shmobile/board-kota2.c | 1 +
1107 arch/arm/mach-shmobile/board-kzm9d.c | 1 +
1108 arch/arm/mach-shmobile/board-kzm9g.c | 22 +-
1109 arch/arm/mach-shmobile/board-mackerel.c | 24 +-
1110 arch/arm/mach-shmobile/board-marzen.c | 69 +-
1111 arch/arm/mach-shmobile/clock-r8a7740.c | 46 +-
1112 arch/arm/mach-shmobile/clock-r8a7779.c | 11 +-
1113 arch/arm/mach-shmobile/clock-sh7367.c | 44 +-
1114 arch/arm/mach-shmobile/clock-sh7372.c | 60 +-
1115 arch/arm/mach-shmobile/clock-sh7377.c | 50 +-
1116 arch/arm/mach-shmobile/clock-sh73a0.c | 70 +-
1117 arch/arm/mach-shmobile/hotplug.c | 31 +-
1118 arch/arm/mach-shmobile/include/mach/common.h | 24 +-
1119 arch/arm/mach-shmobile/include/mach/emev2.h | 7 +-
1120 arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 +
1121 arch/arm/mach-shmobile/include/mach/sh73a0.h | 2 +
1122 arch/arm/mach-shmobile/intc-r8a7779.c | 14 +-
1123 arch/arm/mach-shmobile/intc-sh7372.c | 27 +-
1124 arch/arm/mach-shmobile/intc-sh73a0.c | 20 +-
1125 arch/arm/mach-shmobile/pfc-r8a7740.c | 2 +-
1126 arch/arm/mach-shmobile/pfc-r8a7779.c | 2 +-
1127 arch/arm/mach-shmobile/pfc-sh7367.c | 2 +-
1128 arch/arm/mach-shmobile/pfc-sh7372.c | 2 +-
1129 arch/arm/mach-shmobile/pfc-sh7377.c | 2 +-
1130 arch/arm/mach-shmobile/pfc-sh73a0.c | 2 +-
1131 arch/arm/mach-shmobile/platsmp.c | 96 +-
1132 arch/arm/mach-shmobile/pm-rmobile.c | 6 +-
1133 arch/arm/mach-shmobile/pm-sh7372.c | 57 +-
1134 arch/arm/mach-shmobile/setup-emev2.c | 22 +
1135 arch/arm/mach-shmobile/setup-sh7367.c | 2 +-
1136 arch/arm/mach-shmobile/setup-sh7377.c | 2 +-
1137 arch/arm/mach-shmobile/setup-sh73a0.c | 23 +-
1138 .../{include/mach/gpio.h => sh-gpio.h} | 20 +-
1139 arch/arm/mach-shmobile/smp-emev2.c | 47 +-
1140 arch/arm/mach-shmobile/smp-r8a7779.c | 48 +-
1141 arch/arm/mach-shmobile/smp-sh73a0.c | 48 +-
1142 arch/arm/mach-socfpga/Kconfig | 16 +
1143 arch/arm/mach-socfpga/Makefile.boot | 1 -
1144 arch/arm/mach-socfpga/include/mach/uncompress.h | 9 -
1145 arch/arm/mach-spear13xx/Makefile.boot | 3 -
1146 arch/arm/mach-spear13xx/hotplug.c | 22 +-
1147 arch/arm/mach-spear13xx/include/mach/generic.h | 3 +
1148 arch/arm/mach-spear13xx/include/mach/gpio.h | 19 -
1149 arch/arm/mach-spear13xx/include/mach/spear.h | 14 +-
1150 arch/arm/mach-spear13xx/platsmp.c | 25 +-
1151 arch/arm/mach-spear13xx/spear1310.c | 1 +
1152 arch/arm/mach-spear13xx/spear1340.c | 1 +
1153 arch/arm/mach-spear13xx/spear13xx.c | 6 +-
1154 arch/arm/mach-spear3xx/Makefile.boot | 4 -
1155 arch/arm/mach-spear3xx/include/mach/gpio.h | 19 -
1156 arch/arm/mach-spear6xx/Makefile.boot | 2 -
1157 arch/arm/mach-spear6xx/include/mach/gpio.h | 19 -
1158 arch/arm/mach-tegra/Kconfig | 27 -
1159 arch/arm/mach-tegra/Makefile | 20 +-
1160 arch/arm/mach-tegra/Makefile.boot | 8 -
1161 arch/arm/mach-tegra/apbio.c | 122 +-
1162 arch/arm/mach-tegra/board-dt-tegra20.c | 53 +-
1163 arch/arm/mach-tegra/board-dt-tegra30.c | 2 +
1164 arch/arm/mach-tegra/board-harmony-pcie.c | 49 +-
1165 arch/arm/mach-tegra/board-harmony-pinmux.c | 156 -
1166 arch/arm/mach-tegra/board-harmony-power.c | 156 -
1167 arch/arm/mach-tegra/board-harmony.c | 197 --
1168 arch/arm/mach-tegra/board-harmony.h | 41 -
1169 arch/arm/mach-tegra/board-paz00-pinmux.c | 156 -
1170 arch/arm/mach-tegra/board-paz00.c | 192 --
1171 arch/arm/mach-tegra/board-paz00.h | 17 +-
1172 arch/arm/mach-tegra/board-pinmux.c | 87 -
1173 arch/arm/mach-tegra/board-pinmux.h | 54 -
1174 arch/arm/mach-tegra/board-trimslice-pinmux.c | 155 -
1175 arch/arm/mach-tegra/board-trimslice.c | 183 --
1176 arch/arm/mach-tegra/board-trimslice.h | 30 -
1177 arch/arm/mach-tegra/clock.c | 574 +---
1178 arch/arm/mach-tegra/clock.h | 40 +-
1179 arch/arm/mach-tegra/common.c | 5 +-
1180 arch/arm/mach-tegra/common.h | 4 +
1181 arch/arm/mach-tegra/cpu-tegra.c | 48 +-
1182 arch/arm/mach-tegra/devices.c | 702 ----
1183 arch/arm/mach-tegra/devices.h | 60 -
1184 arch/arm/mach-tegra/dma.c | 823 -----
1185 arch/arm/mach-tegra/fuse.c | 4 +-
1186 arch/arm/mach-tegra/headsmp.S | 6 +-
1187 arch/arm/mach-tegra/hotplug.c | 127 +-
1188 arch/arm/mach-tegra/include/mach/clk.h | 3 +
1189 arch/arm/mach-tegra/include/mach/dma.h | 97 -
1190 arch/arm/mach-tegra/include/mach/gpio.h | 1 -
1191 arch/arm/mach-tegra/include/mach/io.h | 46 -
1192 arch/arm/mach-tegra/include/mach/iomap.h | 3 +
1193 arch/arm/mach-tegra/include/mach/pinconf-tegra.h | 63 -
1194 arch/arm/mach-tegra/include/mach/suspend.h | 38 -
1195 arch/arm/mach-tegra/pcie.c | 95 +-
1196 arch/arm/mach-tegra/platsmp.c | 52 +-
1197 arch/arm/mach-tegra/powergate.c | 43 +-
1198 arch/arm/mach-tegra/sleep-t20.S | 82 +
1199 arch/arm/mach-tegra/sleep-t30.S | 107 +
1200 arch/arm/mach-tegra/sleep.S | 33 +-
1201 arch/arm/mach-tegra/sleep.h | 85 +
1202 arch/arm/mach-tegra/tegra20_clocks.c | 1624 ++++++++++
1203 arch/arm/mach-tegra/tegra20_clocks.h | 42 +
1204 arch/arm/mach-tegra/tegra20_clocks_data.c | 1139 +++++++
1205 arch/arm/mach-tegra/tegra2_clocks.c | 2484 --------------
1206 arch/arm/mach-tegra/tegra30_clocks.c | 2593 +++++----------
1207 arch/arm/mach-tegra/tegra30_clocks.h | 53 +
1208 arch/arm/mach-tegra/tegra30_clocks_data.c | 1377 ++++++++
1209 arch/arm/mach-tegra/tegra_cpu_car.h | 87 +
1210 arch/arm/mach-tegra/timer.c | 1 -
1211 arch/arm/mach-u300/Kconfig | 43 +-
1212 arch/arm/mach-u300/Makefile | 1 -
1213 arch/arm/mach-u300/core.c | 103 +-
1214 .../mach-u300/{include/mach => }/dma_channels.h | 11 +-
1215 arch/arm/mach-u300/i2c.c | 6 +-
1216 arch/arm/mach-u300/include/mach/clkdev.h | 7 -
1217 arch/arm/mach-u300/include/mach/gpio.h | 1 -
1218 arch/arm/mach-u300/include/mach/irqs.h | 36 +-
1219 arch/arm/mach-u300/include/mach/platform.h | 20 -
1220 arch/arm/mach-u300/include/mach/syscon.h | 32 +-
1221 arch/arm/mach-u300/include/mach/u300-regs.h | 19 +-
1222 arch/arm/mach-u300/spi.c | 2 +-
1223 arch/arm/mach-u300/timer.c | 5 +-
1224 arch/arm/mach-u300/timer.h | 1 +
1225 arch/arm/mach-u300/u300-gpio.h | 46 +-
1226 arch/arm/mach-u300/u300.c | 57 -
1227 arch/arm/mach-ux500/Kconfig | 1 +
1228 arch/arm/mach-ux500/Makefile | 2 +-
1229 arch/arm/mach-ux500/Makefile.boot | 2 -
1230 .../{board-mop500-msp.c => board-mop500-audio.c} | 102 +-
1231 arch/arm/mach-ux500/board-mop500-msp.h | 14 -
1232 arch/arm/mach-ux500/board-mop500-pins.c | 83 +-
1233 arch/arm/mach-ux500/board-mop500-regulators.c | 15 +
1234 arch/arm/mach-ux500/board-mop500-regulators.h | 1 +
1235 arch/arm/mach-ux500/board-mop500-sdi.c | 4 +-
1236 arch/arm/mach-ux500/board-mop500.c | 64 +-
1237 arch/arm/mach-ux500/board-mop500.h | 11 +
1238 arch/arm/mach-ux500/cache-l2x0.c | 2 +-
1239 arch/arm/mach-ux500/cpu-db8500.c | 18 +-
1240 arch/arm/mach-ux500/cpu.c | 4 +-
1241 arch/arm/mach-ux500/devices-common.h | 2 +-
1242 arch/arm/mach-ux500/hotplug.c | 36 +-
1243 arch/arm/mach-ux500/include/mach/gpio.h | 5 -
1244 arch/arm/mach-ux500/include/mach/id.h | 44 +-
1245 arch/arm/mach-ux500/include/mach/msp.h | 2 -
1246 arch/arm/mach-ux500/include/mach/setup.h | 3 +
1247 arch/arm/mach-ux500/include/mach/uncompress.h | 4 +-
1248 arch/arm/mach-ux500/platsmp.c | 28 +-
1249 arch/arm/mach-ux500/timer.c | 2 +-
1250 arch/arm/mach-ux500/usb.c | 2 +-
1251 arch/arm/mach-versatile/core.c | 10 -
1252 arch/arm/mach-versatile/include/mach/gpio.h | 1 -
1253 arch/arm/mach-versatile/include/mach/hardware.h | 1 -
1254 arch/arm/mach-versatile/pci.c | 22 +-
1255 arch/arm/mach-vexpress/Kconfig | 64 +-
1256 arch/arm/mach-vexpress/Makefile | 2 +
1257 arch/arm/mach-vexpress/Makefile.boot | 10 -
1258 arch/arm/mach-vexpress/core.h | 4 +
1259 arch/arm/mach-vexpress/ct-ca9x4.c | 4 +-
1260 arch/arm/mach-vexpress/hotplug.c | 18 +-
1261 arch/arm/mach-vexpress/include/mach/gpio.h | 1 -
1262 arch/arm/mach-vexpress/include/mach/irqs.h | 2 +
1263 arch/arm/mach-vexpress/include/mach/timex.h | 23 -
1264 arch/arm/mach-vexpress/include/mach/uncompress.h | 86 -
1265 arch/arm/mach-vexpress/platsmp.c | 18 +-
1266 arch/arm/mach-vexpress/v2m.c | 8 +-
1267 arch/arm/mach-vt8500/Kconfig | 73 -
1268 arch/arm/mach-vt8500/Makefile | 8 +-
1269 arch/arm/mach-vt8500/bv07.c | 81 -
1270 .../mach/gpio-tegra.h => mach-vt8500/common.h} | 22 +-
1271 arch/arm/mach-vt8500/devices-vt8500.c | 96 -
1272 arch/arm/mach-vt8500/devices-wm8505.c | 103 -
1273 arch/arm/mach-vt8500/devices.c | 281 --
1274 arch/arm/mach-vt8500/devices.h | 89 -
1275 arch/arm/mach-vt8500/gpio.c | 240 --
1276 arch/arm/mach-vt8500/include/mach/gpio.h | 1 -
1277 arch/arm/mach-vt8500/include/mach/restart.h | 4 +-
1278 arch/arm/mach-vt8500/include/mach/vt8500_irqs.h | 88 -
1279 arch/arm/mach-vt8500/include/mach/vt8500_regs.h | 79 -
1280 arch/arm/mach-vt8500/include/mach/wm8505_irqs.h | 115 -
1281 arch/arm/mach-vt8500/include/mach/wm8505_regs.h | 78 -
1282 arch/arm/mach-vt8500/irq.c | 209 +-
1283 arch/arm/mach-vt8500/restart.c | 54 -
1284 arch/arm/mach-vt8500/timer.c | 67 +-
1285 arch/arm/mach-vt8500/vt8500.c | 195 ++
1286 arch/arm/mach-vt8500/wm8505_7in.c | 80 -
1287 arch/arm/mach-w90x900/dev.c | 6 +-
1288 arch/arm/mach-w90x900/mach-nuc950evb.c | 2 +-
1289 arch/arm/mm/cache-l2x0.c | 2 +-
1290 arch/arm/mm/cache-tauros2.c | 83 +-
1291 arch/arm/mm/ioremap.c | 14 +
1292 arch/arm/mm/mmu.c | 54 +-
1293 arch/arm/plat-iop/pci.c | 25 +-
1294 arch/arm/plat-iop/pmu.c | 3 +-
1295 arch/arm/plat-iop/setup.c | 5 -
1296 arch/arm/plat-mxc/Makefile | 2 +-
1297 arch/arm/plat-mxc/clock.c | 257 --
1298 arch/arm/plat-mxc/cpufreq.c | 1 -
1299 arch/arm/plat-mxc/devices/platform-imx-uart.c | 2 +-
1300 .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 2 +-
1301 arch/arm/plat-mxc/include/mach/clock.h | 70 -
1302 arch/arm/plat-mxc/include/mach/common.h | 10 +-
1303 arch/arm/plat-mxc/include/mach/devices-common.h | 32 +-
1304 arch/arm/plat-mxc/include/mach/gpio.h | 1 -
1305 arch/arm/plat-mxc/include/mach/iomux-mx3.h | 5 +
1306 arch/arm/plat-mxc/include/mach/iomux-mx53.h | 1219 -------
1307 arch/arm/plat-mxc/include/mach/mx31.h | 6 +-
1308 arch/arm/plat-mxc/ssi-fiq-ksym.c | 2 +-
1309 arch/arm/plat-mxc/ssi-fiq.S | 89 +-
1310 arch/arm/plat-mxc/system.c | 4 -
1311 arch/arm/plat-omap/Kconfig | 4 +-
1312 arch/arm/plat-omap/Makefile | 3 +-
1313 arch/arm/plat-omap/common.c | 42 +-
1314 arch/arm/plat-omap/counter_32k.c | 3 -
1315 arch/arm/plat-omap/debug-devices.c | 3 -
1316 arch/arm/plat-omap/debug-leds.c | 294 +-
1317 arch/arm/plat-omap/devices.c | 92 -
1318 arch/arm/plat-omap/dma.c | 54 +-
1319 arch/arm/plat-omap/fb.c | 2 -
1320 arch/arm/plat-omap/i2c.c | 4 +-
1321 arch/arm/plat-omap/include/plat/board.h | 138 -
1322 arch/arm/plat-omap/include/plat/cpu.h | 3 +
1323 arch/arm/plat-omap/include/plat/dma.h | 2 +
1324 arch/arm/plat-omap/include/plat/gpio-switch.h | 54 -
1325 arch/arm/plat-omap/include/plat/gpmc.h | 19 +
1326 arch/arm/plat-omap/include/plat/hardware.h | 293 --
1327 arch/arm/plat-omap/include/plat/irqs-44xx.h | 144 -
1328 arch/arm/plat-omap/include/plat/irqs.h | 453 ---
1329 arch/arm/plat-omap/include/plat/mmc.h | 1 -
1330 arch/arm/plat-omap/include/plat/omap-serial.h | 4 +-
1331 arch/arm/plat-omap/include/plat/omap_device.h | 2 +
1332 arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +
1333 arch/arm/plat-omap/include/plat/param.h | 8 -
1334 arch/arm/plat-omap/include/plat/usb.h | 1 -
1335 arch/arm/plat-omap/mailbox.c | 2 +-
1336 arch/arm/plat-omap/mux.c | 90 -
1337 arch/arm/plat-omap/omap-pm-noop.c | 39 +-
1338 arch/arm/plat-omap/omap_device.c | 160 +-
1339 arch/arm/plat-omap/sram.c | 1 -
1340 arch/arm/plat-orion/common.c | 4 +-
1341 arch/arm/plat-orion/gpio.c | 2 +-
1342 .../include/plat/{gpio.h => orion-gpio.h} | 2 +-
1343 arch/arm/plat-orion/irq.c | 2 +-
1344 arch/arm/plat-orion/mpp.c | 1 +
1345 arch/arm/plat-samsung/clock.c | 8 +-
1346 arch/arm/plat-samsung/devs.c | 28 +-
1347 arch/arm/plat-samsung/include/plat/gpio-fns.h | 97 -
1348 arch/arm/plat-samsung/s5p-irq-gpioint.c | 4 +-
1349 arch/arm/plat-samsung/time.c | 1 -
1350 arch/arm/plat-spear/include/plat/gpio.h | 1 -
1351 arch/arm/plat-versatile/Kconfig | 4 +-
1352 arch/arm/plat-versatile/Makefile | 2 +
1353 arch/arm/plat-versatile/include/plat/platsmp.h | 14 +
1354 arch/arm/plat-versatile/leds.c | 8 +-
1355 arch/arm/plat-versatile/platsmp.c | 10 +-
1356 arch/arm/tools/mach-types | 2 -
1357 arch/ia64/kernel/mca_drv.c | 3 +-
1358 arch/ia64/kernel/perfmon.c | 32 +-
1359 arch/ia64/kernel/signal.c | 4 +-
1360 arch/m68k/configs/amiga_defconfig | 1 -
1361 arch/m68k/configs/apollo_defconfig | 1 -
1362 arch/m68k/configs/atari_defconfig | 1 -
1363 arch/m68k/configs/bvme6000_defconfig | 1 -
1364 arch/m68k/configs/hp300_defconfig | 1 -
1365 arch/m68k/configs/mac_defconfig | 1 -
1366 arch/m68k/configs/multi_defconfig | 1 -
1367 arch/m68k/configs/mvme147_defconfig | 1 -
1368 arch/m68k/configs/mvme16x_defconfig | 1 -
1369 arch/m68k/configs/q40_defconfig | 1 -
1370 arch/m68k/configs/sun3_defconfig | 1 -
1371 arch/m68k/configs/sun3x_defconfig | 1 -
1372 arch/mips/configs/ar7_defconfig | 1 -
1373 arch/mips/configs/bcm47xx_defconfig | 1 -
1374 arch/mips/configs/ip22_defconfig | 1 -
1375 arch/mips/configs/jazz_defconfig | 1 -
1376 arch/mips/configs/malta_defconfig | 1 -
1377 arch/mips/configs/markeins_defconfig | 1 -
1378 arch/mips/configs/nlm_xlp_defconfig | 1 -
1379 arch/mips/configs/nlm_xlr_defconfig | 1 -
1380 arch/mips/configs/rm200_defconfig | 1 -
1381 arch/powerpc/configs/pmac32_defconfig | 1 -
1382 arch/powerpc/configs/ppc64_defconfig | 1 -
1383 arch/powerpc/configs/ppc64e_defconfig | 1 -
1384 arch/powerpc/configs/ppc6xx_defconfig | 1 -
1385 arch/powerpc/mm/fault.c | 2 +-
1386 arch/powerpc/platforms/83xx/suspend.c | 2 +-
1387 arch/powerpc/platforms/cell/celleb_pci.c | 2 +-
1388 arch/powerpc/platforms/cell/cpufreq_spudemand.c | 2 +-
1389 arch/powerpc/sysdev/fsl_msi.c | 8 +-
1390 arch/s390/hypfs/inode.c | 20 +-
1391 arch/s390/kernel/compat_linux.c | 36 +-
1392 arch/sh/drivers/push-switch.c | 2 +-
1393 arch/sparc/Kbuild | 1 +
1394 arch/sparc/crypto/Makefile | 25 +
1395 arch/sparc/crypto/aes_asm.S | 1535 +++++++++
1396 arch/sparc/crypto/aes_glue.c | 477 +++
1397 arch/sparc/crypto/camellia_asm.S | 563 ++++
1398 arch/sparc/crypto/camellia_glue.c | 322 ++
1399 arch/sparc/crypto/crc32c_asm.S | 20 +
1400 arch/sparc/crypto/crc32c_glue.c | 179 +
1401 arch/sparc/crypto/crop_devid.c | 14 +
1402 arch/sparc/crypto/des_asm.S | 418 +++
1403 arch/sparc/crypto/des_glue.c | 529 +++
1404 arch/sparc/crypto/md5_asm.S | 70 +
1405 arch/sparc/crypto/md5_glue.c | 188 ++
1406 arch/sparc/crypto/opcodes.h | 99 +
1407 arch/sparc/crypto/sha1_asm.S | 72 +
1408 arch/sparc/crypto/sha1_glue.c | 183 ++
1409 arch/sparc/crypto/sha256_asm.S | 78 +
1410 arch/sparc/crypto/sha256_glue.c | 241 ++
1411 arch/sparc/crypto/sha512_asm.S | 102 +
1412 arch/sparc/crypto/sha512_glue.c | 226 ++
1413 arch/sparc/include/asm/asi.h | 4 +-
1414 arch/sparc/include/asm/elf_64.h | 9 +
1415 arch/sparc/include/asm/hypervisor.h | 11 +
1416 arch/sparc/include/asm/mdesc.h | 1 +
1417 arch/sparc/include/asm/pcr.h | 36 +-
1418 arch/sparc/include/asm/perfctr.h | 30 -
1419 arch/sparc/include/asm/pstate.h | 14 +
1420 arch/sparc/kernel/head_64.S | 14 +-
1421 arch/sparc/kernel/hvapi.c | 1 +
1422 arch/sparc/kernel/hvcalls.S | 16 +
1423 arch/sparc/kernel/ktlb.S | 25 +-
1424 arch/sparc/kernel/mdesc.c | 24 +
1425 arch/sparc/kernel/nmi.c | 21 +-
1426 arch/sparc/kernel/pci_sun4v.c | 2 +-
1427 arch/sparc/kernel/pcr.c | 172 +-
1428 arch/sparc/kernel/perf_event.c | 516 ++-
1429 arch/sparc/kernel/setup_64.c | 67 +-
1430 arch/sparc/lib/Makefile | 3 +
1431 arch/sparc/lib/NG4copy_from_user.S | 30 +
1432 arch/sparc/lib/NG4copy_page.S | 57 +
1433 arch/sparc/lib/NG4copy_to_user.S | 39 +
1434 arch/sparc/lib/NG4memcpy.S | 360 ++
1435 arch/sparc/lib/NG4patch.S | 43 +
1436 arch/sparc/lib/NGpage.S | 2 +
1437 arch/sparc/lib/ksyms.c | 4 +
1438 arch/sparc/mm/init_64.c | 230 +-
1439 arch/sparc/mm/init_64.h | 4 +-
1440 arch/sparc/net/bpf_jit_comp.c | 4 +
1441 arch/tile/configs/tilegx_defconfig | 1 -
1442 arch/tile/configs/tilepro_defconfig | 1 -
1443 arch/x86/net/bpf_jit_comp.c | 34 +
1444 block/blk-cgroup.c | 8 +
1445 block/blk-core.c | 8 +-
1446 block/blk-throttle.c | 14 +-
1447 block/genhd.c | 14 +-
1448 crypto/Kconfig | 97 +
1449 crypto/crypto_user.c | 7 +-
1450 drivers/Kconfig | 4 +
1451 drivers/Makefile | 4 +-
1452 drivers/ata/pata_ep93xx.c | 2 +-
1453 drivers/ata/pata_pxa.c | 2 +-
1454 drivers/ata/pata_samsung_cf.c | 2 +-
1455 drivers/base/devtmpfs.c | 4 +-
1456 drivers/bcma/Kconfig | 4 +-
1457 drivers/bcma/bcma_private.h | 2 +
1458 drivers/bcma/core.c | 2 +-
1459 drivers/bcma/driver_chipcommon_nflash.c | 28 +-
1460 drivers/bcma/driver_chipcommon_pmu.c | 9 +-
1461 drivers/bcma/driver_chipcommon_sflash.c | 123 +-
1462 drivers/bcma/driver_pci.c | 6 +-
1463 drivers/bcma/driver_pci_host.c | 8 +-
1464 drivers/bcma/host_pci.c | 12 +-
1465 drivers/bcma/host_soc.c | 2 +-
1466 drivers/bcma/main.c | 27 +
1467 drivers/bcma/sprom.c | 2 +
1468 drivers/block/floppy.c | 5 +-
1469 drivers/block/loop.c | 4 +-
1470 drivers/block/xen-blkfront.c | 4 +-
1471 drivers/bluetooth/bcm203x.c | 8 +-
1472 drivers/bluetooth/bfusb.c | 12 +-
1473 drivers/bluetooth/bluecard_cs.c | 7 +-
1474 drivers/bluetooth/bpa10x.c | 8 +-
1475 drivers/bluetooth/bt3c_cs.c | 5 +-
1476 drivers/bluetooth/btmrvl_sdio.c | 18 +-
1477 drivers/bluetooth/btsdio.c | 8 +-
1478 drivers/bluetooth/btuart_cs.c | 7 +-
1479 drivers/bluetooth/btusb.c | 16 +-
1480 drivers/bluetooth/btwilink.c | 24 +-
1481 drivers/bluetooth/dtl1_cs.c | 3 +-
1482 drivers/bluetooth/hci_ldisc.c | 2 +-
1483 drivers/bluetooth/hci_ll.c | 2 +-
1484 drivers/bluetooth/hci_vhci.c | 2 +-
1485 drivers/bus/Kconfig | 21 +
1486 drivers/bus/Makefile | 8 +
1487 drivers/bus/omap-ocp2scp.c | 88 +
1488 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.c | 4 +-
1489 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.h | 0
1490 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.c | 0
1491 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.h | 0
1492 drivers/cdrom/gdrom.c | 2 +-
1493 drivers/char/nwflash.c | 34 -
1494 drivers/char/sonypi.c | 2 +-
1495 drivers/char/tpm/tpm.c | 4 +-
1496 drivers/clk/Makefile | 2 +
1497 drivers/clk/clk-bcm2835.c | 59 +
1498 drivers/clk/clk-vt8500.c | 510 +++
1499 drivers/clk/mxs/Makefile | 2 +-
1500 drivers/clk/mxs/clk-imx23.c | 57 +-
1501 drivers/clk/mxs/clk-imx28.c | 115 +-
1502 drivers/clk/mxs/clk-ssp.c | 62 +
1503 drivers/clocksource/Makefile | 2 +
1504 drivers/clocksource/bcm2835_timer.c | 161 +
1505 drivers/connector/cn_proc.c | 18 +-
1506 drivers/connector/connector.c | 3 +-
1507 drivers/cpufreq/cpufreq_conservative.c | 2 +-
1508 drivers/cpufreq/cpufreq_ondemand.c | 2 +-
1509 drivers/crypto/n2_core.c | 2 +-
1510 drivers/crypto/ux500/cryp/cryp_core.c | 2 +-
1511 drivers/crypto/ux500/hash/hash_core.c | 2 +-
1512 drivers/devfreq/devfreq.c | 2 +-
1513 drivers/dma/at_hdmac_regs.h | 2 +-
1514 drivers/dma/ep93xx_dma.c | 2 +-
1515 drivers/dma/imx-dma.c | 2 +-
1516 drivers/dma/imx-sdma.c | 4 +-
1517 drivers/dma/mmp_tdma.c | 2 +-
1518 drivers/dma/mv_xor.c | 2 +-
1519 drivers/dma/omap-dma.c | 2 +
1520 drivers/dma/tegra20-apb-dma.c | 8 +-
1521 drivers/edac/edac_mc.c | 17 +-
1522 drivers/extcon/extcon-adc-jack.c | 2 +-
1523 drivers/gpio/Kconfig | 20 +-
1524 drivers/gpio/Makefile | 2 +
1525 drivers/gpio/gpio-74x164.c | 103 +-
1526 drivers/gpio/gpio-adnp.c | 611 ++++
1527 drivers/gpio/gpio-adp5588.c | 14 +-
1528 drivers/gpio/gpio-bt8xx.c | 2 +-
1529 drivers/gpio/gpio-da9052.c | 15 +-
1530 drivers/gpio/gpio-davinci.c | 2 +-
1531 drivers/gpio/gpio-em.c | 12 +-
1532 drivers/gpio/gpio-lpc32xx.c | 3 +-
1533 drivers/gpio/gpio-mc9s08dz60.c | 21 +-
1534 drivers/gpio/gpio-ml-ioh.c | 20 +-
1535 drivers/gpio/gpio-mpc8xxx.c | 2 +-
1536 drivers/gpio/gpio-msm-v2.c | 4 +-
1537 drivers/gpio/gpio-mxs.c | 48 +-
1538 drivers/gpio/gpio-omap.c | 23 +-
1539 drivers/gpio/gpio-pcf857x.c | 122 +
1540 drivers/gpio/gpio-pch.c | 22 +-
1541 drivers/gpio/gpio-pxa.c | 90 +-
1542 drivers/gpio/gpio-samsung.c | 124 +-
1543 drivers/gpio/gpio-sodaville.c | 2 +-
1544 drivers/gpio/gpio-sx150x.c | 24 +-
1545 drivers/gpio/gpio-tc3589x.c | 120 +-
1546 drivers/gpio/gpio-tegra.c | 3 -
1547 drivers/gpio/gpio-tps65912.c | 17 +-
1548 drivers/gpio/gpio-twl4030.c | 90 +-
1549 drivers/gpio/gpio-vt8500.c | 316 ++
1550 drivers/gpio/gpio-wm831x.c | 19 +-
1551 drivers/gpio/gpio-wm8350.c | 19 +-
1552 drivers/gpio/gpiolib.c | 102 +-
1553 drivers/gpu/drm/drm_crtc_helper.c | 6 +-
1554 drivers/gpu/drm/drm_fops.c | 3 +-
1555 drivers/gpu/drm/drm_info.c | 5 +-
1556 drivers/gpu/drm/drm_ioctl.c | 4 +-
1557 drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +-
1558 drivers/gpu/drm/nouveau/nouveau_gpio.c | 2 +-
1559 drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +-
1560 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +-
1561 drivers/hid/hid-picolcd_fb.c | 2 +-
1562 drivers/hid/hid-wiimote-ext.c | 2 +-
1563 drivers/hwmon/s3c-hwmon.c | 2 +-
1564 drivers/i2c/busses/Kconfig | 2 +-
1565 drivers/i2c/busses/i2c-davinci.c | 2 +-
1566 drivers/i2c/busses/i2c-imx.c | 2 +-
1567 drivers/i2c/busses/i2c-iop3xx.c | 121 +-
1568 drivers/i2c/busses/i2c-mpc.c | 12 +-
1569 drivers/i2c/busses/i2c-nuc900.c | 2 +-
1570 drivers/i2c/busses/i2c-omap.c | 3 +-
1571 drivers/i2c/busses/i2c-s3c2410.c | 2 +-
1572 drivers/i2c/busses/i2c-tegra.c | 130 +-
1573 drivers/infiniband/core/addr.c | 4 +-
1574 drivers/infiniband/core/cache.c | 43 +-
1575 drivers/infiniband/core/cma.c | 5 +-
1576 drivers/infiniband/core/device.c | 16 +-
1577 drivers/infiniband/core/mad.c | 16 +-
1578 drivers/infiniband/core/netlink.c | 2 +-
1579 drivers/infiniband/core/ucm.c | 1 -
1580 drivers/infiniband/core/ucma.c | 1 -
1581 drivers/infiniband/hw/cxgb4/qp.c | 64 +-
1582 drivers/infiniband/hw/mlx4/Makefile | 2 +-
1583 drivers/infiniband/hw/mlx4/alias_GUID.c | 688 ++++
1584 drivers/infiniband/hw/mlx4/cm.c | 437 +++
1585 drivers/infiniband/hw/mlx4/cq.c | 31 +-
1586 drivers/infiniband/hw/mlx4/mad.c | 1573 ++++++++-
1587 drivers/infiniband/hw/mlx4/main.c | 273 +-
1588 drivers/infiniband/hw/mlx4/mcg.c | 1254 +++++++
1589 drivers/infiniband/hw/mlx4/mlx4_ib.h | 341 +-
1590 drivers/infiniband/hw/mlx4/qp.c | 660 +++-
1591 drivers/infiniband/hw/mlx4/sysfs.c | 794 +++++
1592 drivers/infiniband/hw/nes/nes.h | 15 +-
1593 drivers/infiniband/hw/nes/nes_cm.c | 34 +-
1594 drivers/infiniband/hw/nes/nes_hw.c | 10 +-
1595 drivers/infiniband/hw/nes/nes_nic.c | 45 +-
1596 drivers/infiniband/hw/nes/nes_utils.c | 2 +-
1597 drivers/infiniband/hw/nes/nes_verbs.c | 14 +-
1598 drivers/infiniband/hw/qib/qib_common.h | 14 +-
1599 drivers/infiniband/hw/qib/qib_driver.c | 3 +-
1600 drivers/infiniband/hw/qib/qib_fs.c | 4 +-
1601 drivers/infiniband/hw/qib/qib_keys.c | 5 +-
1602 drivers/infiniband/hw/qib/qib_verbs.c | 2 +-
1603 drivers/infiniband/ulp/ipoib/Makefile | 3 +-
1604 drivers/infiniband/ulp/ipoib/ipoib.h | 16 +
1605 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 34 +-
1606 drivers/infiniband/ulp/ipoib/ipoib_main.c | 43 +-
1607 drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 19 +-
1608 drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 172 +
1609 drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 124 +-
1610 drivers/infiniband/ulp/srp/ib_srp.c | 3 +-
1611 drivers/input/apm-power.c | 2 +-
1612 drivers/input/ff-core.c | 4 +-
1613 drivers/input/ff-memless.c | 14 +-
1614 drivers/input/input.c | 43 +-
1615 drivers/input/joydev.c | 2 +-
1616 drivers/input/keyboard/Kconfig | 2 +-
1617 drivers/input/keyboard/davinci_keyscan.c | 2 +-
1618 drivers/input/keyboard/ep93xx_keypad.c | 2 +-
1619 drivers/input/keyboard/gpio_keys.c | 169 +-
1620 drivers/input/keyboard/gpio_keys_polled.c | 147 +-
1621 drivers/input/keyboard/nomadik-ske-keypad.c | 2 +-
1622 drivers/input/keyboard/omap-keypad.c | 162 +-
1623 drivers/input/keyboard/pxa27x_keypad.c | 2 +-
1624 drivers/input/keyboard/pxa930_rotary.c | 2 +-
1625 drivers/input/keyboard/qt2160.c | 3 +-
1626 drivers/input/keyboard/samsung-keypad.c | 10 +-
1627 drivers/input/keyboard/spear-keyboard.c | 2 +-
1628 drivers/input/keyboard/tegra-kbc.c | 2 +-
1629 drivers/input/keyboard/w90p910_keypad.c | 2 +-
1630 drivers/input/misc/rotary_encoder.c | 140 +-
1631 drivers/input/misc/twl4030-pwrbutton.c | 1 +
1632 drivers/input/misc/uinput.c | 197 +-
1633 drivers/input/mouse/hgpk.c | 9 +-
1634 drivers/input/mouse/pxa930_trkball.c | 2 +-
1635 drivers/input/mouse/rpcmouse.c | 2 +-
1636 drivers/input/mouse/synaptics.c | 31 +-
1637 drivers/input/mouse/synaptics_i2c.c | 7 +-
1638 drivers/input/mousedev.c | 9 +-
1639 drivers/input/serio/ams_delta_serio.c | 2 +-
1640 drivers/input/sparse-keymap.c | 4 +-
1641 drivers/input/tablet/wacom_wac.c | 2 +-
1642 drivers/input/touchscreen/s3c2410_ts.c | 4 +-
1643 drivers/input/touchscreen/wm831x-ts.c | 2 +-
1644 drivers/irqchip/Kconfig | 1 +
1645 drivers/irqchip/Makefile | 1 +
1646 drivers/irqchip/irq-bcm2835.c | 223 ++
1647 drivers/isdn/gigaset/common.c | 1 -
1648 drivers/isdn/mISDN/hwchannel.c | 2 +-
1649 drivers/leds/Kconfig | 10 +
1650 drivers/leds/Makefile | 1 +
1651 drivers/leds/leds-lm3533.c | 6 +-
1652 drivers/leds/leds-lp8788.c | 2 +-
1653 drivers/leds/leds-netxbig.c | 2 +-
1654 drivers/leds/leds-ns2.c | 2 +-
1655 drivers/leds/leds-s3c24xx.c | 2 +-
1656 drivers/leds/leds-wm8350.c | 2 +-
1657 drivers/leds/ledtrig-cpu.c | 163 +
1658 drivers/macintosh/ams/ams-core.c | 2 +-
1659 drivers/macintosh/mediabay.c | 8 +-
1660 drivers/md/dm-mpath.c | 2 +-
1661 drivers/md/dm-raid1.c | 2 +-
1662 drivers/md/dm-stripe.c | 2 +-
1663 drivers/media/dvb/dvb-core/dvb_net.c | 4 +-
1664 drivers/media/dvb/mantis/mantis_evm.c | 2 +-
1665 drivers/media/dvb/mantis/mantis_uart.c | 2 +-
1666 drivers/media/video/bt8xx/bttv-driver.c | 2 +-
1667 drivers/media/video/cx18/cx18-driver.c | 2 +-
1668 drivers/media/video/cx231xx/cx231xx-cards.c | 2 +-
1669 drivers/media/video/cx23885/cx23885-input.c | 6 +-
1670 drivers/media/video/cx88/cx88-mpeg.c | 2 +-
1671 drivers/media/video/davinci/vpbe_venc.c | 2 +-
1672 drivers/media/video/em28xx/em28xx-cards.c | 2 +-
1673 drivers/media/video/mx1_camera.c | 2 +-
1674 drivers/media/video/mx2_camera.c | 2 +-
1675 drivers/media/video/mx3_camera.c | 4 +-
1676 drivers/media/video/omap/omap_vout.c | 1 +
1677 drivers/media/video/omap24xxcam.c | 6 +-
1678 drivers/media/video/omap3isp/isp.c | 2 +
1679 drivers/media/video/pxa_camera.c | 2 +-
1680 drivers/media/video/s5p-fimc/mipi-csis.c | 2 +-
1681 drivers/media/video/saa7134/saa7134-core.c | 2 +-
1682 drivers/media/video/saa7134/saa7134-empress.c | 2 +-
1683 drivers/media/video/tm6000/tm6000-cards.c | 2 +-
1684 drivers/mfd/da9052-i2c.c | 4 +-
1685 drivers/mfd/mcp-sa11x0.c | 2 +-
1686 drivers/mfd/menelaus.c | 4 +-
1687 drivers/mfd/twl-core.c | 54 +-
1688 drivers/misc/ioc4.c | 2 +-
1689 drivers/mmc/core/host.c | 4 +-
1690 drivers/mmc/host/davinci_mmc.c | 2 +-
1691 drivers/mmc/host/msm_sdcc.c | 2 +-
1692 drivers/mmc/host/mvsdio.c | 2 +-
1693 drivers/mmc/host/mxcmmc.c | 4 +-
1694 drivers/mmc/host/mxs-mmc.c | 323 +-
1695 drivers/mmc/host/omap.c | 2 -
1696 drivers/mmc/host/omap_hsmmc.c | 3 +-
1697 drivers/mmc/host/pxamci.c | 2 +-
1698 drivers/mmc/host/s3cmci.c | 2 +-
1699 drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
1700 drivers/mmc/host/sdhci-tegra.c | 2 +-
1701 drivers/mtd/mtdoops.c | 4 +-
1702 drivers/mtd/nand/Kconfig | 40 -
1703 drivers/mtd/nand/ams-delta.c | 10 +-
1704 drivers/mtd/nand/bcm_umi_nand.c | 12 +-
1705 drivers/mtd/nand/davinci_nand.c | 4 +-
1706 drivers/mtd/nand/mxc_nand.c | 2 +-
1707 drivers/mtd/nand/nand_bcm_umi.h | 73 +-
1708 drivers/mtd/nand/nomadik_nand.c | 2 +-
1709 drivers/mtd/nand/omap2.c | 303 +-
1710 drivers/mtd/nand/orion_nand.c | 2 +-
1711 drivers/mtd/nand/pxa3xx_nand.c | 89 +-
1712 drivers/mtd/nand/s3c2410.c | 2 +-
1713 drivers/mtd/onenand/omap2.c | 34 +-
1714 drivers/net/Kconfig | 17 +-
1715 drivers/net/Makefile | 2 +
1716 drivers/net/bonding/bond_main.c | 140 +-
1717 drivers/net/can/c_can/c_can.c | 130 +-
1718 drivers/net/can/c_can/c_can.h | 14 +-
1719 drivers/net/can/c_can/c_can_pci.c | 6 +-
1720 drivers/net/can/c_can/c_can_platform.c | 123 +-
1721 drivers/net/can/flexcan.c | 29 +-
1722 drivers/net/can/mscan/mpc5xxx_can.c | 8 +-
1723 drivers/net/can/sja1000/sja1000.c | 31 +-
1724 drivers/net/can/usb/peak_usb/pcan_usb_core.c | 8 +-
1725 drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 +-
1726 drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 8 +-
1727 drivers/net/ethernet/Kconfig | 9 -
1728 drivers/net/ethernet/Makefile | 1 -
1729 drivers/net/ethernet/broadcom/Kconfig | 1 +
1730 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 4 +-
1731 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 24 +-
1732 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 16 +-
1733 drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 12 +-
1734 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 58 +-
1735 .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 3 -
1736 drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 109 +-
1737 drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +-
1738 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 1701 +++++-----
1739 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 7 +-
1740 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 34 +-
1741 drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 14 +-
1742 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 5 +-
1743 drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 35 +-
1744 drivers/net/ethernet/broadcom/cnic.c | 116 +-
1745 drivers/net/ethernet/broadcom/cnic.h | 5 +
1746 drivers/net/ethernet/broadcom/cnic_defs.h | 2 +-
1747 drivers/net/ethernet/broadcom/cnic_if.h | 4 +-
1748 drivers/net/ethernet/broadcom/tg3.c | 534 ++-
1749 drivers/net/ethernet/broadcom/tg3.h | 9 +-
1750 drivers/net/ethernet/brocade/bna/bnad.c | 1 +
1751 drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +-
1752 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 51 +-
1753 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 954 +++++-
1754 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 2 +
1755 drivers/net/ethernet/chelsio/cxgb4/sge.c | 341 +-
1756 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 734 ++++-
1757 drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 80 +
1758 drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 185 +-
1759 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 97 +-
1760 drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 5 +-
1761 drivers/net/ethernet/emulex/benet/be.h | 2 +-
1762 drivers/net/ethernet/emulex/benet/be_cmds.c | 55 +-
1763 drivers/net/ethernet/emulex/benet/be_cmds.h | 6 +-
1764 drivers/net/ethernet/emulex/benet/be_ethtool.c | 57 +-
1765 drivers/net/ethernet/emulex/benet/be_main.c | 96 +-
1766 drivers/net/ethernet/freescale/Kconfig | 7 +
1767 drivers/net/ethernet/freescale/Makefile | 1 +
1768 drivers/net/ethernet/freescale/fsl_pq_mdio.c | 549 ++--
1769 drivers/net/ethernet/freescale/fsl_pq_mdio.h | 52 -
1770 drivers/net/ethernet/freescale/gianfar.c | 12 +-
1771 drivers/net/ethernet/freescale/gianfar.h | 11 +-
1772 drivers/net/ethernet/freescale/gianfar_ptp.c | 2 +-
1773 drivers/net/ethernet/freescale/ucc_geth.c | 1 -
1774 drivers/net/ethernet/freescale/xgmac_mdio.c | 274 ++
1775 drivers/net/ethernet/i825xx/Kconfig | 2 +-
1776 drivers/net/ethernet/i825xx/znet.c | 4 +-
1777 drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 39 +
1778 drivers/net/ethernet/intel/e1000/e1000_main.c | 14 +
1779 drivers/net/ethernet/intel/e1000e/82571.c | 4 +-
1780 drivers/net/ethernet/intel/e1000e/ethtool.c | 44 +-
1781 drivers/net/ethernet/intel/e1000e/netdev.c | 19 +-
1782 drivers/net/ethernet/intel/e1000e/phy.c | 31 +-
1783 drivers/net/ethernet/intel/igb/e1000_82575.c | 17 +-
1784 drivers/net/ethernet/intel/igb/e1000_defines.h | 11 +-
1785 drivers/net/ethernet/intel/igb/e1000_phy.c | 29 +-
1786 drivers/net/ethernet/intel/igb/e1000_phy.h | 5 +-
1787 drivers/net/ethernet/intel/igb/e1000_regs.h | 3 +
1788 drivers/net/ethernet/intel/igb/igb.h | 41 +-
1789 drivers/net/ethernet/intel/igb/igb_ethtool.c | 198 +-
1790 drivers/net/ethernet/intel/igb/igb_main.c | 711 ++--
1791 drivers/net/ethernet/intel/igb/igb_ptp.c | 677 +++-
1792 drivers/net/ethernet/intel/ixgbe/Makefile | 2 +-
1793 drivers/net/ethernet/intel/ixgbe/ixgbe.h | 35 +-
1794 drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 300 ++
1795 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 573 ++--
1796 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 3 +-
1797 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 105 +-
1798 drivers/net/ethernet/intel/ixgbevf/defines.h | 1 +
1799 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 9 +-
1800 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 272 +-
1801 drivers/net/ethernet/intel/ixgbevf/mbx.c | 15 +-
1802 drivers/net/ethernet/intel/ixgbevf/mbx.h | 21 +-
1803 drivers/net/ethernet/intel/ixgbevf/vf.c | 122 +-
1804 drivers/net/ethernet/intel/ixgbevf/vf.h | 4 +
1805 drivers/net/ethernet/mellanox/mlx4/cmd.c | 242 +-
1806 drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 -
1807 drivers/net/ethernet/mellanox/mlx4/eq.c | 245 +-
1808 drivers/net/ethernet/mellanox/mlx4/fw.c | 246 +-
1809 drivers/net/ethernet/mellanox/mlx4/fw.h | 11 +-
1810 drivers/net/ethernet/mellanox/mlx4/main.c | 171 +-
1811 drivers/net/ethernet/mellanox/mlx4/mlx4.h | 59 +-
1812 drivers/net/ethernet/mellanox/mlx4/port.c | 10 +
1813 drivers/net/ethernet/mellanox/mlx4/qp.c | 100 +-
1814 .../net/ethernet/mellanox/mlx4/resource_tracker.c | 222 +-
1815 drivers/net/ethernet/mellanox/mlx4/sense.c | 2 +-
1816 drivers/net/ethernet/mipsnet.c | 345 --
1817 drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +-
1818 drivers/net/ethernet/netx-eth.c | 2 +-
1819 drivers/net/ethernet/nvidia/forcedeth.c | 17 +-
1820 drivers/net/ethernet/realtek/r8169.c | 4 +-
1821 drivers/net/ethernet/seeq/ether3.c | 4 +-
1822 drivers/net/ethernet/sfc/Kconfig | 7 +
1823 drivers/net/ethernet/sfc/Makefile | 1 +
1824 drivers/net/ethernet/sfc/bitfield.h | 22 +-
1825 drivers/net/ethernet/sfc/efx.c | 250 +-
1826 drivers/net/ethernet/sfc/efx.h | 1 +
1827 drivers/net/ethernet/sfc/ethtool.c | 16 +-
1828 drivers/net/ethernet/sfc/falcon_boards.c | 2 +-
1829 drivers/net/ethernet/sfc/filter.c | 108 +-
1830 drivers/net/ethernet/sfc/filter.h | 7 +-
1831 drivers/net/ethernet/sfc/mcdi.c | 49 +-
1832 drivers/net/ethernet/sfc/mcdi.h | 12 +-
1833 drivers/net/ethernet/sfc/mcdi_pcol.h | 29 +-
1834 drivers/net/ethernet/sfc/mtd.c | 7 +-
1835 drivers/net/ethernet/sfc/net_driver.h | 78 +-
1836 drivers/net/ethernet/sfc/nic.c | 6 +-
1837 drivers/net/ethernet/sfc/nic.h | 36 +
1838 drivers/net/ethernet/sfc/ptp.c | 1484 +++++++++
1839 drivers/net/ethernet/sfc/rx.c | 20 +-
1840 drivers/net/ethernet/sfc/selftest.c | 3 +-
1841 drivers/net/ethernet/sfc/siena.c | 1 +
1842 drivers/net/ethernet/sfc/siena_sriov.c | 8 +
1843 drivers/net/ethernet/sfc/tx.c | 627 ++--
1844 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 11 +-
1845 drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 -
1846 .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 39 +-
1847 drivers/net/ethernet/sun/cassini.c | 2 +-
1848 drivers/net/ethernet/sun/niu.c | 2 +-
1849 drivers/net/ethernet/sun/sunbmac.c | 1 -
1850 drivers/net/ethernet/ti/Kconfig | 4 +-
1851 drivers/net/ethernet/ti/cpsw.c | 179 +-
1852 drivers/net/ethernet/ti/davinci_mdio.c | 41 +-
1853 drivers/net/ethernet/tundra/tsi108_eth.c | 1 -
1854 drivers/net/ethernet/wiznet/w5100.c | 3 +-
1855 drivers/net/ethernet/wiznet/w5300.c | 3 +-
1856 drivers/net/hyperv/hyperv_net.h | 4 +-
1857 drivers/net/hyperv/netvsc.c | 22 +-
1858 drivers/net/hyperv/netvsc_drv.c | 4 +-
1859 drivers/net/hyperv/rndis_filter.c | 60 +-
1860 drivers/{ => net}/ieee802154/Kconfig | 11 +
1861 drivers/{ => net}/ieee802154/Makefile | 1 +
1862 drivers/{ => net}/ieee802154/at86rf230.c | 12 +-
1863 drivers/{ => net}/ieee802154/fakehard.c | 1 -
1864 drivers/{ => net}/ieee802154/fakelb.c | 0
1865 drivers/net/ieee802154/mrf24j40.c | 767 +++++
1866 drivers/net/irda/pxaficp_ir.c | 30 +-
1867 drivers/net/loopback.c | 3 +-
1868 drivers/net/macvlan.c | 6 +-
1869 drivers/net/phy/Kconfig | 13 +
1870 drivers/net/phy/Makefile | 1 +
1871 drivers/net/phy/dp83640.c | 2 +-
1872 drivers/net/phy/lxt.c | 127 +
1873 drivers/net/phy/mdio-gpio.c | 132 +-
1874 drivers/net/phy/mdio-mux-mmioreg.c | 171 +
1875 drivers/net/phy/phy.c | 74 +-
1876 drivers/net/ppp/ppp_generic.c | 58 +-
1877 drivers/net/team/Kconfig | 4 +-
1878 drivers/net/team/team.c | 342 +-
1879 drivers/net/team/team_mode_broadcast.c | 8 +-
1880 drivers/net/team/team_mode_roundrobin.c | 8 +-
1881 drivers/net/tun.c | 47 +-
1882 drivers/net/usb/asix_devices.c | 40 +-
1883 drivers/net/usb/catc.c | 55 +-
1884 drivers/net/usb/cx82310_eth.c | 11 +-
1885 drivers/net/usb/gl620a.c | 10 +-
1886 drivers/net/usb/kaweth.c | 134 +-
1887 drivers/net/usb/net1080.c | 51 +-
1888 drivers/net/usb/qmi_wwan.c | 47 +-
1889 drivers/net/usb/rtl8150.c | 6 +-
1890 drivers/net/usb/sierra_net.c | 25 +-
1891 drivers/net/usb/smsc75xx.c | 240 +-
1892 drivers/net/usb/smsc95xx.c | 560 ++--
1893 drivers/net/usb/smsc95xx.h | 12 +-
1894 drivers/net/veth.c | 3 +
1895 drivers/net/virtio_net.c | 14 +-
1896 drivers/net/vxlan.c | 1219 +++++++
1897 drivers/net/wimax/i2400m/driver.c | 3 +-
1898 drivers/net/wireless/adm8211.c | 4 +-
1899 drivers/net/wireless/airo.c | 55 +-
1900 drivers/net/wireless/at76c50x-usb.c | 58 +-
1901 drivers/net/wireless/ath/ath.h | 1 +
1902 drivers/net/wireless/ath/ath5k/ath5k.h | 2 +-
1903 drivers/net/wireless/ath/ath5k/base.c | 6 +-
1904 drivers/net/wireless/ath/ath5k/mac80211-ops.c | 12 +-
1905 drivers/net/wireless/ath/ath5k/phy.c | 45 +-
1906 drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +-
1907 drivers/net/wireless/ath/ath6kl/cfg80211.h | 2 +-
1908 drivers/net/wireless/ath/ath9k/ani.c | 2 +-
1909 drivers/net/wireless/ath/ath9k/antenna.c | 117 +-
1910 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 288 +-
1911 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 3 +-
1912 drivers/net/wireless/ath/ath9k/ar9003_hw.c | 57 +-
1913 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 21 +-
1914 drivers/net/wireless/ath/ath9k/ar9003_mci.c | 43 +-
1915 drivers/net/wireless/ath/ath9k/ar9003_mci.h | 14 +-
1916 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 197 +-
1917 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 95 +-
1918 .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 2 +-
1919 .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 1231 +++++++
1920 drivers/net/wireless/ath/ath9k/ath9k.h | 12 +-
1921 drivers/net/wireless/ath/ath9k/btcoex.c | 65 +-
1922 drivers/net/wireless/ath/ath9k/btcoex.h | 3 +-
1923 drivers/net/wireless/ath/ath9k/debug.c | 58 +-
1924 drivers/net/wireless/ath/ath9k/debug.h | 4 +-
1925 drivers/net/wireless/ath/ath9k/eeprom.h | 3 +-
1926 drivers/net/wireless/ath/ath9k/gpio.c | 72 +-
1927 drivers/net/wireless/ath/ath9k/hif_usb.c | 38 +-
1928 drivers/net/wireless/ath/ath9k/hif_usb.h | 4 +-
1929 drivers/net/wireless/ath/ath9k/htc.h | 1 +
1930 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 2 +-
1931 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 13 +-
1932 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 5 +
1933 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 51 +-
1934 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +-
1935 drivers/net/wireless/ath/ath9k/hw-ops.h | 7 +
1936 drivers/net/wireless/ath/ath9k/hw.c | 57 +-
1937 drivers/net/wireless/ath/ath9k/hw.h | 4 +-
1938 drivers/net/wireless/ath/ath9k/init.c | 15 +-
1939 drivers/net/wireless/ath/ath9k/main.c | 66 +-
1940 drivers/net/wireless/ath/ath9k/mci.c | 94 +-
1941 drivers/net/wireless/ath/ath9k/pci.c | 4 +-
1942 drivers/net/wireless/ath/ath9k/rc.c | 819 ++---
1943 drivers/net/wireless/ath/ath9k/rc.h | 4 -
1944 drivers/net/wireless/ath/ath9k/recv.c | 4 +-
1945 drivers/net/wireless/ath/ath9k/reg.h | 9 +
1946 drivers/net/wireless/ath/ath9k/wow.c | 2 +-
1947 drivers/net/wireless/ath/ath9k/xmit.c | 15 +-
1948 drivers/net/wireless/ath/carl9170/carl9170.h | 5 +-
1949 drivers/net/wireless/ath/carl9170/fw.c | 1 +
1950 drivers/net/wireless/ath/carl9170/mac.c | 5 +-
1951 drivers/net/wireless/ath/carl9170/main.c | 6 +-
1952 drivers/net/wireless/ath/carl9170/rx.c | 16 +-
1953 drivers/net/wireless/ath/carl9170/tx.c | 16 +-
1954 drivers/net/wireless/b43/Makefile | 1 +
1955 drivers/net/wireless/b43/b43.h | 10 +-
1956 drivers/net/wireless/b43/main.c | 54 +-
1957 drivers/net/wireless/b43/phy_common.c | 17 +-
1958 drivers/net/wireless/b43/phy_common.h | 6 +
1959 drivers/net/wireless/b43/phy_n.c | 668 +++-
1960 drivers/net/wireless/b43/phy_n.h | 1 +
1961 drivers/net/wireless/b43/radio_2057.c | 141 +
1962 drivers/net/wireless/b43/radio_2057.h | 430 +++
1963 drivers/net/wireless/b43/tables_nphy.c | 75 +
1964 drivers/net/wireless/b43/tables_nphy.h | 10 +
1965 drivers/net/wireless/b43legacy/main.c | 5 +-
1966 drivers/net/wireless/brcm80211/Kconfig | 8 +
1967 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 39 +-
1968 .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 27 +-
1969 drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 62 +-
1970 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 2 +-
1971 .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 73 +-
1972 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 2 +
1973 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 65 +-
1974 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1047 +++---
1975 .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 17 +
1976 .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 2 +
1977 drivers/net/wireless/brcm80211/brcmfmac/usb.c | 353 +-
1978 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 3425 +++++++++++++++-----
1979 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 296 +-
1980 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 3 -
1981 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 15 +-
1982 drivers/net/wireless/brcm80211/brcmsmac/main.c | 13 +-
1983 .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 +
1984 .../net/wireless/brcm80211/include/brcmu_wifi.h | 5 -
1985 drivers/net/wireless/hostap/hostap_ap.c | 4 +-
1986 drivers/net/wireless/hostap/hostap_hw.c | 10 +-
1987 drivers/net/wireless/hostap/hostap_info.c | 4 +-
1988 drivers/net/wireless/hostap/hostap_ioctl.c | 15 +-
1989 drivers/net/wireless/hostap/hostap_main.c | 2 +-
1990 drivers/net/wireless/ipw2x00/ipw2100.c | 19 +-
1991 drivers/net/wireless/ipw2x00/ipw2200.c | 11 +-
1992 drivers/net/wireless/ipw2x00/libipw_wx.c | 2 +-
1993 drivers/net/wireless/iwlegacy/3945-mac.c | 12 +-
1994 drivers/net/wireless/iwlegacy/4965-mac.c | 26 +-
1995 drivers/net/wireless/iwlegacy/4965.h | 8 +-
1996 drivers/net/wireless/iwlegacy/common.c | 19 +-
1997 drivers/net/wireless/iwlegacy/common.h | 2 -
1998 drivers/net/wireless/iwlwifi/dvm/agn.h | 13 +-
1999 drivers/net/wireless/iwlwifi/dvm/commands.h | 3 +-
2000 drivers/net/wireless/iwlwifi/dvm/debugfs.c | 56 +-
2001 drivers/net/wireless/iwlwifi/dvm/dev.h | 1 +
2002 drivers/net/wireless/iwlwifi/dvm/mac80211.c | 8 +-
2003 drivers/net/wireless/iwlwifi/dvm/main.c | 24 +-
2004 drivers/net/wireless/iwlwifi/dvm/rx.c | 11 +
2005 drivers/net/wireless/iwlwifi/dvm/scan.c | 4 +-
2006 drivers/net/wireless/iwlwifi/dvm/sta.c | 9 +-
2007 drivers/net/wireless/iwlwifi/dvm/tx.c | 18 +-
2008 drivers/net/wireless/iwlwifi/dvm/ucode.c | 4 +-
2009 drivers/net/wireless/iwlwifi/iwl-devtrace.h | 34 +-
2010 drivers/net/wireless/iwlwifi/iwl-drv.c | 167 +-
2011 drivers/net/wireless/iwlwifi/iwl-drv.h | 6 +-
2012 drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 2 -
2013 drivers/net/wireless/iwlwifi/iwl-fw.h | 3 +-
2014 drivers/net/wireless/iwlwifi/iwl-op-mode.h | 3 +-
2015 drivers/net/wireless/iwlwifi/iwl-trans.h | 12 +-
2016 drivers/net/wireless/iwlwifi/pcie/drv.c | 19 +-
2017 drivers/net/wireless/iwlwifi/pcie/internal.h | 3 +-
2018 drivers/net/wireless/iwlwifi/pcie/rx.c | 91 +-
2019 drivers/net/wireless/iwlwifi/pcie/trans.c | 112 +-
2020 drivers/net/wireless/iwlwifi/pcie/tx.c | 51 +-
2021 drivers/net/wireless/libertas/cmd.c | 16 +
2022 drivers/net/wireless/libertas/cmd.h | 1 +
2023 drivers/net/wireless/libertas/main.c | 4 +-
2024 drivers/net/wireless/libertas_tf/main.c | 4 +-
2025 drivers/net/wireless/mac80211_hwsim.c | 59 +-
2026 drivers/net/wireless/mwifiex/11n.c | 64 +-
2027 drivers/net/wireless/mwifiex/11n.h | 20 +-
2028 drivers/net/wireless/mwifiex/11n_aggr.c | 14 +-
2029 drivers/net/wireless/mwifiex/11n_rxreorder.c | 115 +-
2030 drivers/net/wireless/mwifiex/11n_rxreorder.h | 10 +
2031 drivers/net/wireless/mwifiex/Makefile | 2 +
2032 drivers/net/wireless/mwifiex/cfg80211.c | 460 ++-
2033 drivers/net/wireless/mwifiex/cmdevt.c | 7 +-
2034 drivers/net/wireless/mwifiex/decl.h | 9 +-
2035 drivers/net/wireless/mwifiex/fw.h | 93 +-
2036 drivers/net/wireless/mwifiex/ie.c | 88 +-
2037 drivers/net/wireless/mwifiex/init.c | 126 +-
2038 drivers/net/wireless/mwifiex/ioctl.h | 14 +-
2039 drivers/net/wireless/mwifiex/main.c | 39 +-
2040 drivers/net/wireless/mwifiex/main.h | 87 +-
2041 drivers/net/wireless/mwifiex/scan.c | 15 +-
2042 drivers/net/wireless/mwifiex/sta_cmd.c | 150 +-
2043 drivers/net/wireless/mwifiex/sta_cmdresp.c | 77 +-
2044 drivers/net/wireless/mwifiex/sta_event.c | 74 +-
2045 drivers/net/wireless/mwifiex/sta_ioctl.c | 124 +-
2046 drivers/net/wireless/mwifiex/sta_rx.c | 44 +-
2047 drivers/net/wireless/mwifiex/sta_tx.c | 12 +-
2048 drivers/net/wireless/mwifiex/txrx.c | 11 +-
2049 drivers/net/wireless/mwifiex/uap_cmd.c | 62 +-
2050 drivers/net/wireless/mwifiex/uap_event.c | 290 ++
2051 drivers/net/wireless/mwifiex/uap_txrx.c | 340 ++
2052 drivers/net/wireless/mwifiex/util.c | 40 +
2053 drivers/net/wireless/mwifiex/wmm.c | 77 +-
2054 drivers/net/wireless/mwl8k.c | 17 +-
2055 drivers/net/wireless/orinoco/wext.c | 7 +-
2056 drivers/net/wireless/p54/eeprom.c | 108 +-
2057 drivers/net/wireless/p54/eeprom.h | 12 +
2058 drivers/net/wireless/p54/lmac.h | 4 +-
2059 drivers/net/wireless/p54/main.c | 15 +-
2060 drivers/net/wireless/p54/p54pci.c | 88 +-
2061 drivers/net/wireless/p54/p54pci.h | 1 +
2062 drivers/net/wireless/p54/txrx.c | 15 +-
2063 drivers/net/wireless/rndis_wlan.c | 3 -
2064 drivers/net/wireless/rt2x00/rt2400pci.c | 5 +-
2065 drivers/net/wireless/rt2x00/rt2400pci.h | 27 +-
2066 drivers/net/wireless/rt2x00/rt2500pci.c | 3 +-
2067 drivers/net/wireless/rt2x00/rt2500pci.h | 18 +-
2068 drivers/net/wireless/rt2x00/rt2500usb.c | 5 +-
2069 drivers/net/wireless/rt2x00/rt2500usb.h | 27 +-
2070 drivers/net/wireless/rt2x00/rt2800.h | 52 +-
2071 drivers/net/wireless/rt2x00/rt2800lib.c | 397 ++-
2072 drivers/net/wireless/rt2x00/rt2800lib.h | 22 +-
2073 drivers/net/wireless/rt2x00/rt2800pci.c | 83 +-
2074 drivers/net/wireless/rt2x00/rt2800usb.c | 62 +-
2075 drivers/net/wireless/rt2x00/rt2x00.h | 20 +-
2076 drivers/net/wireless/rt2x00/rt2x00dev.c | 35 +-
2077 drivers/net/wireless/rt2x00/rt2x00mac.c | 44 +-
2078 drivers/net/wireless/rt2x00/rt2x00queue.c | 20 +-
2079 drivers/net/wireless/rt2x00/rt61pci.c | 13 +-
2080 drivers/net/wireless/rt2x00/rt61pci.h | 28 +-
2081 drivers/net/wireless/rt2x00/rt73usb.c | 5 +-
2082 drivers/net/wireless/rt2x00/rt73usb.h | 34 +-
2083 drivers/net/wireless/rtl818x/rtl8180/dev.c | 6 +-
2084 drivers/net/wireless/rtl818x/rtl8187/dev.c | 6 +-
2085 drivers/net/wireless/rtlwifi/Kconfig | 8 +-
2086 drivers/net/wireless/rtlwifi/base.c | 3 +-
2087 drivers/net/wireless/rtlwifi/core.c | 8 +-
2088 drivers/net/wireless/rtlwifi/pci.c | 16 +-
2089 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 41 +-
2090 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 3 +-
2091 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 4 +-
2092 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 2 +-
2093 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 5 +-
2094 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 1 +
2095 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 7 +-
2096 drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 4 +-
2097 drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 10 +-
2098 drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 3 +-
2099 drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 2 +-
2100 drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 5 +-
2101 drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 1 +
2102 drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 11 +-
2103 drivers/net/wireless/rtlwifi/rtl8192se/trx.h | 1 +
2104 drivers/net/wireless/rtlwifi/usb.c | 17 +-
2105 drivers/net/wireless/rtlwifi/wifi.h | 121 +-
2106 drivers/net/wireless/ti/wl1251/main.c | 4 +-
2107 drivers/net/wireless/ti/wl12xx/main.c | 79 +-
2108 drivers/net/wireless/ti/wl12xx/wl12xx.h | 7 +
2109 drivers/net/wireless/ti/wl18xx/debugfs.c | 2 +-
2110 drivers/net/wireless/ti/wl18xx/main.c | 129 +-
2111 drivers/net/wireless/ti/wl18xx/wl18xx.h | 7 +
2112 drivers/net/wireless/ti/wlcore/cmd.c | 21 +-
2113 drivers/net/wireless/ti/wlcore/cmd.h | 5 -
2114 drivers/net/wireless/ti/wlcore/conf.h | 3 +-
2115 drivers/net/wireless/ti/wlcore/debug.h | 16 +-
2116 drivers/net/wireless/ti/wlcore/debugfs.c | 32 +-
2117 drivers/net/wireless/ti/wlcore/init.c | 12 +-
2118 drivers/net/wireless/ti/wlcore/io.h | 4 +-
2119 drivers/net/wireless/ti/wlcore/main.c | 372 ++-
2120 drivers/net/wireless/ti/wlcore/ps.c | 10 +-
2121 drivers/net/wireless/ti/wlcore/rx.c | 2 +-
2122 drivers/net/wireless/ti/wlcore/scan.c | 20 +-
2123 drivers/net/wireless/ti/wlcore/spi.c | 10 +-
2124 drivers/net/wireless/ti/wlcore/testmode.c | 4 +-
2125 drivers/net/wireless/ti/wlcore/tx.c | 112 +-
2126 drivers/net/wireless/ti/wlcore/tx.h | 4 +-
2127 drivers/net/wireless/ti/wlcore/wlcore.h | 23 +-
2128 drivers/net/wireless/ti/wlcore/wlcore_i.h | 13 +-
2129 drivers/net/wireless/wl3501_cs.c | 3 +-
2130 drivers/net/wireless/zd1211rw/zd_mac.c | 9 +-
2131 drivers/net/wireless/zd1211rw/zd_usb.c | 3 +-
2132 drivers/net/xen-netfront.c | 2 +-
2133 drivers/nfc/Kconfig | 14 +-
2134 drivers/nfc/Makefile | 1 -
2135 drivers/nfc/nfcwilink.c | 20 +-
2136 drivers/nfc/pn533.c | 107 +-
2137 drivers/nfc/pn544.c | 893 -----
2138 drivers/nfc/pn544_hci.c | 177 +-
2139 drivers/pcmcia/omap_cf.c | 2 +-
2140 drivers/pcmcia/pxa2xx_base.c | 2 +-
2141 drivers/pcmcia/pxa2xx_viper.c | 2 +-
2142 drivers/pinctrl/Kconfig | 30 +
2143 drivers/pinctrl/Makefile | 6 +
2144 drivers/pinctrl/core.c | 4 +-
2145 drivers/pinctrl/pinctrl-bcm2835.c | 1075 ++++++
2146 drivers/pinctrl/pinctrl-coh901.c | 220 +-
2147 drivers/pinctrl/pinctrl-exynos.c | 579 ++++
2148 drivers/pinctrl/pinctrl-exynos.h | 218 ++
2149 drivers/pinctrl/pinctrl-imx.c | 2 +-
2150 drivers/pinctrl/pinctrl-imx35.c | 1595 +++++++++
2151 drivers/pinctrl/pinctrl-imx51.c | 490 +--
2152 drivers/pinctrl/pinctrl-imx53.c | 402 +--
2153 drivers/pinctrl/pinctrl-nomadik-db8500.c | 5 +-
2154 drivers/pinctrl/pinctrl-nomadik-db8540.c | 999 ++++++
2155 drivers/pinctrl/pinctrl-nomadik-stn8815.c | 357 ++
2156 drivers/pinctrl/pinctrl-nomadik.c | 10 +-
2157 drivers/pinctrl/pinctrl-nomadik.h | 27 +
2158 drivers/pinctrl/pinctrl-samsung.c | 888 +++++
2159 drivers/pinctrl/pinctrl-samsung.h | 239 ++
2160 drivers/pinctrl/pinctrl-single.c | 56 +-
2161 drivers/pinctrl/pinctrl-sirf.c | 81 +-
2162 drivers/pinctrl/pinctrl-tegra.c | 2 -
2163 drivers/pinctrl/pinctrl-tegra.h | 44 +
2164 drivers/pinctrl/pinmux.c | 5 +-
2165 drivers/platform/x86/thinkpad_acpi.c | 20 +-
2166 drivers/power/ab8500_btemp.c | 2 +-
2167 drivers/power/ab8500_charger.c | 8 +-
2168 drivers/power/ab8500_fg.c | 8 +-
2169 drivers/power/abx500_chargalg.c | 4 +-
2170 drivers/power/avs/smartreflex.c | 2 +
2171 drivers/power/charger-manager.c | 9 +-
2172 drivers/power/collie_battery.c | 2 +-
2173 drivers/power/ds2760_battery.c | 9 +-
2174 drivers/power/jz4740-battery.c | 6 +-
2175 drivers/power/max17040_battery.c | 2 +-
2176 drivers/power/tosa_battery.c | 2 +-
2177 drivers/power/wm97xx_battery.c | 2 +-
2178 drivers/power/z2_battery.c | 2 +-
2179 drivers/ptp/ptp_clock.c | 16 +-
2180 drivers/ptp/ptp_ixp46x.c | 2 +-
2181 drivers/ptp/ptp_pch.c | 2 +-
2182 drivers/ptp/ptp_private.h | 1 +
2183 drivers/regulator/core.c | 2 +-
2184 drivers/remoteproc/omap_remoteproc.c | 2 +-
2185 drivers/rtc/rtc-ab8500.c | 6 -
2186 drivers/rtc/rtc-pxa.c | 11 +
2187 drivers/rtc/rtc-vt8500.c | 9 +-
2188 drivers/s390/net/ctcm_fsms.c | 2 +-
2189 drivers/s390/net/ctcm_main.c | 2 +-
2190 drivers/s390/net/lcs.c | 2 +-
2191 drivers/s390/net/qeth_core_main.c | 78 +-
2192 drivers/s390/net/qeth_l3_main.c | 2 +
2193 drivers/sbus/char/display7seg.c | 2 +-
2194 drivers/sbus/char/envctrl.c | 8 +-
2195 drivers/sbus/char/openprom.c | 4 +-
2196 drivers/scsi/arcmsr/arcmsr_hba.c | 4 +-
2197 drivers/scsi/arm/eesox.c | 2 +-
2198 drivers/scsi/ipr.c | 2 +-
2199 drivers/scsi/pmcraid.c | 2 +-
2200 drivers/scsi/qla2xxx/qla_target.c | 2 +-
2201 drivers/scsi/scsi_netlink.c | 557 +---
2202 drivers/scsi/scsi_transport_iscsi.c | 7 +-
2203 drivers/sh/pfc/gpio.c | 1 +
2204 drivers/spi/Kconfig | 15 +-
2205 drivers/spi/Makefile | 3 +-
2206 drivers/spi/spi-altera.c | 4 +-
2207 drivers/spi/spi-davinci.c | 2 +-
2208 drivers/spi/spi-ep93xx.c | 4 +-
2209 drivers/spi/spi-gpio.c | 131 +-
2210 drivers/spi/spi-imx.c | 10 +-
2211 drivers/spi/spi-mpc512x-psc.c | 3 +-
2212 drivers/spi/spi-mpc52xx-psc.c | 3 +-
2213 drivers/spi/spi-mpc52xx.c | 9 +-
2214 drivers/spi/spi-mxs.c | 674 ++++
2215 drivers/spi/spi-nuc900.c | 2 +-
2216 drivers/spi/spi-omap-uwire.c | 5 +-
2217 drivers/spi/spi-omap2-mcspi.c | 325 +-
2218 drivers/spi/spi-orion.c | 209 +-
2219 drivers/spi/spi-pl022.c | 251 +-
2220 drivers/spi/spi-s3c24xx.c | 1 +
2221 drivers/spi/spi-s3c64xx.c | 13 +-
2222 drivers/spi/spi-sc18is602.c | 364 +++
2223 drivers/spi/spi-sh-hspi.c | 5 +-
2224 drivers/spi/spi-stmp.c | 6 +-
2225 drivers/spi/spi-tegra.c | 700 ----
2226 drivers/spi/spi-tle62x0.c | 13 +-
2227 drivers/spi/spi-topcliff-pch.c | 2 -
2228 drivers/ssb/driver_mipscore.c | 28 +-
2229 drivers/staging/android/binder.c | 14 +-
2230 drivers/staging/ccg/u_ether.c | 2 +-
2231 drivers/staging/gdm72xx/netlink_k.c | 4 +-
2232 drivers/staging/nvec/nvec.c | 4 +-
2233 .../staging/ste_rmi4/board-mop500-u8500uib-rmi4.c | 1 -
2234 drivers/staging/tidspbridge/core/dsp-clock.c | 2 +-
2235 drivers/staging/tidspbridge/core/tiomap3430.c | 2 +-
2236 drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 2 +-
2237 drivers/staging/tidspbridge/core/tiomap_io.c | 2 +-
2238 drivers/staging/tidspbridge/core/wdt.c | 2 +-
2239 drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 +-
2240 drivers/staging/winbond/wbusb.c | 4 +-
2241 drivers/thermal/thermal_sys.c | 15 +-
2242 drivers/tty/hvc/hvsi.c | 2 +-
2243 drivers/tty/ipwireless/hardware.c | 2 +-
2244 drivers/tty/ipwireless/network.c | 4 +-
2245 drivers/tty/serial/imx.c | 2 +-
2246 drivers/tty/serial/kgdboc.c | 2 +-
2247 drivers/tty/serial/mpc52xx_uart.c | 2 +-
2248 drivers/tty/serial/omap-serial.c | 2 +-
2249 drivers/tty/serial/serial_ks8695.c | 4 +-
2250 drivers/tty/serial/vt8500_serial.c | 58 +-
2251 drivers/tty/tty_audit.c | 17 +-
2252 drivers/tty/tty_ldisc.c | 6 +-
2253 drivers/usb/Kconfig | 1 -
2254 drivers/usb/atm/speedtch.c | 2 +-
2255 drivers/usb/atm/ueagle-atm.c | 2 +-
2256 drivers/usb/gadget/f_fs.c | 23 +-
2257 drivers/usb/gadget/imx_udc.c | 2 +-
2258 drivers/usb/gadget/inode.c | 4 +-
2259 drivers/usb/gadget/pxa27x_udc.c | 2 +-
2260 drivers/usb/gadget/s3c2410_udc.c | 2 +-
2261 drivers/usb/gadget/u_ether.c | 2 +-
2262 drivers/usb/host/Kconfig | 2 +-
2263 drivers/usb/host/ehci-mxc.c | 2 +-
2264 drivers/usb/host/ehci-orion.c | 2 +-
2265 drivers/usb/host/ehci-s5p.c | 2 +-
2266 drivers/usb/host/imx21-hcd.h | 2 +-
2267 drivers/usb/host/ohci-da8xx.c | 2 +-
2268 drivers/usb/host/ohci-exynos.c | 2 +-
2269 drivers/usb/host/ohci-hcd.c | 4 +-
2270 drivers/usb/host/ohci-nxp.c | 84 +-
2271 drivers/usb/host/ohci-omap.c | 2 +-
2272 drivers/usb/host/ohci-pxa27x.c | 4 +-
2273 drivers/usb/host/ohci-s3c2410.c | 2 +-
2274 drivers/usb/musb/da8xx.c | 2 +-
2275 drivers/usb/musb/tusb6010_omap.c | 1 -
2276 drivers/usb/musb/ux500_dma.c | 2 +-
2277 drivers/usb/otg/isp1301_omap.c | 4 +-
2278 drivers/usb/phy/tegra_usb_phy.c | 1 -
2279 drivers/video/Kconfig | 18 +-
2280 drivers/video/Makefile | 1 -
2281 drivers/video/backlight/omap1_bl.c | 4 +-
2282 drivers/video/da8xx-fb.c | 8 +-
2283 drivers/video/ep93xx-fb.c | 2 +-
2284 drivers/video/epson1355fb.c | 749 -----
2285 drivers/video/imxfb.c | 2 +-
2286 drivers/video/msm/mddi.c | 2 +-
2287 drivers/video/msm/mddi_client_dummy.c | 2 +-
2288 drivers/video/msm/mddi_client_nt35399.c | 2 +-
2289 drivers/video/msm/mddi_client_toshiba.c | 2 +-
2290 drivers/video/msm/mdp.c | 2 +-
2291 drivers/video/msm/mdp_hw.h | 2 +-
2292 drivers/video/msm/mdp_ppp.c | 2 +-
2293 drivers/video/msm/msm_fb.c | 2 +-
2294 drivers/video/mx3fb.c | 4 +-
2295 drivers/video/nuc900fb.c | 2 +-
2296 drivers/video/nuc900fb.h | 2 +-
2297 drivers/video/omap/lcd_ams_delta.c | 3 +-
2298 drivers/video/omap/lcd_mipid.c | 2 +-
2299 drivers/video/omap/lcd_osk.c | 2 +-
2300 drivers/video/omap2/displays/panel-taal.c | 6 +-
2301 drivers/video/omap2/dss/dispc.c | 1 +
2302 drivers/video/omap2/dss/dsi.c | 6 +-
2303 drivers/video/omap2/omapfb/omapfb-main.c | 1 +
2304 drivers/video/pxafb.c | 2 +-
2305 drivers/video/vt8500lcdfb.c | 81 +-
2306 drivers/video/wm8505fb.c | 99 +-
2307 drivers/video/wmt_ge_rops.c | 9 +-
2308 drivers/watchdog/Kconfig | 6 +-
2309 drivers/watchdog/ks8695_wdt.c | 14 +-
2310 drivers/watchdog/mpc8xxx_wdt.c | 2 +-
2311 drivers/watchdog/omap_wdt.c | 5 +
2312 drivers/xen/xenfs/super.c | 3 +-
2313 firmware/Makefile | 1 -
2314 firmware/cxgb3/t3fw-7.10.0.bin.ihex | 1935 -----------
2316 fs/adfs/adfs.h | 4 +-
2317 fs/adfs/inode.c | 4 +-
2318 fs/adfs/super.c | 21 +-
2319 fs/affs/affs.h | 4 +-
2320 fs/affs/inode.c | 20 +-
2321 fs/affs/super.c | 20 +-
2322 fs/afs/callback.c | 4 +-
2323 fs/afs/server.c | 10 +-
2324 fs/afs/vlocation.c | 14 +-
2325 fs/befs/befs.h | 4 +-
2326 fs/befs/linuxvfs.c | 27 +-
2327 fs/bfs/inode.c | 8 +-
2328 fs/btrfs/acl.c | 8 +-
2329 fs/btrfs/delayed-inode.c | 8 +-
2330 fs/btrfs/inode.c | 8 +-
2331 fs/btrfs/ioctl.c | 6 +-
2332 fs/compat_ioctl.c | 2 +
2333 fs/configfs/inode.c | 4 +-
2334 fs/cramfs/inode.c | 4 +-
2335 fs/debugfs/inode.c | 26 +-
2336 fs/dlm/netlink.c | 8 +-
2337 fs/ecryptfs/main.c | 5 +-
2338 fs/ecryptfs/messaging.c | 5 +-
2339 fs/efs/inode.c | 4 +-
2340 fs/exofs/inode.c | 8 +-
2341 fs/ext2/acl.c | 32 +-
2342 fs/ext3/acl.c | 32 +-
2343 fs/ext3/super.c | 2 +-
2344 fs/ext4/acl.c | 31 +-
2345 fs/ext4/super.c | 2 +-
2347 fs/fat/file.c | 6 +-
2348 fs/fat/inode.c | 18 +-
2349 fs/freevxfs/vxfs_inode.c | 4 +-
2350 fs/generic_acl.c | 4 +-
2351 fs/gfs2/acl.c | 14 +-
2352 fs/gfs2/lock_dlm.c | 2 +-
2353 fs/gfs2/quota.c | 32 +-
2354 fs/gfs2/super.c | 2 +-
2355 fs/hfs/hfs_fs.h | 4 +-
2356 fs/hfs/inode.c | 6 +-
2357 fs/hfs/super.c | 16 +-
2358 fs/hfsplus/catalog.c | 4 +-
2359 fs/hfsplus/hfsplus_fs.h | 4 +-
2360 fs/hfsplus/inode.c | 8 +-
2361 fs/hfsplus/options.c | 15 +-
2362 fs/hostfs/hostfs_kern.c | 8 +-
2363 fs/hpfs/hpfs_fn.h | 4 +-
2364 fs/hpfs/inode.c | 19 +-
2365 fs/hpfs/namei.c | 8 +-
2366 fs/hpfs/super.c | 18 +-
2367 fs/hugetlbfs/inode.c | 16 +-
2368 fs/isofs/inode.c | 17 +-
2369 fs/isofs/isofs.h | 4 +-
2370 fs/isofs/rock.c | 4 +-
2371 fs/jffs2/acl.c | 30 +-
2372 fs/jffs2/file.c | 8 +-
2373 fs/jffs2/fs.c | 24 +-
2374 fs/jffs2/os-linux.h | 4 +-
2376 fs/jfs/file.c | 4 +-
2377 fs/jfs/jfs_imap.c | 22 +-
2378 fs/jfs/jfs_incore.h | 8 +-
2379 fs/jfs/super.c | 22 +-
2380 fs/jfs/xattr.c | 4 +-
2381 fs/logfs/inode.c | 4 +-
2382 fs/logfs/readwrite.c | 8 +-
2383 fs/minix/inode.c | 16 +-
2385 fs/ncpfs/inode.c | 6 +-
2386 fs/nfs/nfs3acl.c | 4 +-
2387 fs/nfs/nfs4renewd.c | 3 +-
2388 fs/nfsd/vfs.c | 8 +-
2389 fs/nilfs2/inode.c | 8 +-
2390 fs/ntfs/inode.c | 7 +-
2391 fs/ntfs/super.c | 39 +-
2392 fs/ntfs/volume.h | 5 +-
2393 fs/ocfs2/acl.c | 4 +-
2394 fs/ocfs2/cluster/quorum.c | 2 +-
2395 fs/ocfs2/file.c | 6 +-
2396 fs/ocfs2/quota_global.c | 43 +-
2397 fs/ocfs2/quota_local.c | 15 +-
2398 fs/omfs/inode.c | 8 +-
2399 fs/omfs/omfs.h | 4 +-
2401 fs/posix_acl.c | 30 +-
2402 fs/proc/base.c | 27 +-
2403 fs/qnx4/inode.c | 4 +-
2404 fs/qnx6/inode.c | 4 +-
2405 fs/quota/Makefile | 2 +-
2406 fs/quota/dquot.c | 114 +-
2407 fs/quota/kqid.c | 132 +
2408 fs/quota/netlink.c | 10 +-
2409 fs/quota/quota.c | 28 +-
2410 fs/quota/quota_tree.c | 22 +-
2411 fs/quota/quota_v1.c | 12 +-
2412 fs/quota/quota_v2.c | 26 +-
2413 fs/reiserfs/inode.c | 26 +-
2414 fs/reiserfs/xattr_acl.c | 24 +-
2416 fs/squashfs/inode.c | 8 +-
2417 fs/sysv/inode.c | 8 +-
2418 fs/ubifs/budget.c | 4 +-
2419 fs/ubifs/debug.c | 4 +-
2420 fs/ubifs/journal.c | 4 +-
2421 fs/ubifs/sb.c | 4 +-
2422 fs/ubifs/super.c | 4 +-
2423 fs/ubifs/ubifs.h | 4 +-
2424 fs/udf/inode.c | 12 +-
2425 fs/udf/super.c | 20 +-
2426 fs/udf/udf_sb.h | 4 +-
2427 fs/ufs/inode.c | 16 +-
2429 fs/xattr_acl.c | 96 +-
2430 fs/xfs/xfs_acl.c | 4 +-
2431 fs/xfs/xfs_quotaops.c | 12 +-
2432 fs/xfs/xfs_super.c | 2 +-
2433 fs/xfs/xfs_sync.c | 2 +-
2434 fs/xfs/xfs_trans_dquot.c | 8 +-
2435 include/asm-generic/gpio.h | 2 +
2436 include/drm/drmP.h | 4 +-
2437 include/linux/Kbuild | 2 +
2438 include/linux/amba/pl022.h | 2 +
2439 include/linux/atmel_tc.h | 2 +-
2440 include/linux/audit.h | 12 +-
2441 .../hardware.h => include/linux/bcm2835_timer.h | 13 +-
2442 include/linux/bcma/bcma_driver_chipcommon.h | 111 +
2443 include/linux/bcma/bcma_regs.h | 4 +
2444 include/linux/cgroup.h | 40 +-
2445 include/linux/cgroup_subsys.h | 24 +-
2446 .../mach/timex.h => include/linux/clk/bcm2835.h | 9 +-
2447 include/linux/etherdevice.h | 11 +
2448 include/linux/ethtool.h | 17 +-
2449 include/linux/filter.h | 7 +
2450 include/linux/hash.h | 10 +
2451 include/linux/i2c/pcf857x.h | 3 +
2452 include/linux/i2c/twl.h | 3 -
2453 include/linux/ieee80211.h | 80 -
2454 include/linux/if_arp.h | 1 +
2455 include/linux/if_link.h | 34 +
2456 include/linux/if_team.h | 11 +-
2457 include/linux/if_tunnel.h | 3 +
2458 include/linux/if_vlan.h | 9 +-
2459 include/linux/inet_diag.h | 1 +
2460 include/linux/inetdevice.h | 11 +-
2461 include/linux/init_task.h | 2 +-
2462 .../mach/kbc.h => include/linux/input/tegra_kbc.h | 0
2463 include/linux/ip6_tunnel.h | 17 +
2464 include/linux/ipc.h | 9 +-
2465 include/linux/ipv6.h | 1 +
2466 .../mach/io.h => include/linux/irqchip/bcm2835.h | 16 +-
2467 include/linux/jiffies.h | 6 +
2468 include/linux/key.h | 9 +-
2469 include/linux/leds.h | 16 +
2470 include/linux/loop.h | 2 +-
2471 include/linux/mdio.h | 83 +
2472 include/linux/mfd/abx500/ab8500-codec.h | 6 +-
2473 include/linux/mfd/twl6040.h | 1 -
2474 include/linux/mlx4/device.h | 69 +-
2475 include/linux/mlx4/driver.h | 2 +
2476 include/linux/mlx4/qp.h | 3 +-
2477 include/linux/mod_devicetable.h | 2 +-
2478 include/linux/netdevice.h | 51 +-
2479 include/linux/netfilter.h | 14 +-
2480 include/linux/netfilter/ipset/ip_set.h | 15 +-
2481 include/linux/netfilter/ipset/ip_set_ahash.h | 106 +-
2482 include/linux/netfilter/nf_conntrack_amanda.h | 1 +
2483 include/linux/netfilter/nf_conntrack_ftp.h | 7 +-
2484 include/linux/netfilter/nf_conntrack_h323.h | 15 +-
2485 include/linux/netfilter/nf_conntrack_irc.h | 1 +
2486 include/linux/netfilter/nf_conntrack_pptp.h | 2 +
2487 include/linux/netfilter/nf_conntrack_sip.h | 21 +-
2488 include/linux/netfilter/nf_nat.h | 8 +
2489 include/linux/netfilter/nfnetlink_conntrack.h | 8 +-
2490 include/linux/netfilter/nfnetlink_queue.h | 1 +
2491 include/linux/netfilter/xt_time.h | 5 +
2492 include/linux/netfilter_ipv4.h | 1 -
2493 include/linux/netfilter_ipv6/Kbuild | 1 +
2494 include/linux/netfilter_ipv6/ip6t_NPT.h | 16 +
2495 include/linux/netlink.h | 40 +-
2496 include/linux/nfc.h | 11 +
2497 include/linux/nl80211.h | 54 +-
2498 include/linux/of_irq.h | 5 +
2499 include/linux/of_mdio.h | 33 +
2500 include/linux/omapfb.h | 7 +-
2501 include/linux/packet_diag.h | 72 +
2502 include/linux/pinctrl/consumer.h | 2 +-
2503 include/linux/pinctrl/pinctrl-state.h | 15 +-
2504 .../linux/platform_data/asoc-imx-ssi.h | 0
2505 .../linux/platform_data/asoc-kirkwood.h | 0
2506 .../linux/platform_data/asoc-palm27x.h | 0
2507 .../linux/platform_data/asoc-s3c.h | 0
2508 .../linux/platform_data/asoc-s3c24xx_simtec.h | 0
2509 .../linux/platform_data/asoc-ti-mcbsp.h | 0
2510 .../linux/platform_data/ata-pxa.h | 0
2511 .../linux/platform_data/ata-samsung_cf.h | 0
2512 include/linux/platform_data/atmel-aes.h | 2 +-
2513 .../linux/platform_data/camera-mx1.h | 0
2514 .../linux/platform_data/camera-mx2.h | 2 -
2515 .../linux/platform_data/camera-mx3.h | 0
2516 .../linux/platform_data/camera-pxa.h | 0
2517 .../linux/platform_data}/crypto-ux500.h | 0
2518 .../linux/platform_data/dma-atmel.h | 0
2519 .../linux/platform_data/dma-ep93xx.h | 0
2520 .../linux/platform_data/dma-imx-sdma.h | 0
2521 .../dma.h => include/linux/platform_data/dma-imx.h | 0
2522 .../linux/platform_data/dma-mmp_tdma.h | 0
2523 .../linux/platform_data/dma-mv_xor.h | 0
2524 .../linux/platform_data/dsp-omap.h | 0
2525 .../linux/platform_data/eth-netx.h | 0
2526 .../linux/platform_data/gpio-omap.h | 15 +-
2527 .../linux/platform_data/hwmon-s3c.h | 0
2528 .../linux/platform_data/i2c-davinci.h | 0
2529 .../i2c.h => include/linux/platform_data/i2c-imx.h | 0
2530 .../linux/platform_data/i2c-nuc900.h | 0
2531 .../linux/platform_data/i2c-s3c2410.h | 0
2532 .../linux/platform_data/irda-pxaficp.h | 0
2533 .../linux/platform_data/keyboard-pxa930_rotary.h | 0
2534 .../linux/platform_data/keyboard-spear.h | 0
2535 .../linux/platform_data/keypad-ep93xx.h | 0
2536 .../linux/platform_data/keypad-nomadik-ske.h | 0
2537 .../linux/platform_data/keypad-omap.h | 0
2538 .../linux/platform_data/keypad-pxa27x.h | 0
2539 .../linux/platform_data/keypad-w90p910.h | 0
2540 .../linux/platform_data/keyscan-davinci.h | 0
2541 .../linux/platform_data/lcd-mipid.h | 0
2542 .../linux/platform_data/leds-kirkwood-netxbig.h | 0
2543 .../linux/platform_data/leds-kirkwood-ns2.h | 0
2544 .../linux/platform_data/leds-s3c24xx.h | 0
2545 .../linux/platform_data/mfd-mcp-sa11x0.h | 0
2546 .../linux/platform_data/mipi-csis.h | 0
2547 .../linux/platform_data/mmc-davinci.h | 0
2548 .../linux/platform_data/mmc-esdhc-imx.h | 0
2549 .../linux/platform_data/mmc-msm_sdcc.h | 0
2550 .../linux/platform_data/mmc-mvsdio.h | 0
2551 .../linux/platform_data/mmc-mxcmmc.h | 0
2552 .../linux/platform_data/mmc-pxamci.h | 0
2553 .../linux/platform_data/mmc-s3cmci.h | 0
2554 .../linux/platform_data/mmc-sdhci-tegra.h | 6 +-
2555 .../linux/platform_data/mouse-pxa930_trkball.h | 0
2556 .../linux/platform_data/mtd-davinci-aemif.h | 0
2557 .../linux/platform_data/mtd-davinci.h | 0
2558 .../linux/platform_data/mtd-mxc_nand.h | 0
2559 .../linux/platform_data/mtd-nand-omap2.h | 3 +-
2560 .../linux/platform_data/mtd-nand-pxa3xx.h | 0
2561 .../linux/platform_data/mtd-nand-s3c2410.h | 0
2562 .../linux/platform_data/mtd-nomadik-nand.h | 0
2563 .../linux/platform_data/mtd-onenand-omap2.h | 0
2564 .../linux/platform_data/mtd-orion_nand.h | 0
2565 include/linux/platform_data/omap1_bl.h | 11 +
2566 .../linux/platform_data/pcmcia-pxa2xx_viper.h | 0
2567 .../linux/platform_data/pinctrl-coh901.h | 13 +-
2568 .../linux/platform_data/remoteproc-omap.h | 0
2569 include/linux/platform_data/sc18is602.h | 19 +
2570 .../linux/platform_data/serial-imx.h | 0
2571 .../linux/platform_data/spi-davinci.h | 0
2572 .../linux/platform_data/spi-ep93xx.h | 0
2573 .../spi.h => include/linux/platform_data/spi-imx.h | 0
2574 .../linux/platform_data/spi-nuc900.h | 0
2575 .../linux/platform_data/spi-omap2-mcspi.h | 0
2576 .../linux/platform_data/spi-s3c64xx.h | 0
2577 .../linux/platform_data/touchscreen-s3c2410.h | 0
2578 .../linux/platform_data/usb-davinci.h | 0
2579 .../linux/platform_data/usb-ehci-mxc.h | 0
2580 .../linux/platform_data/usb-ehci-orion.h | 0
2581 .../linux/platform_data/usb-ehci-s5p.h | 0
2582 .../linux/platform_data/usb-exynos.h | 0
2583 .../linux/platform_data/usb-imx_udc.h | 0
2584 .../linux/platform_data/usb-musb-ux500.h | 0
2585 .../linux/platform_data/usb-mx2.h | 0
2586 .../linux/platform_data/usb-ohci-pxa27x.h | 0
2587 .../linux/platform_data/usb-ohci-s3c2410.h | 0
2588 .../linux/platform_data/usb-pxa3xx-ulpi.h | 0
2589 .../linux/platform_data/usb-s3c2410_udc.h | 0
2590 .../linux/platform_data/video-ep93xx.h | 0
2591 .../linux/platform_data/video-imxfb.h | 0
2592 .../linux/platform_data/video-msm_fb.h | 0
2593 .../linux/platform_data/video-mx3fb.h | 0
2594 .../linux/platform_data/video-nuc900fb.h | 0
2595 .../linux/platform_data/video-pxafb.h | 0
2596 .../linux/platform_data/video-vt8500lcdfb.h | 0
2597 .../linux/platform_data/voltage-omap.h | 0
2598 include/linux/posix_acl.h | 8 +-
2599 include/linux/posix_acl_xattr.h | 18 +-
2600 include/linux/power/smartreflex.h | 2 +-
2601 include/linux/pps_kernel.h | 9 +
2602 include/linux/projid.h | 104 +
2603 include/linux/ptp_clock_kernel.h | 21 +-
2604 include/linux/quota.h | 136 +-
2605 include/linux/quotaops.h | 6 +-
2606 include/linux/rfkill.h | 31 +
2607 include/linux/sched.h | 5 +-
2608 include/linux/security.h | 6 +-
2609 include/linux/seq_file.h | 14 +
2610 include/linux/shmem_fs.h | 3 +-
2611 include/linux/skbuff.h | 9 +-
2612 include/linux/snmp.h | 16 +-
2613 include/linux/spi/mxs-spi.h | 150 +
2614 include/linux/ssb/ssb_driver_chipcommon.h | 4 +-
2615 include/linux/stmmac.h | 1 -
2616 include/linux/tcp.h | 49 +-
2617 include/linux/tcp_metrics.h | 54 +
2618 include/linux/tipc_config.h | 8 +-
2619 include/linux/tsacct_kern.h | 8 +-
2620 include/linux/tty.h | 4 +-
2621 include/linux/uinput.h | 27 +-
2622 include/linux/user_namespace.h | 3 +
2623 include/linux/workqueue.h | 220 +-
2624 include/linux/xattr.h | 48 +
2625 include/net/addrconf.h | 2 +-
2626 include/net/arp.h | 3 +-
2627 include/net/ax25.h | 4 +-
2628 include/net/bluetooth/bluetooth.h | 10 +
2629 include/net/bluetooth/hci.h | 32 +
2630 include/net/bluetooth/hci_core.h | 48 +-
2631 include/net/bluetooth/l2cap.h | 20 +-
2632 include/net/bluetooth/mgmt.h | 16 +
2633 include/net/bluetooth/smp.h | 8 +-
2634 include/net/cfg80211.h | 68 +-
2635 include/net/checksum.h | 3 +
2636 include/net/cls_cgroup.h | 27 +-
2637 include/net/dst.h | 10 +-
2638 include/net/genetlink.h | 34 +-
2639 include/net/gro_cells.h | 103 +
2640 include/net/ieee80211_radiotap.h | 11 +
2641 include/net/inet_ecn.h | 76 +
2642 include/net/inet_frag.h | 4 +-
2643 include/net/inet_sock.h | 4 +-
2644 include/net/ip.h | 2 +
2645 include/net/ip6_fib.h | 1 +
2646 include/net/ip6_tunnel.h | 41 +-
2647 include/net/ip_vs.h | 16 +-
2648 include/net/ipip.h | 3 +
2649 include/net/ipv6.h | 38 +-
2650 include/net/llc.h | 1 -
2651 include/net/mac80211.h | 99 +-
2652 include/net/ndisc.h | 3 +-
2653 include/net/neighbour.h | 14 +-
2654 include/net/net_namespace.h | 15 +
2655 include/net/netfilter/nf_conntrack_ecache.h | 32 +-
2656 include/net/netfilter/nf_conntrack_expect.h | 2 +-
2657 include/net/netfilter/nf_conntrack_timeout.h | 20 +
2658 include/net/netfilter/nf_nat.h | 6 +-
2659 include/net/netfilter/nf_nat_core.h | 5 +-
2660 include/net/netfilter/nf_nat_helper.h | 11 +-
2661 include/net/netfilter/nf_nat_l3proto.h | 52 +
2662 include/net/netfilter/nf_nat_l4proto.h | 72 +
2663 include/net/netfilter/nf_nat_protocol.h | 67 -
2664 include/net/netfilter/nf_nat_rule.h | 15 -
2665 include/net/netlabel.h | 2 +-
2666 include/net/netlink.h | 124 +-
2667 include/net/netns/conntrack.h | 4 +
2668 include/net/netns/ipv4.h | 5 +-
2669 include/net/netns/ipv6.h | 9 +
2670 include/net/netns/packet.h | 4 +-
2671 include/net/netns/sctp.h | 131 +
2672 include/net/netprio_cgroup.h | 30 +-
2673 include/net/nfc/hci.h | 21 +-
2674 include/net/nfc/llc.h | 54 +
2675 include/net/nfc/nci.h | 29 +
2676 include/net/nfc/nci_core.h | 5 +
2677 include/net/nfc/nfc.h | 4 +-
2678 include/net/nfc/shdlc.h | 107 -
2679 include/net/request_sock.h | 49 +-
2680 include/net/sch_generic.h | 3 +-
2681 include/net/scm.h | 25 +-
2682 include/net/sctp/sctp.h | 69 +-
2683 include/net/sctp/sm.h | 8 +-
2684 include/net/sctp/structs.h | 154 +-
2685 include/net/snmp.h | 10 +-
2686 include/net/sock.h | 48 +-
2687 include/net/tcp.h | 93 +-
2688 include/net/xfrm.h | 31 +-
2689 include/rdma/ib_cache.h | 16 +
2690 include/rdma/ib_verbs.h | 3 +
2691 include/scsi/scsi_netlink.h | 24 -
2692 include/video/epson1355.h | 64 -
2699 kernel/acct.c | 4 +-
2700 kernel/audit.c | 142 +-
2701 kernel/audit.h | 4 +-
2702 kernel/audit_watch.c | 2 +-
2703 kernel/auditfilter.c | 137 +-
2704 kernel/auditsc.c | 219 +-
2705 kernel/cgroup.c | 332 +-
2706 kernel/cgroup_freezer.c | 8 +
2707 kernel/cred.c | 10 +-
2708 kernel/events/core.c | 7 +
2712 kernel/pid_namespace.c | 2 +
2713 kernel/srcu.c | 4 +-
2714 kernel/taskstats.c | 27 +-
2715 kernel/trace/trace.c | 3 +-
2716 kernel/trace/trace.h | 2 +-
2717 kernel/tsacct.c | 12 +-
2719 kernel/user_namespace.c | 128 +-
2720 kernel/workqueue.c | 1335 ++++----
2721 lib/kobject_uevent.c | 5 +-
2723 mm/memcontrol.c | 7 +
2727 net/8021q/vlan_core.c | 6 +
2728 net/9p/trans_fd.c | 2 +-
2730 net/appletalk/atalk_proc.c | 3 +-
2731 net/atm/resources.c | 2 +-
2732 net/ax25/ax25_uid.c | 21 +-
2733 net/batman-adv/bat_iv_ogm.c | 86 +-
2734 net/batman-adv/bridge_loop_avoidance.c | 214 +-
2735 net/batman-adv/bridge_loop_avoidance.h | 11 +-
2736 net/batman-adv/debugfs.c | 12 +
2737 net/batman-adv/gateway_client.c | 53 +-
2738 net/batman-adv/hard-interface.c | 13 +-
2739 net/batman-adv/main.c | 27 +-
2740 net/batman-adv/main.h | 29 +-
2741 net/batman-adv/packet.h | 35 +-
2742 net/batman-adv/routing.c | 85 +-
2743 net/batman-adv/send.c | 8 +-
2744 net/batman-adv/soft-interface.c | 79 +-
2745 net/batman-adv/soft-interface.h | 5 +-
2746 net/batman-adv/translation-table.c | 416 ++-
2747 net/batman-adv/translation-table.h | 4 +-
2748 net/batman-adv/types.h | 120 +-
2749 net/batman-adv/unicast.c | 16 +-
2750 net/batman-adv/vis.c | 144 +-
2751 net/batman-adv/vis.h | 2 +-
2752 net/bluetooth/a2mp.c | 16 +-
2753 net/bluetooth/af_bluetooth.c | 139 +
2754 net/bluetooth/bnep/sock.c | 22 +-
2755 net/bluetooth/cmtp/sock.c | 23 +-
2756 net/bluetooth/hci_conn.c | 100 +-
2757 net/bluetooth/hci_core.c | 12 +-
2758 net/bluetooth/hci_event.c | 190 +-
2759 net/bluetooth/hci_sock.c | 13 +-
2760 net/bluetooth/hidp/sock.c | 22 +-
2761 net/bluetooth/l2cap_core.c | 37 +-
2762 net/bluetooth/l2cap_sock.c | 22 +-
2763 net/bluetooth/mgmt.c | 62 +-
2764 net/bluetooth/rfcomm/sock.c | 14 +-
2765 net/bluetooth/sco.c | 16 +-
2766 net/bridge/br_fdb.c | 17 +-
2767 net/bridge/br_netlink.c | 2 +-
2768 net/bridge/br_private.h | 6 +-
2769 net/bridge/br_stp_timer.c | 2 +-
2770 net/bridge/netfilter/ebt_ulog.c | 3 +-
2771 net/bridge/netfilter/ebtable_filter.c | 4 +-
2772 net/bridge/netfilter/ebtable_nat.c | 4 +-
2774 net/core/dev.c | 118 +-
2775 net/core/dev_addr_lists.c | 40 +-
2776 net/core/dst.c | 6 +-
2777 net/core/ethtool.c | 12 -
2778 net/core/fib_rules.c | 6 +-
2779 net/core/filter.c | 27 +-
2780 net/core/link_watch.c | 29 +-
2781 net/core/neighbour.c | 10 +-
2782 net/core/net-sysfs.c | 18 +-
2783 net/core/netpoll.c | 5 +-
2784 net/core/netprio_cgroup.c | 64 +-
2785 net/core/request_sock.c | 95 +
2786 net/core/rtnetlink.c | 38 +-
2787 net/core/scm.c | 44 +-
2788 net/core/secure_seq.c | 1 +
2789 net/core/skbuff.c | 86 +-
2790 net/core/sock.c | 89 +-
2791 net/core/sock_diag.c | 3 +-
2792 net/core/utils.c | 20 +
2793 net/dcb/dcbnl.c | 18 +-
2794 net/decnet/af_decnet.c | 4 +-
2795 net/decnet/dn_dev.c | 6 +-
2796 net/decnet/dn_route.c | 16 +-
2797 net/decnet/dn_table.c | 12 +-
2798 net/decnet/netfilter/dn_rtmsg.c | 3 +-
2799 net/dns_resolver/dns_key.c | 3 +-
2800 net/dsa/dsa.c | 2 +-
2801 net/ieee802154/6lowpan.c | 53 +-
2802 net/ieee802154/nl-mac.c | 6 +-
2803 net/ieee802154/nl-phy.c | 6 +-
2804 net/ipv4/af_inet.c | 27 +-
2805 net/ipv4/devinet.c | 67 +-
2806 net/ipv4/fib_frontend.c | 25 +-
2807 net/ipv4/fib_semantics.c | 8 +-
2808 net/ipv4/fib_trie.c | 15 +-
2809 net/ipv4/igmp.c | 38 +-
2810 net/ipv4/inet_connection_sock.c | 57 +-
2811 net/ipv4/inet_diag.c | 45 +-
2812 net/ipv4/inet_fragment.c | 9 +-
2813 net/ipv4/inetpeer.c | 2 +-
2814 net/ipv4/ip_fragment.c | 13 +-
2815 net/ipv4/ip_gre.c | 128 +-
2816 net/ipv4/ip_output.c | 74 +-
2817 net/ipv4/ip_vti.c | 5 -
2818 net/ipv4/ipconfig.c | 43 +-
2819 net/ipv4/ipip.c | 51 +-
2820 net/ipv4/ipmr.c | 12 +-
2821 net/ipv4/netfilter.c | 41 +-
2822 net/ipv4/netfilter/Kconfig | 90 +-
2823 net/ipv4/netfilter/Makefile | 18 +-
2824 net/ipv4/netfilter/ipt_MASQUERADE.c | 18 +-
2825 net/ipv4/netfilter/ipt_NETMAP.c | 98 -
2826 net/ipv4/netfilter/ipt_REDIRECT.c | 110 -
2827 net/ipv4/netfilter/ipt_ULOG.c | 3 +-
2828 net/ipv4/netfilter/ipt_rpfilter.c | 2 +-
2829 net/ipv4/netfilter/iptable_filter.c | 10 +-
2830 net/ipv4/netfilter/iptable_mangle.c | 10 +-
2831 .../{nf_nat_standalone.c => iptable_nat.c} | 264 +-
2832 net/ipv4/netfilter/iptable_raw.c | 10 +-
2833 net/ipv4/netfilter/iptable_security.c | 5 +-
2834 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 8 +-
2835 net/ipv4/netfilter/nf_nat_h323.c | 71 +-
2836 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 281 ++
2837 net/ipv4/netfilter/nf_nat_pptp.c | 21 +-
2838 net/ipv4/netfilter/nf_nat_proto_gre.c | 30 +-
2839 net/ipv4/netfilter/nf_nat_proto_icmp.c | 24 +-
2840 net/ipv4/netfilter/nf_nat_rule.c | 214 --
2841 net/ipv4/ping.c | 22 +-
2842 net/ipv4/proc.c | 4 +
2843 net/ipv4/raw.c | 4 +-
2844 net/ipv4/route.c | 30 +-
2845 net/ipv4/syncookies.c | 1 +
2846 net/ipv4/sysctl_net_ipv4.c | 87 +-
2847 net/ipv4/tcp.c | 135 +-
2848 net/ipv4/tcp_fastopen.c | 83 +-
2849 net/ipv4/tcp_input.c | 281 +-
2850 net/ipv4/tcp_ipv4.c | 332 +-
2851 net/ipv4/tcp_metrics.c | 354 +-
2852 net/ipv4/tcp_minisocks.c | 75 +-
2853 net/ipv4/tcp_output.c | 27 +-
2854 net/ipv4/tcp_timer.c | 39 +-
2855 net/ipv4/udp.c | 4 +-
2856 net/ipv4/udp_diag.c | 9 +-
2857 net/ipv6/Kconfig | 16 +
2858 net/ipv6/Makefile | 1 +
2859 net/ipv6/addrconf.c | 83 +-
2860 net/ipv6/addrlabel.c | 24 +-
2861 net/ipv6/ip6_fib.c | 20 +-
2862 net/ipv6/ip6_flowlabel.c | 47 +-
2863 net/ipv6/ip6_gre.c | 1770 ++++++++++
2864 net/ipv6/ip6_output.c | 85 +-
2865 net/ipv6/ip6_tunnel.c | 91 +-
2866 net/ipv6/ip6mr.c | 10 +-
2867 net/ipv6/netfilter.c | 8 +
2868 net/ipv6/netfilter/Kconfig | 37 +-
2869 net/ipv6/netfilter/Makefile | 6 +
2870 net/ipv6/netfilter/ip6t_MASQUERADE.c | 135 +
2871 net/ipv6/netfilter/ip6t_NPT.c | 165 +
2872 net/ipv6/netfilter/ip6table_filter.c | 4 +-
2873 net/ipv6/netfilter/ip6table_mangle.c | 4 +-
2874 net/ipv6/netfilter/ip6table_nat.c | 321 ++
2875 net/ipv6/netfilter/ip6table_raw.c | 4 +-
2876 net/ipv6/netfilter/ip6table_security.c | 5 +-
2877 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 137 +-
2878 net/ipv6/netfilter/nf_conntrack_reasm.c | 218 +-
2879 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 288 ++
2880 net/ipv6/netfilter/nf_nat_proto_icmpv6.c | 90 +
2881 net/ipv6/raw.c | 3 +-
2882 net/ipv6/reassembly.c | 89 +-
2883 net/ipv6/route.c | 96 +-
2884 net/ipv6/sit.c | 6 -
2885 net/ipv6/syncookies.c | 1 +
2886 net/ipv6/tcp_ipv6.c | 46 +-
2887 net/ipv6/udp.c | 3 +-
2888 net/ipx/ipx_proc.c | 3 +-
2889 net/irda/irnetlink.c | 2 +-
2890 net/key/af_key.c | 41 +-
2891 net/l2tp/Kconfig | 1 +
2892 net/l2tp/l2tp_eth.c | 3 +-
2893 net/l2tp/l2tp_netlink.c | 24 +-
2894 net/llc/llc_proc.c | 2 +-
2895 net/llc/llc_station.c | 600 +---
2896 net/llc/sysctl_net_llc.c | 7 -
2897 net/mac80211/aes_cmac.c | 6 +-
2898 net/mac80211/agg-tx.c | 2 +-
2899 net/mac80211/cfg.c | 103 +-
2900 net/mac80211/chan.c | 67 +-
2901 net/mac80211/debugfs.c | 36 +-
2902 net/mac80211/driver-ops.h | 11 +-
2903 net/mac80211/ibss.c | 50 +-
2904 net/mac80211/ieee80211_i.h | 53 +-
2905 net/mac80211/iface.c | 316 +-
2906 net/mac80211/key.c | 2 +-
2907 net/mac80211/main.c | 31 +-
2908 net/mac80211/mesh.c | 49 +-
2909 net/mac80211/mesh.h | 5 +-
2910 net/mac80211/mesh_hwmp.c | 2 -
2911 net/mac80211/mesh_pathtbl.c | 44 +-
2912 net/mac80211/mesh_plink.c | 85 +-
2913 net/mac80211/mlme.c | 443 ++-
2914 net/mac80211/offchannel.c | 9 +-
2915 net/mac80211/rate.h | 2 +-
2916 net/mac80211/rx.c | 60 +-
2917 net/mac80211/scan.c | 53 +-
2918 net/mac80211/sta_info.c | 123 +-
2919 net/mac80211/sta_info.h | 2 +
2920 net/mac80211/status.c | 42 +-
2921 net/mac80211/trace.h | 11 +-
2922 net/mac80211/tx.c | 73 +-
2923 net/mac80211/util.c | 108 +-
2924 net/netfilter/Kconfig | 83 +-
2925 net/netfilter/Makefile | 21 +-
2926 net/netfilter/core.c | 21 +-
2927 net/netfilter/ipset/ip_set_bitmap_ip.c | 19 +-
2928 net/netfilter/ipset/ip_set_bitmap_ipmac.c | 18 +-
2929 net/netfilter/ipset/ip_set_bitmap_port.c | 9 +-
2930 net/netfilter/ipset/ip_set_core.c | 39 +-
2931 net/netfilter/ipset/ip_set_hash_ip.c | 15 +-
2932 net/netfilter/ipset/ip_set_hash_ipport.c | 24 +-
2933 net/netfilter/ipset/ip_set_hash_ipportip.c | 24 +-
2934 net/netfilter/ipset/ip_set_hash_ipportnet.c | 47 +-
2935 net/netfilter/ipset/ip_set_hash_net.c | 25 +-
2936 net/netfilter/ipset/ip_set_hash_netiface.c | 66 +-
2937 net/netfilter/ipset/ip_set_hash_netport.c | 36 +-
2938 net/netfilter/ipset/ip_set_list_set.c | 9 +-
2939 net/netfilter/ipvs/Kconfig | 3 +-
2940 net/netfilter/ipvs/ip_vs_app.c | 58 +-
2941 net/netfilter/ipvs/ip_vs_core.c | 76 +-
2942 net/netfilter/ipvs/ip_vs_ctl.c | 25 +-
2943 net/netfilter/ipvs/ip_vs_ftp.c | 22 +-
2944 net/netfilter/ipvs/ip_vs_xmit.c | 111 +-
2945 net/netfilter/nf_conntrack_amanda.c | 5 +-
2946 net/netfilter/nf_conntrack_core.c | 15 +-
2947 net/netfilter/nf_conntrack_ecache.c | 2 +-
2948 net/netfilter/nf_conntrack_ftp.c | 24 +-
2949 net/netfilter/nf_conntrack_h323_main.c | 232 +-
2950 net/netfilter/nf_conntrack_irc.c | 3 +-
2951 net/netfilter/nf_conntrack_netlink.c | 114 +-
2952 net/netfilter/nf_conntrack_pptp.c | 18 +-
2953 net/netfilter/nf_conntrack_proto.c | 5 -
2954 net/netfilter/nf_conntrack_proto_tcp.c | 8 +-
2955 net/netfilter/nf_conntrack_sip.c | 143 +-
2956 net/netfilter/nf_internals.h | 4 +-
2957 net/{ipv4 => }/netfilter/nf_nat_amanda.c | 4 +-
2958 net/{ipv4 => }/netfilter/nf_nat_core.c | 679 ++--
2959 net/{ipv4 => }/netfilter/nf_nat_ftp.c | 34 +-
2960 net/{ipv4 => }/netfilter/nf_nat_helper.c | 109 +-
2961 net/{ipv4 => }/netfilter/nf_nat_irc.c | 10 +-
2962 net/{ipv4 => }/netfilter/nf_nat_proto_common.c | 54 +-
2963 net/{ipv4 => }/netfilter/nf_nat_proto_dccp.c | 56 +-
2964 net/{ipv4 => }/netfilter/nf_nat_proto_sctp.c | 53 +-
2965 net/{ipv4 => }/netfilter/nf_nat_proto_tcp.c | 40 +-
2966 net/{ipv4 => }/netfilter/nf_nat_proto_udp.c | 42 +-
2967 net/{ipv4 => }/netfilter/nf_nat_proto_udplite.c | 58 +-
2968 net/{ipv4 => }/netfilter/nf_nat_proto_unknown.c | 16 +-
2969 net/{ipv4 => }/netfilter/nf_nat_sip.c | 270 +-
2970 net/{ipv4 => }/netfilter/nf_nat_tftp.c | 1 -
2971 net/netfilter/nf_queue.c | 10 +-
2972 net/netfilter/nfnetlink.c | 2 +-
2973 net/netfilter/nfnetlink_acct.c | 16 +-
2974 net/netfilter/nfnetlink_cthelper.c | 17 +-
2975 net/netfilter/nfnetlink_cttimeout.c | 12 +-
2976 net/netfilter/nfnetlink_log.c | 27 +-
2977 net/netfilter/nfnetlink_queue_core.c | 50 +-
2978 net/netfilter/xt_CT.c | 262 +-
2979 net/netfilter/xt_LOG.c | 8 +-
2980 net/netfilter/xt_NETMAP.c | 165 +
2981 net/netfilter/xt_NFQUEUE.c | 8 +-
2982 net/netfilter/xt_NOTRACK.c | 53 -
2983 net/netfilter/xt_REDIRECT.c | 190 ++
2984 net/netfilter/xt_nat.c | 170 +
2985 net/netfilter/xt_osf.c | 2 +-
2986 net/netfilter/xt_owner.c | 30 +-
2987 net/netfilter/xt_recent.c | 13 +-
2988 net/netfilter/xt_set.c | 22 +
2989 net/netfilter/xt_socket.c | 12 +-
2990 net/netfilter/xt_time.c | 24 +-
2991 net/netlabel/netlabel_cipso_v4.c | 2 +-
2992 net/netlabel/netlabel_mgmt.c | 4 +-
2993 net/netlabel/netlabel_unlabeled.c | 4 +-
2994 net/netlabel/netlabel_user.c | 2 +-
2995 net/netlink/af_netlink.c | 216 +-
2996 net/netlink/genetlink.c | 48 +-
2997 net/nfc/core.c | 13 +-
2998 net/nfc/hci/Makefile | 4 +-
2999 net/nfc/hci/command.c | 45 +-
3000 net/nfc/hci/core.c | 336 +-
3001 net/nfc/hci/hci.h | 15 +-
3002 net/nfc/hci/hcp.c | 6 +-
3003 net/nfc/hci/llc.c | 170 +
3004 net/nfc/hci/llc.h | 69 +
3005 net/nfc/hci/llc_nop.c | 99 +
3006 net/nfc/hci/{shdlc.c => llc_shdlc.c} | 544 ++--
3007 net/nfc/llcp/commands.c | 2 +
3008 net/nfc/llcp/llcp.c | 131 +-
3009 net/nfc/llcp/llcp.h | 6 +-
3010 net/nfc/llcp/sock.c | 93 +-
3011 net/nfc/nci/core.c | 91 +-
3012 net/nfc/nci/ntf.c | 52 +
3013 net/nfc/nci/rsp.c | 14 +
3014 net/nfc/netlink.c | 68 +-
3015 net/openvswitch/actions.c | 6 +-
3016 net/openvswitch/datapath.c | 453 ++-
3017 net/openvswitch/datapath.h | 52 +-
3018 net/openvswitch/dp_notify.c | 8 +-
3019 net/openvswitch/flow.c | 21 +-
3020 net/openvswitch/flow.h | 3 +-
3021 net/openvswitch/vport-internal_dev.c | 7 +-
3022 net/openvswitch/vport-netdev.c | 2 +-
3023 net/openvswitch/vport.c | 27 +-
3024 net/openvswitch/vport.h | 13 +-
3025 net/packet/Kconfig | 8 +
3026 net/packet/Makefile | 2 +
3027 net/packet/af_packet.c | 145 +-
3028 net/packet/diag.c | 242 ++
3029 net/packet/internal.h | 121 +
3030 net/phonet/pn_netlink.c | 14 +-
3031 net/phonet/socket.c | 6 +-
3032 net/rds/tcp_connect.c | 4 +-
3033 net/rds/tcp_listen.c | 4 +-
3034 net/rds/tcp_recv.c | 4 +-
3035 net/rds/tcp_send.c | 4 +-
3036 net/rfkill/core.c | 22 +-
3037 net/rfkill/input.c | 3 +-
3038 net/rxrpc/ar-key.c | 6 +-
3039 net/sched/act_api.c | 52 +-
3040 net/sched/cls_api.c | 16 +-
3041 net/sched/cls_basic.c | 3 +-
3042 net/sched/cls_cgroup.c | 25 +-
3043 net/sched/cls_flow.c | 19 +-
3044 net/sched/cls_fw.c | 3 +-
3045 net/sched/cls_route.c | 3 +-
3046 net/sched/cls_rsvp.h | 3 +-
3047 net/sched/cls_tcindex.c | 3 +-
3048 net/sched/cls_u32.c | 3 +-
3049 net/sched/em_meta.c | 2 +-
3050 net/sched/sch_api.c | 44 +-
3051 net/sched/sch_drr.c | 2 +-
3052 net/sched/sch_generic.c | 27 +-
3053 net/sched/sch_qfq.c | 2 +-
3054 net/sctp/associola.c | 25 +-
3055 net/sctp/auth.c | 20 +-
3056 net/sctp/bind_addr.c | 20 +-
3057 net/sctp/chunk.c | 2 +-
3058 net/sctp/endpointola.c | 25 +-
3059 net/sctp/input.c | 115 +-
3060 net/sctp/ipv6.c | 36 +-
3061 net/sctp/objcnt.c | 8 +-
3062 net/sctp/output.c | 2 +-
3063 net/sctp/outqueue.c | 28 +-
3064 net/sctp/primitive.c | 4 +-
3065 net/sctp/proc.c | 61 +-
3066 net/sctp/protocol.c | 454 +--
3067 net/sctp/sm_make_chunk.c | 61 +-
3068 net/sctp/sm_sideeffect.c | 26 +-
3069 net/sctp/sm_statefuns.c | 725 +++--
3070 net/sctp/sm_statetable.c | 17 +-
3071 net/sctp/socket.c | 119 +-
3072 net/sctp/sysctl.c | 198 +-
3073 net/sctp/transport.c | 23 +-
3074 net/sctp/ulpqueue.c | 18 +-
3075 net/socket.c | 89 +-
3076 net/sunrpc/cache.c | 2 +-
3077 net/tipc/bearer.c | 21 +-
3078 net/tipc/config.c | 48 +-
3079 net/tipc/core.c | 22 +-
3080 net/tipc/core.h | 18 +-
3081 net/tipc/eth_media.c | 29 +-
3082 net/tipc/handler.c | 2 +-
3083 net/tipc/link.c | 4 +-
3084 net/tipc/name_table.c | 16 +-
3085 net/tipc/net.c | 3 +-
3086 net/tipc/net.h | 2 +-
3087 net/tipc/netlink.c | 2 +-
3088 net/tipc/subscr.c | 4 +-
3089 net/unix/af_unix.c | 17 +-
3090 net/unix/diag.c | 14 +-
3091 net/wireless/chan.c | 7 +-
3092 net/wireless/core.c | 53 +-
3093 net/wireless/core.h | 2 +-
3094 net/wireless/mlme.c | 37 +-
3095 net/wireless/nl80211.c | 266 +-
3096 net/wireless/nl80211.h | 5 +
3097 net/wireless/radiotap.c | 2 +
3098 net/wireless/reg.c | 45 +-
3099 net/wireless/scan.c | 2 +-
3100 net/wireless/util.c | 36 +-
3101 net/wireless/wext-core.c | 8 +-
3102 net/xfrm/xfrm_policy.c | 91 +-
3103 net/xfrm/xfrm_state.c | 18 +-
3104 net/xfrm/xfrm_user.c | 89 +-
3105 security/apparmor/domain.c | 4 +-
3106 security/apparmor/file.c | 12 +-
3107 security/apparmor/include/audit.h | 2 +-
3108 security/apparmor/include/file.h | 4 +-
3109 security/apparmor/lsm.c | 2 +-
3110 security/capability.c | 2 +-
3111 security/device_cgroup.c | 9 +
3112 security/integrity/evm/evm_crypto.c | 4 +-
3113 security/integrity/ima/ima_audit.c | 5 +-
3114 security/integrity/ima/ima_policy.c | 14 +-
3115 security/keys/gc.c | 8 +-
3116 security/keys/internal.h | 6 +-
3117 security/keys/key.c | 25 +-
3118 security/keys/keyctl.c | 50 +-
3119 security/keys/keyring.c | 4 +-
3120 security/keys/permission.c | 14 +-
3121 security/keys/proc.c | 44 +-
3122 security/keys/process_keys.c | 15 +-
3123 security/keys/request_key.c | 6 +-
3124 security/security.c | 2 +-
3125 security/selinux/netlink.c | 5 +-
3126 security/selinux/selinuxfs.c | 6 +-
3127 security/selinux/ss/services.c | 2 +-
3128 security/tomoyo/audit.c | 23 +-
3129 security/tomoyo/common.c | 4 +-
3130 security/tomoyo/common.h | 4 +-
3131 security/tomoyo/condition.c | 20 +-
3132 security/tomoyo/tomoyo.c | 12 +-
3133 sound/i2c/other/ak4113.c | 2 +-
3134 sound/i2c/other/ak4114.c | 2 +-
3135 sound/pci/oxygen/oxygen_lib.c | 8 +-
3136 sound/soc/codecs/ab8500-codec.c | 81 +
3137 sound/soc/codecs/wm8350.c | 2 +-
3138 sound/soc/codecs/wm8753.c | 2 +-
3139 sound/soc/ep93xx/ep93xx-ac97.c | 2 +-
3140 sound/soc/ep93xx/ep93xx-i2s.c | 2 +-
3141 sound/soc/ep93xx/ep93xx-pcm.c | 2 +-
3142 sound/soc/fsl/imx-pcm-dma.c | 2 +-
3143 sound/soc/fsl/imx-pcm-fiq.c | 2 +-
3144 sound/soc/fsl/imx-ssi.c | 2 +-
3145 sound/soc/fsl/imx-ssi.h | 2 +-
3146 sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
3147 sound/soc/kirkwood/kirkwood-openrd.c | 2 +-
3148 sound/soc/kirkwood/kirkwood-t5325.c | 2 +-
3149 sound/soc/omap/am3517evm.c | 2 +-
3150 sound/soc/omap/ams-delta.c | 4 +-
3151 sound/soc/omap/igep0020.c | 2 +-
3152 sound/soc/omap/mcbsp.c | 4 +-
3153 sound/soc/omap/n810.c | 2 +-
3154 sound/soc/omap/omap-abe-twl6040.c | 4 -
3155 sound/soc/omap/omap-mcbsp.c | 3 +-
3156 sound/soc/omap/omap-mcpdm.c | 2 +
3157 sound/soc/omap/omap-pcm.c | 1 +
3158 sound/soc/omap/omap3beagle.c | 2 +-
3159 sound/soc/omap/omap3evm.c | 2 +-
3160 sound/soc/omap/omap3pandora.c | 2 +-
3161 sound/soc/omap/osk5912.c | 2 +-
3162 sound/soc/omap/overo.c | 2 +-
3163 sound/soc/omap/rx51.c | 2 +-
3164 sound/soc/omap/sdp3430.c | 3 +-
3165 sound/soc/omap/zoom2.c | 2 +-
3166 sound/soc/pxa/palm27x.c | 2 +-
3167 sound/soc/samsung/ac97.c | 2 +-
3168 sound/soc/samsung/i2s.c | 2 +-
3169 sound/soc/samsung/pcm.c | 2 +-
3170 sound/soc/samsung/s3c24xx_simtec.c | 2 +-
3171 sound/soc/samsung/spdif.c | 2 +-
3172 sound/soc/soc-core.c | 6 +-
3173 sound/soc/tegra/Kconfig | 2 +-
3174 sound/soc/tegra/tegra_pcm.c | 232 --
3175 sound/soc/tegra/tegra_pcm.h | 14 -
3176 sound/soc/ux500/mop500.c | 47 +-
3177 sound/soc/ux500/ux500_msp_dai.c | 6 +
3178 sound/soc/ux500/ux500_msp_i2s.c | 89 +-
3179 sound/soc/ux500/ux500_msp_i2s.h | 8 +-
3180 virt/kvm/eventfd.c | 2 +-
3181 3170 files changed, 104766 insertions(+), 82392 deletions(-)
3182 create mode 100644 Documentation/arm/Marvell/README
3183 create mode 100644 Documentation/devicetree/bindings/arm/bcm2835.txt
3184 create mode 100644 Documentation/devicetree/bindings/arm/mrvl/tauros2.txt
3185 create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
3186 create mode 100644 Documentation/devicetree/bindings/arm/vt8500.txt
3187 create mode 100644 Documentation/devicetree/bindings/arm/vt8500/via,vt8500-intc.txt
3188 create mode 100644 Documentation/devicetree/bindings/arm/vt8500/via,vt8500-pmc.txt
3189 create mode 100644 Documentation/devicetree/bindings/arm/vt8500/via,vt8500-timer.txt
3190 create mode 100644 Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
3191 create mode 100644 Documentation/devicetree/bindings/clock/imx23-clock.txt
3192 create mode 100644 Documentation/devicetree/bindings/clock/imx28-clock.txt
3193 create mode 100644 Documentation/devicetree/bindings/clock/imx6q-clock.txt
3194 create mode 100644 Documentation/devicetree/bindings/clock/vt8500.txt
3195 create mode 100644 Documentation/devicetree/bindings/dma/mmp-dma.txt
3196 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-74x164.txt
3197 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-adnp.txt
3198 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-vt8500.txt
3199 create mode 100644 Documentation/devicetree/bindings/input/gpio-keys-polled.txt
3200 create mode 100644 Documentation/devicetree/bindings/input/rotary-encoder.txt
3201 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
3202 create mode 100644 Documentation/devicetree/bindings/lpddr2/lpddr2-timings.txt
3203 create mode 100644 Documentation/devicetree/bindings/lpddr2/lpddr2.txt
3204 create mode 100644 Documentation/devicetree/bindings/media/exynos5-gsc.txt
3205 create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
3206 create mode 100644 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt
3207 create mode 100644 Documentation/devicetree/bindings/net/can/c_can.txt
3208 create mode 100644 Documentation/devicetree/bindings/net/cpsw.txt
3209 create mode 100644 Documentation/devicetree/bindings/net/davinci-mdio.txt
3210 create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt
3211 create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt
3212 create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx35-pinctrl.txt
3213 create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
3214 create mode 100644 Documentation/devicetree/bindings/rtc/pxa-rtc.txt
3215 create mode 100644 Documentation/devicetree/bindings/rtc/via,vt8500-rtc.txt
3216 create mode 100644 Documentation/devicetree/bindings/sound/ux500-mop500.txt
3217 create mode 100644 Documentation/devicetree/bindings/sound/ux500-msp.txt
3218 create mode 100644 Documentation/devicetree/bindings/spi/mxs-spi.txt
3219 create mode 100644 Documentation/devicetree/bindings/spi/spi-gpio.txt
3220 create mode 100644 Documentation/devicetree/bindings/spi/spi-sc18is602.txt
3221 create mode 100644 Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt
3222 create mode 100644 Documentation/devicetree/bindings/tty/serial/via,vt8500-uart.txt
3223 create mode 100644 Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt
3224 create mode 100644 Documentation/devicetree/bindings/video/via,vt8500-fb.txt
3225 create mode 100644 Documentation/devicetree/bindings/video/wm,prizm-ge-rops.txt
3226 create mode 100644 Documentation/devicetree/bindings/video/wm,wm8505-fb.txt
3227 create mode 100644 Documentation/networking/vxlan.txt
3228 create mode 100644 Documentation/spi/spi-sc18is602
3229 create mode 100644 arch/arm/boot/dts/Makefile
3230 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b.dts
3231 create mode 100644 arch/arm/boot/dts/bcm2835.dtsi
3232 rename arch/arm/boot/dts/{db8500.dtsi => dbx5x0.dtsi} (88%)
3233 create mode 100644 arch/arm/boot/dts/elpida_ecb240abacn.dtsi
3234 create mode 100644 arch/arm/boot/dts/exynos4.dtsi
3235 create mode 100644 arch/arm/boot/dts/exynos4210-pinctrl.dtsi
3236 create mode 100644 arch/arm/boot/dts/exynos4210-trats.dts
3237 create mode 100644 arch/arm/boot/dts/hrefv60plus.dts
3238 create mode 100644 arch/arm/boot/dts/imx28-cfa10049.dts
3239 create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
3240 create mode 100644 arch/arm/boot/dts/omap2420.dtsi
3241 create mode 100644 arch/arm/boot/dts/omap2430.dtsi
3242 rename arch/arm/boot/dts/{omap3-beagle.dts => omap3-beagle-xm.dts} (52%)
3243 create mode 100644 arch/arm/boot/dts/omap3-overo.dtsi
3244 create mode 100644 arch/arm/boot/dts/omap3-tobi.dts
3245 create mode 100644 arch/arm/boot/dts/omap36xx.dtsi
3246 delete mode 100644 arch/arm/boot/dts/prima2-cb.dts
3247 create mode 100644 arch/arm/boot/dts/prima2-evb.dts
3248 create mode 100644 arch/arm/boot/dts/prima2.dtsi
3249 create mode 100644 arch/arm/boot/dts/pxa27x.dtsi
3250 create mode 100644 arch/arm/boot/dts/pxa2xx.dtsi
3251 create mode 100644 arch/arm/boot/dts/pxa3xx.dtsi
3252 create mode 100644 arch/arm/boot/dts/tegra20-medcom-wide.dts
3253 create mode 100644 arch/arm/boot/dts/tegra20-plutux.dts
3254 create mode 100644 arch/arm/boot/dts/tegra20-tamonten.dtsi
3255 create mode 100644 arch/arm/boot/dts/tegra20-tec.dts
3256 create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a02.dts
3257 create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a04.dts
3258 delete mode 100644 arch/arm/boot/dts/tegra30-cardhu.dts
3259 create mode 100644 arch/arm/boot/dts/tegra30-cardhu.dtsi
3260 create mode 100644 arch/arm/boot/dts/tps65217.dtsi
3261 create mode 100644 arch/arm/boot/dts/tps65910.dtsi
3262 create mode 100644 arch/arm/boot/dts/vt8500-bv07.dts
3263 create mode 100644 arch/arm/boot/dts/vt8500.dtsi
3264 create mode 100644 arch/arm/boot/dts/wm8505-ref.dts
3265 create mode 100644 arch/arm/boot/dts/wm8505.dtsi
3266 create mode 100644 arch/arm/boot/dts/wm8650-mid.dts
3267 create mode 100644 arch/arm/boot/dts/wm8650.dtsi
3268 create mode 100644 arch/arm/configs/bcm2835_defconfig
3269 delete mode 100644 arch/arm/configs/bcmring_defconfig
3270 create mode 100644 arch/arm/configs/multi_v7_defconfig
3271 delete mode 100644 arch/arm/configs/pnx4008_defconfig
3272 delete mode 100644 arch/arm/include/asm/leds.h
3273 rename arch/arm/{mach-highbank/include/mach/debug-macro.S => include/debug/highbank.S} (83%)
3274 create mode 100644 arch/arm/include/debug/icedcc.S
3275 rename arch/arm/{mach-mvebu/include/mach/debug-macro.S => include/debug/mvebu.S} (86%)
3276 rename arch/arm/{mach-picoxcell/include/mach/debug-macro.S => include/debug/picoxcell.S} (89%)
3277 rename arch/arm/{mach-socfpga/include/mach/debug-macro.S => include/debug/socfpga.S} (100%)
3278 rename arch/arm/{mach-vexpress/include/mach/debug-macro.S => include/debug/vexpress.S} (100%)
3279 delete mode 100644 arch/arm/kernel/leds.c
3280 create mode 100644 arch/arm/kernel/perf_event_cpu.c
3281 delete mode 100644 arch/arm/kernel/pmu.c
3282 create mode 100644 arch/arm/mach-bcm2835/Makefile
3283 create mode 100644 arch/arm/mach-bcm2835/Makefile.boot
3284 create mode 100644 arch/arm/mach-bcm2835/bcm2835.c
3285 rename arch/arm/{mach-picoxcell/include/mach/map.h => mach-bcm2835/include/mach/bcm2835_soc.h} (57%)
3286 create mode 100644 arch/arm/mach-bcm2835/include/mach/debug-macro.S
3287 rename arch/arm/{mach-pnx4008/include/mach/param.h => mach-bcm2835/include/mach/timex.h} (81%)
3288 create mode 100644 arch/arm/mach-bcm2835/include/mach/uncompress.h
3289 delete mode 100644 arch/arm/mach-bcmring/Kconfig
3290 delete mode 100644 arch/arm/mach-bcmring/Makefile
3291 delete mode 100644 arch/arm/mach-bcmring/Makefile.boot
3292 delete mode 100644 arch/arm/mach-bcmring/arch.c
3293 delete mode 100644 arch/arm/mach-bcmring/clock.c
3294 delete mode 100644 arch/arm/mach-bcmring/clock.h
3295 delete mode 100644 arch/arm/mach-bcmring/core.c
3296 delete mode 100644 arch/arm/mach-bcmring/core.h
3297 delete mode 100644 arch/arm/mach-bcmring/csp/Makefile
3298 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/Makefile
3299 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw.c
3300 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c
3301 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c
3302 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c
3303 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/Makefile
3304 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw.c
3305 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
3306 delete mode 100644 arch/arm/mach-bcmring/csp/tmr/Makefile
3307 delete mode 100644 arch/arm/mach-bcmring/csp/tmr/tmrHw.c
3308 delete mode 100644 arch/arm/mach-bcmring/dma.c
3309 delete mode 100644 arch/arm/mach-bcmring/dma_device.c
3310 delete mode 100644 arch/arm/mach-bcmring/include/cfg_global.h
3311 delete mode 100644 arch/arm/mach-bcmring/include/cfg_global_defines.h
3312 delete mode 100644 arch/arm/mach-bcmring/include/csp/cache.h
3313 delete mode 100644 arch/arm/mach-bcmring/include/csp/delay.h
3314 delete mode 100644 arch/arm/mach-bcmring/include/csp/dmacHw.h
3315 delete mode 100644 arch/arm/mach-bcmring/include/csp/errno.h
3316 delete mode 100644 arch/arm/mach-bcmring/include/csp/intcHw.h
3317 delete mode 100644 arch/arm/mach-bcmring/include/csp/module.h
3318 delete mode 100644 arch/arm/mach-bcmring/include/csp/reg.h
3319 delete mode 100644 arch/arm/mach-bcmring/include/csp/secHw.h
3320 delete mode 100644 arch/arm/mach-bcmring/include/csp/stdint.h
3321 delete mode 100644 arch/arm/mach-bcmring/include/csp/string.h
3322 delete mode 100644 arch/arm/mach-bcmring/include/csp/tmrHw.h
3323 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap.h
3324 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap_inline.h
3325 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h
3326 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h
3327 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h
3328 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h
3329 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h
3330 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h
3331 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h
3332 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h
3333 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h
3334 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_io.h
3335 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h
3336 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h
3337 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h
3338 delete mode 100644 arch/arm/mach-bcmring/include/mach/dma.h
3339 delete mode 100644 arch/arm/mach-bcmring/include/mach/entry-macro.S
3340 delete mode 100644 arch/arm/mach-bcmring/include/mach/hardware.h
3341 delete mode 100644 arch/arm/mach-bcmring/include/mach/irqs.h
3342 delete mode 100644 arch/arm/mach-bcmring/include/mach/memory_settings.h
3343 delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_nand.h
3344 delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_umi.h
3345 delete mode 100644 arch/arm/mach-bcmring/include/mach/timer.h
3346 delete mode 100644 arch/arm/mach-bcmring/include/mach/timex.h
3347 delete mode 100644 arch/arm/mach-bcmring/include/mach/uncompress.h
3348 delete mode 100644 arch/arm/mach-bcmring/irq.c
3349 delete mode 100644 arch/arm/mach-bcmring/mm.c
3350 delete mode 100644 arch/arm/mach-bcmring/timer.c
3351 delete mode 100644 arch/arm/mach-clps711x/ceiva.c
3352 delete mode 100644 arch/arm/mach-clps711x/p720t-leds.c
3353 delete mode 100644 arch/arm/mach-dove/include/mach/gpio.h
3354 delete mode 100644 arch/arm/mach-dove/include/mach/io.h
3355 delete mode 100644 arch/arm/mach-ep93xx/include/mach/gpio.h
3356 rename arch/arm/mach-ep93xx/{include/mach => }/ts72xx.h (89%)
3357 delete mode 100644 arch/arm/mach-footbridge/ebsa285-leds.c
3358 delete mode 100644 arch/arm/mach-footbridge/netwinder-leds.c
3359 create mode 100644 arch/arm/mach-highbank/Kconfig
3360 delete mode 100644 arch/arm/mach-highbank/Makefile.boot
3361 delete mode 100644 arch/arm/mach-highbank/include/mach/gpio.h
3362 delete mode 100644 arch/arm/mach-highbank/include/mach/timex.h
3363 delete mode 100644 arch/arm/mach-highbank/include/mach/uncompress.h
3364 create mode 100644 arch/arm/mach-imx/clk.c
3365 delete mode 100644 arch/arm/mach-imx/devices-imx53.h
3366 delete mode 100644 arch/arm/mach-imx/efika.h
3367 rename arch/arm/mach-imx/{imx53-dt.c => mach-imx53.c} (81%)
3368 delete mode 100644 arch/arm/mach-imx/mach-mx51_efikamx.c
3369 delete mode 100644 arch/arm/mach-imx/mach-mx51_efikasb.c
3370 delete mode 100644 arch/arm/mach-imx/mach-mx53_ard.c
3371 delete mode 100644 arch/arm/mach-imx/mach-mx53_evk.c
3372 delete mode 100644 arch/arm/mach-imx/mach-mx53_loco.c
3373 delete mode 100644 arch/arm/mach-imx/mach-mx53_smd.c
3374 delete mode 100644 arch/arm/mach-imx/mx51_efika.c
3375 delete mode 100644 arch/arm/mach-integrator/include/mach/io.h
3376 delete mode 100644 arch/arm/mach-iop13xx/include/mach/io.h
3377 delete mode 100644 arch/arm/mach-iop32x/include/mach/io.h
3378 delete mode 100644 arch/arm/mach-iop33x/include/mach/io.h
3379 delete mode 100644 arch/arm/mach-ixp4xx/include/mach/gpio.h
3380 delete mode 100644 arch/arm/mach-kirkwood/include/mach/gpio.h
3381 delete mode 100644 arch/arm/mach-kirkwood/include/mach/io.h
3382 create mode 100644 arch/arm/mach-ks8695/board-og.c
3383 create mode 100644 arch/arm/mach-ks8695/board-sg.c
3384 delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-timer.h
3385 delete mode 100644 arch/arm/mach-ks8695/leds.c
3386 create mode 100644 arch/arm/mach-mmp/clock-mmp2.c
3387 create mode 100644 arch/arm/mach-mmp/clock-pxa168.c
3388 create mode 100644 arch/arm/mach-mmp/clock-pxa910.c
3389 delete mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
3390 delete mode 100644 arch/arm/mach-msm/acpuclock.h
3391 create mode 100644 arch/arm/mach-msm/board-dt-8660.c
3392 create mode 100644 arch/arm/mach-msm/board-dt-8960.c
3393 delete mode 100644 arch/arm/mach-msm/board-msm7x27.c
3394 delete mode 100644 arch/arm/mach-msm/board-msm8960.c
3395 delete mode 100644 arch/arm/mach-msm/board-msm8x60.c
3396 create mode 100644 arch/arm/mach-msm/common.h
3397 create mode 100644 arch/arm/mach-msm/core.h
3398 delete mode 100644 arch/arm/mach-msm/devices-msm8960.c
3399 delete mode 100644 arch/arm/mach-msm/idle.c
3400 delete mode 100644 arch/arm/mach-msm/include/mach/gpio.h
3401 delete mode 100644 arch/arm/mach-msm/include/mach/system.h
3402 delete mode 100644 arch/arm/mach-mv78xx0/include/mach/io.h
3403 delete mode 100644 arch/arm/mach-mvebu/Makefile.boot
3404 rename arch/arm/mach-mvebu/{include/mach => }/armada-370-xp.h (100%)
3405 delete mode 100644 arch/arm/mach-mvebu/include/mach/timex.h
3406 delete mode 100644 arch/arm/mach-mvebu/include/mach/uncompress.h
3407 delete mode 100644 arch/arm/mach-mxs/devices-mx23.h
3408 delete mode 100644 arch/arm/mach-mxs/devices-mx28.h
3409 delete mode 100644 arch/arm/mach-mxs/devices.c
3410 delete mode 100644 arch/arm/mach-mxs/devices/Kconfig
3411 delete mode 100644 arch/arm/mach-mxs/devices/Makefile
3412 delete mode 100644 arch/arm/mach-mxs/devices/platform-auart.c
3413 delete mode 100644 arch/arm/mach-mxs/devices/platform-dma.c
3414 delete mode 100644 arch/arm/mach-mxs/devices/platform-fec.c
3415 delete mode 100644 arch/arm/mach-mxs/devices/platform-flexcan.c
3416 delete mode 100644 arch/arm/mach-mxs/devices/platform-gpio-mxs.c
3417 delete mode 100644 arch/arm/mach-mxs/devices/platform-gpmi-nand.c
3418 delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-i2c.c
3419 delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-mmc.c
3420 delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-pwm.c
3421 delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
3422 delete mode 100644 arch/arm/mach-mxs/devices/platform-mxsfb.c
3423 delete mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
3424 delete mode 100644 arch/arm/mach-mxs/include/mach/devices-common.h
3425 delete mode 100644 arch/arm/mach-mxs/include/mach/entry-macro.S
3426 delete mode 100644 arch/arm/mach-mxs/include/mach/gpio.h
3427 delete mode 100644 arch/arm/mach-mxs/include/mach/iomux-mx23.h
3428 delete mode 100644 arch/arm/mach-mxs/include/mach/iomux-mx28.h
3429 delete mode 100644 arch/arm/mach-mxs/include/mach/iomux.h
3430 delete mode 100644 arch/arm/mach-mxs/include/mach/irqs.h
3431 delete mode 100644 arch/arm/mach-mxs/iomux.c
3432 delete mode 100644 arch/arm/mach-mxs/mach-apx4devkit.c
3433 delete mode 100644 arch/arm/mach-mxs/mach-m28evk.c
3434 delete mode 100644 arch/arm/mach-mxs/mach-mx23evk.c
3435 delete mode 100644 arch/arm/mach-mxs/mach-mx28evk.c
3436 delete mode 100644 arch/arm/mach-mxs/mach-stmp378x_devb.c
3437 delete mode 100644 arch/arm/mach-mxs/mach-tx28.c
3438 delete mode 100644 arch/arm/mach-mxs/module-tx28.c
3439 delete mode 100644 arch/arm/mach-mxs/module-tx28.h
3440 delete mode 100644 arch/arm/mach-nomadik/include/mach/gpio.h
3441 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-ams-delta.h (100%)
3442 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-sx1.h (100%)
3443 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-voiceblue.h (100%)
3444 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/flash.h (100%)
3445 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/irda.h (100%)
3446 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/mux.h (100%)
3447 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap1510.h (97%)
3448 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap16xx.h (99%)
3449 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap7xx.h (98%)
3450 delete mode 100644 arch/arm/mach-omap1/include/mach/smp.h
3451 delete mode 100644 arch/arm/mach-omap1/leds-h2p2-debug.c
3452 delete mode 100644 arch/arm/mach-omap1/leds-innovator.c
3453 delete mode 100644 arch/arm/mach-omap1/leds-osk.c
3454 delete mode 100644 arch/arm/mach-omap1/leds.c
3455 delete mode 100644 arch/arm/mach-omap1/leds.h
3456 rename arch/arm/{plat-omap/include/plat => mach-omap2}/am33xx.h (100%)
3457 rename arch/arm/mach-omap2/{include/mach => }/am35xx.h (100%)
3458 rename arch/arm/mach-omap2/{include/mach => }/board-rx51.h (100%)
3459 rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_core_44xx.h (100%)
3460 rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_pad_core_44xx.h (100%)
3461 rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_pad_wkup_44xx.h (100%)
3462 rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_wkup_44xx.h (100%)
3463 create mode 100644 arch/arm/mach-omap2/debug-devices.h
3464 rename arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc-smc91x.h (100%)
3465 rename arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc-smsc911x.h (100%)
3466 rename arch/arm/{plat-omap/include/plat => mach-omap2}/hdq1w.h (100%)
3467 rename arch/arm/mach-omap2/{include/mach => }/id.h (100%)
3468 delete mode 100644 arch/arm/mach-omap2/include/mach/smp.h
3469 rename arch/arm/{plat-omap/include/plat => mach-omap2}/l3_2xxx.h (100%)
3470 rename arch/arm/{plat-omap/include/plat => mach-omap2}/l3_3xxx.h (100%)
3471 rename arch/arm/{plat-omap/include/plat => mach-omap2}/l4_2xxx.h (100%)
3472 rename arch/arm/{plat-omap/include/plat => mach-omap2}/l4_3xxx.h (100%)
3473 rename arch/arm/mach-omap2/{include/mach => }/omap-secure.h (100%)
3474 rename arch/arm/mach-omap2/{include/mach => }/omap-wakeupgen.h (100%)
3475 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap24xx.h (98%)
3476 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap34xx.h (98%)
3477 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap4-keypad.h (87%)
3478 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap44xx.h (97%)
3479 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap54xx.h (100%)
3480 create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_data.c
3481 create mode 100644 arch/arm/mach-omap2/soc.h
3482 rename arch/arm/{plat-omap/include/plat => mach-omap2}/ti81xx.h (100%)
3483 delete mode 100644 arch/arm/mach-orion5x/include/mach/gpio.h
3484 delete mode 100644 arch/arm/mach-orion5x/include/mach/io.h
3485 create mode 100644 arch/arm/mach-picoxcell/Kconfig
3486 delete mode 100644 arch/arm/mach-picoxcell/Makefile.boot
3487 delete mode 100644 arch/arm/mach-picoxcell/include/mach/gpio.h
3488 delete mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h
3489 delete mode 100644 arch/arm/mach-picoxcell/include/mach/timex.h
3490 delete mode 100644 arch/arm/mach-picoxcell/include/mach/uncompress.h
3491 delete mode 100644 arch/arm/mach-pnx4008/Makefile
3492 delete mode 100644 arch/arm/mach-pnx4008/Makefile.boot
3493 delete mode 100644 arch/arm/mach-pnx4008/clock.c
3494 delete mode 100644 arch/arm/mach-pnx4008/clock.h
3495 delete mode 100644 arch/arm/mach-pnx4008/core.c
3496 delete mode 100644 arch/arm/mach-pnx4008/dma.c
3497 delete mode 100644 arch/arm/mach-pnx4008/gpio.c
3498 delete mode 100644 arch/arm/mach-pnx4008/i2c.c
3499 delete mode 100644 arch/arm/mach-pnx4008/include/mach/clock.h
3500 delete mode 100644 arch/arm/mach-pnx4008/include/mach/debug-macro.S
3501 delete mode 100644 arch/arm/mach-pnx4008/include/mach/dma.h
3502 delete mode 100644 arch/arm/mach-pnx4008/include/mach/entry-macro.S
3503 delete mode 100644 arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
3504 delete mode 100644 arch/arm/mach-pnx4008/include/mach/hardware.h
3505 delete mode 100644 arch/arm/mach-pnx4008/include/mach/irq.h
3506 delete mode 100644 arch/arm/mach-pnx4008/include/mach/irqs.h
3507 delete mode 100644 arch/arm/mach-pnx4008/include/mach/platform.h
3508 delete mode 100644 arch/arm/mach-pnx4008/include/mach/pm.h
3509 delete mode 100644 arch/arm/mach-pnx4008/include/mach/timex.h
3510 delete mode 100644 arch/arm/mach-pnx4008/include/mach/uncompress.h
3511 delete mode 100644 arch/arm/mach-pnx4008/irq.c
3512 delete mode 100644 arch/arm/mach-pnx4008/pm.c
3513 delete mode 100644 arch/arm/mach-pnx4008/serial.c
3514 delete mode 100644 arch/arm/mach-pnx4008/sleep.S
3515 delete mode 100644 arch/arm/mach-pnx4008/time.c
3516 delete mode 100644 arch/arm/mach-pnx4008/time.h
3517 create mode 100644 arch/arm/mach-prima2/Kconfig
3518 rename arch/arm/mach-prima2/{prima2.c => common.c} (81%)
3519 delete mode 100644 arch/arm/mach-pxa/leds-idp.c
3520 delete mode 100644 arch/arm/mach-pxa/leds-lubbock.c
3521 delete mode 100644 arch/arm/mach-pxa/leds-mainstone.c
3522 delete mode 100644 arch/arm/mach-pxa/leds.c
3523 delete mode 100644 arch/arm/mach-pxa/leds.h
3524 create mode 100644 arch/arm/mach-pxa/pxa-dt.c
3525 delete mode 100644 arch/arm/mach-realview/include/mach/gpio.h
3526 delete mode 100644 arch/arm/mach-sa1100/leds-assabet.c
3527 delete mode 100644 arch/arm/mach-sa1100/leds-badge4.c
3528 delete mode 100644 arch/arm/mach-sa1100/leds-cerf.c
3529 delete mode 100644 arch/arm/mach-sa1100/leds-hackkit.c
3530 delete mode 100644 arch/arm/mach-sa1100/leds-lart.c
3531 delete mode 100644 arch/arm/mach-sa1100/leds.c
3532 delete mode 100644 arch/arm/mach-sa1100/leds.h
3533 delete mode 100644 arch/arm/mach-shark/include/mach/io.h
3534 rename arch/arm/mach-shmobile/{include/mach/gpio.h => sh-gpio.h} (69%)
3535 create mode 100644 arch/arm/mach-socfpga/Kconfig
3536 delete mode 100644 arch/arm/mach-socfpga/Makefile.boot
3537 delete mode 100644 arch/arm/mach-socfpga/include/mach/uncompress.h
3538 delete mode 100644 arch/arm/mach-spear13xx/include/mach/gpio.h
3539 delete mode 100644 arch/arm/mach-spear3xx/include/mach/gpio.h
3540 delete mode 100644 arch/arm/mach-spear6xx/include/mach/gpio.h
3541 delete mode 100644 arch/arm/mach-tegra/board-harmony-pinmux.c
3542 delete mode 100644 arch/arm/mach-tegra/board-harmony-power.c
3543 delete mode 100644 arch/arm/mach-tegra/board-harmony.c
3544 delete mode 100644 arch/arm/mach-tegra/board-harmony.h
3545 delete mode 100644 arch/arm/mach-tegra/board-paz00-pinmux.c
3546 delete mode 100644 arch/arm/mach-tegra/board-pinmux.c
3547 delete mode 100644 arch/arm/mach-tegra/board-pinmux.h
3548 delete mode 100644 arch/arm/mach-tegra/board-trimslice-pinmux.c
3549 delete mode 100644 arch/arm/mach-tegra/board-trimslice.c
3550 delete mode 100644 arch/arm/mach-tegra/board-trimslice.h
3551 create mode 100644 arch/arm/mach-tegra/common.h
3552 delete mode 100644 arch/arm/mach-tegra/devices.c
3553 delete mode 100644 arch/arm/mach-tegra/devices.h
3554 delete mode 100644 arch/arm/mach-tegra/dma.c
3555 delete mode 100644 arch/arm/mach-tegra/include/mach/gpio.h
3556 delete mode 100644 arch/arm/mach-tegra/include/mach/io.h
3557 delete mode 100644 arch/arm/mach-tegra/include/mach/pinconf-tegra.h
3558 delete mode 100644 arch/arm/mach-tegra/include/mach/suspend.h
3559 create mode 100644 arch/arm/mach-tegra/sleep-t20.S
3560 create mode 100644 arch/arm/mach-tegra/sleep-t30.S
3561 create mode 100644 arch/arm/mach-tegra/sleep.h
3562 create mode 100644 arch/arm/mach-tegra/tegra20_clocks.c
3563 create mode 100644 arch/arm/mach-tegra/tegra20_clocks.h
3564 create mode 100644 arch/arm/mach-tegra/tegra20_clocks_data.c
3565 delete mode 100644 arch/arm/mach-tegra/tegra2_clocks.c
3566 create mode 100644 arch/arm/mach-tegra/tegra30_clocks.h
3567 create mode 100644 arch/arm/mach-tegra/tegra30_clocks_data.c
3568 create mode 100644 arch/arm/mach-tegra/tegra_cpu_car.h
3569 rename arch/arm/mach-u300/{include/mach => }/dma_channels.h (88%)
3570 delete mode 100644 arch/arm/mach-u300/include/mach/clkdev.h
3571 delete mode 100644 arch/arm/mach-u300/include/mach/gpio.h
3572 delete mode 100644 arch/arm/mach-u300/include/mach/platform.h
3573 create mode 100644 arch/arm/mach-u300/timer.h
3574 delete mode 100644 arch/arm/mach-u300/u300.c
3575 rename arch/arm/mach-ux500/{board-mop500-msp.c => board-mop500-audio.c} (66%)
3576 delete mode 100644 arch/arm/mach-ux500/board-mop500-msp.h
3577 delete mode 100644 arch/arm/mach-ux500/include/mach/gpio.h
3578 delete mode 100644 arch/arm/mach-versatile/include/mach/gpio.h
3579 delete mode 100644 arch/arm/mach-vexpress/Makefile.boot
3580 delete mode 100644 arch/arm/mach-vexpress/include/mach/gpio.h
3581 delete mode 100644 arch/arm/mach-vexpress/include/mach/timex.h
3582 delete mode 100644 arch/arm/mach-vexpress/include/mach/uncompress.h
3583 delete mode 100644 arch/arm/mach-vt8500/Kconfig
3584 delete mode 100644 arch/arm/mach-vt8500/bv07.c
3585 rename arch/arm/{mach-tegra/include/mach/gpio-tegra.h => mach-vt8500/common.h} (53%)
3586 delete mode 100644 arch/arm/mach-vt8500/devices-vt8500.c
3587 delete mode 100644 arch/arm/mach-vt8500/devices-wm8505.c
3588 delete mode 100644 arch/arm/mach-vt8500/devices.c
3589 delete mode 100644 arch/arm/mach-vt8500/devices.h
3590 delete mode 100644 arch/arm/mach-vt8500/gpio.c
3591 delete mode 100644 arch/arm/mach-vt8500/include/mach/gpio.h
3592 delete mode 100644 arch/arm/mach-vt8500/include/mach/vt8500_irqs.h
3593 delete mode 100644 arch/arm/mach-vt8500/include/mach/vt8500_regs.h
3594 delete mode 100644 arch/arm/mach-vt8500/include/mach/wm8505_irqs.h
3595 delete mode 100644 arch/arm/mach-vt8500/include/mach/wm8505_regs.h
3596 delete mode 100644 arch/arm/mach-vt8500/restart.c
3597 create mode 100644 arch/arm/mach-vt8500/vt8500.c
3598 delete mode 100644 arch/arm/mach-vt8500/wm8505_7in.c
3599 delete mode 100644 arch/arm/plat-mxc/clock.c
3600 delete mode 100644 arch/arm/plat-mxc/include/mach/clock.h
3601 delete mode 100644 arch/arm/plat-mxc/include/mach/gpio.h
3602 delete mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx53.h
3603 delete mode 100644 arch/arm/plat-omap/devices.c
3604 delete mode 100644 arch/arm/plat-omap/include/plat/board.h
3605 delete mode 100644 arch/arm/plat-omap/include/plat/gpio-switch.h
3606 delete mode 100644 arch/arm/plat-omap/include/plat/hardware.h
3607 delete mode 100644 arch/arm/plat-omap/include/plat/irqs-44xx.h
3608 delete mode 100644 arch/arm/plat-omap/include/plat/irqs.h
3609 delete mode 100644 arch/arm/plat-omap/include/plat/param.h
3610 delete mode 100644 arch/arm/plat-omap/mux.c
3611 rename arch/arm/plat-orion/include/plat/{gpio.h => orion-gpio.h} (95%)
3612 delete mode 100644 arch/arm/plat-spear/include/plat/gpio.h
3613 create mode 100644 arch/arm/plat-versatile/include/plat/platsmp.h
3614 create mode 100644 arch/sparc/crypto/Makefile
3615 create mode 100644 arch/sparc/crypto/aes_asm.S
3616 create mode 100644 arch/sparc/crypto/aes_glue.c
3617 create mode 100644 arch/sparc/crypto/camellia_asm.S
3618 create mode 100644 arch/sparc/crypto/camellia_glue.c
3619 create mode 100644 arch/sparc/crypto/crc32c_asm.S
3620 create mode 100644 arch/sparc/crypto/crc32c_glue.c
3621 create mode 100644 arch/sparc/crypto/crop_devid.c
3622 create mode 100644 arch/sparc/crypto/des_asm.S
3623 create mode 100644 arch/sparc/crypto/des_glue.c
3624 create mode 100644 arch/sparc/crypto/md5_asm.S
3625 create mode 100644 arch/sparc/crypto/md5_glue.c
3626 create mode 100644 arch/sparc/crypto/opcodes.h
3627 create mode 100644 arch/sparc/crypto/sha1_asm.S
3628 create mode 100644 arch/sparc/crypto/sha1_glue.c
3629 create mode 100644 arch/sparc/crypto/sha256_asm.S
3630 create mode 100644 arch/sparc/crypto/sha256_glue.c
3631 create mode 100644 arch/sparc/crypto/sha512_asm.S
3632 create mode 100644 arch/sparc/crypto/sha512_glue.c
3633 create mode 100644 arch/sparc/lib/NG4copy_from_user.S
3634 create mode 100644 arch/sparc/lib/NG4copy_page.S
3635 create mode 100644 arch/sparc/lib/NG4copy_to_user.S
3636 create mode 100644 arch/sparc/lib/NG4memcpy.S
3637 create mode 100644 arch/sparc/lib/NG4patch.S
3638 create mode 100644 drivers/bus/Kconfig
3639 create mode 100644 drivers/bus/Makefile
3640 create mode 100644 drivers/bus/omap-ocp2scp.c
3641 rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.c (99%)
3642 rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.h (100%)
3643 rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.c (100%)
3644 rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.h (100%)
3645 create mode 100644 drivers/clk/clk-bcm2835.c
3646 create mode 100644 drivers/clk/clk-vt8500.c
3647 create mode 100644 drivers/clk/mxs/clk-ssp.c
3648 create mode 100644 drivers/clocksource/bcm2835_timer.c
3649 create mode 100644 drivers/gpio/gpio-adnp.c
3650 create mode 100644 drivers/gpio/gpio-vt8500.c
3651 create mode 100644 drivers/infiniband/hw/mlx4/alias_GUID.c
3652 create mode 100644 drivers/infiniband/hw/mlx4/cm.c
3653 create mode 100644 drivers/infiniband/hw/mlx4/mcg.c
3654 create mode 100644 drivers/infiniband/hw/mlx4/sysfs.c
3655 create mode 100644 drivers/infiniband/ulp/ipoib/ipoib_netlink.c
3656 create mode 100644 drivers/irqchip/Kconfig
3657 create mode 100644 drivers/irqchip/Makefile
3658 create mode 100644 drivers/irqchip/irq-bcm2835.c
3659 create mode 100644 drivers/leds/ledtrig-cpu.c
3660 delete mode 100644 drivers/net/ethernet/freescale/fsl_pq_mdio.h
3661 create mode 100644 drivers/net/ethernet/freescale/xgmac_mdio.c
3662 create mode 100644 drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
3663 delete mode 100644 drivers/net/ethernet/mipsnet.c
3664 create mode 100644 drivers/net/ethernet/sfc/ptp.c
3665 rename drivers/{ => net}/ieee802154/Kconfig (76%)
3666 rename drivers/{ => net}/ieee802154/Makefile (74%)
3667 rename drivers/{ => net}/ieee802154/at86rf230.c (98%)
3668 rename drivers/{ => net}/ieee802154/fakehard.c (99%)
3669 rename drivers/{ => net}/ieee802154/fakelb.c (100%)
3670 create mode 100644 drivers/net/ieee802154/mrf24j40.c
3671 create mode 100644 drivers/net/phy/mdio-mux-mmioreg.c
3672 create mode 100644 drivers/net/vxlan.c
3673 create mode 100644 drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h
3674 create mode 100644 drivers/net/wireless/b43/radio_2057.c
3675 create mode 100644 drivers/net/wireless/b43/radio_2057.h
3676 create mode 100644 drivers/net/wireless/mwifiex/uap_event.c
3677 create mode 100644 drivers/net/wireless/mwifiex/uap_txrx.c
3678 delete mode 100644 drivers/nfc/pn544.c
3679 create mode 100644 drivers/pinctrl/pinctrl-bcm2835.c
3680 create mode 100644 drivers/pinctrl/pinctrl-exynos.c
3681 create mode 100644 drivers/pinctrl/pinctrl-exynos.h
3682 create mode 100644 drivers/pinctrl/pinctrl-imx35.c
3683 create mode 100644 drivers/pinctrl/pinctrl-nomadik-db8540.c
3684 create mode 100644 drivers/pinctrl/pinctrl-nomadik-stn8815.c
3685 create mode 100644 drivers/pinctrl/pinctrl-samsung.c
3686 create mode 100644 drivers/pinctrl/pinctrl-samsung.h
3687 create mode 100644 drivers/spi/spi-mxs.c
3688 create mode 100644 drivers/spi/spi-sc18is602.c
3689 delete mode 100644 drivers/spi/spi-tegra.c
3690 delete mode 100644 drivers/video/epson1355fb.c
3691 delete mode 100644 firmware/cxgb3/t3fw-7.10.0.bin.ihex
3692 create mode 100644 fs/quota/kqid.c
3693 rename arch/arm/mach-picoxcell/include/mach/hardware.h => include/linux/bcm2835_timer.h (70%)
3694 rename arch/arm/mach-socfpga/include/mach/timex.h => include/linux/clk/bcm2835.h (83%)
3695 rename arch/arm/mach-tegra/include/mach/kbc.h => include/linux/input/tegra_kbc.h (100%)
3696 rename arch/arm/mach-versatile/include/mach/io.h => include/linux/irqchip/bcm2835.h (74%)
3697 create mode 100644 include/linux/netfilter_ipv6/ip6t_NPT.h
3698 create mode 100644 include/linux/packet_diag.h
3699 rename arch/arm/plat-mxc/include/mach/ssi.h => include/linux/platform_data/asoc-imx-ssi.h (100%)
3700 rename arch/arm/plat-orion/include/plat/audio.h => include/linux/platform_data/asoc-kirkwood.h (100%)
3701 rename arch/arm/mach-pxa/include/mach/palmasoc.h => include/linux/platform_data/asoc-palm27x.h (100%)
3702 rename arch/arm/plat-samsung/include/plat/audio.h => include/linux/platform_data/asoc-s3c.h (100%)
3703 rename arch/arm/plat-samsung/include/plat/audio-simtec.h => include/linux/platform_data/asoc-s3c24xx_simtec.h (100%)
3704 rename arch/arm/plat-omap/include/plat/mcbsp.h => include/linux/platform_data/asoc-ti-mcbsp.h (100%)
3705 rename arch/arm/mach-pxa/include/mach/pata_pxa.h => include/linux/platform_data/ata-pxa.h (100%)
3706 rename arch/arm/plat-samsung/include/plat/ata.h => include/linux/platform_data/ata-samsung_cf.h (100%)
3707 rename arch/arm/plat-mxc/include/mach/mx1_camera.h => include/linux/platform_data/camera-mx1.h (100%)
3708 rename arch/arm/plat-mxc/include/mach/mx2_cam.h => include/linux/platform_data/camera-mx2.h (95%)
3709 rename arch/arm/plat-mxc/include/mach/mx3_camera.h => include/linux/platform_data/camera-mx3.h (100%)
3710 rename arch/arm/mach-pxa/include/mach/camera.h => include/linux/platform_data/camera-pxa.h (100%)
3711 rename {arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%)
3712 rename arch/arm/mach-at91/include/mach/at_hdmac.h => include/linux/platform_data/dma-atmel.h (100%)
3713 rename arch/arm/mach-ep93xx/include/mach/dma.h => include/linux/platform_data/dma-ep93xx.h (100%)
3714 rename arch/arm/plat-mxc/include/mach/sdma.h => include/linux/platform_data/dma-imx-sdma.h (100%)
3715 rename arch/arm/plat-mxc/include/mach/dma.h => include/linux/platform_data/dma-imx.h (100%)
3716 rename arch/arm/mach-mmp/include/mach/sram.h => include/linux/platform_data/dma-mmp_tdma.h (100%)
3717 rename arch/arm/plat-orion/include/plat/mv_xor.h => include/linux/platform_data/dma-mv_xor.h (100%)
3718 rename arch/arm/plat-omap/include/plat/dsp.h => include/linux/platform_data/dsp-omap.h (100%)
3719 rename arch/arm/mach-netx/include/mach/eth.h => include/linux/platform_data/eth-netx.h (100%)
3720 rename arch/arm/plat-omap/include/plat/gpio.h => include/linux/platform_data/gpio-omap.h (94%)
3721 rename arch/arm/plat-samsung/include/plat/hwmon.h => include/linux/platform_data/hwmon-s3c.h (100%)
3722 rename arch/arm/mach-davinci/include/mach/i2c.h => include/linux/platform_data/i2c-davinci.h (100%)
3723 rename arch/arm/plat-mxc/include/mach/i2c.h => include/linux/platform_data/i2c-imx.h (100%)
3724 rename arch/arm/mach-w90x900/include/mach/i2c.h => include/linux/platform_data/i2c-nuc900.h (100%)
3725 rename arch/arm/plat-samsung/include/plat/iic.h => include/linux/platform_data/i2c-s3c2410.h (100%)
3726 rename arch/arm/mach-pxa/include/mach/irda.h => include/linux/platform_data/irda-pxaficp.h (100%)
3727 rename arch/arm/mach-pxa/include/mach/pxa930_rotary.h => include/linux/platform_data/keyboard-pxa930_rotary.h (100%)
3728 rename arch/arm/plat-spear/include/plat/keyboard.h => include/linux/platform_data/keyboard-spear.h (100%)
3729 rename arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h => include/linux/platform_data/keypad-ep93xx.h (100%)
3730 rename arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h (100%)
3731 rename arch/arm/plat-omap/include/plat/keypad.h => include/linux/platform_data/keypad-omap.h (100%)
3732 rename arch/arm/plat-pxa/include/plat/pxa27x_keypad.h => include/linux/platform_data/keypad-pxa27x.h (100%)
3733 rename arch/arm/mach-w90x900/include/mach/w90p910_keypad.h => include/linux/platform_data/keypad-w90p910.h (100%)
3734 rename arch/arm/mach-davinci/include/mach/keyscan.h => include/linux/platform_data/keyscan-davinci.h (100%)
3735 rename arch/arm/plat-omap/include/plat/lcd_mipid.h => include/linux/platform_data/lcd-mipid.h (100%)
3736 rename arch/arm/mach-kirkwood/include/mach/leds-netxbig.h => include/linux/platform_data/leds-kirkwood-netxbig.h (100%)
3737 rename arch/arm/mach-kirkwood/include/mach/leds-ns2.h => include/linux/platform_data/leds-kirkwood-ns2.h (100%)
3738 rename arch/arm/mach-s3c24xx/include/mach/leds-gpio.h => include/linux/platform_data/leds-s3c24xx.h (100%)
3739 rename arch/arm/mach-sa1100/include/mach/mcp.h => include/linux/platform_data/mfd-mcp-sa11x0.h (100%)
3740 rename arch/arm/plat-samsung/include/plat/mipi_csis.h => include/linux/platform_data/mipi-csis.h (100%)
3741 rename arch/arm/mach-davinci/include/mach/mmc.h => include/linux/platform_data/mmc-davinci.h (100%)
3742 rename arch/arm/plat-mxc/include/mach/esdhc.h => include/linux/platform_data/mmc-esdhc-imx.h (100%)
3743 rename arch/arm/mach-msm/include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h (100%)
3744 rename arch/arm/plat-orion/include/plat/mvsdio.h => include/linux/platform_data/mmc-mvsdio.h (100%)
3745 rename arch/arm/plat-mxc/include/mach/mmc.h => include/linux/platform_data/mmc-mxcmmc.h (100%)
3746 rename arch/arm/mach-pxa/include/mach/mmc.h => include/linux/platform_data/mmc-pxamci.h (100%)
3747 rename arch/arm/plat-samsung/include/plat/mci.h => include/linux/platform_data/mmc-s3cmci.h (100%)
3748 rename arch/arm/mach-tegra/include/mach/sdhci.h => include/linux/platform_data/mmc-sdhci-tegra.h (84%)
3749 rename arch/arm/mach-pxa/include/mach/pxa930_trkball.h => include/linux/platform_data/mouse-pxa930_trkball.h (100%)
3750 rename arch/arm/mach-davinci/include/mach/aemif.h => include/linux/platform_data/mtd-davinci-aemif.h (100%)
3751 rename arch/arm/mach-davinci/include/mach/nand.h => include/linux/platform_data/mtd-davinci.h (100%)
3752 rename arch/arm/plat-mxc/include/mach/mxc_nand.h => include/linux/platform_data/mtd-mxc_nand.h (100%)
3753 rename arch/arm/plat-omap/include/plat/nand.h => include/linux/platform_data/mtd-nand-omap2.h (96%)
3754 rename arch/arm/plat-pxa/include/plat/pxa3xx_nand.h => include/linux/platform_data/mtd-nand-pxa3xx.h (100%)
3755 rename arch/arm/plat-samsung/include/plat/nand.h => include/linux/platform_data/mtd-nand-s3c2410.h (100%)
3756 rename arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h (100%)
3757 rename arch/arm/plat-omap/include/plat/onenand.h => include/linux/platform_data/mtd-onenand-omap2.h (100%)
3758 rename arch/arm/plat-orion/include/plat/orion_nand.h => include/linux/platform_data/mtd-orion_nand.h (100%)
3759 create mode 100644 include/linux/platform_data/omap1_bl.h
3760 rename arch/arm/mach-pxa/include/mach/arcom-pcmcia.h => include/linux/platform_data/pcmcia-pxa2xx_viper.h (100%)
3761 rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (72%)
3762 rename arch/arm/plat-omap/include/plat/remoteproc.h => include/linux/platform_data/remoteproc-omap.h (100%)
3763 create mode 100644 include/linux/platform_data/sc18is602.h
3764 rename arch/arm/plat-mxc/include/mach/imx-uart.h => include/linux/platform_data/serial-imx.h (100%)
3765 rename arch/arm/mach-davinci/include/mach/spi.h => include/linux/platform_data/spi-davinci.h (100%)
3766 rename arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h (100%)
3767 rename arch/arm/plat-mxc/include/mach/spi.h => include/linux/platform_data/spi-imx.h (100%)
3768 rename arch/arm/mach-w90x900/include/mach/nuc900_spi.h => include/linux/platform_data/spi-nuc900.h (100%)
3769 rename arch/arm/plat-omap/include/plat/mcspi.h => include/linux/platform_data/spi-omap2-mcspi.h (100%)
3770 rename arch/arm/plat-samsung/include/plat/s3c64xx-spi.h => include/linux/platform_data/spi-s3c64xx.h (100%)
3771 rename arch/arm/plat-samsung/include/plat/ts.h => include/linux/platform_data/touchscreen-s3c2410.h (100%)
3772 rename arch/arm/mach-davinci/include/mach/usb.h => include/linux/platform_data/usb-davinci.h (100%)
3773 rename arch/arm/plat-mxc/include/mach/mxc_ehci.h => include/linux/platform_data/usb-ehci-mxc.h (100%)
3774 rename arch/arm/plat-orion/include/plat/ehci-orion.h => include/linux/platform_data/usb-ehci-orion.h (100%)
3775 rename arch/arm/plat-samsung/include/plat/ehci.h => include/linux/platform_data/usb-ehci-s5p.h (100%)
3776 rename arch/arm/mach-exynos/include/mach/ohci.h => include/linux/platform_data/usb-exynos.h (100%)
3777 rename arch/arm/plat-mxc/include/mach/usb.h => include/linux/platform_data/usb-imx_udc.h (100%)
3778 rename arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h (100%)
3779 rename arch/arm/plat-mxc/include/mach/mx21-usbhost.h => include/linux/platform_data/usb-mx2.h (100%)
3780 rename arch/arm/mach-pxa/include/mach/ohci.h => include/linux/platform_data/usb-ohci-pxa27x.h (100%)
3781 rename arch/arm/plat-samsung/include/plat/usb-control.h => include/linux/platform_data/usb-ohci-s3c2410.h (100%)
3782 rename arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h => include/linux/platform_data/usb-pxa3xx-ulpi.h (100%)
3783 rename arch/arm/plat-samsung/include/plat/udc.h => include/linux/platform_data/usb-s3c2410_udc.h (100%)
3784 rename arch/arm/mach-ep93xx/include/mach/fb.h => include/linux/platform_data/video-ep93xx.h (100%)
3785 rename arch/arm/plat-mxc/include/mach/imxfb.h => include/linux/platform_data/video-imxfb.h (100%)
3786 rename arch/arm/mach-msm/include/mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h (100%)
3787 rename arch/arm/plat-mxc/include/mach/mx3fb.h => include/linux/platform_data/video-mx3fb.h (100%)
3788 rename arch/arm/mach-w90x900/include/mach/fb.h => include/linux/platform_data/video-nuc900fb.h (100%)
3789 rename arch/arm/mach-pxa/include/mach/pxafb.h => include/linux/platform_data/video-pxafb.h (100%)
3790 rename arch/arm/mach-vt8500/include/mach/vt8500fb.h => include/linux/platform_data/video-vt8500lcdfb.h (100%)
3791 rename arch/arm/plat-omap/include/plat/voltage.h => include/linux/platform_data/voltage-omap.h (100%)
3792 create mode 100644 include/linux/projid.h
3793 create mode 100644 include/linux/spi/mxs-spi.h
3794 create mode 100644 include/linux/tcp_metrics.h
3795 create mode 100644 include/net/gro_cells.h
3796 create mode 100644 include/net/netfilter/nf_nat_l3proto.h
3797 create mode 100644 include/net/netfilter/nf_nat_l4proto.h
3798 delete mode 100644 include/net/netfilter/nf_nat_protocol.h
3799 delete mode 100644 include/net/netfilter/nf_nat_rule.h
3800 create mode 100644 include/net/netns/sctp.h
3801 create mode 100644 include/net/nfc/llc.h
3802 delete mode 100644 include/net/nfc/shdlc.h
3803 delete mode 100644 include/video/epson1355.h
3804 delete mode 100644 net/ipv4/netfilter/ipt_NETMAP.c
3805 delete mode 100644 net/ipv4/netfilter/ipt_REDIRECT.c
3806 rename net/ipv4/netfilter/{nf_nat_standalone.c => iptable_nat.c} (52%)
3807 create mode 100644 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
3808 delete mode 100644 net/ipv4/netfilter/nf_nat_rule.c
3809 create mode 100644 net/ipv6/ip6_gre.c
3810 create mode 100644 net/ipv6/netfilter/ip6t_MASQUERADE.c
3811 create mode 100644 net/ipv6/netfilter/ip6t_NPT.c
3812 create mode 100644 net/ipv6/netfilter/ip6table_nat.c
3813 create mode 100644 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
3814 create mode 100644 net/ipv6/netfilter/nf_nat_proto_icmpv6.c
3815 rename net/{ipv4 => }/netfilter/nf_nat_amanda.c (96%)
3816 rename net/{ipv4 => }/netfilter/nf_nat_core.c (51%)
3817 rename net/{ipv4 => }/netfilter/nf_nat_ftp.c (79%)
3818 rename net/{ipv4 => }/netfilter/nf_nat_helper.c (82%)
3819 rename net/{ipv4 => }/netfilter/nf_nat_irc.c (89%)
3820 rename net/{ipv4 => }/netfilter/nf_nat_proto_common.c (62%)
3821 rename net/{ipv4 => }/netfilter/nf_nat_proto_dccp.c (61%)
3822 rename net/{ipv4 => }/netfilter/nf_nat_proto_sctp.c (61%)
3823 rename net/{ipv4 => }/netfilter/nf_nat_proto_tcp.c (65%)
3824 rename net/{ipv4 => }/netfilter/nf_nat_proto_udp.c (60%)
3825 rename net/{ipv4 => }/netfilter/nf_nat_proto_udplite.c (58%)
3826 rename net/{ipv4 => }/netfilter/nf_nat_proto_unknown.c (76%)
3827 rename net/{ipv4 => }/netfilter/nf_nat_sip.c (62%)
3828 rename net/{ipv4 => }/netfilter/nf_nat_tftp.c (97%)
3829 create mode 100644 net/netfilter/xt_NETMAP.c
3830 delete mode 100644 net/netfilter/xt_NOTRACK.c
3831 create mode 100644 net/netfilter/xt_REDIRECT.c
3832 create mode 100644 net/netfilter/xt_nat.c
3833 create mode 100644 net/nfc/hci/llc.c
3834 create mode 100644 net/nfc/hci/llc.h
3835 create mode 100644 net/nfc/hci/llc_nop.c
3836 rename net/nfc/hci/{shdlc.c => llc_shdlc.c} (54%)
3837 create mode 100644 net/packet/diag.c
3838 create mode 100644 net/packet/internal.h
3839 Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
3840 $ git merge fixes/master
3842 Merging kbuild-current/rc-fixes (fe04ddf kbuild: Do not package /boot and /lib in make tar-pkg)
3843 $ git merge kbuild-current/rc-fixes
3844 Auto-merging arch/x86/Makefile
3845 Merge made by the 'recursive' strategy.
3846 arch/x86/Makefile | 2 +-
3847 scripts/Makefile.fwinst | 4 ++--
3848 scripts/package/buildtar | 2 +-
3849 3 files changed, 4 insertions(+), 4 deletions(-)
3850 Merging arm-current/fixes (7253b85 ARM: 7541/1: Add ARM ERRATA 775420 workaround)
3851 $ git merge arm-current/fixes
3852 Auto-merging arch/arm/Kconfig
3853 Merge made by the 'recursive' strategy.
3854 arch/arm/Kconfig | 10 ++++++++++
3855 arch/arm/mm/cache-v7.S | 3 +++
3856 2 files changed, 13 insertions(+)
3857 Merging m68k-current/for-linus (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
3858 $ git merge m68k-current/for-linus
3860 Merging powerpc-merge/merge (636802e powerpc: Don't use __put_user() in patch_instruction)
3861 $ git merge powerpc-merge/merge
3863 Merging sparc/master (1b62ca7 sparc64: Fix return value of Niagara-2 memcpy.)
3864 $ git merge sparc/master
3865 Merge made by the 'recursive' strategy.
3866 arch/sparc/lib/NG2memcpy.S | 46 ++++++++++++++++++++++----------------------
3867 1 file changed, 23 insertions(+), 23 deletions(-)
3868 Merging net/master (a0d271c Linux 3.6)
3869 $ git merge net/master
3871 Merging sound-current/for-linus (5d037f9 Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
3872 $ git merge sound-current/for-linus
3874 Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
3875 $ git merge pci-current/for-linus
3877 Merging wireless/master (a7be50b iwlwifi: don't double free the interrupt in failure path)
3878 $ git merge wireless/master
3880 Merging driver-core.current/driver-core-linus (5698bd7 Linux 3.6-rc6)
3881 $ git merge driver-core.current/driver-core-linus
3883 Merging tty.current/tty-linus (5698bd7 Linux 3.6-rc6)
3884 $ git merge tty.current/tty-linus
3886 Merging usb.current/usb-linus (0d00dc2 USB: Fix race condition when removing host controllers)
3887 $ git merge usb.current/usb-linus
3889 Merging staging.current/staging-linus (5698bd7 Linux 3.6-rc6)
3890 $ git merge staging.current/staging-linus
3892 Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3)
3893 $ git merge char-misc.current/char-misc-linus
3895 Merging input-current/for-linus (dde3ada Merge branch 'next' into for-linus)
3896 $ git merge input-current/for-linus
3898 Merging md-current/for-linus (80b4812 md/raid10: fix "enough" function for detecting if array is failed.)
3899 $ git merge md-current/for-linus
3901 Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
3902 $ git merge audit-current/for-linus
3904 Merging crypto-current/master (298b973 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
3905 $ git merge crypto-current/master
3906 Merge made by the 'recursive' strategy.
3907 arch/x86/crypto/glue_helper.c | 2 +-
3908 1 file changed, 1 insertion(+), 1 deletion(-)
3909 Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
3910 $ git merge ide/master
3912 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
3913 $ git merge dwmw2/master
3915 Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
3916 $ git merge sh-current/sh-fixes-for-linus
3918 Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
3919 $ git merge irqdomain-current/irqdomain/merge
3921 Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
3922 $ git merge devicetree-current/devicetree/merge
3923 Auto-merging drivers/of/base.c
3924 Merge made by the 'recursive' strategy.
3925 drivers/of/base.c | 2 ++
3926 1 file changed, 2 insertions(+)
3927 Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
3928 $ git merge spi-current/spi/merge
3929 Auto-merging drivers/spi/spi.c
3930 Auto-merging drivers/spi/spi-s3c64xx.c
3931 Auto-merging drivers/spi/spi-bcm63xx.c
3932 Merge made by the 'recursive' strategy.
3933 drivers/spi/spi-bcm63xx.c | 16 ++++++----------
3934 drivers/spi/spi-s3c64xx.c | 10 ++++------
3935 drivers/spi/spi.c | 5 ++++-
3936 3 files changed, 14 insertions(+), 17 deletions(-)
3937 Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
3938 $ git merge gpio-current/gpio/merge
3940 Merging arm/for-next (f537d06 Merge branch 'devel-stable' into for-next)
3941 $ git merge arm/for-next
3942 Resolved 'arch/arm/include/asm/timex.h' using previous resolution.
3943 Resolved 'arch/arm/kernel/smp.c' using previous resolution.
3944 Resolved 'arch/arm/mach-integrator/integrator_cp.c' using previous resolution.
3945 Auto-merging arch/arm/mm/ioremap.c
3946 Auto-merging arch/arm/mm/cache-l2x0.c
3947 Auto-merging arch/arm/mach-shmobile/smp-emev2.c
3948 Removing arch/arm/mach-sa1100/include/mach/lart.h
3949 Removing arch/arm/mach-sa1100/include/mach/SA-1111.h
3950 Auto-merging arch/arm/mach-integrator/integrator_cp.c
3951 CONFLICT (content): Merge conflict in arch/arm/mach-integrator/integrator_cp.c
3952 Auto-merging arch/arm/mach-integrator/integrator_ap.c
3953 Auto-merging arch/arm/mach-integrator/core.c
3954 Auto-merging arch/arm/mach-exynos/platsmp.c
3955 Auto-merging arch/arm/kernel/smp.c
3956 CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
3957 Auto-merging arch/arm/kernel/setup.c
3958 Auto-merging arch/arm/kernel/head.S
3959 Removing arch/arm/kernel/compat.h
3960 Auto-merging arch/arm/kernel/atags_compat.c
3961 Auto-merging arch/arm/kernel/Makefile
3962 Removing arch/arm/include/asm/unaligned.h
3963 Removing arch/arm/include/asm/types.h
3964 Auto-merging arch/arm/include/asm/timex.h
3965 CONFLICT (content): Merge conflict in arch/arm/include/asm/timex.h
3966 Removing arch/arm/include/asm/termios.h
3967 Removing arch/arm/include/asm/termbits.h
3968 Removing arch/arm/include/asm/sockios.h
3969 Removing arch/arm/include/asm/socket.h
3970 Removing arch/arm/include/asm/shmbuf.h
3971 Removing arch/arm/include/asm/serial.h
3972 Removing arch/arm/include/asm/sembuf.h
3973 Removing arch/arm/include/asm/segment.h
3974 Removing arch/arm/include/asm/parport.h
3975 Removing arch/arm/include/asm/param.h
3976 Removing arch/arm/include/asm/msgbuf.h
3977 Removing arch/arm/include/asm/ipcbuf.h
3978 Auto-merging arch/arm/include/asm/io.h
3979 Removing arch/arm/include/asm/hardware/linkup-l1110.h
3980 Removing arch/arm/include/asm/exec.h
3981 Removing arch/arm/include/asm/current.h
3982 Auto-merging arch/arm/Makefile
3983 Auto-merging arch/arm/Kconfig
3984 Automatic merge failed; fix conflicts and then commit the result.
3986 [master 8bebe81] Merge remote-tracking branch 'arm/for-next'
3987 $ git diff -M --stat --summary HEAD^..
3988 Documentation/arm/Booting | 22 +-
3989 Documentation/devicetree/bindings/arm/arm-boards | 12 +
3990 .../devicetree/bindings/arm/versatile-fpga-irq.txt | 31 ++
3991 arch/arm/Kconfig | 31 +-
3992 arch/arm/Makefile | 9 +-
3993 arch/arm/boot/compressed/.gitignore | 1 +
3994 arch/arm/boot/compressed/Makefile | 9 +-
3995 arch/arm/boot/compressed/decompress.c | 3 +
3996 arch/arm/boot/compressed/head.S | 71 +++-
3997 arch/arm/boot/dts/integrator.dtsi | 76 ++++
3998 arch/arm/boot/dts/integratorap.dts | 68 ++++
3999 arch/arm/boot/dts/integratorcp.dts | 110 ++++++
4000 arch/arm/include/asm/Kbuild | 17 +
4001 arch/arm/include/asm/arch_timer.h | 8 +-
4002 arch/arm/include/asm/assembler.h | 28 ++
4003 arch/arm/include/asm/cacheflush.h | 15 +
4004 arch/arm/include/asm/current.h | 15 -
4005 arch/arm/include/asm/delay.h | 9 +
4006 arch/arm/include/asm/exec.h | 6 -
4007 arch/arm/include/asm/glue-cache.h | 17 +-
4008 arch/arm/include/asm/hardirq.h | 2 +-
4009 arch/arm/include/asm/hardware/linkup-l1110.h | 48 ---
4010 arch/arm/include/asm/io.h | 67 +++-
4011 arch/arm/include/asm/ipcbuf.h | 1 -
4012 arch/arm/include/asm/msgbuf.h | 31 --
4013 arch/arm/include/asm/mutex.h | 9 +-
4014 arch/arm/include/asm/opcodes-virt.h | 39 ++
4015 arch/arm/include/asm/opcodes.h | 181 ++++++++-
4016 arch/arm/include/asm/param.h | 31 --
4017 arch/arm/include/asm/parport.h | 18 -
4018 arch/arm/include/asm/ptrace.h | 1 +
4019 arch/arm/include/asm/segment.h | 11 -
4020 arch/arm/include/asm/sembuf.h | 25 --
4021 arch/arm/include/asm/serial.h | 19 -
4022 arch/arm/include/asm/shmbuf.h | 42 ---
4023 arch/arm/include/asm/socket.h | 72 ----
4024 arch/arm/include/asm/sockios.h | 13 -
4025 arch/arm/include/asm/syscall.h | 4 +
4026 arch/arm/include/asm/termbits.h | 198 ----------
4027 arch/arm/include/asm/termios.h | 92 -----
4028 arch/arm/include/asm/thread_info.h | 6 +-
4029 arch/arm/include/asm/timex.h | 6 -
4030 arch/arm/include/asm/types.h | 16 -
4031 arch/arm/include/asm/unaligned.h | 19 -
4032 arch/arm/include/asm/unistd.h | 8 +
4033 arch/arm/include/asm/virt.h | 69 ++++
4034 arch/arm/kernel/Makefile | 7 +-
4035 arch/arm/kernel/arch_timer.c | 383 ++++++++++++++------
4036 arch/arm/kernel/asm-offsets.c | 2 +
4037 arch/arm/kernel/atags.h | 14 +
4038 arch/arm/kernel/{compat.c => atags_compat.c} | 4 +-
4039 arch/arm/kernel/atags_parse.c | 238 ++++++++++++
4040 arch/arm/kernel/{atags.c => atags_proc.c} | 0
4041 arch/arm/kernel/compat.h | 11 -
4042 arch/arm/kernel/entry-common.S | 9 +
4043 arch/arm/kernel/head.S | 14 +-
4044 arch/arm/kernel/hyp-stub.S | 223 ++++++++++++
4045 arch/arm/kernel/machine_kexec.c | 29 +-
4046 arch/arm/kernel/ptrace.c | 19 +-
4047 arch/arm/kernel/sched_clock.c | 8 +
4048 arch/arm/kernel/setup.c | 256 ++-----------
4049 arch/arm/kernel/smp.c | 21 +-
4050 arch/arm/kernel/suspend.c | 17 +-
4051 arch/arm/lib/delay.c | 35 +-
4052 arch/arm/mach-exynos/platsmp.c | 2 +-
4053 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 +-
4054 arch/arm/mach-integrator/common.h | 3 +
4055 arch/arm/mach-integrator/core.c | 17 +-
4056 arch/arm/mach-integrator/integrator_ap.c | 276 ++++++++++----
4057 arch/arm/mach-integrator/integrator_cp.c | 325 +++++++++++------
4058 arch/arm/mach-sa1100/include/mach/SA-1111.h | 5 -
4059 arch/arm/mach-sa1100/include/mach/lart.h | 13 -
4060 arch/arm/mach-shmobile/smp-emev2.c | 2 +-
4061 arch/arm/mm/Kconfig | 17 +
4062 arch/arm/mm/alignment.c | 6 +-
4063 arch/arm/mm/cache-fa.S | 3 +
4064 arch/arm/mm/cache-l2x0.c | 8 +-
4065 arch/arm/mm/cache-v3.S | 3 +
4066 arch/arm/mm/cache-v4.S | 3 +
4067 arch/arm/mm/cache-v4wb.S | 3 +
4068 arch/arm/mm/cache-v4wt.S | 3 +
4069 arch/arm/mm/cache-v6.S | 3 +
4070 arch/arm/mm/cache-v7.S | 48 ++-
4071 arch/arm/mm/init.c | 2 +-
4072 arch/arm/mm/ioremap.c | 1 +
4073 arch/arm/mm/proc-arm1020.S | 3 +
4074 arch/arm/mm/proc-arm1020e.S | 3 +
4075 arch/arm/mm/proc-arm1022.S | 3 +
4076 arch/arm/mm/proc-arm1026.S | 3 +
4077 arch/arm/mm/proc-arm920.S | 3 +
4078 arch/arm/mm/proc-arm922.S | 3 +
4079 arch/arm/mm/proc-arm925.S | 3 +
4080 arch/arm/mm/proc-arm926.S | 3 +
4081 arch/arm/mm/proc-arm940.S | 3 +
4082 arch/arm/mm/proc-arm946.S | 3 +
4083 arch/arm/mm/proc-feroceon.S | 4 +
4084 arch/arm/mm/proc-macros.S | 1 +
4085 arch/arm/mm/proc-mohawk.S | 3 +
4086 arch/arm/mm/proc-v7.S | 2 +-
4087 arch/arm/mm/proc-xsc3.S | 3 +
4088 arch/arm/mm/proc-xscale.S | 4 +
4089 arch/arm/plat-versatile/fpga-irq.c | 72 +++-
4090 arch/arm/plat-versatile/include/plat/fpga-irq.h | 2 +
4091 103 files changed, 2417 insertions(+), 1329 deletions(-)
4092 create mode 100644 Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt
4093 create mode 100644 arch/arm/boot/dts/integrator.dtsi
4094 create mode 100644 arch/arm/boot/dts/integratorap.dts
4095 create mode 100644 arch/arm/boot/dts/integratorcp.dts
4096 delete mode 100644 arch/arm/include/asm/current.h
4097 delete mode 100644 arch/arm/include/asm/exec.h
4098 delete mode 100644 arch/arm/include/asm/hardware/linkup-l1110.h
4099 delete mode 100644 arch/arm/include/asm/ipcbuf.h
4100 delete mode 100644 arch/arm/include/asm/msgbuf.h
4101 create mode 100644 arch/arm/include/asm/opcodes-virt.h
4102 delete mode 100644 arch/arm/include/asm/param.h
4103 delete mode 100644 arch/arm/include/asm/parport.h
4104 delete mode 100644 arch/arm/include/asm/segment.h
4105 delete mode 100644 arch/arm/include/asm/sembuf.h
4106 delete mode 100644 arch/arm/include/asm/serial.h
4107 delete mode 100644 arch/arm/include/asm/shmbuf.h
4108 delete mode 100644 arch/arm/include/asm/socket.h
4109 delete mode 100644 arch/arm/include/asm/sockios.h
4110 delete mode 100644 arch/arm/include/asm/termbits.h
4111 delete mode 100644 arch/arm/include/asm/termios.h
4112 delete mode 100644 arch/arm/include/asm/types.h
4113 delete mode 100644 arch/arm/include/asm/unaligned.h
4114 create mode 100644 arch/arm/include/asm/virt.h
4115 rename arch/arm/kernel/{compat.c => atags_compat.c} (99%)
4116 create mode 100644 arch/arm/kernel/atags_parse.c
4117 rename arch/arm/kernel/{atags.c => atags_proc.c} (100%)
4118 delete mode 100644 arch/arm/kernel/compat.h
4119 create mode 100644 arch/arm/kernel/hyp-stub.S
4120 delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1111.h
4121 delete mode 100644 arch/arm/mach-sa1100/include/mach/lart.h
4122 Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf)
4123 $ git merge arm-perf/for-next/perf
4124 Resolved 'arch/arm/kernel/hw_breakpoint.c' using previous resolution.
4125 Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution.
4126 Auto-merging arch/arm/mach-ux500/cpu-db8500.c
4127 CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
4128 CONFLICT (modify/delete): arch/arm/mach-tegra/devices.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-tegra/devices.c left in tree.
4129 CONFLICT (modify/delete): arch/arm/mach-bcmring/arch.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-bcmring/arch.c left in tree.
4130 Auto-merging arch/arm/kernel/hw_breakpoint.c
4131 CONFLICT (content): Merge conflict in arch/arm/kernel/hw_breakpoint.c
4132 Automatic merge failed; fix conflicts and then commit the result.
4133 $ git rm -f arch/arm/mach-tegra/devices.c arch/arm/mach-bcmring/arch.c
4134 arch/arm/mach-bcmring/arch.c: needs merge
4135 arch/arm/mach-tegra/devices.c: needs merge
4136 rm 'arch/arm/mach-bcmring/arch.c'
4137 rm 'arch/arm/mach-tegra/devices.c'
4139 [master 1b22de6] Merge remote-tracking branch 'arm-perf/for-next/perf'
4140 $ git diff -M --stat --summary HEAD^..
4141 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
4142 $ git merge davinci/davinci-next
4144 Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
4145 $ git merge xilinx/arm-next
4147 Merging arm64/upstream (27aa55c arm64: ptrace: remove obsolete ptrace request numbers from user headers)
4148 $ git merge arm64/upstream
4150 Merging blackfin/for-linus (6895f97 kbuild: add symbol prefix arg to kallsyms)
4151 $ git merge blackfin/for-linus
4153 Merging c6x/for-linux-next (a0d271c Linux 3.6)
4154 $ git merge c6x/for-linux-next
4156 Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code)
4157 $ git merge cris/for-next
4158 Removing arch/cris/arch-v32/mach-fs/vcs_hook.h
4159 Removing arch/cris/arch-v32/mach-fs/vcs_hook.c
4160 Removing arch/cris/arch-v32/mach-a3/vcs_hook.h
4161 Removing arch/cris/arch-v32/mach-a3/vcs_hook.c
4162 Auto-merging arch/cris/arch-v32/drivers/pci/bios.c
4163 Auto-merging arch/cris/Kconfig
4164 Merge made by the 'recursive' strategy.
4165 arch/cris/Kconfig | 5 -
4166 arch/cris/arch-v32/drivers/axisflashmap.c | 29 ------
4167 arch/cris/arch-v32/drivers/pci/bios.c | 25 -----
4168 arch/cris/arch-v32/kernel/head.S | 58 +----------
4169 arch/cris/arch-v32/kernel/kgdb.c | 14 ---
4170 arch/cris/arch-v32/mach-a3/Makefile | 2 -
4171 arch/cris/arch-v32/mach-a3/vcs_hook.c | 103 --------------------
4172 arch/cris/arch-v32/mach-a3/vcs_hook.h | 58 -----------
4173 arch/cris/arch-v32/mach-fs/Makefile | 2 -
4174 arch/cris/arch-v32/mach-fs/vcs_hook.c | 100 -------------------
4175 arch/cris/arch-v32/mach-fs/vcs_hook.h | 42 --------
4176 arch/cris/arch-v32/mm/init.c | 8 --
4177 arch/cris/include/arch-v32/arch/page.h | 5 -
4178 arch/cris/include/arch-v32/arch/processor.h | 6 +-
4179 .../cris/include/arch-v32/mach-fs/mach/startup.inc | 6 --
4180 arch/cris/include/asm/pci.h | 1 -
4181 16 files changed, 3 insertions(+), 461 deletions(-)
4182 delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.c
4183 delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.h
4184 delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.c
4185 delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.h
4186 Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
4187 $ git merge hexagon/linux-next
4189 Merging ia64/next (39c9a4a [IA64] xen: Fix return value check in xencomm_vtop())
4190 $ git merge ia64/next
4192 Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
4193 $ git merge m68k/for-next
4195 Merging m68knommu/for-next (a255172 m68knommu: fix inconsistent formating in ColdFire 5407 definitions)
4196 $ git merge m68knommu/for-next
4197 Merge made by the 'recursive' strategy.
4198 arch/m68k/include/asm/cacheflush_no.h | 19 +-
4199 arch/m68k/include/asm/m5206sim.h | 98 +--
4200 arch/m68k/include/asm/m523xsim.h | 24 +-
4201 arch/m68k/include/asm/m5249sim.h | 98 +--
4202 arch/m68k/include/asm/m525xsim.h | 70 +-
4203 arch/m68k/include/asm/m5272sim.h | 99 +--
4204 arch/m68k/include/asm/m527xsim.h | 84 ++-
4205 arch/m68k/include/asm/m528xsim.h | 51 +-
4206 arch/m68k/include/asm/m5307sim.h | 136 ++--
4207 arch/m68k/include/asm/m532xsim.h | 1189 ++-----------------------------
4208 arch/m68k/include/asm/m5407sim.h | 110 +--
4209 arch/m68k/include/asm/m54xxgpt.h | 40 +-
4210 arch/m68k/include/asm/m54xxsim.h | 27 +-
4211 arch/m68k/include/asm/mcfslt.h | 7 -
4212 arch/m68k/include/asm/nettel.h | 9 +-
4213 arch/m68k/platform/68VZ328/Makefile | 8 +-
4214 arch/m68k/platform/coldfire/device.c | 4 +-
4215 arch/m68k/platform/coldfire/head.S | 2 +-
4216 arch/m68k/platform/coldfire/intc-5249.c | 10 +-
4217 arch/m68k/platform/coldfire/intc-5272.c | 20 +-
4218 arch/m68k/platform/coldfire/intc.c | 28 +-
4219 arch/m68k/platform/coldfire/m523x.c | 8 +-
4220 arch/m68k/platform/coldfire/m5249.c | 10 +-
4221 arch/m68k/platform/coldfire/m525x.c | 4 +-
4222 arch/m68k/platform/coldfire/m5272.c | 19 +-
4223 arch/m68k/platform/coldfire/m527x.c | 24 +-
4224 arch/m68k/platform/coldfire/m528x.c | 6 +-
4225 arch/m68k/platform/coldfire/m532x.c | 221 +++---
4226 arch/m68k/platform/coldfire/m54xx.c | 16 +-
4227 arch/m68k/platform/coldfire/nettel.c | 4 +-
4228 arch/m68k/platform/coldfire/pci.c | 4 +-
4229 arch/m68k/platform/coldfire/reset.c | 2 +-
4230 arch/m68k/platform/coldfire/sltimers.c | 4 +-
4231 arch/m68k/platform/coldfire/timers.c | 4 +-
4232 drivers/watchdog/m54xx_wdt.c | 21 +-
4233 35 files changed, 702 insertions(+), 1778 deletions(-)
4234 Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
4235 $ git merge microblaze/next
4237 Merging mips/mips-for-linux-next (97541cc MIPS: ath79: Fix CPU/DDR frequency calculation for SRIF PLLs)
4238 $ git merge mips/mips-for-linux-next
4239 Resolved 'drivers/net/ethernet/octeon/octeon_mgmt.c' using previous resolution.
4240 Resolved 'drivers/pinctrl/Makefile' using previous resolution.
4241 Auto-merging drivers/pinctrl/Makefile
4242 CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile
4243 Auto-merging drivers/pinctrl/Kconfig
4244 Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
4245 CONFLICT (content): Merge conflict in drivers/net/ethernet/octeon/octeon_mgmt.c
4246 Removing arch/mips/mipssim/sim_time.c
4247 Removing arch/mips/mipssim/sim_smtc.c
4248 Removing arch/mips/mipssim/sim_setup.c
4249 Removing arch/mips/mipssim/sim_platform.c
4250 Removing arch/mips/mipssim/sim_mem.c
4251 Removing arch/mips/mipssim/sim_int.c
4252 Removing arch/mips/mipssim/sim_console.c
4253 Removing arch/mips/mipssim/Platform
4254 Removing arch/mips/mipssim/Makefile
4255 Removing arch/mips/lantiq/xway/gpio.c
4256 Removing arch/mips/include/asm/mips-boards/simint.h
4257 Auto-merging arch/mips/include/asm/mach-sead3/war.h
4258 Auto-merging arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h
4259 Removing arch/mips/configs/mipssim_defconfig
4260 Automatic merge failed; fix conflicts and then commit the result.
4262 [master 32d17f7] Merge remote-tracking branch 'mips/mips-for-linux-next'
4263 $ git diff -M --stat --summary HEAD^..
4264 .../bindings/pinctrl/lantiq,falcon-pinumx.txt | 83 +
4265 .../bindings/pinctrl/lantiq,xway-pinumx.txt | 97 +
4266 arch/mips/Kbuild.platforms | 2 +-
4267 arch/mips/Kconfig | 33 +-
4268 arch/mips/ath79/clock.c | 109 +-
4269 arch/mips/ath79/dev-usb.c | 92 +-
4270 arch/mips/ath79/mach-db120.c | 2 +
4271 arch/mips/bcm63xx/Makefile | 2 +-
4272 arch/mips/bcm63xx/boards/board_bcm963xx.c | 26 +-
4273 arch/mips/bcm63xx/clk.c | 21 +-
4274 arch/mips/bcm63xx/dev-usb-usbd.c | 65 +
4275 arch/mips/cavium-octeon/csrc-octeon.c | 93 +-
4276 .../cavium-octeon/executive/cvmx-interrupt-rsl.c | 2 +-
4277 arch/mips/cavium-octeon/octeon-irq.c | 842 +-
4278 arch/mips/cavium-octeon/setup.c | 3 +-
4279 ...um-octeon_defconfig => cavium_octeon_defconfig} | 0
4280 arch/mips/configs/mipssim_defconfig | 64 -
4281 ...5-stb225_defconfig => pnx8335_stb225_defconfig} | 0
4282 ...pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} | 0
4283 ...0-stb810_defconfig => pnx8550_stb810_defconfig} | 0
4284 ...1250-swarm_defconfig => sb1250_swarm_defconfig} | 0
4285 arch/mips/configs/sead3_defconfig | 124 +
4286 arch/mips/include/asm/cpu-features.h | 4 +-
4287 arch/mips/include/asm/cpu.h | 2 +
4288 arch/mips/include/asm/gic.h | 49 +-
4289 arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 30 +
4290 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 85 +-
4291 .../asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h | 17 +
4292 arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h | 38 +
4293 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 167 +-
4294 .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 5 +
4295 .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 2 +-
4296 arch/mips/include/asm/mach-cavium-octeon/irq.h | 7 +-
4297 .../include/asm/mach-lantiq/falcon/falcon_irq.h | 2 +
4298 .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 4 +
4299 arch/mips/include/asm/mach-lantiq/gpio.h | 5 +-
4300 .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 2 +
4301 .../cpu-feature-overrides.h | 15 +-
4302 arch/mips/include/asm/mach-sead3/irq.h | 9 +
4303 .../include/asm/mach-sead3/kernel-entry-init.h | 52 +
4304 .../include/asm/{mach-mipssim => mach-sead3}/war.h | 12 +-
4305 arch/mips/include/asm/mips-boards/maltaint.h | 55 +-
4306 arch/mips/include/asm/mips-boards/sead3int.h | 19 +
4307 arch/mips/include/asm/mips-boards/simint.h | 31 -
4308 arch/mips/include/asm/mipsregs.h | 3 +
4309 arch/mips/include/asm/octeon/cvmx-agl-defs.h | 1014 +-
4310 arch/mips/include/asm/octeon/cvmx-asxx-defs.h | 300 +-
4311 arch/mips/include/asm/octeon/cvmx-ciu-defs.h |11333 ++++++++++++++++----
4312 arch/mips/include/asm/octeon/cvmx-ciu2-defs.h | 7108 ++++++++++++
4313 arch/mips/include/asm/octeon/cvmx-dbg-defs.h | 39 +-
4314 arch/mips/include/asm/octeon/cvmx-dpi-defs.h | 411 +-
4315 arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1321 ++-
4316 arch/mips/include/asm/octeon/cvmx-gmxx-defs.h | 4966 ++++++++-
4317 arch/mips/include/asm/octeon/cvmx-gpio-defs.h | 282 +-
4318 arch/mips/include/asm/octeon/cvmx-iob-defs.h | 722 +-
4319 arch/mips/include/asm/octeon/cvmx-ipd-defs.h | 1111 +-
4320 arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 1726 ++-
4321 arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 171 +-
4322 arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 105 +-
4323 arch/mips/include/asm/octeon/cvmx-led-defs.h | 67 +-
4324 arch/mips/include/asm/octeon/cvmx-mio-defs.h | 1909 +++-
4325 arch/mips/include/asm/octeon/cvmx-mixx-defs.h | 234 +-
4326 arch/mips/include/asm/octeon/cvmx-npei-defs.h | 1743 ++-
4327 arch/mips/include/asm/octeon/cvmx-npi-defs.h | 1260 ++-
4328 arch/mips/include/asm/octeon/cvmx-pci-defs.h | 909 +-
4329 arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 1292 ++-
4330 arch/mips/include/asm/octeon/cvmx-pcsx-defs.h | 729 +-
4331 arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h | 574 +-
4332 arch/mips/include/asm/octeon/cvmx-pemx-defs.h | 288 +-
4333 arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 246 +-
4334 arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 2 +-
4335 arch/mips/include/asm/octeon/cvmx-pip-defs.h | 2431 ++++-
4336 arch/mips/include/asm/octeon/cvmx-pko-defs.h | 1993 +++-
4337 arch/mips/include/asm/octeon/cvmx-pow-defs.h | 530 +-
4338 arch/mips/include/asm/octeon/cvmx-rnm-defs.h | 107 +-
4339 arch/mips/include/asm/octeon/cvmx-sli-defs.h | 1351 ++-
4340 arch/mips/include/asm/octeon/cvmx-smix-defs.h | 202 +-
4341 arch/mips/include/asm/octeon/cvmx-spxx-defs.h | 225 +-
4342 arch/mips/include/asm/octeon/cvmx-sriox-defs.h | 703 +-
4343 arch/mips/include/asm/octeon/cvmx-srxx-defs.h | 62 +-
4344 arch/mips/include/asm/octeon/cvmx-stxx-defs.h | 166 +-
4345 arch/mips/include/asm/octeon/cvmx-uctlx-defs.h | 268 +-
4346 arch/mips/include/asm/octeon/octeon-model.h | 18 +
4347 arch/mips/include/asm/octeon/octeon.h | 4 +
4348 arch/mips/include/asm/pgtable-bits.h | 18 +-
4349 arch/mips/include/asm/pgtable.h | 12 +-
4350 arch/mips/include/asm/thread_info.h | 6 +-
4351 arch/mips/include/asm/uasm.h | 2 +
4352 arch/mips/include/asm/unistd.h | 15 +-
4353 arch/mips/kernel/cevt-r4k.c | 5 +
4354 arch/mips/kernel/cpu-probe.c | 10 +-
4355 arch/mips/kernel/entry.S | 15 +-
4356 arch/mips/kernel/irq-gic.c | 162 +-
4357 arch/mips/kernel/scall32-o32.S | 14 +-
4358 arch/mips/kernel/scall64-64.S | 14 +-
4359 arch/mips/kernel/scall64-n32.S | 14 +-
4360 arch/mips/kernel/scall64-o32.S | 14 +-
4361 arch/mips/kernel/signal.c | 8 -
4362 arch/mips/lantiq/Kconfig | 2 +
4363 arch/mips/lantiq/falcon/prom.c | 5 +
4364 arch/mips/lantiq/falcon/sysctrl.c | 1 +
4365 arch/mips/lantiq/irq.c | 82 +-
4366 arch/mips/lantiq/xway/Makefile | 2 +-
4367 arch/mips/lantiq/xway/gpio.c | 183 -
4368 arch/mips/lantiq/xway/gptu.c | 214 +
4369 arch/mips/lantiq/xway/sysctrl.c | 3 +-
4370 arch/mips/mipssim/Makefile | 23 -
4371 arch/mips/mipssim/Platform | 6 -
4372 arch/mips/mipssim/sim_console.c | 40 -
4373 arch/mips/mipssim/sim_int.c | 87 -
4374 arch/mips/mipssim/sim_mem.c | 115 -
4375 arch/mips/mipssim/sim_platform.c | 35 -
4376 arch/mips/mipssim/sim_setup.c | 99 -
4377 arch/mips/mipssim/sim_smtc.c | 116 -
4378 arch/mips/mipssim/sim_time.c | 117 -
4379 arch/mips/mm/c-r4k.c | 21 +
4380 arch/mips/mm/cache.c | 2 +-
4381 arch/mips/mm/fault.c | 2 +-
4382 arch/mips/mm/tlb-r4k.c | 2 +-
4383 arch/mips/mm/tlbex.c | 44 +-
4384 arch/mips/mm/uasm.c | 23 +-
4385 arch/mips/mti-malta/malta-int.c | 34 +
4386 arch/mips/mti-sead3/Makefile | 19 +
4387 arch/mips/mti-sead3/Platform | 7 +
4388 arch/mips/mti-sead3/leds-sead3.c | 128 +
4389 arch/mips/mti-sead3/sead3-cmdline.c | 46 +
4390 arch/mips/mti-sead3/sead3-console.c | 46 +
4391 arch/mips/mti-sead3/sead3-display.c | 78 +
4392 arch/mips/mti-sead3/sead3-ehci.c | 47 +
4393 arch/mips/mti-sead3/sead3-i2c-dev.c | 33 +
4394 arch/mips/mti-sead3/sead3-i2c-drv.c | 405 +
4395 arch/mips/mti-sead3/sead3-i2c.c | 37 +
4396 arch/mips/mti-sead3/sead3-init.c | 91 +
4397 arch/mips/mti-sead3/sead3-int.c | 158 +
4398 arch/mips/mti-sead3/sead3-lcd.c | 43 +
4399 arch/mips/mti-sead3/sead3-leds.c | 83 +
4400 arch/mips/mti-sead3/sead3-memory.c | 138 +
4401 arch/mips/mti-sead3/sead3-mtd.c | 54 +
4402 arch/mips/mti-sead3/sead3-net.c | 51 +
4403 arch/mips/mti-sead3/sead3-pic32-bus.c | 103 +
4404 arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 435 +
4405 arch/mips/mti-sead3/sead3-platform.c | 45 +
4406 arch/mips/mti-sead3/sead3-reset.c | 39 +
4407 arch/mips/mti-sead3/sead3-serial.c | 45 +
4408 arch/mips/mti-sead3/sead3-setup.c | 20 +
4409 arch/mips/mti-sead3/sead3-time.c | 117 +
4410 drivers/gpio/gpio-stp-xway.c | 2 +-
4411 drivers/net/ethernet/broadcom/bcm63xx_enet.h | 30 +-
4412 drivers/net/ethernet/octeon/octeon_mgmt.c | 550 +-
4413 drivers/pinctrl/Kconfig | 16 +
4414 drivers/pinctrl/Makefile | 3 +
4415 drivers/pinctrl/pinctrl-falcon.c | 468 +
4416 drivers/pinctrl/pinctrl-lantiq.c | 342 +
4417 drivers/pinctrl/pinctrl-lantiq.h | 194 +
4418 drivers/pinctrl/pinctrl-xway.c | 781 ++
4419 155 files changed, 51777 insertions(+), 4641 deletions(-)
4420 create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt
4421 create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt
4422 create mode 100644 arch/mips/bcm63xx/dev-usb-usbd.c
4423 rename arch/mips/configs/{cavium-octeon_defconfig => cavium_octeon_defconfig} (100%)
4424 delete mode 100644 arch/mips/configs/mipssim_defconfig
4425 rename arch/mips/configs/{pnx8335-stb225_defconfig => pnx8335_stb225_defconfig} (100%)
4426 rename arch/mips/configs/{pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} (100%)
4427 rename arch/mips/configs/{pnx8550-stb810_defconfig => pnx8550_stb810_defconfig} (100%)
4428 rename arch/mips/configs/{sb1250-swarm_defconfig => sb1250_swarm_defconfig} (100%)
4429 create mode 100644 arch/mips/configs/sead3_defconfig
4430 create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
4431 create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h
4432 rename arch/mips/include/asm/{mach-mipssim => mach-sead3}/cpu-feature-overrides.h (83%)
4433 create mode 100644 arch/mips/include/asm/mach-sead3/irq.h
4434 create mode 100644 arch/mips/include/asm/mach-sead3/kernel-entry-init.h
4435 rename arch/mips/include/asm/{mach-mipssim => mach-sead3}/war.h (72%)
4436 create mode 100644 arch/mips/include/asm/mips-boards/sead3int.h
4437 delete mode 100644 arch/mips/include/asm/mips-boards/simint.h
4438 create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu2-defs.h
4439 delete mode 100644 arch/mips/lantiq/xway/gpio.c
4440 create mode 100644 arch/mips/lantiq/xway/gptu.c
4441 delete mode 100644 arch/mips/mipssim/Makefile
4442 delete mode 100644 arch/mips/mipssim/Platform
4443 delete mode 100644 arch/mips/mipssim/sim_console.c
4444 delete mode 100644 arch/mips/mipssim/sim_int.c
4445 delete mode 100644 arch/mips/mipssim/sim_mem.c
4446 delete mode 100644 arch/mips/mipssim/sim_platform.c
4447 delete mode 100644 arch/mips/mipssim/sim_setup.c
4448 delete mode 100644 arch/mips/mipssim/sim_smtc.c
4449 delete mode 100644 arch/mips/mipssim/sim_time.c
4450 create mode 100644 arch/mips/mti-sead3/Makefile
4451 create mode 100644 arch/mips/mti-sead3/Platform
4452 create mode 100644 arch/mips/mti-sead3/leds-sead3.c
4453 create mode 100644 arch/mips/mti-sead3/sead3-cmdline.c
4454 create mode 100644 arch/mips/mti-sead3/sead3-console.c
4455 create mode 100644 arch/mips/mti-sead3/sead3-display.c
4456 create mode 100644 arch/mips/mti-sead3/sead3-ehci.c
4457 create mode 100644 arch/mips/mti-sead3/sead3-i2c-dev.c
4458 create mode 100644 arch/mips/mti-sead3/sead3-i2c-drv.c
4459 create mode 100644 arch/mips/mti-sead3/sead3-i2c.c
4460 create mode 100644 arch/mips/mti-sead3/sead3-init.c
4461 create mode 100644 arch/mips/mti-sead3/sead3-int.c
4462 create mode 100644 arch/mips/mti-sead3/sead3-lcd.c
4463 create mode 100644 arch/mips/mti-sead3/sead3-leds.c
4464 create mode 100644 arch/mips/mti-sead3/sead3-memory.c
4465 create mode 100644 arch/mips/mti-sead3/sead3-mtd.c
4466 create mode 100644 arch/mips/mti-sead3/sead3-net.c
4467 create mode 100644 arch/mips/mti-sead3/sead3-pic32-bus.c
4468 create mode 100644 arch/mips/mti-sead3/sead3-pic32-i2c-drv.c
4469 create mode 100644 arch/mips/mti-sead3/sead3-platform.c
4470 create mode 100644 arch/mips/mti-sead3/sead3-reset.c
4471 create mode 100644 arch/mips/mti-sead3/sead3-serial.c
4472 create mode 100644 arch/mips/mti-sead3/sead3-setup.c
4473 create mode 100644 arch/mips/mti-sead3/sead3-time.c
4474 create mode 100644 drivers/pinctrl/pinctrl-falcon.c
4475 create mode 100644 drivers/pinctrl/pinctrl-lantiq.c
4476 create mode 100644 drivers/pinctrl/pinctrl-lantiq.h
4477 create mode 100644 drivers/pinctrl/pinctrl-xway.c
4478 Merging openrisc/for-upstream (4c8faa4 openrisc: mask interrupts in irq_mask_ack function)
4479 $ git merge openrisc/for-upstream
4480 Auto-merging include/linux/audit.h
4481 Merge made by the 'recursive' strategy.
4482 arch/openrisc/include/asm/processor.h | 2 +-
4483 arch/openrisc/kernel/irq.c | 20 +++++++++++---------
4484 arch/openrisc/kernel/ptrace.c | 2 +-
4485 arch/openrisc/lib/delay.c | 6 +++---
4486 include/linux/audit.h | 1 +
4487 5 files changed, 17 insertions(+), 14 deletions(-)
4488 Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
4489 $ git merge parisc/for-next
4491 Merging s390/features (12dce10 s390/mm,pageattr: remove superfluous EXPORT_SYMBOLs)
4492 $ git merge s390/features
4493 Merge made by the 'recursive' strategy.
4494 arch/s390/include/asm/page.h | 14 ++++++++---
4495 arch/s390/include/asm/pgtable.h | 9 +++++++
4496 arch/s390/include/asm/setup.h | 14 ++++++-----
4497 arch/s390/kernel/early.c | 17 +++++--------
4498 arch/s390/kernel/setup.c | 38 +++++++++++++++++++++++++---
4499 arch/s390/mm/pageattr.c | 40 +++++++++++++++++++-----------
4500 arch/s390/mm/vmem.c | 29 +++++++++++-----------
4501 drivers/s390/block/dcssblk.c | 52 +++++++++++++++++----------------------
4502 8 files changed, 132 insertions(+), 81 deletions(-)
4503 Merging sh/sh-latest (16d74eb sh: pfc: Fix up GPIO mux type reconfig case.)
4504 $ git merge sh/sh-latest
4506 Merging sparc-next/master (42a4172 sparc64: Fix trailing whitespace in NG4 memcpy.)
4507 $ git merge sparc-next/master
4509 Merging tile/master (e70cf54 tile: gxio iorpc numbering change for TRIO interface)
4510 $ git merge tile/master
4512 Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
4513 $ git merge unicore32/unicore32
4514 Auto-merging arch/unicore32/Kconfig
4515 Merge made by the 'recursive' strategy.
4516 arch/unicore32/Kconfig | 3 +++
4517 arch/unicore32/include/asm/bug.h | 5 -----
4518 arch/unicore32/include/asm/cmpxchg.h | 2 +-
4519 arch/unicore32/kernel/setup.h | 6 ++++++
4520 arch/unicore32/mm/fault.c | 37 +++++++++++++++++++++++++---------
4521 5 files changed, 37 insertions(+), 16 deletions(-)
4522 Merging xtensa/for_next (ded389d xtensa: Add missing RCU idle APIs on idle loop)
4523 $ git merge xtensa/for_next
4524 Removing arch/xtensa/platforms/iss/io.c
4525 Auto-merging arch/xtensa/platforms/iss/console.c
4526 Auto-merging arch/xtensa/kernel/pci.c
4527 Removing arch/xtensa/kernel/io.c
4528 Auto-merging arch/xtensa/Kconfig
4529 Merge made by the 'recursive' strategy.
4530 arch/xtensa/Kconfig | 6 +-
4531 arch/xtensa/Makefile | 2 +-
4532 arch/xtensa/boot/boot-elf/Makefile | 9 +-
4533 arch/xtensa/boot/boot-redboot/Makefile | 12 +-
4534 arch/xtensa/include/asm/io.h | 172 +++-----------------
4535 arch/xtensa/include/asm/ioctls.h | 4 +-
4536 arch/xtensa/include/asm/regs.h | 2 +-
4537 arch/xtensa/kernel/Makefile | 3 +-
4538 arch/xtensa/kernel/io.c | 75 ---------
4539 arch/xtensa/kernel/irq.c | 4 +-
4540 arch/xtensa/kernel/pci-dma.c | 4 +
4541 arch/xtensa/kernel/pci.c | 2 +-
4542 arch/xtensa/kernel/platform.c | 4 +-
4543 arch/xtensa/kernel/xtensa_ksyms.c | 25 +++
4544 arch/xtensa/platforms/iss/Makefile | 4 +-
4545 arch/xtensa/platforms/iss/console.c | 15 +-
4546 .../platforms/iss/include/platform/simcall.h | 53 ++++++
4547 arch/xtensa/platforms/iss/io.c | 32 ----
4548 arch/xtensa/platforms/iss/network.c | 49 ------
4549 arch/xtensa/platforms/iss/setup.c | 14 +-
4550 drivers/isdn/hisax/Kconfig | 10 +-
4551 drivers/parport/Kconfig | 2 +-
4552 drivers/usb/musb/musb_io.h | 3 +-
4553 scripts/mod/modpost.c | 2 +
4554 24 files changed, 154 insertions(+), 354 deletions(-)
4555 delete mode 100644 arch/xtensa/kernel/io.c
4556 create mode 100644 arch/xtensa/platforms/iss/include/platform/serial.h
4557 delete mode 100644 arch/xtensa/platforms/iss/io.c
4558 Merging btrfs/next (b456b5a btrfs: move inline function code to header file)
4559 $ git merge btrfs/next
4560 Auto-merging fs/btrfs/ioctl.c
4561 Auto-merging fs/btrfs/inode.c
4562 Auto-merging fs/btrfs/delayed-inode.c
4563 Auto-merging fs/btrfs/ctree.h
4564 Merge made by the 'recursive' strategy.
4565 fs/btrfs/backref.c | 299 ++++++++++---
4566 fs/btrfs/backref.h | 10 +-
4567 fs/btrfs/btrfs_inode.h | 15 +-
4568 fs/btrfs/ctree.c | 175 ++------
4569 fs/btrfs/ctree.h | 105 ++++-
4570 fs/btrfs/delayed-inode.c | 6 +-
4571 fs/btrfs/disk-io.c | 117 ++---
4572 fs/btrfs/extent-tree.c | 395 ++++++++---------
4573 fs/btrfs/extent_io.c | 111 +++--
4574 fs/btrfs/extent_io.h | 23 +-
4575 fs/btrfs/extent_map.c | 55 ++-
4576 fs/btrfs/extent_map.h | 8 +-
4577 fs/btrfs/file-item.c | 5 +-
4578 fs/btrfs/file.c | 447 +++++++++++++++++--
4579 fs/btrfs/free-space-cache.c | 10 +-
4580 fs/btrfs/hash.h | 10 +
4581 fs/btrfs/inode-item.c | 285 +++++++++++-
4582 fs/btrfs/inode.c | 1002 +++++++++++++++++++++++++++++++++++++-----
4583 fs/btrfs/ioctl.c | 92 ++--
4584 fs/btrfs/math.h | 44 ++
4585 fs/btrfs/ordered-data.c | 97 ++--
4586 fs/btrfs/ordered-data.h | 12 +-
4587 fs/btrfs/qgroup.c | 40 +-
4588 fs/btrfs/relocation.c | 11 +-
4589 fs/btrfs/root-tree.c | 29 +-
4590 fs/btrfs/scrub.c | 30 +-
4591 fs/btrfs/send.c | 915 +++++++++++++++++++++-----------------
4592 fs/btrfs/send.h | 1 +
4593 fs/btrfs/super.c | 52 ++-
4594 fs/btrfs/transaction.c | 283 ++++++++----
4595 fs/btrfs/transaction.h | 20 +-
4596 fs/btrfs/tree-log.c | 798 +++++++++++++++++++++++++++------
4597 fs/btrfs/ulist.c | 7 +-
4598 fs/btrfs/ulist.h | 9 +-
4599 fs/btrfs/volumes.c | 60 +--
4600 include/trace/events/btrfs.h | 14 +-
4601 36 files changed, 4000 insertions(+), 1592 deletions(-)
4602 create mode 100644 fs/btrfs/math.h
4603 Merging ceph/master (5ce765a libceph: only kunmap kmapped pages)
4604 $ git merge ceph/master
4606 Merging cifs/for-next (1d4ab90 [CIFS] Fix indentation of fs/cifs/Kconfig entries)
4607 $ git merge cifs/for-next
4609 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
4610 $ git merge configfs/linux-next
4612 Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
4613 $ git merge ecryptfs/next
4615 Merging ext3/for_next (09e05d4 jbd: Fix assertion failure in commit code due to lacking transaction credits)
4616 $ git merge ext3/for_next
4617 Auto-merging fs/udf/inode.c
4618 Auto-merging fs/ext3/super.c
4619 Merge made by the 'recursive' strategy.
4620 fs/ext3/super.c | 8 ++++---
4621 fs/jbd/commit.c | 45 ++++++++++++++++++++++++++---------
4622 fs/jbd/transaction.c | 64 ++++++++++++++++++++++++++++++++++----------------
4623 fs/reiserfs/xattr.c | 2 +-
4624 fs/udf/file.c | 9 +++++++
4625 fs/udf/inode.c | 59 +++++++++++++++++++++++++++++++++-------------
4626 6 files changed, 136 insertions(+), 51 deletions(-)
4627 Merging ext4/dev (041bbb6 ext4: fix mtime update in nodelalloc mode)
4628 $ git merge ext4/dev
4629 Auto-merging fs/jbd2/journal.c
4630 Auto-merging fs/fs-writeback.c
4631 Auto-merging fs/ext4/super.c
4632 Auto-merging fs/ext4/mballoc.c
4633 Auto-merging fs/ext4/inode.c
4634 Auto-merging fs/buffer.c
4635 Merge made by the 'recursive' strategy.
4636 Documentation/ABI/testing/sysfs-fs-ext4 | 13 +
4637 Documentation/filesystems/ext4.txt | 10 +
4639 fs/ext4/ext4.h | 46 ++-
4640 fs/ext4/extents.c | 256 ++++++++-------
4641 fs/ext4/file.c | 6 +-
4642 fs/ext4/fsync.c | 90 +-----
4643 fs/ext4/ialloc.c | 9 +
4644 fs/ext4/indirect.c | 18 +-
4645 fs/ext4/inode.c | 83 ++---
4646 fs/ext4/ioctl.c | 25 +-
4647 fs/ext4/mballoc.c | 129 ++++----
4648 fs/ext4/mballoc.h | 5 -
4649 fs/ext4/move_extent.c | 520 +++++++++++++++++++------------
4650 fs/ext4/namei.c | 105 +++++--
4651 fs/ext4/page-io.c | 173 ++++++----
4652 fs/ext4/resize.c | 432 +++++++++++++++++++------
4653 fs/ext4/super.c | 92 ++++--
4654 fs/fs-writeback.c | 1 +
4655 fs/jbd2/commit.c | 40 ++-
4656 fs/jbd2/journal.c | 5 +
4657 fs/jbd2/recovery.c | 7 +-
4658 fs/jbd2/transaction.c | 65 ++--
4659 fs/nilfs2/file.c | 1 +
4660 include/linux/falloc.h | 1 +
4661 include/trace/events/ext4.h | 242 +++++++-------
4662 26 files changed, 1492 insertions(+), 895 deletions(-)
4663 Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
4664 $ git merge fuse/for-next
4665 Auto-merging fs/fuse/inode.c
4666 Auto-merging fs/fuse/dev.c
4667 Merge made by the 'recursive' strategy.
4668 fs/Kconfig | 10 ----
4669 fs/fuse/Kconfig | 16 ++++-
4670 fs/fuse/dev.c | 19 ++++++
4671 fs/fuse/dir.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++--
4672 fs/fuse/fuse_i.h | 6 ++
4673 fs/fuse/inode.c | 5 +-
4674 include/linux/fuse.h | 12 ++++
4675 7 files changed, 211 insertions(+), 17 deletions(-)
4676 Merging gfs2/master (2216db7 GFS2: Write out dirty inode metadata in delayed deletes)
4677 $ git merge gfs2/master
4679 Merging jfs/jfs-next (84f4141 jfs: Fix do_div precision in commit b40c2e66)
4680 $ git merge jfs/jfs-next
4681 Auto-merging fs/jfs/super.c
4682 Auto-merging fs/jfs/jfs_incore.h
4683 Merge made by the 'recursive' strategy.
4684 Documentation/filesystems/jfs.txt | 19 ++++--
4685 fs/jfs/Makefile | 2 +-
4686 fs/jfs/ioctl.c | 43 ++++++++++++-
4687 fs/jfs/jfs_discard.c | 117 ++++++++++++++++++++++++++++++++++
4688 fs/jfs/jfs_discard.h | 26 ++++++++
4689 fs/jfs/jfs_dmap.c | 126 +++++++++++++++++++++++++++++++++++--
4690 fs/jfs/jfs_dmap.h | 2 +
4691 fs/jfs/jfs_filsys.h | 3 +
4692 fs/jfs/jfs_incore.h | 1 +
4693 fs/jfs/jfs_txnmgr.c | 9 +--
4694 fs/jfs/super.c | 71 ++++++++++++++++-----
4695 11 files changed, 388 insertions(+), 31 deletions(-)
4696 create mode 100644 fs/jfs/jfs_discard.c
4697 create mode 100644 fs/jfs/jfs_discard.h
4698 Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
4699 $ git merge logfs/master
4700 Merge made by the 'recursive' strategy.
4701 fs/logfs/dev_mtd.c | 2 +-
4702 1 file changed, 1 insertion(+), 1 deletion(-)
4703 Merging nfs/linux-next (807d66d8 NFSv4: nfs4_open_done first must check that GETATTR decoded a file type)
4704 $ git merge nfs/linux-next
4705 Auto-merging fs/nfs/super.c
4706 Auto-merging Documentation/kernel-parameters.txt
4707 Merge made by the 'recursive' strategy.
4708 Documentation/filesystems/nfs/nfs.txt | 44 +++-
4709 Documentation/kernel-parameters.txt | 5 +
4710 fs/lockd/mon.c | 86 ++++++--
4711 fs/lockd/netns.h | 4 +
4712 fs/lockd/svc.c | 1 +
4713 fs/nfs/blocklayout/blocklayout.c | 270 ++++++++++++++++++++----
4714 fs/nfs/blocklayout/blocklayout.h | 1 +
4715 fs/nfs/blocklayout/extents.c | 3 +-
4716 fs/nfs/callback.c | 321 ++++++++++++++++++----------
4717 fs/nfs/callback.h | 3 +-
4718 fs/nfs/callback_proc.c | 31 ++-
4719 fs/nfs/client.c | 23 +-
4720 fs/nfs/dir.c | 16 +-
4721 fs/nfs/direct.c | 20 +-
4722 fs/nfs/file.c | 41 ++--
4723 fs/nfs/getroot.c | 2 +
4724 fs/nfs/idmap.c | 114 ++++++----
4725 fs/nfs/inode.c | 10 +-
4726 fs/nfs/internal.h | 14 +-
4727 fs/nfs/netns.h | 4 +
4728 fs/nfs/nfs4_fs.h | 19 +-
4729 fs/nfs/nfs4client.c | 256 ++++++++++++++++++++++-
4730 fs/nfs/nfs4file.c | 29 ++-
4731 fs/nfs/nfs4filelayout.c | 41 ++--
4732 fs/nfs/nfs4filelayout.h | 16 +-
4733 fs/nfs/nfs4filelayoutdev.c | 17 +-
4734 fs/nfs/nfs4namespace.c | 16 +-
4735 fs/nfs/nfs4proc.c | 228 ++++++++++++++------
4736 fs/nfs/nfs4state.c | 228 ++++++++++++++++++--
4737 fs/nfs/nfs4sysctl.c | 1 +
4738 fs/nfs/nfs4xdr.c | 29 ++-
4739 fs/nfs/pagelist.c | 12 +-
4740 fs/nfs/pnfs.c | 369 +++++++++++++++++++--------------
4741 fs/nfs/pnfs.h | 54 ++---
4742 fs/nfs/pnfs_dev.c | 27 +++
4743 fs/nfs/super.c | 31 ++-
4744 fs/nfs/write.c | 11 +-
4745 include/linux/nfs_fs.h | 11 +-
4746 include/linux/nfs_fs_sb.h | 3 +
4747 include/linux/nfs_xdr.h | 5 +-
4748 include/linux/sunrpc/clnt.h | 2 +
4749 include/linux/sunrpc/xprt.h | 3 +-
4750 net/sunrpc/auth_gss/auth_gss.c | 58 +++---
4751 net/sunrpc/clnt.c | 105 ++++++----
4752 net/sunrpc/rpc_pipe.c | 8 +-
4753 net/sunrpc/sched.c | 2 +-
4754 net/sunrpc/xdr.c | 21 +-
4755 net/sunrpc/xprt.c | 8 +-
4756 net/sunrpc/xprtrdma/transport.c | 22 +-
4757 net/sunrpc/xprtsock.c | 40 ++--
4758 50 files changed, 1945 insertions(+), 740 deletions(-)
4759 Merging nfsd/nfsd-next (0d22f68 nfsd4: don't allow reclaims of expired clients)
4760 $ git merge nfsd/nfsd-next
4761 Auto-merging fs/nfsd/vfs.c
4762 Auto-merging fs/nfs/callback.c
4763 Auto-merging fs/lockd/svc.c
4764 Merge made by the 'recursive' strategy.
4765 .../filesystems/nfs/nfsd-admin-interfaces.txt | 41 +++
4766 fs/lockd/svc.c | 17 +-
4768 fs/nfs/callback.c | 16 +-
4769 fs/nfsd/nfs2acl.c | 3 +-
4770 fs/nfsd/nfs3proc.c | 2 +-
4771 fs/nfsd/nfs4callback.c | 1 -
4772 fs/nfsd/nfs4idmap.c | 4 +-
4773 fs/nfsd/nfs4proc.c | 6 +-
4774 fs/nfsd/nfs4state.c | 351 +++++++++++---------
4775 fs/nfsd/nfs4xdr.c | 2 +-
4776 fs/nfsd/nfsctl.c | 84 +----
4777 fs/nfsd/nfsd.h | 4 +-
4778 fs/nfsd/nfssvc.c | 26 +-
4779 fs/nfsd/state.h | 8 +-
4780 fs/nfsd/vfs.c | 2 +-
4781 include/linux/sunrpc/svc_xprt.h | 5 +-
4782 include/linux/sunrpc/svcsock.h | 3 -
4783 net/sunrpc/svc_xprt.c | 233 +++++++------
4784 net/sunrpc/svcsock.c | 157 +++------
4785 net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 -
4786 21 files changed, 460 insertions(+), 515 deletions(-)
4787 create mode 100644 Documentation/filesystems/nfs/nfsd-admin-interfaces.txt
4788 Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
4789 $ git merge ocfs2/linux-next
4790 Merge made by the 'recursive' strategy.
4791 fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
4792 fs/ocfs2/cluster/masklog.h | 3 ++-
4793 fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
4794 fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
4795 fs/ocfs2/symlink.c | 2 +-
4796 5 files changed, 27 insertions(+), 35 deletions(-)
4797 Merging omfs/for-next (976d167 Linux 3.1-rc9)
4798 $ git merge omfs/for-next
4800 Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
4801 $ git merge squashfs/master
4803 Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
4804 $ git merge v9fs/for-next
4805 Auto-merging net/9p/trans_fd.c
4806 Merge made by the 'recursive' strategy.
4807 fs/9p/v9fs.c | 30 +++++++++++++++++++-----------
4808 fs/9p/vfs_inode.c | 8 ++++----
4809 net/9p/client.c | 18 ++++++++++++++++--
4810 net/9p/trans_fd.c | 38 ++++++++++++++++++++------------------
4811 4 files changed, 59 insertions(+), 35 deletions(-)
4812 Merging ubifs/linux-next (3668b70 UBIFS: print less)
4813 $ git merge ubifs/linux-next
4814 Resolved 'fs/ubifs/debug.c' using previous resolution.
4815 Auto-merging fs/ubifs/ubifs.h
4816 Auto-merging fs/ubifs/super.c
4817 Auto-merging fs/ubifs/sb.c
4818 Auto-merging fs/ubifs/debug.c
4819 CONFLICT (content): Merge conflict in fs/ubifs/debug.c
4820 Auto-merging fs/ubifs/budget.c
4821 Automatic merge failed; fix conflicts and then commit the result.
4823 [master 6d923f9c] Merge remote-tracking branch 'ubifs/linux-next'
4824 $ git diff -M --stat --summary HEAD^..
4825 fs/ubifs/budget.c | 5 +-
4826 fs/ubifs/commit.c | 8 +-
4827 fs/ubifs/compress.c | 7 +-
4828 fs/ubifs/debug.c | 633 +++++++++++++++++++++----------------------------
4829 fs/ubifs/debug.h | 15 +-
4830 fs/ubifs/dir.c | 4 +-
4831 fs/ubifs/file.c | 4 +-
4832 fs/ubifs/gc.c | 6 +-
4833 fs/ubifs/log.c | 14 +-
4834 fs/ubifs/lprops.c | 66 +++---
4835 fs/ubifs/lpt.c | 5 +-
4836 fs/ubifs/lpt_commit.c | 58 ++---
4837 fs/ubifs/orphan.c | 7 +-
4838 fs/ubifs/recovery.c | 11 +-
4839 fs/ubifs/replay.c | 16 +-
4840 fs/ubifs/sb.c | 19 +-
4841 fs/ubifs/scan.c | 15 +-
4842 fs/ubifs/super.c | 119 +++++-----
4843 fs/ubifs/tnc_misc.c | 4 +-
4844 fs/ubifs/ubifs.h | 13 +-
4845 20 files changed, 451 insertions(+), 578 deletions(-)
4846 Merging xfs/for-next (2ea0392 xfs: Make inode32 a remountable option)
4847 $ git merge xfs/for-next
4848 Auto-merging fs/xfs/xfs_super.c
4849 Auto-merging fs/xfs/xfs_ialloc.c
4850 Merge made by the 'recursive' strategy.
4851 fs/xfs/xfs_file.c | 379 ++++++++++++++++++++++++++++++++++++++++++++++-----
4852 fs/xfs/xfs_ialloc.c | 2 +-
4853 fs/xfs/xfs_mount.c | 43 +-----
4854 fs/xfs/xfs_mount.h | 5 -
4855 fs/xfs/xfs_super.c | 95 ++++++++++++-
4856 fs/xfs/xfs_super.h | 2 +
4857 fs/xfs/xfs_trace.h | 1 +
4858 7 files changed, 447 insertions(+), 80 deletions(-)
4859 Merging vfs/for-next (49de614 MAX_LFS_FILESIZE should be a loff_t)
4860 $ git merge vfs/for-next
4861 Resolved 'drivers/staging/android/binder.c' using previous resolution.
4862 Resolved 'net/socket.c' using previous resolution.
4863 Auto-merging net/socket.c
4864 CONFLICT (content): Merge conflict in net/socket.c
4865 Auto-merging net/sctp/socket.c
4866 Auto-merging net/core/scm.c
4867 Auto-merging net/core/netprio_cgroup.c
4868 Auto-merging net/9p/trans_fd.c
4869 Auto-merging kernel/taskstats.c
4870 Auto-merging kernel/exit.c
4871 Auto-merging kernel/events/core.c
4872 Auto-merging include/linux/sched.h
4873 Auto-merging fs/xfs/xfs_super.c
4874 Auto-merging fs/xattr.c
4875 Auto-merging fs/udf/super.c
4876 Auto-merging fs/ubifs/super.c
4877 Auto-merging fs/sysv/inode.c
4878 Auto-merging fs/stat.c
4879 Auto-merging fs/qnx6/inode.c
4880 Auto-merging fs/qnx4/inode.c
4881 Auto-merging fs/proc/base.c
4882 Auto-merging fs/open.c
4883 Auto-merging fs/ocfs2/cluster/heartbeat.c
4884 Auto-merging fs/ntfs/super.c
4885 Auto-merging fs/nfsd/nfs4state.c
4886 Auto-merging fs/nfs/inode.c
4887 Auto-merging fs/ncpfs/inode.c
4888 Auto-merging fs/namei.c
4889 Auto-merging fs/minix/inode.c
4890 Auto-merging fs/logfs/inode.c
4891 Auto-merging fs/locks.c
4892 Auto-merging fs/jfs/super.c
4893 Auto-merging fs/isofs/inode.c
4894 Auto-merging fs/hugetlbfs/inode.c
4895 Auto-merging fs/hpfs/super.c
4896 Auto-merging fs/hfs/super.c
4897 Auto-merging fs/fuse/inode.c
4898 Auto-merging fs/fuse/dev.c
4899 Auto-merging fs/fat/inode.c
4900 Auto-merging fs/ext4/super.c
4901 Auto-merging fs/ext4/ioctl.c
4902 Auto-merging fs/ext3/super.c
4903 Auto-merging fs/ecryptfs/main.c
4904 Auto-merging fs/dcache.c
4905 Auto-merging fs/compat_ioctl.c
4906 Auto-merging fs/cifs/cifsfs.c
4907 Auto-merging fs/btrfs/ioctl.c
4908 Auto-merging fs/btrfs/inode.c
4909 Auto-merging fs/btrfs/extent_io.c
4910 Auto-merging fs/bfs/inode.c
4911 Auto-merging fs/befs/linuxvfs.c
4912 Auto-merging fs/affs/super.c
4913 Auto-merging fs/adfs/super.c
4914 Auto-merging fs/9p/v9fs.c
4915 Auto-merging drivers/video/msm/mdp.c
4916 Auto-merging drivers/usb/gadget/f_fs.c
4917 Auto-merging drivers/tty/tty_io.c
4918 Auto-merging drivers/staging/omapdrm/omap_gem.c
4919 Auto-merging drivers/staging/android/binder.c
4920 CONFLICT (content): Merge conflict in drivers/staging/android/binder.c
4921 Auto-merging drivers/infiniband/core/ucma.c
4922 Auto-merging arch/um/drivers/mconsole_kern.c
4923 Auto-merging arch/s390/hypfs/inode.c
4924 Auto-merging arch/ia64/kernel/perfmon.c
4925 Auto-merging arch/alpha/kernel/osf_sys.c
4926 Automatic merge failed; fix conflicts and then commit the result.
4928 [master 70d277d] Merge remote-tracking branch 'vfs/for-next'
4929 $ git diff -M --stat --summary HEAD^..
4930 arch/alpha/kernel/osf_sys.c | 13 +-
4931 arch/ia64/kernel/perfmon.c | 18 +-
4932 arch/parisc/hpux/fs.c | 17 +-
4933 arch/powerpc/include/asm/systbl.h | 4 +-
4934 arch/powerpc/include/asm/unistd.h | 1 +
4935 arch/powerpc/kernel/sys_ppc32.c | 45 +-
4936 arch/powerpc/platforms/cell/spu_syscalls.c | 21 +-
4937 arch/powerpc/platforms/cell/spufs/coredump.c | 40 +-
4938 arch/s390/hypfs/inode.c | 2 -
4939 arch/sparc/include/asm/unistd.h | 1 +
4940 arch/sparc/kernel/sys32.S | 2 +-
4941 arch/sparc/kernel/sys_sparc32.c | 46 --
4942 arch/um/drivers/mconsole_kern.c | 99 +---
4943 drivers/base/dma-buf.c | 3 +-
4944 drivers/infiniband/core/ucma.c | 10 +-
4945 drivers/infiniband/core/uverbs_cmd.c | 21 +-
4946 drivers/infiniband/core/uverbs_main.c | 11 +-
4947 drivers/staging/android/binder.c | 111 +----
4948 drivers/staging/omapdrm/omap_gem.c | 3 +-
4949 drivers/tty/tty_io.c | 45 +-
4950 drivers/usb/gadget/f_fs.c | 4 +-
4951 drivers/vfio/vfio.c | 15 +-
4952 drivers/vhost/vhost.c | 8 +-
4953 drivers/video/msm/mdp.c | 12 +-
4956 fs/adfs/super.c | 5 +
4957 fs/affs/super.c | 5 +
4958 fs/afs/super.c | 5 +
4959 fs/autofs4/dev-ioctl.c | 18 +-
4960 fs/autofs4/waitq.c | 3 +-
4961 fs/befs/linuxvfs.c | 5 +
4962 fs/bfs/inode.c | 5 +
4963 fs/binfmt_elf.c | 19 +-
4964 fs/btrfs/extent_io.c | 6 +
4965 fs/btrfs/inode.c | 5 +
4966 fs/btrfs/ioctl.c | 32 +-
4967 fs/btrfs/reada.c | 18 +-
4968 fs/ceph/inode.c | 4 +-
4969 fs/ceph/super.c | 5 +
4970 fs/cifs/cifsfs.c | 5 +
4971 fs/coda/inode.c | 37 +-
4972 fs/compat.c | 112 +++--
4973 fs/compat_ioctl.c | 27 +-
4974 fs/coredump.c | 686 +++++++++++++++++++++++++
4976 fs/ecryptfs/main.c | 6 +
4977 fs/efs/super.c | 5 +
4978 fs/eventpoll.c | 23 +-
4979 fs/exec.c | 688 +-------------------------
4980 fs/exofs/super.c | 5 +
4981 fs/ext2/super.c | 5 +
4982 fs/ext3/super.c | 5 +
4983 fs/ext4/ioctl.c | 12 +-
4984 fs/ext4/super.c | 5 +
4985 fs/fat/inode.c | 5 +
4986 fs/fcntl.c | 166 +------
4987 fs/fhandle.c | 17 +-
4988 fs/file.c | 573 ++++++++++++++++++++-
4989 fs/file_table.c | 106 ----
4990 fs/freevxfs/vxfs_super.c | 5 +
4991 fs/fuse/dev.c | 3 +-
4992 fs/fuse/inode.c | 6 +
4993 fs/hfs/super.c | 6 +
4994 fs/hfsplus/super.c | 6 +
4995 fs/hpfs/super.c | 5 +
4996 fs/hugetlbfs/inode.c | 5 +
4998 fs/isofs/inode.c | 5 +
4999 fs/jffs2/super.c | 6 +
5000 fs/jfs/super.c | 6 +
5002 fs/logfs/inode.c | 5 +
5003 fs/minix/inode.c | 5 +
5005 fs/ncpfs/inode.c | 5 +
5006 fs/nfs/inode.c | 5 +
5007 fs/nfsd/nfs4state.c | 3 +-
5008 fs/nilfs2/super.c | 6 +
5009 fs/notify/fanotify/fanotify_user.c | 87 ++--
5010 fs/notify/inotify/inotify_user.c | 28 +-
5011 fs/ntfs/super.c | 6 +
5012 fs/ocfs2/cluster/heartbeat.c | 38 +-
5013 fs/ocfs2/dlmfs/dlmfs.c | 5 +
5014 fs/ocfs2/super.c | 5 +
5015 fs/open.c | 130 ++---
5016 fs/openpromfs/inode.c | 5 +
5018 fs/proc/Makefile | 2 +-
5019 fs/proc/base.c | 417 +---------------
5020 fs/proc/fd.c | 367 ++++++++++++++
5022 fs/proc/internal.h | 48 ++
5023 fs/qnx4/inode.c | 5 +
5024 fs/qnx6/inode.c | 5 +
5025 fs/read_write.c | 180 +++----
5026 fs/read_write.h | 2 +
5027 fs/readdir.c | 36 +-
5028 fs/reiserfs/super.c | 5 +
5029 fs/romfs/super.c | 5 +
5031 fs/signalfd.c | 13 +-
5032 fs/splice.c | 69 ++-
5033 fs/squashfs/super.c | 5 +
5038 fs/sysv/inode.c | 5 +
5039 fs/timerfd.c | 45 +-
5040 fs/ubifs/super.c | 6 +
5041 fs/udf/super.c | 5 +
5042 fs/ufs/super.c | 5 +
5045 fs/xfs/xfs_dfrag.c | 34 +-
5046 fs/xfs/xfs_ioctl.c | 10 +-
5047 fs/xfs/xfs_super.c | 5 +
5048 include/linux/compat.h | 3 +
5049 include/linux/fdtable.h | 39 +-
5050 include/linux/file.h | 35 +-
5051 include/linux/fs.h | 10 +-
5052 include/linux/net.h | 3 +-
5053 include/linux/sched.h | 1 +
5054 ipc/mqueue.c | 78 +--
5055 kernel/events/core.c | 72 ++-
5056 kernel/exit.c | 97 +---
5057 kernel/sys.c | 14 +-
5058 kernel/taskstats.c | 11 +-
5059 mm/fadvise.c | 34 +-
5063 mm/readahead.c | 14 +-
5064 net/9p/trans_fd.c | 16 +-
5066 net/core/netprio_cgroup.c | 38 +-
5067 net/core/scm.c | 3 +-
5068 net/sctp/socket.c | 25 +-
5069 net/socket.c | 70 ++-
5070 security/selinux/hooks.c | 73 +--
5071 sound/core/pcm_native.c | 13 +-
5072 142 files changed, 2915 insertions(+), 2876 deletions(-)
5073 create mode 100644 fs/coredump.c
5074 create mode 100644 fs/proc/fd.c
5075 create mode 100644 fs/proc/fd.h
5076 $ git am -3 ../patches/0001-net-cope-with-sock_alloc_file-API-change.patch
5077 Applying: net: cope with sock_alloc_file() API change
5079 Unstaged changes after reset:
5080 M include/linux/net.h
5084 $ git commit -v -a --amend
5085 [master ae342cd] Merge remote-tracking branch 'vfs/for-next'
5086 Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next)
5087 $ git merge pci/next
5089 Merging powerpc/next (7844663 powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get)
5090 $ git merge powerpc/next
5091 Resolved 'drivers/scsi/ipr.c' using previous resolution.
5092 Auto-merging drivers/tty/hvc/hvc_console.c
5093 Auto-merging drivers/scsi/ipr.c
5094 CONFLICT (content): Merge conflict in drivers/scsi/ipr.c
5095 Auto-merging arch/powerpc/mm/fault.c
5096 Auto-merging arch/powerpc/kernel/time.c
5097 Auto-merging arch/powerpc/kernel/process.c
5098 Removing arch/powerpc/include/asm/abs_addr.h
5099 Auto-merging arch/powerpc/configs/ppc64_defconfig
5100 Removing arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
5101 Removing arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
5102 Removing arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
5103 Removing arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
5104 Automatic merge failed; fix conflicts and then commit the result.
5106 [master 37d78ac] Merge remote-tracking branch 'powerpc/next'
5107 $ git diff -M --stat --summary HEAD^..
5108 Documentation/devicetree/bindings/misc/ifm-csi.txt | 41 ++
5109 .../devicetree/bindings/powerpc/fsl/ifc.txt | 9 +-
5110 arch/powerpc/Kconfig | 17 +-
5111 arch/powerpc/boot/Makefile | 1 +
5112 arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi | 58 ++
5113 arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi | 52 ++
5114 arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi | 59 ++
5115 arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi | 3 +
5116 arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi | 3 +
5117 arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi | 3 +
5118 arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi | 3 +
5119 arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi | 3 +
5120 arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi | 3 +
5121 arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi | 3 +
5122 arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi | 3 +
5123 arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi | 3 +
5124 arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi | 3 +
5125 arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi | 3 +
5126 arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi | 3 +
5127 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi | 3 +
5128 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi | 3 +
5129 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | 3 +
5130 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 3 +
5131 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 320 +++++++++
5132 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi | 114 ++++
5133 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi | 118 ++++
5134 arch/powerpc/boot/dts/mpc8536ds.dtsi | 4 +
5135 arch/powerpc/boot/dts/mpc8540ads.dts | 2 +
5136 arch/powerpc/boot/dts/mpc8541cds.dts | 2 +
5137 arch/powerpc/boot/dts/mpc8544ds.dts | 4 +-
5138 arch/powerpc/boot/dts/mpc8544ds.dtsi | 39 ++
5139 arch/powerpc/boot/dts/mpc8555cds.dts | 2 +
5140 arch/powerpc/boot/dts/mpc8560ads.dts | 2 +
5141 arch/powerpc/boot/dts/o2d.dts | 47 ++
5142 arch/powerpc/boot/dts/o2d.dtsi | 139 ++++
5143 arch/powerpc/boot/dts/o2d300.dts | 52 ++
5144 arch/powerpc/boot/dts/o2dnt2.dts | 48 ++
5145 arch/powerpc/boot/dts/o2i.dts | 33 +
5146 arch/powerpc/boot/dts/o2mnt.dts | 33 +
5147 arch/powerpc/boot/dts/o3dnt.dts | 48 ++
5148 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts | 63 --
5149 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | 141 ----
5150 arch/powerpc/boot/dts/p1022ds.dtsi | 4 +
5151 arch/powerpc/boot/dts/p1022rdk.dts | 188 ++++++
5152 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 67 --
5153 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 125 ----
5154 arch/powerpc/boot/dts/p2041rdb.dts | 4 +
5155 arch/powerpc/boot/dts/p3041ds.dts | 4 +
5156 arch/powerpc/boot/dts/p4080ds.dts | 4 +
5157 arch/powerpc/boot/dts/p5020ds.dts | 4 +
5158 arch/powerpc/boot/dts/p5040ds.dts | 207 ++++++
5159 arch/powerpc/configs/85xx/p1023rds_defconfig | 6 +
5160 arch/powerpc/configs/corenet32_smp_defconfig | 1 +
5161 arch/powerpc/configs/corenet64_smp_defconfig | 1 +
5162 arch/powerpc/configs/mpc85xx_defconfig | 1 +
5163 arch/powerpc/configs/mpc85xx_smp_defconfig | 1 +
5164 arch/powerpc/configs/ppc64_defconfig | 1 +
5165 arch/powerpc/configs/pseries_defconfig | 1 +
5166 arch/powerpc/include/asm/abs_addr.h | 56 --
5167 arch/powerpc/include/asm/cacheflush.h | 2 +
5168 arch/powerpc/include/asm/debug.h | 2 +-
5169 arch/powerpc/include/asm/eeh.h | 141 ++--
5170 arch/powerpc/include/asm/eeh_event.h | 6 +-
5171 arch/powerpc/include/asm/exception-64e.h | 6 +-
5172 arch/powerpc/include/asm/fsl_guts.h | 2 +
5173 arch/powerpc/include/asm/fsl_ifc.h | 14 +-
5174 arch/powerpc/include/asm/hvcall.h | 5 -
5175 arch/powerpc/include/asm/hw_breakpoint.h | 9 +-
5176 arch/powerpc/include/asm/kprobes.h | 15 +-
5177 arch/powerpc/include/asm/kvm_book3s.h | 2 +-
5178 arch/powerpc/include/asm/kvm_book3s_asm.h | 1 -
5179 arch/powerpc/include/asm/machdep.h | 9 +-
5180 arch/powerpc/include/asm/mmu-hash64.h | 169 +++--
5181 arch/powerpc/include/asm/mmu.h | 9 +
5182 arch/powerpc/include/asm/mpc52xx.h | 2 +
5183 arch/powerpc/include/asm/mpic.h | 19 +
5184 arch/powerpc/include/asm/paca.h | 3 +-
5185 arch/powerpc/include/asm/page_64.h | 10 +-
5186 arch/powerpc/include/asm/pci-bridge.h | 11 +
5187 arch/powerpc/include/asm/perf_event_server.h | 1 +
5188 arch/powerpc/include/asm/pgtable-ppc64-4k.h | 4 +-
5189 arch/powerpc/include/asm/pgtable-ppc64-64k.h | 2 +-
5190 arch/powerpc/include/asm/pgtable-ppc64.h | 19 +-
5191 arch/powerpc/include/asm/pgtable.h | 10 +-
5192 arch/powerpc/include/asm/ppc-opcode.h | 3 +
5193 arch/powerpc/include/asm/ppc-pci.h | 20 +-
5194 arch/powerpc/include/asm/probes.h | 42 ++
5195 arch/powerpc/include/asm/processor.h | 6 +-
5196 arch/powerpc/include/asm/pte-hash64-64k.h | 18 +-
5197 arch/powerpc/include/asm/reg.h | 54 +-
5198 arch/powerpc/include/asm/setup.h | 2 +-
5199 arch/powerpc/include/asm/smp.h | 2 +
5200 arch/powerpc/include/asm/sparsemem.h | 4 +-
5201 arch/powerpc/include/asm/swiotlb.h | 6 +
5202 arch/powerpc/include/asm/thread_info.h | 7 +-
5203 arch/powerpc/include/asm/tlbflush.h | 7 +-
5204 arch/powerpc/include/asm/uaccess.h | 11 -
5205 arch/powerpc/include/asm/uprobes.h | 54 ++
5206 arch/powerpc/kernel/Makefile | 1 +
5207 arch/powerpc/kernel/asm-offsets.c | 2 +-
5208 arch/powerpc/kernel/cpu_setup_fsl_booke.S | 74 ++-
5209 arch/powerpc/kernel/cputable.c | 4 +
5210 arch/powerpc/kernel/dma-swiotlb.c | 22 +-
5211 arch/powerpc/kernel/dma.c | 3 +-
5212 arch/powerpc/kernel/entry_32.S | 47 +-
5213 arch/powerpc/kernel/entry_64.S | 35 +
5214 arch/powerpc/kernel/exceptions-64e.S | 212 +++---
5215 arch/powerpc/kernel/exceptions-64s.S | 127 +++-
5216 arch/powerpc/kernel/fadump.c | 3 +-
5217 arch/powerpc/kernel/head_fsl_booke.S | 46 +-
5218 arch/powerpc/kernel/hw_breakpoint.c | 25 +-
5219 arch/powerpc/kernel/ibmebus.c | 1 -
5220 arch/powerpc/kernel/irq.c | 8 +-
5221 arch/powerpc/kernel/machine_kexec.c | 14 +-
5222 arch/powerpc/kernel/paca.c | 1 +
5223 arch/powerpc/kernel/pci-common.c | 16 +-
5224 arch/powerpc/kernel/process.c | 16 +-
5225 arch/powerpc/kernel/prom.c | 4 +-
5226 arch/powerpc/kernel/prom_init.c | 2 +-
5227 arch/powerpc/kernel/ptrace.c | 3 +
5228 arch/powerpc/kernel/rtas_flash.c | 7 +-
5229 arch/powerpc/kernel/rtas_pci.c | 5 +-
5230 arch/powerpc/kernel/setup_64.c | 2 +
5231 arch/powerpc/kernel/signal.c | 8 +-
5232 arch/powerpc/kernel/smp.c | 14 +-
5233 arch/powerpc/kernel/time.c | 8 +-
5234 arch/powerpc/kernel/traps.c | 1 +
5235 arch/powerpc/kernel/uprobes.c | 184 ++++++
5236 arch/powerpc/kernel/vdso.c | 4 +-
5237 arch/powerpc/kernel/vio.c | 1 -
5238 arch/powerpc/kvm/book3s_32_mmu_host.c | 8 +-
5239 arch/powerpc/kvm/book3s_64_mmu_host.c | 17 +-
5240 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +-
5241 arch/powerpc/kvm/trace.h | 14 +-
5242 arch/powerpc/lib/sstep.c | 36 +-
5243 arch/powerpc/mm/fault.c | 1 +
5244 arch/powerpc/mm/hash_low_64.S | 97 +--
5245 arch/powerpc/mm/hash_native_64.c | 192 +++---
5246 arch/powerpc/mm/hash_utils_64.c | 48 +-
5247 arch/powerpc/mm/hugetlbpage-hash64.c | 15 +-
5248 arch/powerpc/mm/init_64.c | 1 -
5249 arch/powerpc/mm/mem.c | 5 +-
5250 arch/powerpc/mm/mmu_context_hash64.c | 10 +-
5251 arch/powerpc/mm/pgtable_64.c | 13 +-
5252 arch/powerpc/mm/slb_low.S | 62 +-
5253 arch/powerpc/mm/slice.c | 112 ++--
5254 arch/powerpc/mm/stab.c | 3 +-
5255 arch/powerpc/mm/subpage-prot.c | 6 +-
5256 arch/powerpc/mm/tlb_hash64.c | 11 +-
5257 arch/powerpc/mm/tlb_low_64e.S | 18 +-
5258 arch/powerpc/oprofile/op_model_power4.c | 116 +++-
5259 arch/powerpc/perf/core-book3s.c | 46 +-
5260 arch/powerpc/perf/power7-pmu.c | 3 +
5261 arch/powerpc/platforms/44x/currituck.c | 10 +-
5262 arch/powerpc/platforms/512x/Kconfig | 1 +
5263 arch/powerpc/platforms/512x/clock.c | 6 +-
5264 arch/powerpc/platforms/512x/mpc512x_shared.c | 6 -
5265 arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
5266 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 35 +-
5267 arch/powerpc/platforms/85xx/Kconfig | 21 +
5268 arch/powerpc/platforms/85xx/Makefile | 2 +
5269 arch/powerpc/platforms/85xx/common.c | 10 +
5270 arch/powerpc/platforms/85xx/corenet_ds.c | 38 +-
5271 arch/powerpc/platforms/85xx/ge_imp3a.c | 62 +-
5272 arch/powerpc/platforms/85xx/mpc8536_ds.c | 36 +-
5273 arch/powerpc/platforms/85xx/mpc85xx_ads.c | 11 +-
5274 arch/powerpc/platforms/85xx/mpc85xx_cds.c | 44 +-
5275 arch/powerpc/platforms/85xx/mpc85xx_ds.c | 15 +-
5276 arch/powerpc/platforms/85xx/mpc85xx_mds.c | 40 +-
5277 arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 30 +-
5278 arch/powerpc/platforms/85xx/p1010rdb.c | 14 +-
5279 arch/powerpc/platforms/85xx/p1022_ds.c | 36 +-
5280 arch/powerpc/platforms/85xx/p1022_rdk.c | 167 +++++
5281 arch/powerpc/platforms/85xx/p1023_rds.c | 9 +-
5282 arch/powerpc/platforms/85xx/p2041_rdb.c | 2 +-
5283 arch/powerpc/platforms/85xx/p3041_ds.c | 2 +-
5284 arch/powerpc/platforms/85xx/p4080_ds.c | 2 +-
5285 arch/powerpc/platforms/85xx/p5020_ds.c | 2 +-
5286 arch/powerpc/platforms/85xx/p5040_ds.c | 89 +++
5287 arch/powerpc/platforms/85xx/qemu_e500.c | 5 +-
5288 arch/powerpc/platforms/85xx/sbc8548.c | 21 +-
5289 arch/powerpc/platforms/85xx/smp.c | 220 +++++--
5290 arch/powerpc/platforms/85xx/socrates.c | 11 +-
5291 arch/powerpc/platforms/85xx/stx_gp3.c | 13 +-
5292 arch/powerpc/platforms/85xx/tqm85xx.c | 21 +-
5293 arch/powerpc/platforms/85xx/xes_mpc85xx.c | 56 +-
5294 arch/powerpc/platforms/86xx/gef_ppc9a.c | 12 +-
5295 arch/powerpc/platforms/86xx/gef_sbc310.c | 13 +-
5296 arch/powerpc/platforms/86xx/gef_sbc610.c | 12 +-
5297 arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 21 +-
5298 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 42 +-
5299 arch/powerpc/platforms/86xx/sbc8641d.c | 14 +-
5300 arch/powerpc/platforms/cell/beat.c | 4 +-
5301 arch/powerpc/platforms/cell/beat.h | 2 +-
5302 arch/powerpc/platforms/cell/beat_htab.c | 45 +-
5303 arch/powerpc/platforms/pasemi/iommu.c | 6 +-
5304 arch/powerpc/platforms/powernv/pci-ioda.c | 695 +++++---------------
5305 arch/powerpc/platforms/powernv/pci-p5ioc2.c | 1 -
5306 arch/powerpc/platforms/powernv/pci.c | 7 +-
5307 arch/powerpc/platforms/powernv/pci.h | 21 +-
5308 arch/powerpc/platforms/ps3/htab.c | 22 +-
5309 arch/powerpc/platforms/ps3/setup.c | 10 +-
5310 arch/powerpc/platforms/pseries/Makefile | 5 +-
5311 arch/powerpc/platforms/pseries/eeh.c | 543 ++++-----------
5312 arch/powerpc/platforms/pseries/eeh_cache.c | 59 +-
5313 arch/powerpc/platforms/pseries/eeh_dev.c | 14 +-
5314 arch/powerpc/platforms/pseries/eeh_driver.c | 310 ++++-----
5315 arch/powerpc/platforms/pseries/eeh_event.c | 54 +-
5316 arch/powerpc/platforms/pseries/eeh_pe.c | 652 ++++++++++++++++++
5317 arch/powerpc/platforms/pseries/eeh_pseries.c | 247 ++++---
5318 arch/powerpc/platforms/pseries/eeh_sysfs.c | 9 -
5319 arch/powerpc/platforms/pseries/iommu.c | 12 +-
5320 arch/powerpc/platforms/pseries/lpar.c | 77 +--
5321 arch/powerpc/platforms/pseries/msi.c | 26 +-
5322 arch/powerpc/platforms/pseries/pci.c | 2 +-
5323 arch/powerpc/platforms/pseries/pci_dlpar.c | 32 +-
5324 arch/powerpc/platforms/pseries/setup.c | 22 +-
5325 arch/powerpc/sysdev/Makefile | 2 +-
5326 arch/powerpc/sysdev/dart_iommu.c | 7 +-
5327 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 10 +
5328 arch/powerpc/sysdev/fsl_ifc.c | 20 +-
5329 arch/powerpc/sysdev/fsl_mpic_err.c | 149 +++++
5330 arch/powerpc/sysdev/fsl_pci.c | 120 ++--
5331 arch/powerpc/sysdev/fsl_pci.h | 20 +-
5332 arch/powerpc/sysdev/mpic.c | 102 ++-
5333 arch/powerpc/sysdev/mpic.h | 22 +
5334 arch/powerpc/xmon/xmon.c | 111 +++-
5335 drivers/crypto/nx/nx.c | 17 +-
5336 drivers/edac/mpc85xx_edac.c | 43 +-
5337 drivers/infiniband/hw/ehca/ehca_cq.c | 2 +-
5338 drivers/infiniband/hw/ehca/ehca_eq.c | 2 +-
5339 drivers/infiniband/hw/ehca/ehca_mrmw.c | 45 +-
5340 drivers/infiniband/hw/ehca/ehca_qp.c | 6 +-
5341 drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +-
5342 drivers/infiniband/hw/ehca/ehca_tools.h | 1 -
5343 drivers/infiniband/hw/ehca/hcp_if.c | 12 +-
5344 drivers/infiniband/hw/ehca/ipz_pt_fn.c | 2 +-
5345 drivers/macintosh/smu.c | 3 +-
5346 drivers/net/ethernet/ibm/ehea/ehea.h | 1 -
5347 drivers/net/ethernet/ibm/ehea/ehea_phyp.c | 12 +-
5348 drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 14 +-
5349 drivers/pci/hotplug/rpadlpar_core.c | 2 +-
5350 drivers/scsi/ipr.c | 18 +-
5351 drivers/tty/hvc/hvc_console.c | 33 +-
5352 drivers/tty/hvc/hvc_vio.c | 123 ++--
5353 drivers/video/ps3fb.c | 3 +-
5354 246 files changed, 6326 insertions(+), 3223 deletions(-)
5355 create mode 100644 Documentation/devicetree/bindings/misc/ifm-csi.txt
5356 create mode 100644 arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi
5357 create mode 100644 arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi
5358 create mode 100644 arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi
5359 create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
5360 create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
5361 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi
5362 create mode 100644 arch/powerpc/boot/dts/o2d.dts
5363 create mode 100644 arch/powerpc/boot/dts/o2d.dtsi
5364 create mode 100644 arch/powerpc/boot/dts/o2d300.dts
5365 create mode 100644 arch/powerpc/boot/dts/o2dnt2.dts
5366 create mode 100644 arch/powerpc/boot/dts/o2i.dts
5367 create mode 100644 arch/powerpc/boot/dts/o2mnt.dts
5368 create mode 100644 arch/powerpc/boot/dts/o3dnt.dts
5369 delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
5370 delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
5371 create mode 100644 arch/powerpc/boot/dts/p1022rdk.dts
5372 delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
5373 delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
5374 create mode 100644 arch/powerpc/boot/dts/p5040ds.dts
5375 delete mode 100644 arch/powerpc/include/asm/abs_addr.h
5376 create mode 100644 arch/powerpc/include/asm/probes.h
5377 create mode 100644 arch/powerpc/include/asm/uprobes.h
5378 create mode 100644 arch/powerpc/kernel/uprobes.c
5379 create mode 100644 arch/powerpc/platforms/85xx/p1022_rdk.c
5380 create mode 100644 arch/powerpc/platforms/85xx/p5040_ds.c
5381 create mode 100644 arch/powerpc/platforms/pseries/eeh_pe.c
5382 create mode 100644 arch/powerpc/sysdev/fsl_mpic_err.c
5383 Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
5384 $ git merge 4xx/next
5386 Merging mpc5xxx/next (9d9fd88 powerpc/mpc52xx_lpbfifo: optionally defer fifo transfer start)
5387 $ git merge mpc5xxx/next
5389 Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
5390 $ git merge galak/next
5391 Merge made by the 'recursive' strategy.
5392 arch/powerpc/sysdev/fsl_pci.c | 37 +++++++++++++++++---------
5393 drivers/mtd/nand/fsl_ifc_nand.c | 56 ++++++++++++++++++++++++++++++++++++++-
5394 2 files changed, 79 insertions(+), 14 deletions(-)
5395 Merging hid/for-next (0b82411 Merge branch 'hidraw' into for-next)
5396 $ git merge hid/for-next
5397 Resolved 'drivers/hid/hid-multitouch.c' using previous resolution.
5398 Auto-merging drivers/hid/hid-multitouch.c
5399 CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c
5400 Automatic merge failed; fix conflicts and then commit the result.
5402 [master a717dce] Merge remote-tracking branch 'hid/for-next'
5403 $ git diff -M --stat --summary HEAD^..
5404 Merging quilt/i2c (cf53e33 i2c-viapro: Add VIA VX900 device ID)
5405 $ git merge quilt/i2c
5406 Auto-merging include/linux/pci_ids.h
5407 Auto-merging drivers/i2c/busses/Kconfig
5408 Merge made by the 'recursive' strategy.
5409 Documentation/i2c/busses/i2c-viapro | 6 +-
5410 drivers/i2c/Kconfig | 17 ++-
5411 drivers/i2c/busses/Kconfig | 18 +--
5412 drivers/i2c/busses/i2c-designware-core.c | 2 +-
5413 drivers/i2c/busses/i2c-i801.c | 214 +++++++++++++++++++++++++++++-
5414 drivers/i2c/busses/i2c-parport.c | 2 +-
5415 drivers/i2c/busses/i2c-viapro.c | 3 +
5416 drivers/i2c/busses/scx200_acb.c | 24 ++--
5417 drivers/i2c/busses/scx200_i2c.c | 15 +--
5418 drivers/i2c/i2c-core.c | 16 ++-
5419 drivers/i2c/i2c-mux.c | 22 +++
5420 drivers/i2c/i2c-smbus.c | 11 +-
5421 drivers/i2c/muxes/i2c-mux-gpio.c | 4 +-
5422 drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +-
5423 drivers/i2c/muxes/i2c-mux-pca954x.c | 10 +-
5424 drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
5425 include/linux/i2c-mux-gpio.h | 2 +
5426 include/linux/i2c-mux.h | 1 +
5427 include/linux/i2c/pca954x.h | 1 +
5428 include/linux/pci_ids.h | 1 +
5429 20 files changed, 316 insertions(+), 57 deletions(-)
5430 Merging i2c-embedded/i2c-embedded/for-next (2bdbfa9 i2c: davinci: preparation for switch to common clock framework)
5431 $ git merge i2c-embedded/i2c-embedded/for-next
5432 Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution.
5433 Auto-merging drivers/i2c/busses/i2c-omap.c
5434 CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
5435 Auto-merging drivers/i2c/busses/i2c-imx.c
5436 Auto-merging drivers/i2c/busses/i2c-davinci.c
5437 Auto-merging drivers/i2c/busses/Kconfig
5438 Removing arch/arm/mach-at91/include/mach/at91_twi.h
5439 Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
5440 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
5441 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
5442 Auto-merging arch/arm/mach-at91/at91sam9263.c
5443 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
5444 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
5445 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
5446 Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
5447 Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi
5448 Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi
5449 Auto-merging arch/arm/boot/dts/at91sam9263.dtsi
5450 Auto-merging arch/arm/boot/dts/at91sam9260.dtsi
5451 Automatic merge failed; fix conflicts and then commit the result.
5453 [master ab45f28] Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
5454 $ git diff -M --stat --summary HEAD^..
5455 .../devicetree/bindings/i2c/atmel-i2c.txt | 30 +
5456 Documentation/devicetree/bindings/i2c/davinci.txt | 28 +
5457 arch/arm/boot/dts/at91sam9260.dtsi | 10 +
5458 arch/arm/boot/dts/at91sam9263.dtsi | 10 +
5459 arch/arm/boot/dts/at91sam9g20.dtsi | 4 +
5460 arch/arm/boot/dts/at91sam9g25ek.dts | 12 +
5461 arch/arm/boot/dts/at91sam9g45.dtsi | 20 +
5462 arch/arm/boot/dts/at91sam9m10g45ek.dts | 8 +
5463 arch/arm/boot/dts/at91sam9n12.dtsi | 20 +
5464 arch/arm/boot/dts/at91sam9n12ek.dts | 8 +
5465 arch/arm/boot/dts/at91sam9x5.dtsi | 30 +
5466 arch/arm/mach-at91/at91rm9200.c | 1 +
5467 arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
5468 arch/arm/mach-at91/at91sam9260.c | 3 +
5469 arch/arm/mach-at91/at91sam9260_devices.c | 8 +-
5470 arch/arm/mach-at91/at91sam9261.c | 2 +
5471 arch/arm/mach-at91/at91sam9261_devices.c | 14 +-
5472 arch/arm/mach-at91/at91sam9263.c | 2 +
5473 arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
5474 arch/arm/mach-at91/at91sam9g45.c | 4 +
5475 arch/arm/mach-at91/at91sam9g45_devices.c | 10 +-
5476 arch/arm/mach-at91/at91sam9n12.c | 2 +
5477 arch/arm/mach-at91/at91sam9rl.c | 2 +
5478 arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
5479 arch/arm/mach-at91/at91sam9x5.c | 3 +
5480 arch/arm/mach-at91/include/mach/at91_twi.h | 68 --
5481 drivers/i2c/busses/Kconfig | 17 +-
5482 drivers/i2c/busses/i2c-at91.c | 667 +++++++++++++-------
5483 drivers/i2c/busses/i2c-davinci.c | 58 +-
5484 drivers/i2c/busses/i2c-imx.c | 6 +-
5485 drivers/i2c/busses/i2c-nomadik.c | 17 -
5486 drivers/i2c/busses/i2c-omap.c | 448 ++++++++-----
5487 32 files changed, 1003 insertions(+), 515 deletions(-)
5488 create mode 100644 Documentation/devicetree/bindings/i2c/atmel-i2c.txt
5489 create mode 100644 Documentation/devicetree/bindings/i2c/davinci.txt
5490 delete mode 100644 arch/arm/mach-at91/include/mach/at91_twi.h
5491 Merging quilt/jdelvare-hwmon (65c575a hwmon: Fix spelling of Celsius)
5492 $ git merge quilt/jdelvare-hwmon
5493 Merge made by the 'recursive' strategy.
5494 Documentation/hwmon/da9052 | 2 +-
5495 Documentation/hwmon/max1619 | 2 +-
5496 Documentation/hwmon/twl4030-madc-hwmon | 2 +-
5497 drivers/hwmon/max1619.c | 4 ++--
5498 drivers/hwmon/max6642.c | 2 +-
5499 5 files changed, 6 insertions(+), 6 deletions(-)
5500 Merging hwmon-staging/hwmon-next (967d7fe hwmon: (ads7828) driver cleanup)
5501 $ git merge hwmon-staging/hwmon-next
5502 Merge made by the 'recursive' strategy.
5503 drivers/hwmon/ads7828.c | 91 ++++++++++++++++++++++-------------------------
5504 1 file changed, 43 insertions(+), 48 deletions(-)
5505 Merging v4l-dvb/master (0421fb6 Merge /home/v4l/v4l/patchwork)
5506 $ git merge v4l-dvb/master
5507 Removing drivers/staging/media/lirc/lirc_ttusbir.c
5508 Removing drivers/staging/media/lirc/lirc_ene0100.h
5509 Removing drivers/staging/media/easycap/easycap_testcard.c
5510 Removing drivers/staging/media/easycap/easycap_sound.c
5511 Removing drivers/staging/media/easycap/easycap_settings.c
5512 Removing drivers/staging/media/easycap/easycap_main.c
5513 Removing drivers/staging/media/easycap/easycap_low.c
5514 Removing drivers/staging/media/easycap/easycap_ioctl.c
5515 Removing drivers/staging/media/easycap/easycap.h
5516 Removing drivers/staging/media/easycap/README
5517 Removing drivers/staging/media/easycap/Makefile
5518 Removing drivers/staging/media/easycap/Kconfig
5519 Removing drivers/media/video/tlg2300/Makefile
5520 Removing drivers/media/video/cx23885/Kconfig
5521 Removing drivers/media/video/bt8xx/Makefile
5522 Removing drivers/media/video/bt8xx/Kconfig
5523 Removing drivers/media/video/Makefile
5524 Removing drivers/media/video/Kconfig
5525 Auto-merging drivers/media/v4l2-core/videobuf2-vmalloc.c
5526 Auto-merging drivers/media/v4l2-core/videobuf2-core.c
5527 Auto-merging drivers/media/v4l2-core/videobuf-dvb.c
5528 Auto-merging drivers/media/v4l2-core/v4l2-subdev.c
5529 Auto-merging drivers/media/v4l2-core/v4l2-mem2mem.c
5530 Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c
5531 Auto-merging drivers/media/v4l2-core/v4l2-dev.c
5532 Auto-merging drivers/media/v4l2-core/v4l2-ctrls.c
5533 Auto-merging drivers/media/v4l2-core/v4l2-compat-ioctl32.c
5534 Auto-merging drivers/media/v4l2-core/v4l2-common.c
5535 Auto-merging drivers/media/usb/uvc/uvcvideo.h
5536 Auto-merging drivers/media/usb/uvc/uvc_video.c
5537 Auto-merging drivers/media/usb/uvc/uvc_driver.c
5538 Auto-merging drivers/media/usb/usbvision/usbvision-video.c
5539 Auto-merging drivers/media/usb/usbvision/Makefile
5540 Auto-merging drivers/media/usb/usbvision/Kconfig
5541 Auto-merging drivers/media/usb/ttusb-dec/Makefile
5542 Auto-merging drivers/media/usb/ttusb-budget/Kconfig
5543 Auto-merging drivers/media/usb/tm6000/tm6000-video.c
5544 Auto-merging drivers/media/usb/tm6000/tm6000-input.c
5545 Auto-merging drivers/media/usb/tm6000/tm6000-alsa.c
5546 Auto-merging drivers/media/usb/tm6000/Makefile
5547 Auto-merging drivers/media/usb/tlg2300/pd-alsa.c
5548 Auto-merging drivers/media/usb/s2255/s2255drv.c
5549 Auto-merging drivers/media/usb/pwc/pwc-if.c
5550 Auto-merging drivers/media/usb/pwc/Makefile
5551 Auto-merging drivers/media/usb/pvrusb2/pvrusb2-devattr.c
5552 Auto-merging drivers/media/usb/pvrusb2/Makefile
5553 Auto-merging drivers/media/usb/pvrusb2/Kconfig
5554 Auto-merging drivers/media/usb/hdpvr/Makefile
5555 Auto-merging drivers/media/usb/gspca/zc3xx.c
5556 Auto-merging drivers/media/usb/gspca/xirlink_cit.c
5557 Auto-merging drivers/media/usb/gspca/vicam.c
5558 Auto-merging drivers/media/usb/gspca/vc032x.c
5559 Auto-merging drivers/media/usb/gspca/stv06xx/Makefile
5560 Auto-merging drivers/media/usb/gspca/sq930x.c
5561 Auto-merging drivers/media/usb/gspca/sq905c.c
5562 Auto-merging drivers/media/usb/gspca/sq905.c
5563 Auto-merging drivers/media/usb/gspca/sonixj.c
5564 Auto-merging drivers/media/usb/gspca/sn9c20x.c
5565 Auto-merging drivers/media/usb/gspca/pac7302.c
5566 Auto-merging drivers/media/usb/gspca/ov519.c
5567 Auto-merging drivers/media/usb/gspca/m5602/Makefile
5568 Auto-merging drivers/media/usb/gspca/jl2005bcd.c
5569 Auto-merging drivers/media/usb/gspca/gspca.c
5570 Auto-merging drivers/media/usb/gspca/gl860/Makefile
5571 Auto-merging drivers/media/usb/gspca/finepix.c
5572 Auto-merging drivers/media/usb/gspca/cpia1.c
5573 Auto-merging drivers/media/usb/gspca/Kconfig
5574 Auto-merging drivers/media/usb/em28xx/em28xx-video.c
5575 Auto-merging drivers/media/usb/em28xx/em28xx-core.c
5576 Auto-merging drivers/media/usb/em28xx/em28xx-audio.c
5577 Auto-merging drivers/media/usb/em28xx/Makefile
5578 Auto-merging drivers/media/usb/em28xx/Kconfig
5579 Auto-merging drivers/media/usb/dvb-usb/ttusb2.c
5580 Auto-merging drivers/media/usb/dvb-usb/pctv452e.c
5581 Auto-merging drivers/media/usb/dvb-usb/dvb-usb.h
5582 Auto-merging drivers/media/usb/dvb-usb/dvb-usb-dvb.c
5583 Auto-merging drivers/media/usb/dvb-usb/dib0700_core.c
5584 Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.h
5585 Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.c
5586 Auto-merging drivers/media/usb/dvb-usb-v2/mxl111sf.h
5587 Auto-merging drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
5588 Auto-merging drivers/media/usb/dvb-usb-v2/lmedm04.c
5589 Auto-merging drivers/media/usb/dvb-usb-v2/gl861.h
5590 Auto-merging drivers/media/usb/dvb-usb-v2/gl861.c
5591 Auto-merging drivers/media/usb/dvb-usb-v2/ec168.h
5592 Auto-merging drivers/media/usb/dvb-usb-v2/ec168.c
5593 Auto-merging drivers/media/usb/dvb-usb-v2/ce6230.h
5594 Auto-merging drivers/media/usb/dvb-usb-v2/ce6230.c
5595 Auto-merging drivers/media/usb/dvb-usb-v2/az6007.c
5596 Auto-merging drivers/media/usb/dvb-usb-v2/au6610.h
5597 Auto-merging drivers/media/usb/dvb-usb-v2/au6610.c
5598 Auto-merging drivers/media/usb/dvb-usb-v2/anysee.h
5599 Auto-merging drivers/media/usb/dvb-usb-v2/anysee.c
5600 Auto-merging drivers/media/usb/dvb-usb-v2/af9035.h
5601 Auto-merging drivers/media/usb/dvb-usb-v2/af9035.c
5602 Auto-merging drivers/media/usb/dvb-usb-v2/af9015.h
5603 Auto-merging drivers/media/usb/cx231xx/cx231xx-video.c
5604 Auto-merging drivers/media/usb/cx231xx/cx231xx-417.c
5605 Auto-merging drivers/media/usb/cx231xx/Makefile
5606 Auto-merging drivers/media/usb/cx231xx/Kconfig
5607 Auto-merging drivers/media/usb/cpia2/cpia2_v4l.c
5608 Auto-merging drivers/media/usb/cpia2/cpia2_core.c
5609 Auto-merging drivers/media/usb/b2c2/flexcop-usb.c
5610 Auto-merging drivers/media/usb/au0828/au0828.h
5611 Auto-merging drivers/media/usb/au0828/au0828-video.c
5612 Auto-merging drivers/media/usb/au0828/au0828-reg.h
5613 Auto-merging drivers/media/usb/au0828/au0828-i2c.c
5614 Auto-merging drivers/media/usb/au0828/au0828-dvb.c
5615 Auto-merging drivers/media/usb/au0828/au0828-core.c
5616 Auto-merging drivers/media/usb/au0828/au0828-cards.c
5617 Auto-merging drivers/media/usb/au0828/Makefile
5618 Auto-merging drivers/media/usb/au0828/Kconfig
5619 Auto-merging drivers/media/tuners/xc5000.c
5620 Auto-merging drivers/media/tuners/xc4000.c
5621 Auto-merging drivers/media/tuners/tuner-xc2028.c
5622 Auto-merging drivers/media/tuners/tua9001.h
5623 Auto-merging drivers/media/tuners/tua9001.c
5624 Auto-merging drivers/media/tuners/tda18271-common.c
5625 Auto-merging drivers/media/tuners/tda18218_priv.h
5626 Auto-merging drivers/media/tuners/tda18218.c
5627 Auto-merging drivers/media/tuners/tda18212.c
5628 Auto-merging drivers/media/tuners/qt1010.c
5629 Auto-merging drivers/media/tuners/mxl5005s.c
5630 Auto-merging drivers/media/tuners/mc44s803.c
5631 Auto-merging drivers/media/tuners/Makefile
5632 Auto-merging drivers/media/tuners/Kconfig
5633 Auto-merging drivers/media/platform/vivi.c
5634 Auto-merging drivers/media/platform/soc_camera/soc_camera_platform.c
5635 Auto-merging drivers/media/platform/soc_camera/soc_camera.c
5636 Auto-merging drivers/media/platform/soc_camera/omap1_camera.c
5637 Auto-merging drivers/media/platform/soc_camera/mx3_camera.c
5638 Auto-merging drivers/media/platform/soc_camera/mx2_camera.c
5639 Auto-merging drivers/media/platform/sh_vou.c
5640 Auto-merging drivers/media/platform/s5p-tv/sii9234_drv.c
5641 Auto-merging drivers/media/platform/s5p-tv/sdo_drv.c
5642 Auto-merging drivers/media/platform/s5p-tv/regs-sdo.h
5643 Auto-merging drivers/media/platform/s5p-tv/mixer_video.c
5644 Auto-merging drivers/media/platform/s5p-tv/mixer_drv.c
5645 Auto-merging drivers/media/platform/s5p-tv/hdmi_drv.c
5646 Auto-merging drivers/media/platform/s5p-tv/Makefile
5647 Auto-merging drivers/media/platform/s5p-tv/Kconfig
5648 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_shm.h
5649 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
5650 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
5651 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
5652 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
5653 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
5654 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_intr.h
5655 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_intr.c
5656 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
5657 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
5658 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
5659 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
5660 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
5661 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
5662 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
5663 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
5664 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
5665 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc.c
5666 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-regs.h
5667 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-hw.h
5668 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-core.h
5669 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-core.c
5670 Auto-merging drivers/media/platform/s5p-g2d/g2d.c
5671 Auto-merging drivers/media/platform/s5p-fimc/fimc-reg.c
5672 Auto-merging drivers/media/platform/s5p-fimc/fimc-mdevice.h
5673 Auto-merging drivers/media/platform/s5p-fimc/fimc-mdevice.c
5674 Auto-merging drivers/media/platform/s5p-fimc/fimc-m2m.c
5675 Auto-merging drivers/media/platform/s5p-fimc/fimc-lite.h
5676 Auto-merging drivers/media/platform/s5p-fimc/fimc-lite.c
5677 Auto-merging drivers/media/platform/s5p-fimc/fimc-lite-reg.c
5678 Auto-merging drivers/media/platform/s5p-fimc/fimc-core.h
5679 Auto-merging drivers/media/platform/s5p-fimc/fimc-capture.c
5680 Auto-merging drivers/media/platform/s5p-fimc/Kconfig
5681 Auto-merging drivers/media/platform/omap3isp/ispvideo.h
5682 Auto-merging drivers/media/platform/omap3isp/ispvideo.c
5683 Auto-merging drivers/media/platform/omap3isp/ispresizer.c
5684 Auto-merging drivers/media/platform/omap3isp/ispqueue.c
5685 Auto-merging drivers/media/platform/omap3isp/isppreview.h
5686 Auto-merging drivers/media/platform/omap3isp/isppreview.c
5687 Auto-merging drivers/media/platform/omap3isp/isphist.c
5688 Auto-merging drivers/media/platform/omap3isp/isph3a_af.c
5689 Auto-merging drivers/media/platform/omap3isp/isph3a_aewb.c
5690 Auto-merging drivers/media/platform/omap3isp/ispcsi2.c
5691 Auto-merging drivers/media/platform/omap3isp/ispccdc.h
5692 Auto-merging drivers/media/platform/omap3isp/ispccdc.c
5693 Auto-merging drivers/media/platform/omap3isp/isp.h
5694 Auto-merging drivers/media/platform/omap3isp/isp.c
5695 Auto-merging drivers/media/platform/omap3isp/cfa_coef_table.h
5696 Auto-merging drivers/media/platform/omap24xxcam.h
5697 Auto-merging drivers/media/platform/omap24xxcam.c
5698 Auto-merging drivers/media/platform/omap24xxcam-dma.c
5699 Auto-merging drivers/media/platform/omap/Makefile
5700 Auto-merging drivers/media/platform/mx2_emmaprp.c
5701 Auto-merging drivers/media/platform/mem2mem_testdev.c
5702 Auto-merging drivers/media/platform/fsl-viu.c
5703 Auto-merging drivers/media/platform/davinci/vpss.c
5704 Auto-merging drivers/media/platform/davinci/vpif_display.c
5705 Auto-merging drivers/media/platform/davinci/vpif_capture.c
5706 Auto-merging drivers/media/platform/davinci/vpif.c
5707 Auto-merging drivers/media/platform/davinci/vpfe_capture.c
5708 Auto-merging drivers/media/platform/davinci/vpbe_display.c
5709 Auto-merging drivers/media/platform/davinci/isif.c
5710 Auto-merging drivers/media/platform/davinci/dm644x_ccdc.c
5711 Auto-merging drivers/media/platform/davinci/dm355_ccdc.c
5712 Auto-merging drivers/media/platform/davinci/Kconfig
5713 Auto-merging drivers/media/platform/blackfin/bfin_capture.c
5714 Auto-merging drivers/media/pci/zoran/Kconfig
5715 Auto-merging drivers/media/pci/ttpci/budget.c
5716 Auto-merging drivers/media/pci/ttpci/Makefile
5717 Auto-merging drivers/media/pci/ttpci/Kconfig
5718 Auto-merging drivers/media/pci/saa7164/saa7164.h
5719 Auto-merging drivers/media/pci/saa7164/saa7164-core.c
5720 Auto-merging drivers/media/pci/saa7164/saa7164-api.c
5721 Auto-merging drivers/media/pci/saa7164/Makefile
5722 Auto-merging drivers/media/pci/saa7164/Kconfig
5723 Auto-merging drivers/media/pci/saa7134/saa7134.h
5724 Auto-merging drivers/media/pci/saa7134/saa7134-input.c
5725 Auto-merging drivers/media/pci/saa7134/saa7134-dvb.c
5726 Auto-merging drivers/media/pci/saa7134/Makefile
5727 Auto-merging drivers/media/pci/saa7134/Kconfig
5728 Auto-merging drivers/media/pci/pt1/va1j5jf8007s.c
5729 Auto-merging drivers/media/pci/pt1/Makefile
5730 Auto-merging drivers/media/pci/ngene/ngene-core.c
5731 Auto-merging drivers/media/pci/ngene/ngene-cards.c
5732 Auto-merging drivers/media/pci/ngene/Makefile
5733 Auto-merging drivers/media/pci/mantis/mantis_dvb.c
5734 Auto-merging drivers/media/pci/mantis/mantis_core.c
5735 Auto-merging drivers/media/pci/mantis/mantis_cards.c
5736 Auto-merging drivers/media/pci/mantis/Makefile
5737 Auto-merging drivers/media/pci/mantis/Kconfig
5738 Auto-merging drivers/media/pci/ivtv/ivtv-streams.c
5739 Auto-merging drivers/media/pci/ivtv/ivtv-irq.c
5740 Auto-merging drivers/media/pci/ivtv/ivtv-firmware.c
5741 Auto-merging drivers/media/pci/ivtv/ivtv-fileops.h
5742 Auto-merging drivers/media/pci/ivtv/ivtv-fileops.c
5743 Auto-merging drivers/media/pci/ivtv/ivtv-driver.h
5744 Auto-merging drivers/media/pci/ivtv/ivtv-driver.c
5745 Auto-merging drivers/media/pci/ivtv/Makefile
5746 Auto-merging drivers/media/pci/ivtv/Kconfig
5747 Auto-merging drivers/media/pci/dm1105/Kconfig
5748 Auto-merging drivers/media/pci/ddbridge/ddbridge-core.c
5749 Auto-merging drivers/media/pci/ddbridge/Makefile
5750 Auto-merging drivers/media/pci/ddbridge/Kconfig
5751 Auto-merging drivers/media/pci/cx88/cx88.h
5752 Auto-merging drivers/media/pci/cx88/cx88-dvb.c
5753 Auto-merging drivers/media/pci/cx88/cx88-core.c
5754 Auto-merging drivers/media/pci/cx88/cx88-cards.c
5755 Auto-merging drivers/media/pci/cx88/cx88-alsa.c
5756 Auto-merging drivers/media/pci/cx88/Makefile
5757 Auto-merging drivers/media/pci/cx88/Kconfig
5758 Auto-merging drivers/media/pci/cx25821/Makefile
5759 Auto-merging drivers/media/pci/cx23885/cx23885.h
5760 Auto-merging drivers/media/pci/cx23885/cx23885-input.c
5761 Auto-merging drivers/media/pci/cx23885/cx23885-dvb.c
5762 Auto-merging drivers/media/pci/cx23885/cx23885-cards.c
5763 Auto-merging drivers/media/pci/cx23885/cx23885-417.c
5764 Auto-merging drivers/media/pci/cx23885/altera-ci.c
5765 Auto-merging drivers/media/pci/cx23885/Makefile
5766 Auto-merging drivers/media/pci/cx18/cx18-firmware.c
5767 Auto-merging drivers/media/pci/cx18/cx18-dvb.c
5768 Auto-merging drivers/media/pci/cx18/cx18-driver.c
5769 Auto-merging drivers/media/pci/cx18/cx18-av-firmware.c
5770 Auto-merging drivers/media/pci/cx18/Makefile
5771 Auto-merging drivers/media/pci/cx18/Kconfig
5772 Auto-merging drivers/media/pci/bt8xx/dst_ca.c
5773 Auto-merging drivers/media/i2c/tvp514x_regs.h
5774 Auto-merging drivers/media/i2c/tvp514x.c
5775 Auto-merging drivers/media/i2c/tea6415c.c
5776 Auto-merging drivers/media/i2c/tcm825x.h
5777 Auto-merging drivers/media/i2c/tcm825x.c
5778 Auto-merging drivers/media/i2c/soc_camera/tw9910.c
5779 Auto-merging drivers/media/i2c/soc_camera/rj54n1cb0c.c
5780 Auto-merging drivers/media/i2c/soc_camera/ov9740.c
5781 Auto-merging drivers/media/i2c/soc_camera/ov9640.c
5782 Auto-merging drivers/media/i2c/soc_camera/ov772x.c
5783 Auto-merging drivers/media/i2c/soc_camera/ov6650.c
5784 Auto-merging drivers/media/i2c/soc_camera/ov5642.c
5785 Auto-merging drivers/media/i2c/soc_camera/ov2640.c
5786 Auto-merging drivers/media/i2c/soc_camera/mt9v022.c
5787 Auto-merging drivers/media/i2c/soc_camera/mt9t112.c
5788 Auto-merging drivers/media/i2c/soc_camera/mt9t031.c
5789 Auto-merging drivers/media/i2c/soc_camera/mt9m111.c
5790 Auto-merging drivers/media/i2c/soc_camera/mt9m001.c
5791 Auto-merging drivers/media/i2c/soc_camera/imx074.c
5792 Auto-merging drivers/media/i2c/smiapp/smiapp.h
5793 Auto-merging drivers/media/i2c/smiapp/smiapp-regs.c
5794 Auto-merging drivers/media/i2c/smiapp/smiapp-reg.h
5795 Auto-merging drivers/media/i2c/smiapp/smiapp-reg-defs.h
5796 Auto-merging drivers/media/i2c/smiapp/smiapp-quirk.h
5797 Auto-merging drivers/media/i2c/smiapp/smiapp-quirk.c
5798 Auto-merging drivers/media/i2c/smiapp/smiapp-limits.h
5799 Auto-merging drivers/media/i2c/smiapp/smiapp-limits.c
5800 Auto-merging drivers/media/i2c/smiapp/smiapp-core.c
5801 Auto-merging drivers/media/i2c/smiapp/Makefile
5802 Auto-merging drivers/media/i2c/smiapp-pll.h
5803 Auto-merging drivers/media/i2c/smiapp-pll.c
5804 Auto-merging drivers/media/i2c/saa7127.c
5805 Auto-merging drivers/media/i2c/s5k6aa.c
5806 Auto-merging drivers/media/i2c/mt9v032.c
5807 Auto-merging drivers/media/i2c/mt9p031.c
5808 Auto-merging drivers/media/i2c/mt9m032.c
5809 Auto-merging drivers/media/i2c/m5mols/m5mols_core.c
5810 Auto-merging drivers/media/i2c/m5mols/m5mols_controls.c
5811 Auto-merging drivers/media/i2c/m5mols/m5mols.h
5812 Auto-merging drivers/media/i2c/cx25840/cx25840-firmware.c
5813 Auto-merging drivers/media/i2c/cx25840/Makefile
5814 Auto-merging drivers/media/i2c/as3645a.c
5815 Auto-merging drivers/media/i2c/adp1653.c
5816 Auto-merging drivers/media/firewire/Makefile
5817 Removing drivers/media/dvb/ttusb-budget/Makefile
5818 Removing drivers/media/dvb/siano/Kconfig
5819 Removing drivers/media/dvb/pluto2/Makefile
5820 Removing drivers/media/dvb/ngene/Kconfig
5821 Removing drivers/media/dvb/frontends/ec100_priv.h
5822 Removing drivers/media/dvb/dvb-usb/mxl111sf.c
5823 Removing drivers/media/dvb/dvb-usb/it913x.c
5824 Removing drivers/media/dvb/dvb-usb/af9015.c
5825 Removing drivers/media/dvb/dvb-usb/Makefile
5826 Removing drivers/media/dvb/dvb-usb/Kconfig
5827 Removing drivers/media/dvb/dm1105/Makefile
5828 Removing drivers/media/dvb/bt8xx/Makefile
5829 Removing drivers/media/dvb/bt8xx/Kconfig
5830 Removing drivers/media/dvb/b2c2/MakefilResolved 'arch/arm/mach-imx/mach-imx27_visstrim_m10.c' using previous resolution.
5831 Resolved 'arch/arm/mach-omap2/board-rx51-peripherals.c' using previous resolution.
5833 Removing drivers/media/dvb/b2c2/Kconfig
5834 Removing drivers/media/dvb/Makefile
5835 Removing drivers/media/dvb/Kconfig
5836 Auto-merging drivers/media/dvb-frontends/tda8261.c
5837 Auto-merging drivers/media/dvb-frontends/tda10071_priv.h
5838 Auto-merging drivers/media/dvb-frontends/tda10071.c
5839 Auto-merging drivers/media/dvb-frontends/stv090x.c
5840 Auto-merging drivers/media/dvb-frontends/stb0899_drv.c
5841 Auto-merging drivers/media/dvb-frontends/rtl2832_priv.h
5842 Auto-merging drivers/media/dvb-frontends/rtl2832.h
5843 Auto-merging drivers/media/dvb-frontends/rtl2832.c
5844 Auto-merging drivers/media/dvb-frontends/rtl2830_priv.h
5845 Auto-merging drivers/media/dvb-frontends/rtl2830.h
5846 Auto-merging drivers/media/dvb-frontends/rtl2830.c
5847 Auto-merging drivers/media/dvb-frontends/nxt200x.c
5848 Auto-merging drivers/media/dvb-frontends/m88rs2000.c
5849 Auto-merging drivers/media/dvb-frontends/lgs8gxx.c
5850 Auto-merging drivers/media/dvb-frontends/lgs8gl5.c
5851 Auto-merging drivers/media/dvb-frontends/it913x-fe.c
5852 Auto-merging drivers/media/dvb-frontends/hd29l2_priv.h
5853 Auto-merging drivers/media/dvb-frontends/hd29l2.h
5854 Auto-merging drivers/media/dvb-frontends/hd29l2.c
5855 Auto-merging drivers/media/dvb-frontends/ec100.h
5856 Auto-merging drivers/media/dvb-frontends/ec100.c
5857 Auto-merging drivers/media/dvb-frontends/dvb-pll.h
5858 Auto-merging drivers/media/dvb-frontends/dvb-pll.c
5859 Auto-merging drivers/media/dvb-frontends/cxd2820r_t.c
5860 Auto-merging drivers/media/dvb-frontends/au8522_priv.h
5861 Auto-merging drivers/media/dvb-frontends/au8522_dig.c
5862 Auto-merging drivers/media/dvb-frontends/au8522_decoder.c
5863 Auto-merging drivers/media/dvb-frontends/au8522_common.c
5864 Auto-merging drivers/media/dvb-frontends/atbm8830.c
5865 Auto-merging drivers/media/dvb-frontends/af9033.h
5866 Auto-merging drivers/media/dvb-frontends/af9033.c
5867 Auto-merging drivers/media/dvb-frontends/af9013_priv.h
5868 Auto-merging drivers/media/dvb-frontends/af9013.h
5869 Auto-merging drivers/media/dvb-frontends/af9013.c
5870 Auto-merging drivers/media/dvb-frontends/Makefile
5871 Auto-merging drivers/media/dvb-frontends/Kconfig
5872 Auto-merging drivers/media/dvb-core/dvbdev.h
5873 Auto-merging drivers/media/dvb-core/dvbdev.c
5874 Auto-merging drivers/media/dvb-core/dvb_frontend.h
5875 Auto-merging drivers/media/dvb-core/dvb_frontend.c
5876 Auto-merging drivers/media/dvb-core/dvb_demux.c
5877 Auto-merging drivers/media/dvb-core/dvb-usb-ids.h
5878 Auto-merging drivers/media/dvb-core/dmxdev.c
5879 Auto-merging drivers/media/common/siano/Makefile
5880 Auto-merging drivers/media/common/saa7146/saa7146_fops.c
5881 Auto-merging drivers/media/common/saa7146/saa7146_core.c
5882 Auto-merging drivers/media/common/b2c2/flexcop.c
5883 Auto-merging drivers/gpio/gpio-bt8xx.c
5884 Auto-merging arch/arm/plat-mxc/include/mach/devices-common.h
5885 Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
5886 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51-peripherals.c
5887 Auto-merging arch/arm/mach-imx/mach-imx27_visstrim_m10.c
5888 CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
5889 Auto-merging MAINTAINERS
5890 CONFLICT (modify/delete): Documentation/feature-removal-schedule.txt deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/feature-removal-schedule.txt left in tree.
5891 Automatic merge failed; fix conflicts and then commit the result.
5892 $ git rm -f Documentation/feature-removal-schedule.txt
5893 Documentation/feature-removal-schedule.txt: needs merge
5894 rm 'Documentation/feature-removal-schedule.txt'
5896 [master 4b12547] Merge remote-tracking branch 'v4l-dvb/master'
5897 $ git diff -M --stat --summary HEAD^..
5898 Documentation/DocBook/media/Makefile | 2 +-
5899 Documentation/DocBook/media/dvb/audio.xml | 113 +-
5900 Documentation/DocBook/media/dvb/ca.xml | 353 ++
5901 Documentation/DocBook/media/dvb/demux.xml | 230 +-
5902 Documentation/DocBook/media/dvb/dvbapi.xml | 4 +-
5903 Documentation/DocBook/media/dvb/dvbproperty.xml | 97 +-
5904 Documentation/DocBook/media/dvb/frontend.xml | 71 +-
5905 Documentation/DocBook/media/dvb/intro.xml | 2 +-
5906 Documentation/DocBook/media/dvb/kdapi.xml | 2 +-
5907 Documentation/DocBook/media/dvb/net.xml | 127 +
5908 Documentation/DocBook/media/dvb/video.xml | 333 +-
5909 Documentation/DocBook/media/v4l/biblio.xml | 52 +-
5910 Documentation/DocBook/media/v4l/compat.xml | 16 -
5911 Documentation/DocBook/media/v4l/controls.xml | 614 +--
5912 Documentation/DocBook/media/v4l/dev-rds.xml | 2 +-
5913 Documentation/DocBook/media/v4l/dev-subdev.xml | 20 +-
5914 Documentation/DocBook/media/v4l/gen-errors.xml | 12 +-
5915 .../DocBook/media/v4l/pixfmt-srggb10dpcm8.xml | 3 +-
5916 Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml | 154 +
5917 Documentation/DocBook/media/v4l/pixfmt.xml | 1 +
5918 Documentation/DocBook/media/v4l/selection-api.xml | 22 +-
5919 Documentation/DocBook/media/v4l/v4l2.xml | 14 +-
5920 .../DocBook/media/v4l/vidioc-g-selection.xml | 9 +-
5921 Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 6 +
5922 Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 2 +
5923 .../media/v4l/vidioc-subdev-g-selection.xml | 8 +-
5924 Documentation/DocBook/media_api.tmpl | 9 +-
5925 Documentation/dvb/README.dvb-usb | 2 +-
5926 Documentation/ioctl/ioctl-number.txt | 5 -
5927 Documentation/video4linux/CARDLIST.cx23885 | 1 +
5929 arch/arm/mach-imx/clk-imx27.c | 4 +-
5930 arch/arm/mach-imx/devices-imx27.h | 4 +
5931 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 45 +-
5932 arch/arm/mach-omap2/board-rx51-peripherals.c | 30 +
5933 arch/arm/plat-mxc/devices/Kconfig | 6 +-
5934 arch/arm/plat-mxc/devices/Makefile | 1 +
5935 arch/arm/plat-mxc/devices/platform-imx27-coda.c | 37 +
5936 arch/arm/plat-mxc/include/mach/devices-common.h | 8 +
5937 drivers/gpio/gpio-bt8xx.c | 2 +-
5938 drivers/media/Kconfig | 53 +-
5939 drivers/media/Makefile | 23 +-
5940 drivers/media/common/Kconfig | 12 +-
5941 drivers/media/common/Makefile | 7 +-
5942 drivers/media/common/b2c2/Kconfig | 28 +
5943 drivers/media/common/b2c2/Makefile | 8 +
5944 .../media/{dvb => common}/b2c2/flexcop-common.h | 0
5945 .../media/{dvb => common}/b2c2/flexcop-eeprom.c | 0
5946 .../media/{dvb => common}/b2c2/flexcop-fe-tuner.c | 0
5947 .../media/{dvb => common}/b2c2/flexcop-hw-filter.c | 0
5948 drivers/media/{dvb => common}/b2c2/flexcop-i2c.c | 0
5949 drivers/media/{dvb => common}/b2c2/flexcop-misc.c | 0
5950 drivers/media/{dvb => common}/b2c2/flexcop-reg.h | 0
5951 drivers/media/{dvb => common}/b2c2/flexcop-sram.c | 0
5952 drivers/media/{dvb => common}/b2c2/flexcop.c | 1 +
5953 drivers/media/{dvb => common}/b2c2/flexcop.h | 0
5954 .../{dvb => common}/b2c2/flexcop_ibi_value_be.h | 0
5955 .../{dvb => common}/b2c2/flexcop_ibi_value_le.h | 0
5956 drivers/media/common/saa7146/Kconfig | 9 +
5957 drivers/media/common/saa7146/Makefile | 5 +
5958 drivers/media/common/{ => saa7146}/saa7146_core.c | 8 -
5959 drivers/media/common/{ => saa7146}/saa7146_fops.c | 55 +-
5960 drivers/media/common/{ => saa7146}/saa7146_hlp.c | 0
5961 drivers/media/common/{ => saa7146}/saa7146_i2c.c | 0
5962 drivers/media/common/{ => saa7146}/saa7146_vbi.c | 0
5963 drivers/media/common/{ => saa7146}/saa7146_video.c | 0
5964 drivers/media/common/siano/Kconfig | 17 +
5965 drivers/media/{dvb => common}/siano/Makefile | 6 +-
5966 drivers/media/{dvb => common}/siano/sms-cards.c | 0
5967 drivers/media/{dvb => common}/siano/sms-cards.h | 0
5968 drivers/media/{dvb => common}/siano/smscoreapi.c | 0
5969 drivers/media/{dvb => common}/siano/smscoreapi.h | 0
5970 drivers/media/{dvb => common}/siano/smsdvb.c | 0
5971 drivers/media/{dvb => common}/siano/smsendian.c | 0
5972 drivers/media/{dvb => common}/siano/smsendian.h | 0
5973 drivers/media/{dvb => common}/siano/smsir.c | 0
5974 drivers/media/{dvb => common}/siano/smsir.h | 0
5975 drivers/media/dvb-core/Kconfig | 29 +
5976 drivers/media/{dvb => }/dvb-core/Makefile | 0
5977 drivers/media/{dvb => }/dvb-core/demux.h | 0
5978 drivers/media/{dvb => }/dvb-core/dmxdev.c | 4 +-
5979 drivers/media/{dvb => }/dvb-core/dmxdev.h | 0
5980 .../media/{dvb/dvb-usb => dvb-core}/dvb-usb-ids.h | 2 +
5981 drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c | 0
5982 drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h | 0
5983 drivers/media/{dvb => }/dvb-core/dvb_demux.c | 29 +-
5984 drivers/media/{dvb => }/dvb-core/dvb_demux.h | 0
5985 drivers/media/{dvb => }/dvb-core/dvb_filter.c | 0
5986 drivers/media/{dvb => }/dvb-core/dvb_filter.h | 0
5987 drivers/media/{dvb => }/dvb-core/dvb_frontend.c | 329 +-
5988 drivers/media/{dvb => }/dvb-core/dvb_frontend.h | 11 +-
5989 drivers/media/{dvb => }/dvb-core/dvb_math.c | 0
5990 drivers/media/{dvb => }/dvb-core/dvb_math.h | 0
5991 drivers/media/{dvb => }/dvb-core/dvb_net.c | 0
5992 drivers/media/{dvb => }/dvb-core/dvb_net.h | 0
5993 drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c | 0
5994 drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h | 0
5995 drivers/media/{dvb => }/dvb-core/dvbdev.c | 2 +-
5996 drivers/media/{dvb => }/dvb-core/dvbdev.h | 26 -
5997 .../media/{dvb/frontends => dvb-frontends}/Kconfig | 195 +-
5998 .../{dvb/frontends => dvb-frontends}/Makefile | 12 +-
5999 .../media/{dvb/frontends => dvb-frontends}/a8293.c | 0
6000 .../media/{dvb/frontends => dvb-frontends}/a8293.h | 0
6001 .../{dvb/frontends => dvb-frontends}/af9013.c | 158 +-
6002 .../{dvb/frontends => dvb-frontends}/af9013.h | 2 +-
6003 .../{dvb/frontends => dvb-frontends}/af9013_priv.h | 15 +-
6004 .../{dvb/frontends => dvb-frontends}/af9033.c | 83 +-
6005 .../{dvb/frontends => dvb-frontends}/af9033.h | 2 +-
6006 .../{dvb/frontends => dvb-frontends}/af9033_priv.h | 0
6007 .../{dvb/frontends => dvb-frontends}/atbm8830.c | 2 +-
6008 .../{dvb/frontends => dvb-frontends}/atbm8830.h | 0
6009 .../frontends => dvb-frontends}/atbm8830_priv.h | 0
6010 .../{dvb/frontends => dvb-frontends}/au8522.h | 0
6011 .../frontends => dvb-frontends}/au8522_common.c | 22 +-
6012 .../frontends => dvb-frontends}/au8522_decoder.c | 11 +-
6013 .../{dvb/frontends => dvb-frontends}/au8522_dig.c | 98 +-
6014 .../{dvb/frontends => dvb-frontends}/au8522_priv.h | 29 +-
6015 .../{dvb/frontends => dvb-frontends}/bcm3510.c | 0
6016 .../{dvb/frontends => dvb-frontends}/bcm3510.h | 0
6017 .../frontends => dvb-frontends}/bcm3510_priv.h | 0
6018 .../{dvb/frontends => dvb-frontends}/bsbe1-d01a.h | 0
6019 .../media/{dvb/frontends => dvb-frontends}/bsbe1.h | 0
6020 .../media/{dvb/frontends => dvb-frontends}/bsru6.h | 0
6021 .../{dvb/frontends => dvb-frontends}/cx22700.c | 0
6022 .../{dvb/frontends => dvb-frontends}/cx22700.h | 0
6023 .../{dvb/frontends => dvb-frontends}/cx22702.c | 0
6024 .../{dvb/frontends => dvb-frontends}/cx22702.h | 0
6025 .../{dvb/frontends => dvb-frontends}/cx24110.c | 0
6026 .../{dvb/frontends => dvb-frontends}/cx24110.h | 0
6027 .../{dvb/frontends => dvb-frontends}/cx24113.c | 0
6028 .../{dvb/frontends => dvb-frontends}/cx24113.h | 0
6029 .../{dvb/frontends => dvb-frontends}/cx24116.c | 0
6030 .../{dvb/frontends => dvb-frontends}/cx24116.h | 0
6031 .../{dvb/frontends => dvb-frontends}/cx24123.c | 0
6032 .../{dvb/frontends => dvb-frontends}/cx24123.h | 0
6033 .../{dvb/frontends => dvb-frontends}/cxd2820r.h | 0
6034 .../{dvb/frontends => dvb-frontends}/cxd2820r_c.c | 0
6035 .../frontends => dvb-frontends}/cxd2820r_core.c | 0
6036 .../frontends => dvb-frontends}/cxd2820r_priv.h | 0
6037 .../{dvb/frontends => dvb-frontends}/cxd2820r_t.c | 3 +-
6038 .../{dvb/frontends => dvb-frontends}/cxd2820r_t2.c | 0
6039 .../{dvb/frontends => dvb-frontends}/dib0070.c | 0
6040 .../{dvb/frontends => dvb-frontends}/dib0070.h | 0
6041 .../{dvb/frontends => dvb-frontends}/dib0090.c | 0
6042 .../{dvb/frontends => dvb-frontends}/dib0090.h | 0
6043 .../{dvb/frontends => dvb-frontends}/dib3000.h | 0
6044 .../{dvb/frontends => dvb-frontends}/dib3000mb.c | 0
6045 .../frontends => dvb-frontends}/dib3000mb_priv.h | 0
6046 .../{dvb/frontends => dvb-frontends}/dib3000mc.c | 0
6047 .../{dvb/frontends => dvb-frontends}/dib3000mc.h | 0
6048 .../{dvb/frontends => dvb-frontends}/dib7000m.c | 0
6049 .../{dvb/frontends => dvb-frontends}/dib7000m.h | 0
6050 .../{dvb/frontends => dvb-frontends}/dib7000p.c | 0
6051 .../{dvb/frontends => dvb-frontends}/dib7000p.h | 0
6052 .../{dvb/frontends => dvb-frontends}/dib8000.c | 0
6053 .../{dvb/frontends => dvb-frontends}/dib8000.h | 0
6054 .../{dvb/frontends => dvb-frontends}/dib9000.c | 0
6055 .../{dvb/frontends => dvb-frontends}/dib9000.h | 0
6056 .../frontends => dvb-frontends}/dibx000_common.c | 0
6057 .../frontends => dvb-frontends}/dibx000_common.h | 0
6058 .../media/{dvb/frontends => dvb-frontends}/drxd.h | 0
6059 .../{dvb/frontends => dvb-frontends}/drxd_firm.c | 0
6060 .../{dvb/frontends => dvb-frontends}/drxd_firm.h | 0
6061 .../{dvb/frontends => dvb-frontends}/drxd_hard.c | 0
6062 .../frontends => dvb-frontends}/drxd_map_firm.h | 0
6063 .../media/{dvb/frontends => dvb-frontends}/drxk.h | 0
6064 .../{dvb/frontends => dvb-frontends}/drxk_hard.c | 0
6065 .../{dvb/frontends => dvb-frontends}/drxk_hard.h | 0
6066 .../{dvb/frontends => dvb-frontends}/drxk_map.h | 0
6067 .../{dvb/frontends => dvb-frontends}/ds3000.c | 0
6068 .../{dvb/frontends => dvb-frontends}/ds3000.h | 0
6069 .../{dvb/frontends => dvb-frontends}/dvb-pll.c | 26 +
6070 .../{dvb/frontends => dvb-frontends}/dvb-pll.h | 1 +
6071 .../frontends => dvb-frontends}/dvb_dummy_fe.c | 0
6072 .../frontends => dvb-frontends}/dvb_dummy_fe.h | 0
6073 .../media/{dvb/frontends => dvb-frontends}/ec100.c | 60 +-
6074 .../media/{dvb/frontends => dvb-frontends}/ec100.h | 2 +-
6075 .../{dvb/frontends => dvb-frontends}/eds1547.h | 0
6076 .../{dvb/frontends => dvb-frontends}/hd29l2.c | 75 +-
6077 .../{dvb/frontends => dvb-frontends}/hd29l2.h | 2 +-
6078 .../{dvb/frontends => dvb-frontends}/hd29l2_priv.h | 13 -
6079 .../{dvb/frontends => dvb-frontends}/isl6405.c | 0
6080 .../{dvb/frontends => dvb-frontends}/isl6405.h | 0
6081 .../{dvb/frontends => dvb-frontends}/isl6421.c | 0
6082 .../{dvb/frontends => dvb-frontends}/isl6421.h | 0
6083 .../{dvb/frontends => dvb-frontends}/isl6423.c | 0
6084 .../{dvb/frontends => dvb-frontends}/isl6423.h | 0
6085 .../frontends => dvb-frontends}/it913x-fe-priv.h | 0
6086 .../{dvb/frontends => dvb-frontends}/it913x-fe.c | 2 +-
6087 .../{dvb/frontends => dvb-frontends}/it913x-fe.h | 0
6088 .../{dvb/frontends => dvb-frontends}/itd1000.c | 0
6089 .../{dvb/frontends => dvb-frontends}/itd1000.h | 0
6090 .../frontends => dvb-frontends}/itd1000_priv.h | 0
6091 .../{dvb/frontends => dvb-frontends}/ix2505v.c | 0
6092 .../{dvb/frontends => dvb-frontends}/ix2505v.h | 0
6093 .../{dvb/frontends => dvb-frontends}/l64781.c | 0
6094 .../{dvb/frontends => dvb-frontends}/l64781.h | 0
6095 .../{dvb/frontends => dvb-frontends}/lg2160.c | 0
6096 .../{dvb/frontends => dvb-frontends}/lg2160.h | 0
6097 .../{dvb/frontends => dvb-frontends}/lgdt3305.c | 0
6098 .../{dvb/frontends => dvb-frontends}/lgdt3305.h | 0
6099 .../{dvb/frontends => dvb-frontends}/lgdt330x.c | 0
6100 .../{dvb/frontends => dvb-frontends}/lgdt330x.h | 0
6101 .../frontends => dvb-frontends}/lgdt330x_priv.h | 0
6102 .../{dvb/frontends => dvb-frontends}/lgs8gl5.c | 2 +-
6103 .../{dvb/frontends => dvb-frontends}/lgs8gl5.h | 0
6104 .../{dvb/frontends => dvb-frontends}/lgs8gxx.c | 2 +-
6105 .../{dvb/frontends => dvb-frontends}/lgs8gxx.h | 0
6106 .../frontends => dvb-frontends}/lgs8gxx_priv.h | 0
6107 .../{dvb/frontends => dvb-frontends}/lnbh24.h | 0
6108 .../{dvb/frontends => dvb-frontends}/lnbp21.c | 0
6109 .../{dvb/frontends => dvb-frontends}/lnbp21.h | 0
6110 .../{dvb/frontends => dvb-frontends}/lnbp22.c | 0
6111 .../{dvb/frontends => dvb-frontends}/lnbp22.h | 0
6112 .../{dvb/frontends => dvb-frontends}/m88rs2000.c | 2 +-
6113 .../{dvb/frontends => dvb-frontends}/m88rs2000.h | 0
6114 .../{dvb/frontends => dvb-frontends}/mb86a16.c | 0
6115 .../{dvb/frontends => dvb-frontends}/mb86a16.h | 0
6116 .../frontends => dvb-frontends}/mb86a16_priv.h | 0
6117 .../{dvb/frontends => dvb-frontends}/mb86a20s.c | 0
6118 .../{dvb/frontends => dvb-frontends}/mb86a20s.h | 0
6119 .../media/{dvb/frontends => dvb-frontends}/mt312.c | 0
6120 .../media/{dvb/frontends => dvb-frontends}/mt312.h | 0
6121 .../{dvb/frontends => dvb-frontends}/mt312_priv.h | 0
6122 .../media/{dvb/frontends => dvb-frontends}/mt352.c | 0
6123 .../media/{dvb/frontends => dvb-frontends}/mt352.h | 0
6124 .../{dvb/frontends => dvb-frontends}/mt352_priv.h | 0
6125 .../{dvb/frontends => dvb-frontends}/nxt200x.c | 64 +-
6126 .../{dvb/frontends => dvb-frontends}/nxt200x.h | 0
6127 .../{dvb/frontends => dvb-frontends}/nxt6000.c | 0
6128 .../{dvb/frontends => dvb-frontends}/nxt6000.h | 0
6129 .../frontends => dvb-frontends}/nxt6000_priv.h | 0
6130 .../{dvb/frontends => dvb-frontends}/or51132.c | 0
6131 .../{dvb/frontends => dvb-frontends}/or51132.h | 0
6132 .../{dvb/frontends => dvb-frontends}/or51211.c | 0
6133 .../{dvb/frontends => dvb-frontends}/or51211.h | 0
6134 .../{dvb/frontends => dvb-frontends}/rtl2830.c | 124 +-
6135 .../{dvb/frontends => dvb-frontends}/rtl2830.h | 9 +-
6136 .../frontends => dvb-frontends}/rtl2830_priv.h | 13 -
6137 .../{dvb/frontends => dvb-frontends}/rtl2832.c | 297 +-
6138 .../{dvb/frontends => dvb-frontends}/rtl2832.h | 12 +-
6139 .../frontends => dvb-frontends}/rtl2832_priv.h | 75 +-
6140 .../{dvb/frontends => dvb-frontends}/s5h1409.c | 0
6141 .../{dvb/frontends => dvb-frontends}/s5h1409.h | 0
6142 .../{dvb/frontends => dvb-frontends}/s5h1411.c | 0
6143 .../{dvb/frontends => dvb-frontends}/s5h1411.h | 0
6144 .../{dvb/frontends => dvb-frontends}/s5h1420.c | 0
6145 .../{dvb/frontends => dvb-frontends}/s5h1420.h | 0
6146 .../frontends => dvb-frontends}/s5h1420_priv.h | 0
6147 .../{dvb/frontends => dvb-frontends}/s5h1432.c | 0
6148 .../{dvb/frontends => dvb-frontends}/s5h1432.h | 0
6149 .../media/{dvb/frontends => dvb-frontends}/s921.c | 0
6150 .../media/{dvb/frontends => dvb-frontends}/s921.h | 0
6151 .../{dvb/frontends => dvb-frontends}/si21xx.c | 0
6152 .../{dvb/frontends => dvb-frontends}/si21xx.h | 0
6153 .../{dvb/frontends => dvb-frontends}/sp8870.c | 0
6154 .../{dvb/frontends => dvb-frontends}/sp8870.h | 0
6155 .../{dvb/frontends => dvb-frontends}/sp887x.c | 0
6156 .../{dvb/frontends => dvb-frontends}/sp887x.h | 0
6157 .../frontends => dvb-frontends}/stb0899_algo.c | 0
6158 .../{dvb/frontends => dvb-frontends}/stb0899_cfg.h | 0
6159 .../{dvb/frontends => dvb-frontends}/stb0899_drv.c | 1 +
6160 .../{dvb/frontends => dvb-frontends}/stb0899_drv.h | 0
6161 .../frontends => dvb-frontends}/stb0899_priv.h | 0
6162 .../{dvb/frontends => dvb-frontends}/stb0899_reg.h | 0
6163 .../{dvb/frontends => dvb-frontends}/stb6000.c | 0
6164 .../{dvb/frontends => dvb-frontends}/stb6000.h | 0
6165 .../{dvb/frontends => dvb-frontends}/stb6100.c | 0
6166 .../{dvb/frontends => dvb-frontends}/stb6100.h | 0
6167 .../{dvb/frontends => dvb-frontends}/stb6100_cfg.h | 0
6168 .../frontends => dvb-frontends}/stb6100_proc.h | 0
6169 .../{dvb/frontends => dvb-frontends}/stv0288.c | 0
6170 .../{dvb/frontends => dvb-frontends}/stv0288.h | 0
6171 .../{dvb/frontends => dvb-frontends}/stv0297.c | 0
6172 .../{dvb/frontends => dvb-frontends}/stv0297.h | 0
6173 .../{dvb/frontends => dvb-frontends}/stv0299.c | 0
6174 .../{dvb/frontends => dvb-frontends}/stv0299.h | 0
6175 .../{dvb/frontends => dvb-frontends}/stv0367.c | 0
6176 .../{dvb/frontends => dvb-frontends}/stv0367.h | 0
6177 .../frontends => dvb-frontends}/stv0367_priv.h | 0
6178 .../frontends => dvb-frontends}/stv0367_regs.h | 0
6179 .../{dvb/frontends => dvb-frontends}/stv0900.h | 0
6180 .../frontends => dvb-frontends}/stv0900_core.c | 0
6181 .../frontends => dvb-frontends}/stv0900_init.h | 0
6182 .../frontends => dvb-frontends}/stv0900_priv.h | 0
6183 .../{dvb/frontends => dvb-frontends}/stv0900_reg.h | 0
6184 .../{dvb/frontends => dvb-frontends}/stv0900_sw.c | 0
6185 .../{dvb/frontends => dvb-frontends}/stv090x.c | 32 +
6186 .../{dvb/frontends => dvb-frontends}/stv090x.h | 0
6187 .../frontends => dvb-frontends}/stv090x_priv.h | 0
6188 .../{dvb/frontends => dvb-frontends}/stv090x_reg.h | 0
6189 .../{dvb/frontends => dvb-frontends}/stv6110.c | 0
6190 .../{dvb/frontends => dvb-frontends}/stv6110.h | 0
6191 .../{dvb/frontends => dvb-frontends}/stv6110x.c | 0
6192 .../{dvb/frontends => dvb-frontends}/stv6110x.h | 0
6193 .../frontends => dvb-frontends}/stv6110x_priv.h | 0
6194 .../frontends => dvb-frontends}/stv6110x_reg.h | 0
6195 .../{dvb/frontends => dvb-frontends}/tda10021.c | 0
6196 .../{dvb/frontends => dvb-frontends}/tda10023.c | 0
6197 .../{dvb/frontends => dvb-frontends}/tda1002x.h | 0
6198 .../{dvb/frontends => dvb-frontends}/tda10048.c | 0
6199 .../{dvb/frontends => dvb-frontends}/tda10048.h | 0
6200 .../{dvb/frontends => dvb-frontends}/tda1004x.c | 0
6201 .../{dvb/frontends => dvb-frontends}/tda1004x.h | 0
6202 .../{dvb/frontends => dvb-frontends}/tda10071.c | 7 +-
6203 .../{dvb/frontends => dvb-frontends}/tda10071.h | 0
6204 .../frontends => dvb-frontends}/tda10071_priv.h | 2 +-
6205 .../{dvb/frontends => dvb-frontends}/tda10086.c | 0
6206 .../{dvb/frontends => dvb-frontends}/tda10086.h | 0
6207 .../frontends => dvb-frontends}/tda18271c2dd.c | 0
6208 .../frontends => dvb-frontends}/tda18271c2dd.h | 0
6209 .../tda18271c2dd_maps.h | 0
6210 .../{dvb/frontends => dvb-frontends}/tda665x.c | 0
6211 .../{dvb/frontends => dvb-frontends}/tda665x.h | 0
6212 .../{dvb/frontends => dvb-frontends}/tda8083.c | 0
6213 .../{dvb/frontends => dvb-frontends}/tda8083.h | 0
6214 .../{dvb/frontends => dvb-frontends}/tda8261.c | 28 +-
6215 .../{dvb/frontends => dvb-frontends}/tda8261.h | 0
6216 .../{dvb/frontends => dvb-frontends}/tda8261_cfg.h | 0
6217 .../{dvb/frontends => dvb-frontends}/tda826x.c | 0
6218 .../{dvb/frontends => dvb-frontends}/tda826x.h | 0
6219 .../media/{dvb/frontends => dvb-frontends}/tdhd1.h | 0
6220 .../{dvb/frontends => dvb-frontends}/tua6100.c | 0
6221 .../{dvb/frontends => dvb-frontends}/tua6100.h | 0
6222 .../{dvb/frontends => dvb-frontends}/ves1820.c | 0
6223 .../{dvb/frontends => dvb-frontends}/ves1820.h | 0
6224 .../{dvb/frontends => dvb-frontends}/ves1x93.c | 0
6225 .../{dvb/frontends => dvb-frontends}/ves1x93.h | 0
6226 .../{dvb/frontends => dvb-frontends}/z0194a.h | 0
6227 .../{dvb/frontends => dvb-frontends}/zl10036.c | 0
6228 .../{dvb/frontends => dvb-frontends}/zl10036.h | 0
6229 .../{dvb/frontends => dvb-frontends}/zl10039.c | 0
6230 .../{dvb/frontends => dvb-frontends}/zl10039.h | 0
6231 .../{dvb/frontends => dvb-frontends}/zl10353.c | 0
6232 .../{dvb/frontends => dvb-frontends}/zl10353.h | 0
6233 .../frontends => dvb-frontends}/zl10353_priv.h | 0
6234 drivers/media/dvb/Kconfig | 91 -
6235 drivers/media/dvb/Makefile | 21 -
6236 drivers/media/dvb/b2c2/Kconfig | 45 -
6237 drivers/media/dvb/b2c2/Makefile | 16 -
6238 drivers/media/dvb/bt8xx/Kconfig | 22 -
6239 drivers/media/dvb/bt8xx/Makefile | 6 -
6240 drivers/media/dvb/dm1105/Makefile | 3 -
6241 drivers/media/dvb/dvb-usb/Kconfig | 440 --
6242 drivers/media/dvb/dvb-usb/Makefile | 121 -
6243 drivers/media/dvb/dvb-usb/af9015.c | 1952 ---------
6244 drivers/media/dvb/dvb-usb/it913x.c | 931 -----
6245 drivers/media/dvb/dvb-usb/mxl111sf.c | 1835 ---------
6246 drivers/media/dvb/frontends/ec100_priv.h | 39 -
6247 drivers/media/dvb/ngene/Kconfig | 13 -
6248 drivers/media/dvb/pluto2/Makefile | 3 -
6249 drivers/media/dvb/siano/Kconfig | 34 -
6250 drivers/media/dvb/ttusb-budget/Makefile | 3 -
6251 drivers/media/{dvb => }/firewire/Kconfig | 0
6252 drivers/media/{dvb => }/firewire/Makefile | 4 +-
6253 drivers/media/{dvb => }/firewire/firedtv-avc.c | 0
6254 drivers/media/{dvb => }/firewire/firedtv-ci.c | 0
6255 drivers/media/{dvb => }/firewire/firedtv-dvb.c | 0
6256 drivers/media/{dvb => }/firewire/firedtv-fe.c | 0
6257 drivers/media/{dvb => }/firewire/firedtv-fw.c | 0
6258 drivers/media/{dvb => }/firewire/firedtv-rc.c | 0
6259 drivers/media/{dvb => }/firewire/firedtv.h | 0
6260 drivers/media/i2c/Kconfig | 584 +++
6261 drivers/media/i2c/Makefile | 66 +
6262 drivers/media/i2c/ad9389b.c | 1328 ++++++
6263 drivers/media/{video => i2c}/adp1653.c | 2 +-
6264 drivers/media/{video => i2c}/adv7170.c | 0
6265 drivers/media/{video => i2c}/adv7175.c | 0
6266 drivers/media/{video => i2c}/adv7180.c | 0
6267 drivers/media/{video => i2c}/adv7183.c | 0
6268 drivers/media/{video => i2c}/adv7183_regs.h | 0
6269 drivers/media/{video => i2c}/adv7343.c | 0
6270 drivers/media/{video => i2c}/adv7343_regs.h | 0
6271 drivers/media/{video => i2c}/adv7393.c | 0
6272 drivers/media/{video => i2c}/adv7393_regs.h | 0
6273 drivers/media/i2c/adv7604.c | 1959 +++++++++
6274 drivers/media/{video => i2c}/ak881x.c | 0
6275 drivers/media/{video => i2c}/aptina-pll.c | 0
6276 drivers/media/{video => i2c}/aptina-pll.h | 0
6277 drivers/media/{video => i2c}/as3645a.c | 2 +-
6278 drivers/media/{video => i2c}/bt819.c | 0
6279 drivers/media/{video => i2c}/bt856.c | 0
6280 drivers/media/{video => i2c}/bt866.c | 0
6281 drivers/media/{video => i2c}/btcx-risc.c | 0
6282 drivers/media/{video => i2c}/btcx-risc.h | 0
6283 drivers/media/{video => i2c}/cs5345.c | 0
6284 drivers/media/{video => i2c}/cs53l32a.c | 0
6285 drivers/media/{video => i2c}/cx2341x.c | 0
6286 drivers/media/{video => i2c}/cx25840/Kconfig | 0
6287 drivers/media/{video => i2c}/cx25840/Makefile | 2 +-
6288 .../media/{video => i2c}/cx25840/cx25840-audio.c | 0
6289 .../media/{video => i2c}/cx25840/cx25840-core.c | 0
6290 .../media/{video => i2c}/cx25840/cx25840-core.h | 0
6291 .../{video => i2c}/cx25840/cx25840-firmware.c | 15 +-
6292 drivers/media/{video => i2c}/cx25840/cx25840-ir.c | 0
6293 drivers/media/{video => i2c}/cx25840/cx25840-vbi.c | 0
6294 drivers/media/{video => i2c}/ir-kbd-i2c.c | 0
6295 drivers/media/{video => i2c}/ks0127.c | 0
6296 drivers/media/{video => i2c}/ks0127.h | 0
6297 drivers/media/{video => i2c}/m52790.c | 0
6298 drivers/media/{video => i2c}/m5mols/Kconfig | 0
6299 drivers/media/{video => i2c}/m5mols/Makefile | 0
6300 drivers/media/{video => i2c}/m5mols/m5mols.h | 4 +-
6301 .../media/{video => i2c}/m5mols/m5mols_capture.c | 0
6302 .../media/{video => i2c}/m5mols/m5mols_controls.c | 4 +-
6303 drivers/media/{video => i2c}/m5mols/m5mols_core.c | 6 +-
6304 drivers/media/{video => i2c}/m5mols/m5mols_reg.h | 0
6305 drivers/media/{video => i2c}/msp3400-driver.c | 0
6306 drivers/media/{video => i2c}/msp3400-driver.h | 0
6307 drivers/media/{video => i2c}/msp3400-kthreads.c | 0
6308 drivers/media/{video => i2c}/mt9m032.c | 2 +-
6309 drivers/media/{video => i2c}/mt9p031.c | 12 +-
6310 drivers/media/{video => i2c}/mt9t001.c | 0
6311 drivers/media/{video => i2c}/mt9v011.c | 0
6312 drivers/media/{video => i2c}/mt9v032.c | 100 +-
6313 drivers/media/{video => i2c}/noon010pc30.c | 0
6314 drivers/media/{video => i2c}/ov7670.c | 0
6315 drivers/media/{video => i2c}/s5k6aa.c | 9 +-
6316 drivers/media/{video => i2c}/saa6588.c | 0
6317 drivers/media/{video => i2c}/saa7110.c | 0
6318 drivers/media/{video => i2c}/saa7115.c | 0
6319 drivers/media/{video => i2c}/saa711x_regs.h | 0
6320 drivers/media/{video => i2c}/saa7127.c | 5 +-
6321 drivers/media/{video => i2c}/saa717x.c | 0
6322 drivers/media/{video => i2c}/saa7185.c | 0
6323 drivers/media/{video => i2c}/saa7191.c | 0
6324 drivers/media/{video => i2c}/saa7191.h | 0
6325 drivers/media/{video => i2c}/smiapp-pll.c | 2 +-
6326 drivers/media/{video => i2c}/smiapp-pll.h | 2 +-
6327 drivers/media/{video => i2c}/smiapp/Kconfig | 0
6328 drivers/media/{video => i2c}/smiapp/Makefile | 2 +-
6329 drivers/media/{video => i2c}/smiapp/smiapp-core.c | 2 +-
6330 .../media/{video => i2c}/smiapp/smiapp-limits.c | 2 +-
6331 .../media/{video => i2c}/smiapp/smiapp-limits.h | 2 +-
6332 drivers/media/{video => i2c}/smiapp/smiapp-quirk.c | 2 +-
6333 drivers/media/{video => i2c}/smiapp/smiapp-quirk.h | 2 +-
6334 .../media/{video => i2c}/smiapp/smiapp-reg-defs.h | 2 +-
6335 drivers/media/{video => i2c}/smiapp/smiapp-reg.h | 2 +-
6336 drivers/media/{video => i2c}/smiapp/smiapp-regs.c | 2 +-
6337 drivers/media/{video => i2c}/smiapp/smiapp-regs.h | 0
6338 drivers/media/{video => i2c}/smiapp/smiapp.h | 2 +-
6339 drivers/media/i2c/soc_camera/Kconfig | 89 +
6340 drivers/media/i2c/soc_camera/Makefile | 14 +
6341 drivers/media/{video => i2c/soc_camera}/imx074.c | 30 +-
6342 drivers/media/{video => i2c/soc_camera}/mt9m001.c | 26 +-
6343 drivers/media/{video => i2c/soc_camera}/mt9m111.c | 116 +-
6344 drivers/media/{video => i2c/soc_camera}/mt9t031.c | 48 +-
6345 drivers/media/{video => i2c/soc_camera}/mt9t112.c | 21 +-
6346 drivers/media/{video => i2c/soc_camera}/mt9v022.c | 50 +-
6347 drivers/media/{video => i2c/soc_camera}/ov2640.c | 20 +-
6348 drivers/media/{video => i2c/soc_camera}/ov5642.c | 31 +-
6349 drivers/media/{video => i2c/soc_camera}/ov6650.c | 28 +-
6350 drivers/media/{video => i2c/soc_camera}/ov772x.c | 447 ++-
6351 drivers/media/{video => i2c/soc_camera}/ov9640.c | 27 +-
6352 drivers/media/{video => i2c/soc_camera}/ov9640.h | 0
6353 drivers/media/{video => i2c/soc_camera}/ov9740.c | 47 +-
6354 .../media/{video => i2c/soc_camera}/rj54n1cb0c.c | 27 +-
6355 drivers/media/{video => i2c/soc_camera}/tw9910.c | 21 +-
6356 drivers/media/{video => i2c}/sr030pc30.c | 0
6357 drivers/media/{video => i2c}/tcm825x.c | 2 +-
6358 drivers/media/{video => i2c}/tcm825x.h | 2 +-
6359 drivers/media/{video => i2c}/tda7432.c | 0
6360 drivers/media/{video => i2c}/tda9840.c | 0
6361 drivers/media/{video => i2c}/tea6415c.c | 4 +-
6362 drivers/media/{video => i2c}/tea6415c.h | 0
6363 drivers/media/{video => i2c}/tea6420.c | 0
6364 drivers/media/{video => i2c}/tea6420.h | 0
6365 drivers/media/{video => i2c}/ths7303.c | 0
6366 drivers/media/{video => i2c}/tlv320aic23b.c | 0
6367 drivers/media/{video => i2c}/tvaudio.c | 0
6368 drivers/media/{video => i2c}/tveeprom.c | 0
6369 drivers/media/{video => i2c}/tvp514x.c | 2 +-
6370 drivers/media/{video => i2c}/tvp514x_regs.h | 2 +-
6371 drivers/media/{video => i2c}/tvp5150.c | 0
6372 drivers/media/{video => i2c}/tvp5150_reg.h | 0
6373 drivers/media/{video => i2c}/tvp7002.c | 0
6374 drivers/media/{video => i2c}/tvp7002_reg.h | 0
6375 drivers/media/{video => i2c}/upd64031a.c | 0
6376 drivers/media/{video => i2c}/upd64083.c | 0
6377 drivers/media/{video => i2c}/vp27smpx.c | 0
6378 drivers/media/{video => i2c}/vpx3220.c | 0
6379 drivers/media/{video => i2c}/vs6624.c | 0
6380 drivers/media/{video => i2c}/vs6624_regs.h | 0
6381 drivers/media/{video => i2c}/wm8739.c | 0
6382 drivers/media/{video => i2c}/wm8775.c | 0
6383 drivers/media/media-device.c | 4 +-
6384 drivers/media/mmc/Kconfig | 2 +
6385 drivers/media/mmc/Makefile | 1 +
6386 drivers/media/mmc/siano/Kconfig | 10 +
6387 drivers/media/mmc/siano/Makefile | 6 +
6388 drivers/media/{dvb => mmc}/siano/smssdio.c | 0
6389 drivers/media/parport/Kconfig | 52 +
6390 drivers/media/parport/Makefile | 4 +
6391 drivers/media/{video => parport}/bw-qcam.c | 0
6392 drivers/media/{video => parport}/c-qcam.c | 0
6393 drivers/media/{video => parport}/pms.c | 0
6394 drivers/media/{video => parport}/w9966.c | 0
6395 drivers/media/pci/Kconfig | 47 +
6396 drivers/media/pci/Makefile | 26 +
6397 drivers/media/pci/b2c2/Kconfig | 15 +
6398 drivers/media/pci/b2c2/Makefile | 9 +
6399 drivers/media/{dvb => pci}/b2c2/flexcop-dma.c | 0
6400 drivers/media/{dvb => pci}/b2c2/flexcop-pci.c | 0
6401 drivers/media/pci/bt8xx/Kconfig | 43 +
6402 drivers/media/pci/bt8xx/Makefile | 11 +
6403 drivers/media/{video => pci}/bt8xx/bt848.h | 0
6404 drivers/media/{dvb => pci}/bt8xx/bt878.c | 0
6405 drivers/media/{dvb => pci}/bt8xx/bt878.h | 0
6406 .../media/{video => pci}/bt8xx/bttv-audio-hook.c | 0
6407 .../media/{video => pci}/bt8xx/bttv-audio-hook.h | 0
6408 drivers/media/{video => pci}/bt8xx/bttv-cards.c | 0
6409 drivers/media/{video => pci}/bt8xx/bttv-driver.c | 0
6410 drivers/media/{video => pci}/bt8xx/bttv-gpio.c | 0
6411 drivers/media/{video => pci}/bt8xx/bttv-i2c.c | 0
6412 drivers/media/{video => pci}/bt8xx/bttv-if.c | 0
6413 drivers/media/{video => pci}/bt8xx/bttv-input.c | 0
6414 drivers/media/{video => pci}/bt8xx/bttv-risc.c | 0
6415 drivers/media/{video => pci}/bt8xx/bttv-vbi.c | 0
6416 drivers/media/{video => pci}/bt8xx/bttv.h | 0
6417 drivers/media/{video => pci}/bt8xx/bttvp.h | 0
6418 drivers/media/{dvb => pci}/bt8xx/dst.c | 0
6419 drivers/media/{dvb => pci}/bt8xx/dst_ca.c | 3 +-
6420 drivers/media/{dvb => pci}/bt8xx/dst_ca.h | 0
6421 drivers/media/{dvb => pci}/bt8xx/dst_common.h | 0
6422 drivers/media/{dvb => pci}/bt8xx/dst_priv.h | 0
6423 drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c | 0
6424 drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h | 0
6425 drivers/media/{video => pci}/cx18/Kconfig | 10 +-
6426 drivers/media/{video => pci}/cx18/Makefile | 6 +-
6427 drivers/media/{video => pci}/cx18/cx18-alsa-main.c | 0
6428 .../media/{video => pci}/cx18/cx18-alsa-mixer.c | 0
6429 .../media/{video => pci}/cx18/cx18-alsa-mixer.h | 0
6430 drivers/media/{video => pci}/cx18/cx18-alsa-pcm.c | 0
6431 drivers/media/{video => pci}/cx18/cx18-alsa-pcm.h | 0
6432 drivers/media/{video => pci}/cx18/cx18-alsa.h | 0
6433 drivers/media/{video => pci}/cx18/cx18-audio.c | 0
6434 drivers/media/{video => pci}/cx18/cx18-audio.h | 0
6435 drivers/media/{video => pci}/cx18/cx18-av-audio.c | 0
6436 drivers/media/{video => pci}/cx18/cx18-av-core.c | 0
6437 drivers/media/{video => pci}/cx18/cx18-av-core.h | 0
6438 .../media/{video => pci}/cx18/cx18-av-firmware.c | 2 +
6439 drivers/media/{video => pci}/cx18/cx18-av-vbi.c | 0
6440 drivers/media/{video => pci}/cx18/cx18-cards.c | 0
6441 drivers/media/{video => pci}/cx18/cx18-cards.h | 0
6442 drivers/media/{video => pci}/cx18/cx18-controls.c | 0
6443 drivers/media/{video => pci}/cx18/cx18-controls.h | 0
6444 drivers/media/{video => pci}/cx18/cx18-driver.c | 1 +
6445 drivers/media/{video => pci}/cx18/cx18-driver.h | 0
6446 drivers/media/{video => pci}/cx18/cx18-dvb.c | 6 +-
6447 drivers/media/{video => pci}/cx18/cx18-dvb.h | 0
6448 drivers/media/{video => pci}/cx18/cx18-fileops.c | 0
6449 drivers/media/{video => pci}/cx18/cx18-fileops.h | 0
6450 drivers/media/{video => pci}/cx18/cx18-firmware.c | 10 +-
6451 drivers/media/{video => pci}/cx18/cx18-firmware.h | 0
6452 drivers/media/{video => pci}/cx18/cx18-gpio.c | 0
6453 drivers/media/{video => pci}/cx18/cx18-gpio.h | 0
6454 drivers/media/{video => pci}/cx18/cx18-i2c.c | 0
6455 drivers/media/{video => pci}/cx18/cx18-i2c.h | 0
6456 drivers/media/{video => pci}/cx18/cx18-io.c | 0
6457 drivers/media/{video => pci}/cx18/cx18-io.h | 0
6458 drivers/media/{video => pci}/cx18/cx18-ioctl.c | 0
6459 drivers/media/{video => pci}/cx18/cx18-ioctl.h | 0
6460 drivers/media/{video => pci}/cx18/cx18-irq.c | 0
6461 drivers/media/{video => pci}/cx18/cx18-irq.h | 0
6462 drivers/media/{video => pci}/cx18/cx18-mailbox.c | 0
6463 drivers/media/{video => pci}/cx18/cx18-mailbox.h | 0
6464 drivers/media/{video => pci}/cx18/cx18-queue.c | 0
6465 drivers/media/{video => pci}/cx18/cx18-queue.h | 0
6466 drivers/media/{video => pci}/cx18/cx18-scb.c | 0
6467 drivers/media/{video => pci}/cx18/cx18-scb.h | 0
6468 drivers/media/{video => pci}/cx18/cx18-streams.c | 0
6469 drivers/media/{video => pci}/cx18/cx18-streams.h | 0
6470 drivers/media/{video => pci}/cx18/cx18-vbi.c | 0
6471 drivers/media/{video => pci}/cx18/cx18-vbi.h | 0
6472 drivers/media/{video => pci}/cx18/cx18-version.h | 0
6473 drivers/media/{video => pci}/cx18/cx18-video.c | 0
6474 drivers/media/{video => pci}/cx18/cx18-video.h | 0
6475 drivers/media/{video => pci}/cx18/cx23418.h | 0
6476 drivers/media/pci/cx23885/Kconfig | 48 +
6477 drivers/media/{video => pci}/cx23885/Makefile | 8 +-
6478 drivers/media/{video => pci}/cx23885/altera-ci.c | 4 +-
6479 drivers/media/{video => pci}/cx23885/altera-ci.h | 0
6480 drivers/media/{video => pci}/cx23885/cimax2.c | 0
6481 drivers/media/{video => pci}/cx23885/cimax2.h | 0
6482 drivers/media/{video => pci}/cx23885/cx23885-417.c | 2 +
6483 .../media/{video => pci}/cx23885/cx23885-alsa.c | 0
6484 drivers/media/{video => pci}/cx23885/cx23885-av.c | 0
6485 drivers/media/{video => pci}/cx23885/cx23885-av.h | 0
6486 .../media/{video => pci}/cx23885/cx23885-cards.c | 16 +-
6487 .../media/{video => pci}/cx23885/cx23885-core.c | 0
6488 drivers/media/{video => pci}/cx23885/cx23885-dvb.c | 59 +-
6489 .../media/{video => pci}/cx23885/cx23885-f300.c | 0
6490 .../media/{video => pci}/cx23885/cx23885-f300.h | 0
6491 drivers/media/{video => pci}/cx23885/cx23885-i2c.c | 0
6492 .../media/{video => pci}/cx23885/cx23885-input.c | 9 +
6493 .../media/{video => pci}/cx23885/cx23885-input.h | 0
6494 .../media/{video => pci}/cx23885/cx23885-ioctl.c | 0
6495 .../media/{video => pci}/cx23885/cx23885-ioctl.h | 0
6496 drivers/media/{video => pci}/cx23885/cx23885-ir.c | 0
6497 drivers/media/{video => pci}/cx23885/cx23885-ir.h | 0
6498 drivers/media/{video => pci}/cx23885/cx23885-reg.h | 0
6499 drivers/media/{video => pci}/cx23885/cx23885-vbi.c | 0
6500 .../media/{video => pci}/cx23885/cx23885-video.c | 0
6501 drivers/media/{video => pci}/cx23885/cx23885.h | 1 +
6502 drivers/media/{video => pci}/cx23885/cx23888-ir.c | 0
6503 drivers/media/{video => pci}/cx23885/cx23888-ir.h | 0
6504 .../media/{video => pci}/cx23885/netup-eeprom.c | 0
6505 .../media/{video => pci}/cx23885/netup-eeprom.h | 0
6506 drivers/media/{video => pci}/cx23885/netup-init.c | 0
6507 drivers/media/{video => pci}/cx23885/netup-init.h | 0
6508 drivers/media/{video => pci}/cx25821/Kconfig | 0
6509 drivers/media/{video => pci}/cx25821/Makefile | 8 +-
6510 .../media/{video => pci}/cx25821/cx25821-alsa.c | 0
6511 .../cx25821/cx25821-audio-upstream.c | 0
6512 .../cx25821/cx25821-audio-upstream.h | 0
6513 .../media/{video => pci}/cx25821/cx25821-audio.h | 0
6514 .../{video => pci}/cx25821/cx25821-biffuncs.h | 0
6515 .../media/{video => pci}/cx25821/cx25821-cards.c | 0
6516 .../media/{video => pci}/cx25821/cx25821-core.c | 0
6517 .../media/{video => pci}/cx25821/cx25821-gpio.c | 0
6518 drivers/media/{video => pci}/cx25821/cx25821-i2c.c | 0
6519 .../cx25821/cx25821-medusa-defines.h | 0
6520 .../{video => pci}/cx25821/cx25821-medusa-reg.h | 0
6521 .../{video => pci}/cx25821/cx25821-medusa-video.c | 0
6522 .../{video => pci}/cx25821/cx25821-medusa-video.h | 0
6523 drivers/media/{video => pci}/cx25821/cx25821-reg.h | 0
6524 .../media/{video => pci}/cx25821/cx25821-sram.h | 0
6525 .../cx25821/cx25821-video-upstream-ch2.c | 0
6526 .../cx25821/cx25821-video-upstream-ch2.h | 0
6527 .../cx25821/cx25821-video-upstream.c | 0
6528 .../cx25821/cx25821-video-upstream.h | 0
6529 .../media/{video => pci}/cx25821/cx25821-video.c | 0
6530 .../media/{video => pci}/cx25821/cx25821-video.h | 0
6531 drivers/media/{video => pci}/cx25821/cx25821.h | 0
6532 drivers/media/{video => pci}/cx88/Kconfig | 36 +-
6533 drivers/media/{video => pci}/cx88/Makefile | 8 +-
6534 drivers/media/{video => pci}/cx88/cx88-alsa.c | 2 +-
6535 drivers/media/{video => pci}/cx88/cx88-blackbird.c | 0
6536 drivers/media/{video => pci}/cx88/cx88-cards.c | 4 +-
6537 drivers/media/{video => pci}/cx88/cx88-core.c | 2 +-
6538 drivers/media/{video => pci}/cx88/cx88-dsp.c | 0
6539 drivers/media/{video => pci}/cx88/cx88-dvb.c | 2 +-
6540 drivers/media/{video => pci}/cx88/cx88-i2c.c | 0
6541 drivers/media/{video => pci}/cx88/cx88-input.c | 0
6542 drivers/media/{video => pci}/cx88/cx88-mpeg.c | 0
6543 drivers/media/{video => pci}/cx88/cx88-reg.h | 0
6544 drivers/media/{video => pci}/cx88/cx88-tvaudio.c | 0
6545 drivers/media/{video => pci}/cx88/cx88-vbi.c | 0
6546 drivers/media/{video => pci}/cx88/cx88-video.c | 0
6547 .../media/{video => pci}/cx88/cx88-vp3054-i2c.c | 0
6548 .../media/{video => pci}/cx88/cx88-vp3054-i2c.h | 0
6549 drivers/media/{video => pci}/cx88/cx88.h | 2 +-
6550 drivers/media/{dvb => pci}/ddbridge/Kconfig | 10 +-
6551 drivers/media/{dvb => pci}/ddbridge/Makefile | 6 +-
6552 .../media/{dvb => pci}/ddbridge/ddbridge-core.c | 15 +-
6553 .../media/{dvb => pci}/ddbridge/ddbridge-regs.h | 0
6554 drivers/media/{dvb => pci}/ddbridge/ddbridge.h | 0
6555 drivers/media/{dvb => pci}/dm1105/Kconfig | 14 +-
6556 drivers/media/pci/dm1105/Makefile | 3 +
6557 drivers/media/{dvb => pci}/dm1105/dm1105.c | 0
6558 drivers/media/{video => pci}/ivtv/Kconfig | 16 +
6559 drivers/media/{video => pci}/ivtv/Makefile | 10 +-
6560 drivers/media/pci/ivtv/ivtv-alsa-main.c | 303 ++
6561 drivers/media/pci/ivtv/ivtv-alsa-mixer.c | 175 +
6562 drivers/media/pci/ivtv/ivtv-alsa-mixer.h | 23 +
6563 drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 357 ++
6564 drivers/media/pci/ivtv/ivtv-alsa-pcm.h | 27 +
6565 drivers/media/pci/ivtv/ivtv-alsa.h | 75 +
6566 drivers/media/{video => pci}/ivtv/ivtv-cards.c | 0
6567 drivers/media/{video => pci}/ivtv/ivtv-cards.h | 0
6568 drivers/media/{video => pci}/ivtv/ivtv-controls.c | 0
6569 drivers/media/{video => pci}/ivtv/ivtv-controls.h | 0
6570 drivers/media/{video => pci}/ivtv/ivtv-driver.c | 37 +
6571 drivers/media/{video => pci}/ivtv/ivtv-driver.h | 11 +
6572 drivers/media/{video => pci}/ivtv/ivtv-fileops.c | 56 +-
6573 drivers/media/{video => pci}/ivtv/ivtv-fileops.h | 4 +-
6574 drivers/media/{video => pci}/ivtv/ivtv-firmware.c | 4 +
6575 drivers/media/{video => pci}/ivtv/ivtv-firmware.h | 0
6576 drivers/media/{video => pci}/ivtv/ivtv-gpio.c | 0
6577 drivers/media/{video => pci}/ivtv/ivtv-gpio.h | 0
6578 drivers/media/{video => pci}/ivtv/ivtv-i2c.c | 0
6579 drivers/media/{video => pci}/ivtv/ivtv-i2c.h | 0
6580 drivers/media/{video => pci}/ivtv/ivtv-ioctl.c | 0
6581 drivers/media/{video => pci}/ivtv/ivtv-ioctl.h | 0
6582 drivers/media/{video => pci}/ivtv/ivtv-irq.c | 50 +
6583 drivers/media/{video => pci}/ivtv/ivtv-irq.h | 0
6584 drivers/media/{video => pci}/ivtv/ivtv-mailbox.c | 0
6585 drivers/media/{video => pci}/ivtv/ivtv-mailbox.h | 0
6586 drivers/media/{video => pci}/ivtv/ivtv-queue.c | 0
6587 drivers/media/{video => pci}/ivtv/ivtv-queue.h | 0
6588 drivers/media/{video => pci}/ivtv/ivtv-routing.c | 0
6589 drivers/media/{video => pci}/ivtv/ivtv-routing.h | 0
6590 drivers/media/{video => pci}/ivtv/ivtv-streams.c | 6 +-
6591 drivers/media/{video => pci}/ivtv/ivtv-streams.h | 0
6592 drivers/media/{video => pci}/ivtv/ivtv-udma.c | 0
6593 drivers/media/{video => pci}/ivtv/ivtv-udma.h | 0
6594 drivers/media/{video => pci}/ivtv/ivtv-vbi.c | 0
6595 drivers/media/{video => pci}/ivtv/ivtv-vbi.h | 0
6596 drivers/media/{video => pci}/ivtv/ivtv-version.h | 0
6597 drivers/media/{video => pci}/ivtv/ivtv-yuv.c | 0
6598 drivers/media/{video => pci}/ivtv/ivtv-yuv.h | 0
6599 drivers/media/{video => pci}/ivtv/ivtvfb.c | 0
6600 drivers/media/{dvb => pci}/mantis/Kconfig | 20 +-
6601 drivers/media/{dvb => pci}/mantis/Makefile | 2 +-
6602 drivers/media/{dvb => pci}/mantis/hopper_cards.c | 0
6603 drivers/media/{dvb => pci}/mantis/hopper_vp3028.c | 0
6604 drivers/media/{dvb => pci}/mantis/hopper_vp3028.h | 0
6605 drivers/media/{dvb => pci}/mantis/mantis_ca.c | 0
6606 drivers/media/{dvb => pci}/mantis/mantis_ca.h | 0
6607 drivers/media/{dvb => pci}/mantis/mantis_cards.c | 2 +-
6608 drivers/media/{dvb => pci}/mantis/mantis_common.h | 0
6609 drivers/media/{dvb => pci}/mantis/mantis_core.c | 2 +-
6610 drivers/media/{dvb => pci}/mantis/mantis_core.h | 0
6611 drivers/media/{dvb => pci}/mantis/mantis_dma.c | 0
6612 drivers/media/{dvb => pci}/mantis/mantis_dma.h | 0
6613 drivers/media/{dvb => pci}/mantis/mantis_dvb.c | 6 +-
6614 drivers/media/{dvb => pci}/mantis/mantis_dvb.h | 0
6615 drivers/media/{dvb => pci}/mantis/mantis_evm.c | 0
6616 drivers/media/{dvb => pci}/mantis/mantis_hif.c | 0
6617 drivers/media/{dvb => pci}/mantis/mantis_hif.h | 0
6618 drivers/media/{dvb => pci}/mantis/mantis_i2c.c | 0
6619 drivers/media/{dvb => pci}/mantis/mantis_i2c.h | 0
6620 drivers/media/{dvb => pci}/mantis/mantis_input.c | 0
6621 drivers/media/{dvb => pci}/mantis/mantis_ioc.c | 0
6622 drivers/media/{dvb => pci}/mantis/mantis_ioc.h | 0
6623 drivers/media/{dvb => pci}/mantis/mantis_link.h | 0
6624 drivers/media/{dvb => pci}/mantis/mantis_pci.c | 0
6625 drivers/media/{dvb => pci}/mantis/mantis_pci.h | 0
6626 drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c | 0
6627 drivers/media/{dvb => pci}/mantis/mantis_reg.h | 0
6628 drivers/media/{dvb => pci}/mantis/mantis_uart.c | 0
6629 drivers/media/{dvb => pci}/mantis/mantis_uart.h | 0
6630 drivers/media/{dvb => pci}/mantis/mantis_vp1033.c | 0
6631 drivers/media/{dvb => pci}/mantis/mantis_vp1033.h | 0
6632 drivers/media/{dvb => pci}/mantis/mantis_vp1034.c | 0
6633 drivers/media/{dvb => pci}/mantis/mantis_vp1034.h | 0
6634 drivers/media/{dvb => pci}/mantis/mantis_vp1041.c | 0
6635 drivers/media/{dvb => pci}/mantis/mantis_vp1041.h | 0
6636 drivers/media/{dvb => pci}/mantis/mantis_vp2033.c | 0
6637 drivers/media/{dvb => pci}/mantis/mantis_vp2033.h | 0
6638 drivers/media/{dvb => pci}/mantis/mantis_vp2040.c | 0
6639 drivers/media/{dvb => pci}/mantis/mantis_vp2040.h | 0
6640 drivers/media/{dvb => pci}/mantis/mantis_vp3028.c | 0
6641 drivers/media/{dvb => pci}/mantis/mantis_vp3028.h | 0
6642 drivers/media/{dvb => pci}/mantis/mantis_vp3030.c | 0
6643 drivers/media/{dvb => pci}/mantis/mantis_vp3030.h | 0
6644 drivers/media/pci/meye/Kconfig | 13 +
6645 drivers/media/pci/meye/Makefile | 1 +
6646 drivers/media/{video => pci/meye}/meye.c | 0
6647 drivers/media/{video => pci/meye}/meye.h | 0
6648 drivers/media/pci/ngene/Kconfig | 13 +
6649 drivers/media/{dvb => pci}/ngene/Makefile | 6 +-
6650 drivers/media/{dvb => pci}/ngene/ngene-cards.c | 263 ++
6651 drivers/media/{dvb => pci}/ngene/ngene-core.c | 14 +-
6652 drivers/media/{dvb => pci}/ngene/ngene-dvb.c | 0
6653 drivers/media/{dvb => pci}/ngene/ngene-i2c.c | 0
6654 drivers/media/{dvb => pci}/ngene/ngene.h | 0
6655 drivers/media/{dvb => pci}/pluto2/Kconfig | 0
6656 drivers/media/pci/pluto2/Makefile | 3 +
6657 drivers/media/{dvb => pci}/pluto2/pluto2.c | 0
6658 drivers/media/{dvb => pci}/pt1/Kconfig | 0
6659 drivers/media/{dvb => pci}/pt1/Makefile | 2 +-
6660 drivers/media/{dvb => pci}/pt1/pt1.c | 0
6661 drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c | 11 +-
6662 drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h | 0
6663 drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c | 0
6664 drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h | 0
6665 drivers/media/{video => pci}/saa7134/Kconfig | 40 +-
6666 drivers/media/{video => pci}/saa7134/Makefile | 10 +-
6667 drivers/media/{video => pci}/saa7134/saa6752hs.c | 0
6668 .../media/{video => pci}/saa7134/saa7134-alsa.c | 0
6669 .../media/{video => pci}/saa7134/saa7134-cards.c | 0
6670 .../media/{video => pci}/saa7134/saa7134-core.c | 0
6671 drivers/media/{video => pci}/saa7134/saa7134-dvb.c | 4 +-
6672 .../media/{video => pci}/saa7134/saa7134-empress.c | 0
6673 drivers/media/{video => pci}/saa7134/saa7134-i2c.c | 0
6674 .../media/{video => pci}/saa7134/saa7134-input.c | 10 +-
6675 drivers/media/{video => pci}/saa7134/saa7134-reg.h | 0
6676 drivers/media/{video => pci}/saa7134/saa7134-ts.c | 0
6677 .../media/{video => pci}/saa7134/saa7134-tvaudio.c | 0
6678 drivers/media/{video => pci}/saa7134/saa7134-vbi.c | 0
6679 .../media/{video => pci}/saa7134/saa7134-video.c | 0
6680 drivers/media/{video => pci}/saa7134/saa7134.h | 1 -
6681 drivers/media/pci/saa7146/Kconfig | 38 +
6682 drivers/media/pci/saa7146/Makefile | 5 +
6683 .../media/{video => pci/saa7146}/hexium_gemini.c | 0
6684 .../media/{video => pci/saa7146}/hexium_orion.c | 0
6685 drivers/media/{video => pci/saa7146}/mxb.c | 0
6686 drivers/media/{video => pci}/saa7164/Kconfig | 8 +-
6687 drivers/media/{video => pci}/saa7164/Makefile | 8 +-
6688 drivers/media/{video => pci}/saa7164/saa7164-api.c | 15 +-
6689 .../media/{video => pci}/saa7164/saa7164-buffer.c | 0
6690 drivers/media/{video => pci}/saa7164/saa7164-bus.c | 0
6691 .../media/{video => pci}/saa7164/saa7164-cards.c | 0
6692 drivers/media/{video => pci}/saa7164/saa7164-cmd.c | 0
6693 .../media/{video => pci}/saa7164/saa7164-core.c | 46 +-
6694 drivers/media/{video => pci}/saa7164/saa7164-dvb.c | 0
6695 .../media/{video => pci}/saa7164/saa7164-encoder.c | 0
6696 drivers/media/{video => pci}/saa7164/saa7164-fw.c | 0
6697 drivers/media/{video => pci}/saa7164/saa7164-i2c.c | 0
6698 drivers/media/{video => pci}/saa7164/saa7164-reg.h | 0
6699 .../media/{video => pci}/saa7164/saa7164-types.h | 0
6700 drivers/media/{video => pci}/saa7164/saa7164-vbi.c | 0
6701 drivers/media/{video => pci}/saa7164/saa7164.h | 1 -
6702 drivers/media/pci/sta2x11/Kconfig | 12 +
6703 drivers/media/pci/sta2x11/Makefile | 1 +
6704 drivers/media/{video => pci/sta2x11}/sta2x11_vip.c | 0
6705 drivers/media/{video => pci/sta2x11}/sta2x11_vip.h | 0
6706 drivers/media/{dvb => pci}/ttpci/Kconfig | 84 +-
6707 drivers/media/{dvb => pci}/ttpci/Makefile | 4 +-
6708 drivers/media/{dvb => pci}/ttpci/av7110.c | 0
6709 drivers/media/{dvb => pci}/ttpci/av7110.h | 0
6710 drivers/media/{dvb => pci}/ttpci/av7110_av.c | 0
6711 drivers/media/{dvb => pci}/ttpci/av7110_av.h | 0
6712 drivers/media/{dvb => pci}/ttpci/av7110_ca.c | 0
6713 drivers/media/{dvb => pci}/ttpci/av7110_ca.h | 0
6714 drivers/media/{dvb => pci}/ttpci/av7110_hw.c | 0
6715 drivers/media/{dvb => pci}/ttpci/av7110_hw.h | 0
6716 drivers/media/{dvb => pci}/ttpci/av7110_ipack.c | 0
6717 drivers/media/{dvb => pci}/ttpci/av7110_ipack.h | 0
6718 drivers/media/{dvb => pci}/ttpci/av7110_ir.c | 0
6719 drivers/media/{dvb => pci}/ttpci/av7110_v4l.c | 0
6720 drivers/media/{dvb => pci}/ttpci/budget-av.c | 0
6721 drivers/media/{dvb => pci}/ttpci/budget-ci.c | 0
6722 drivers/media/{dvb => pci}/ttpci/budget-core.c | 0
6723 drivers/media/{dvb => pci}/ttpci/budget-patch.c | 0
6724 drivers/media/{dvb => pci}/ttpci/budget.c | 60 +
6725 drivers/media/{dvb => pci}/ttpci/budget.h | 0
6726 drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c | 0
6727 drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h | 0
6728 drivers/media/{video => pci}/zoran/Kconfig | 26 +-
6729 drivers/media/{video => pci}/zoran/Makefile | 0
6730 drivers/media/{video => pci}/zoran/videocodec.c | 0
6731 drivers/media/{video => pci}/zoran/videocodec.h | 0
6732 drivers/media/{video => pci}/zoran/zoran.h | 0
6733 drivers/media/{video => pci}/zoran/zoran_card.c | 0
6734 drivers/media/{video => pci}/zoran/zoran_card.h | 0
6735 drivers/media/{video => pci}/zoran/zoran_device.c | 0
6736 drivers/media/{video => pci}/zoran/zoran_device.h | 0
6737 drivers/media/{video => pci}/zoran/zoran_driver.c | 0
6738 drivers/media/{video => pci}/zoran/zoran_procfs.c | 0
6739 drivers/media/{video => pci}/zoran/zoran_procfs.h | 0
6740 drivers/media/{video => pci}/zoran/zr36016.c | 0
6741 drivers/media/{video => pci}/zoran/zr36016.h | 0
6742 drivers/media/{video => pci}/zoran/zr36050.c | 0
6743 drivers/media/{video => pci}/zoran/zr36050.h | 0
6744 drivers/media/{video => pci}/zoran/zr36057.h | 0
6745 drivers/media/{video => pci}/zoran/zr36060.c | 0
6746 drivers/media/{video => pci}/zoran/zr36060.h | 0
6747 drivers/media/platform/Kconfig | 222 +
6748 drivers/media/platform/Makefile | 50 +
6749 drivers/media/{video => platform}/arv.c | 0
6750 drivers/media/{video => platform}/blackfin/Kconfig | 0
6751 .../media/{video => platform}/blackfin/Makefile | 0
6752 .../{video => platform}/blackfin/bfin_capture.c | 18 +-
6753 drivers/media/{video => platform}/blackfin/ppi.c | 0
6754 drivers/media/platform/coda.c | 1847 +++++++++
6755 drivers/media/platform/coda.h | 216 +
6756 drivers/media/{video => platform}/davinci/Kconfig | 4 +-
6757 drivers/media/{video => platform}/davinci/Makefile | 0
6758 .../{video => platform}/davinci/ccdc_hw_device.h | 0
6759 .../media/{video => platform}/davinci/dm355_ccdc.c | 2 +-
6760 .../{video => platform}/davinci/dm355_ccdc_regs.h | 0
6761 .../{video => platform}/davinci/dm644x_ccdc.c | 2 +-
6762 .../{video => platform}/davinci/dm644x_ccdc_regs.h | 0
6763 drivers/media/{video => platform}/davinci/isif.c | 2 +-
6764 .../media/{video => platform}/davinci/isif_regs.h | 0
6765 drivers/media/{video => platform}/davinci/vpbe.c | 0
6766 .../{video => platform}/davinci/vpbe_display.c | 22 +-
6767 .../media/{video => platform}/davinci/vpbe_osd.c | 0
6768 .../{video => platform}/davinci/vpbe_osd_regs.h | 0
6769 .../media/{video => platform}/davinci/vpbe_venc.c | 0
6770 .../{video => platform}/davinci/vpbe_venc_regs.h | 0
6771 .../{video => platform}/davinci/vpfe_capture.c | 17 +-
6772 drivers/media/{video => platform}/davinci/vpif.c | 2 +-
6773 drivers/media/{video => platform}/davinci/vpif.h | 0
6774 .../{video => platform}/davinci/vpif_capture.c | 28 +-
6775 .../{video => platform}/davinci/vpif_capture.h | 0
6776 .../{video => platform}/davinci/vpif_display.c | 34 +-
6777 .../{video => platform}/davinci/vpif_display.h | 0
6778 drivers/media/{video => platform}/davinci/vpss.c | 2 +-
6779 drivers/media/platform/exynos-gsc/Makefile | 3 +
6780 drivers/media/platform/exynos-gsc/gsc-core.c | 1253 ++++++
6781 drivers/media/platform/exynos-gsc/gsc-core.h | 527 +++
6782 drivers/media/platform/exynos-gsc/gsc-m2m.c | 771 ++++
6783 drivers/media/platform/exynos-gsc/gsc-regs.c | 425 ++
6784 drivers/media/platform/exynos-gsc/gsc-regs.h | 172 +
6785 drivers/media/{video => platform}/fsl-viu.c | 27 +-
6786 drivers/media/{video => platform}/indycam.c | 0
6787 drivers/media/{video => platform}/indycam.h | 0
6788 drivers/media/platform/m2m-deinterlace.c | 1118 ++++++
6789 .../media/{video => platform}/marvell-ccic/Kconfig | 0
6790 .../{video => platform}/marvell-ccic/Makefile | 0
6791 .../{video => platform}/marvell-ccic/cafe-driver.c | 0
6792 .../{video => platform}/marvell-ccic/mcam-core.c | 0
6793 .../{video => platform}/marvell-ccic/mcam-core.h | 0
6794 .../{video => platform}/marvell-ccic/mmp-driver.c | 0
6795 .../media/{video => platform}/mem2mem_testdev.c | 40 +-
6796 drivers/media/{video => platform}/mx2_emmaprp.c | 77 +-
6797 drivers/media/{video => platform}/omap/Kconfig | 0
6798 drivers/media/{video => platform}/omap/Makefile | 2 +-
6799 drivers/media/{video => platform}/omap/omap_vout.c | 0
6800 .../{video => platform}/omap/omap_vout_vrfb.c | 0
6801 .../{video => platform}/omap/omap_vout_vrfb.h | 0
6802 .../media/{video => platform}/omap/omap_voutdef.h | 0
6803 .../media/{video => platform}/omap/omap_voutlib.c | 0
6804 .../media/{video => platform}/omap/omap_voutlib.h | 0
6805 .../media/{video => platform}/omap24xxcam-dma.c | 2 +-
6806 drivers/media/{video => platform}/omap24xxcam.c | 2 +-
6807 drivers/media/{video => platform}/omap24xxcam.h | 2 +-
6808 .../media/{video => platform}/omap3isp/Makefile | 0
6809 .../{video => platform}/omap3isp/cfa_coef_table.h | 16 +-
6810 .../{video => platform}/omap3isp/gamma_table.h | 0
6811 drivers/media/{video => platform}/omap3isp/isp.c | 51 +-
6812 drivers/media/{video => platform}/omap3isp/isp.h | 11 +-
6813 .../media/{video => platform}/omap3isp/ispccdc.c | 234 +-
6814 .../media/{video => platform}/omap3isp/ispccdc.h | 37 -
6815 .../media/{video => platform}/omap3isp/ispccp2.c | 0
6816 .../media/{video => platform}/omap3isp/ispccp2.h | 0
6817 .../media/{video => platform}/omap3isp/ispcsi2.c | 27 +-
6818 .../media/{video => platform}/omap3isp/ispcsi2.h | 0
6819 .../media/{video => platform}/omap3isp/ispcsiphy.c | 0
6820 .../media/{video => platform}/omap3isp/ispcsiphy.h | 0
6821 .../media/{video => platform}/omap3isp/isph3a.h | 0
6822 .../{video => platform}/omap3isp/isph3a_aewb.c | 10 +-
6823 .../media/{video => platform}/omap3isp/isph3a_af.c | 10 +-
6824 .../media/{video => platform}/omap3isp/isphist.c | 6 +-
6825 .../media/{video => platform}/omap3isp/isphist.h | 0
6826 .../{video => platform}/omap3isp/isppreview.c | 707 ++--
6827 .../{video => platform}/omap3isp/isppreview.h | 1 +
6828 .../media/{video => platform}/omap3isp/ispqueue.c | 15 +-
6829 .../media/{video => platform}/omap3isp/ispqueue.h | 0
6830 .../media/{video => platform}/omap3isp/ispreg.h | 0
6831 .../{video => platform}/omap3isp/ispresizer.c | 8 +-
6832 .../{video => platform}/omap3isp/ispresizer.h | 0
6833 .../media/{video => platform}/omap3isp/ispstat.c | 0
6834 .../media/{video => platform}/omap3isp/ispstat.h | 0
6835 .../media/{video => platform}/omap3isp/ispvideo.c | 57 +-
6836 .../media/{video => platform}/omap3isp/ispvideo.h | 6 +-
6837 .../omap3isp/luma_enhance_table.h | 0
6838 .../omap3isp/noise_filter_table.h | 0
6839 drivers/media/{video => platform}/s5p-fimc/Kconfig | 2 +-
6840 .../media/{video => platform}/s5p-fimc/Makefile | 0
6841 .../{video => platform}/s5p-fimc/fimc-capture.c | 31 +-
6842 .../media/{video => platform}/s5p-fimc/fimc-core.c | 0
6843 .../media/{video => platform}/s5p-fimc/fimc-core.h | 4 +-
6844 .../{video => platform}/s5p-fimc/fimc-lite-reg.c | 2 +-
6845 .../{video => platform}/s5p-fimc/fimc-lite-reg.h | 0
6846 .../media/{video => platform}/s5p-fimc/fimc-lite.c | 42 +-
6847 .../media/{video => platform}/s5p-fimc/fimc-lite.h | 2 +-
6848 .../media/{video => platform}/s5p-fimc/fimc-m2m.c | 42 +-
6849 .../{video => platform}/s5p-fimc/fimc-mdevice.c | 9 +-
6850 .../{video => platform}/s5p-fimc/fimc-mdevice.h | 6 +-
6851 .../media/{video => platform}/s5p-fimc/fimc-reg.c | 6 +-
6852 .../media/{video => platform}/s5p-fimc/fimc-reg.h | 0
6853 .../media/{video => platform}/s5p-fimc/mipi-csis.c | 0
6854 .../media/{video => platform}/s5p-fimc/mipi-csis.h | 0
6855 drivers/media/{video => platform}/s5p-g2d/Makefile | 0
6856 drivers/media/{video => platform}/s5p-g2d/g2d-hw.c | 0
6857 .../media/{video => platform}/s5p-g2d/g2d-regs.h | 0
6858 drivers/media/{video => platform}/s5p-g2d/g2d.c | 29 +-
6859 drivers/media/{video => platform}/s5p-g2d/g2d.h | 0
6860 .../media/{video => platform}/s5p-jpeg/Makefile | 0
6861 .../media/{video => platform}/s5p-jpeg/jpeg-core.c | 38 +-
6862 .../media/{video => platform}/s5p-jpeg/jpeg-core.h | 2 +-
6863 .../media/{video => platform}/s5p-jpeg/jpeg-hw.h | 2 +-
6864 .../media/{video => platform}/s5p-jpeg/jpeg-regs.h | 2 +-
6865 drivers/media/{video => platform}/s5p-mfc/Makefile | 0
6866 .../media/{video => platform}/s5p-mfc/regs-mfc.h | 0
6867 .../media/{video => platform}/s5p-mfc/s5p_mfc.c | 19 +-
6868 .../{video => platform}/s5p-mfc/s5p_mfc_cmd.c | 2 +-
6869 .../{video => platform}/s5p-mfc/s5p_mfc_cmd.h | 2 +-
6870 .../{video => platform}/s5p-mfc/s5p_mfc_common.h | 0
6871 .../{video => platform}/s5p-mfc/s5p_mfc_ctrl.c | 4 +-
6872 .../{video => platform}/s5p-mfc/s5p_mfc_ctrl.h | 2 +-
6873 .../{video => platform}/s5p-mfc/s5p_mfc_debug.h | 2 +-
6874 .../{video => platform}/s5p-mfc/s5p_mfc_dec.c | 2 +-
6875 .../{video => platform}/s5p-mfc/s5p_mfc_dec.h | 2 +-
6876 .../{video => platform}/s5p-mfc/s5p_mfc_enc.c | 2 +-
6877 .../{video => platform}/s5p-mfc/s5p_mfc_enc.h | 2 +-
6878 .../{video => platform}/s5p-mfc/s5p_mfc_intr.c | 2 +-
6879 .../{video => platform}/s5p-mfc/s5p_mfc_intr.h | 2 +-
6880 .../{video => platform}/s5p-mfc/s5p_mfc_opr.c | 2 +-
6881 .../{video => platform}/s5p-mfc/s5p_mfc_opr.h | 2 +-
6882 .../media/{video => platform}/s5p-mfc/s5p_mfc_pm.c | 2 +-
6883 .../media/{video => platform}/s5p-mfc/s5p_mfc_pm.h | 2 +-
6884 .../{video => platform}/s5p-mfc/s5p_mfc_shm.c | 2 +-
6885 .../{video => platform}/s5p-mfc/s5p_mfc_shm.h | 2 +-
6886 drivers/media/{video => platform}/s5p-tv/Kconfig | 2 +-
6887 drivers/media/{video => platform}/s5p-tv/Makefile | 2 +-
6888 .../media/{video => platform}/s5p-tv/hdmi_drv.c | 6 +-
6889 .../media/{video => platform}/s5p-tv/hdmiphy_drv.c | 0
6890 drivers/media/{video => platform}/s5p-tv/mixer.h | 0
6891 .../media/{video => platform}/s5p-tv/mixer_drv.c | 6 +-
6892 .../{video => platform}/s5p-tv/mixer_grp_layer.c | 0
6893 .../media/{video => platform}/s5p-tv/mixer_reg.c | 0
6894 .../media/{video => platform}/s5p-tv/mixer_video.c | 33 +-
6895 .../{video => platform}/s5p-tv/mixer_vp_layer.c | 0
6896 .../media/{video => platform}/s5p-tv/regs-hdmi.h | 0
6897 .../media/{video => platform}/s5p-tv/regs-mixer.h | 0
6898 .../media/{video => platform}/s5p-tv/regs-sdo.h | 2 +-
6899 drivers/media/{video => platform}/s5p-tv/regs-vp.h | 0
6900 drivers/media/{video => platform}/s5p-tv/sdo_drv.c | 10 +-
6901 .../media/{video => platform}/s5p-tv/sii9234_drv.c | 17 +-
6902 drivers/media/{video => platform}/sh_vou.c | 25 +-
6903 drivers/media/platform/soc_camera/Kconfig | 87 +
6904 drivers/media/platform/soc_camera/Makefile | 14 +
6905 .../{video => platform/soc_camera}/atmel-isi.c | 0
6906 .../{video => platform/soc_camera}/mx1_camera.c | 0
6907 .../{video => platform/soc_camera}/mx2_camera.c | 40 +
6908 .../{video => platform/soc_camera}/mx3_camera.c | 4 +-
6909 .../{video => platform/soc_camera}/omap1_camera.c | 2 +-
6910 .../{video => platform/soc_camera}/pxa_camera.c | 0
6911 .../soc_camera}/sh_mobile_ceu_camera.c | 0
6912 .../soc_camera}/sh_mobile_csi2.c | 0
6913 .../{video => platform/soc_camera}/soc_camera.c | 197 +-
6914 .../soc_camera}/soc_camera_platform.c | 11 +-
6915 .../{video => platform/soc_camera}/soc_mediabus.c | 0
6916 drivers/media/{video => platform}/timblogiw.c | 0
6917 drivers/media/{video => platform}/via-camera.c | 0
6918 drivers/media/{video => platform}/via-camera.h | 0
6919 drivers/media/{video => platform}/vino.c | 0
6920 drivers/media/{video => platform}/vino.h | 0
6921 drivers/media/{video => platform}/vivi.c | 49 +-
6922 drivers/media/radio/radio-shark.c | 44 +-
6923 drivers/media/radio/radio-shark2.c | 52 +-
6924 drivers/media/radio/radio-si4713.c | 7 +-
6925 drivers/media/radio/radio-tea5777.c | 198 +-
6926 drivers/media/radio/radio-tea5777.h | 3 +
6927 drivers/media/radio/radio-timb.c | 8 +-
6928 drivers/media/radio/radio-wl1273.c | 23 +-
6929 drivers/media/radio/wl128x/fmdrv_v4l2.c | 38 +-
6930 drivers/media/rc/Kconfig | 32 +-
6931 drivers/media/rc/Makefile | 2 +
6932 drivers/media/rc/ati_remote.c | 15 +-
6933 drivers/media/rc/fintek-cir.c | 11 +-
6934 drivers/media/rc/iguanair.c | 247 +-
6935 drivers/media/rc/ir-lirc-codec.c | 35 +-
6936 drivers/media/rc/ir-nec-decoder.c | 4 +-
6937 drivers/media/rc/ir-raw.c | 6 +-
6938 drivers/media/rc/ir-rx51.c | 498 +++
6939 drivers/media/rc/ite-cir.c | 2 +-
6940 drivers/media/rc/keymaps/rc-tt-1500.c | 2 +-
6941 drivers/media/rc/mceusb.c | 30 +-
6942 drivers/media/rc/rc-loopback.c | 12 -
6943 drivers/media/rc/redrat3.c | 5 +-
6944 drivers/media/rc/ttusbir.c | 447 +++
6945 drivers/media/{common => }/tuners/Kconfig | 102 +-
6946 drivers/media/{common => }/tuners/Makefile | 6 +-
6947 drivers/media/tuners/e4000.c | 408 ++
6948 drivers/media/tuners/e4000.h | 52 +
6949 drivers/media/tuners/e4000_priv.h | 147 +
6950 drivers/media/{common => }/tuners/fc0011.c | 0
6951 drivers/media/{common => }/tuners/fc0011.h | 0
6952 drivers/media/{common => }/tuners/fc0012-priv.h | 0
6953 drivers/media/{common => }/tuners/fc0012.c | 0
6954 drivers/media/{common => }/tuners/fc0012.h | 0
6955 drivers/media/{common => }/tuners/fc0013-priv.h | 0
6956 drivers/media/{common => }/tuners/fc0013.c | 0
6957 drivers/media/{common => }/tuners/fc0013.h | 0
6958 drivers/media/{common => }/tuners/fc001x-common.h | 0
6959 drivers/media/tuners/fc2580.c | 524 +++
6960 drivers/media/tuners/fc2580.h | 52 +
6961 drivers/media/tuners/fc2580_priv.h | 134 +
6962 drivers/media/{common => }/tuners/max2165.c | 0
6963 drivers/media/{common => }/tuners/max2165.h | 0
6964 drivers/media/{common => }/tuners/max2165_priv.h | 0
6965 drivers/media/{common => }/tuners/mc44s803.c | 9 +-
6966 drivers/media/{common => }/tuners/mc44s803.h | 0
6967 drivers/media/{common => }/tuners/mc44s803_priv.h | 0
6968 drivers/media/{common => }/tuners/mt2060.c | 0
6969 drivers/media/{common => }/tuners/mt2060.h | 0
6970 drivers/media/{common => }/tuners/mt2060_priv.h | 0
6971 drivers/media/{common => }/tuners/mt2063.c | 0
6972 drivers/media/{common => }/tuners/mt2063.h | 0
6973 drivers/media/{common => }/tuners/mt20xx.c | 0
6974 drivers/media/{common => }/tuners/mt20xx.h | 0
6975 drivers/media/{common => }/tuners/mt2131.c | 0
6976 drivers/media/{common => }/tuners/mt2131.h | 0
6977 drivers/media/{common => }/tuners/mt2131_priv.h | 0
6978 drivers/media/{common => }/tuners/mt2266.c | 0
6979 drivers/media/{common => }/tuners/mt2266.h | 0
6980 drivers/media/{common => }/tuners/mxl5005s.c | 11 +
6981 drivers/media/{common => }/tuners/mxl5005s.h | 0
6982 drivers/media/{common => }/tuners/mxl5007t.c | 0
6983 drivers/media/{common => }/tuners/mxl5007t.h | 0
6984 drivers/media/{common => }/tuners/qt1010.c | 66 +-
6985 drivers/media/{common => }/tuners/qt1010.h | 0
6986 drivers/media/{common => }/tuners/qt1010_priv.h | 0
6987 drivers/media/{common => }/tuners/tda18212.c | 37 +-
6988 drivers/media/{common => }/tuners/tda18212.h | 0
6989 drivers/media/{common => }/tuners/tda18218.c | 52 +-
6990 drivers/media/{common => }/tuners/tda18218.h | 0
6991 drivers/media/{common => }/tuners/tda18218_priv.h | 13 +-
6992 .../media/{common => }/tuners/tda18271-common.c | 10 +-
6993 drivers/media/{common => }/tuners/tda18271-fe.c | 0
6994 drivers/media/{common => }/tuners/tda18271-maps.c | 0
6995 drivers/media/{common => }/tuners/tda18271-priv.h | 0
6996 drivers/media/{common => }/tuners/tda18271.h | 0
6997 drivers/media/{common => }/tuners/tda827x.c | 0
6998 drivers/media/{common => }/tuners/tda827x.h | 0
6999 drivers/media/{common => }/tuners/tda8290.c | 0
7000 drivers/media/{common => }/tuners/tda8290.h | 0
7001 drivers/media/{common => }/tuners/tda9887.c | 0
7002 drivers/media/{common => }/tuners/tda9887.h | 0
7003 drivers/media/{common => }/tuners/tea5761.c | 0
7004 drivers/media/{common => }/tuners/tea5761.h | 0
7005 drivers/media/{common => }/tuners/tea5767.c | 0
7006 drivers/media/{common => }/tuners/tea5767.h | 0
7007 drivers/media/{common => }/tuners/tua9001.c | 95 +-
7008 drivers/media/{common => }/tuners/tua9001.h | 20 +
7009 drivers/media/{common => }/tuners/tua9001_priv.h | 0
7010 drivers/media/{common => }/tuners/tuner-i2c.h | 0
7011 drivers/media/{common => }/tuners/tuner-simple.c | 0
7012 drivers/media/{common => }/tuners/tuner-simple.h | 0
7013 drivers/media/{common => }/tuners/tuner-types.c | 0
7014 .../media/{common => }/tuners/tuner-xc2028-types.h | 0
7015 drivers/media/{common => }/tuners/tuner-xc2028.c | 7 +-
7016 drivers/media/{common => }/tuners/tuner-xc2028.h | 0
7017 drivers/media/{common => }/tuners/xc4000.c | 3 +-
7018 drivers/media/{common => }/tuners/xc4000.h | 0
7019 drivers/media/{common => }/tuners/xc5000.c | 161 +-
7020 drivers/media/{common => }/tuners/xc5000.h | 0
7021 drivers/media/usb/Kconfig | 54 +
7022 drivers/media/usb/Makefile | 22 +
7023 drivers/media/{video => usb}/au0828/Kconfig | 11 +-
7024 drivers/media/{video => usb}/au0828/Makefile | 6 +-
7025 drivers/media/{video => usb}/au0828/au0828-cards.c | 4 +-
7026 drivers/media/{video => usb}/au0828/au0828-cards.h | 0
7027 drivers/media/{video => usb}/au0828/au0828-core.c | 59 +-
7028 drivers/media/{video => usb}/au0828/au0828-dvb.c | 54 +-
7029 drivers/media/{video => usb}/au0828/au0828-i2c.c | 21 +-
7030 drivers/media/{video => usb}/au0828/au0828-reg.h | 1 +
7031 drivers/media/{video => usb}/au0828/au0828-vbi.c | 0
7032 drivers/media/{video => usb}/au0828/au0828-video.c | 76 +-
7033 drivers/media/{video => usb}/au0828/au0828.h | 2 +
7034 drivers/media/usb/b2c2/Kconfig | 15 +
7035 drivers/media/usb/b2c2/Makefile | 5 +
7036 drivers/media/{dvb => usb}/b2c2/flexcop-usb.c | 5 +-
7037 drivers/media/{dvb => usb}/b2c2/flexcop-usb.h | 0
7038 drivers/media/{video => usb}/cpia2/Kconfig | 0
7039 drivers/media/{video => usb}/cpia2/Makefile | 0
7040 drivers/media/{video => usb}/cpia2/cpia2.h | 0
7041 drivers/media/{video => usb}/cpia2/cpia2_core.c | 6 +-
7042 .../media/{video => usb}/cpia2/cpia2_registers.h | 0
7043 drivers/media/{video => usb}/cpia2/cpia2_usb.c | 0
7044 drivers/media/{video => usb}/cpia2/cpia2_v4l.c | 39 +-
7045 drivers/media/{video => usb}/cx231xx/Kconfig | 8 +-
7046 drivers/media/{video => usb}/cx231xx/Makefile | 11 +-
7047 drivers/media/{video => usb}/cx231xx/cx231xx-417.c | 2 +
7048 .../media/{video => usb}/cx231xx/cx231xx-audio.c | 0
7049 .../media/{video => usb}/cx231xx/cx231xx-avcore.c | 0
7050 .../media/{video => usb}/cx231xx/cx231xx-cards.c | 0
7051 .../{video => usb}/cx231xx/cx231xx-conf-reg.h | 0
7052 .../media/{video => usb}/cx231xx/cx231xx-core.c | 0
7053 drivers/media/{video => usb}/cx231xx/cx231xx-dif.h | 0
7054 drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c | 0
7055 drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c | 0
7056 .../media/{video => usb}/cx231xx/cx231xx-input.c | 0
7057 .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c | 0
7058 .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h | 0
7059 drivers/media/{video => usb}/cx231xx/cx231xx-reg.h | 0
7060 drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c | 0
7061 drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h | 0
7062 .../media/{video => usb}/cx231xx/cx231xx-video.c | 47 +-
7063 drivers/media/{video => usb}/cx231xx/cx231xx.h | 0
7064 drivers/media/usb/dvb-usb-v2/Kconfig | 148 +
7065 drivers/media/usb/dvb-usb-v2/Makefile | 49 +
7066 drivers/media/usb/dvb-usb-v2/af9015.c | 1454 +++++++
7067 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9015.h | 55 +-
7068 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.c | 796 ++--
7069 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.h | 6 +-
7070 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.c | 663 ++-
7071 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.h | 9 +-
7072 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.c | 123 +-
7073 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.h | 13 +-
7074 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/az6007.c | 410 +-
7075 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.c | 188 +-
7076 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.h | 33 +-
7077 drivers/media/usb/dvb-usb-v2/cypress_firmware.c | 125 +
7078 drivers/media/usb/dvb-usb-v2/cypress_firmware.h | 31 +
7079 drivers/media/usb/dvb-usb-v2/dvb_usb.h | 403 ++
7080 drivers/media/usb/dvb-usb-v2/dvb_usb_common.h | 35 +
7081 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 1046 +++++
7082 drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 77 +
7083 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.c | 326 +-
7084 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.h | 24 +-
7085 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.c | 132 +-
7086 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.h | 5 +-
7087 drivers/media/usb/dvb-usb-v2/it913x.c | 799 ++++
7088 .../{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.c | 586 ++-
7089 .../{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.h | 0
7090 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.c | 0
7091 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.h | 0
7092 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.c | 0
7093 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.h | 0
7094 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.c | 0
7095 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.h | 0
7096 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.c | 0
7097 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.h | 0
7098 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-reg.h | 0
7099 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.c | 2 +
7100 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.h | 0
7101 drivers/media/usb/dvb-usb-v2/mxl111sf.c | 1431 +++++++
7102 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf.h | 22 +-
7103 .../{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.c | 777 ++--
7104 .../{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.h | 28 +-
7105 drivers/media/usb/dvb-usb-v2/usb_urb.c | 358 ++
7106 drivers/media/usb/dvb-usb/Kconfig | 313 ++
7107 drivers/media/usb/dvb-usb/Makefile | 83 +
7108 drivers/media/{dvb => usb}/dvb-usb/a800.c | 0
7109 drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c | 0
7110 drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c | 0
7111 drivers/media/{dvb => usb}/dvb-usb/af9005-script.h | 0
7112 drivers/media/{dvb => usb}/dvb-usb/af9005.c | 0
7113 drivers/media/{dvb => usb}/dvb-usb/af9005.h | 0
7114 drivers/media/{dvb => usb}/dvb-usb/az6027.c | 0
7115 drivers/media/{dvb => usb}/dvb-usb/az6027.h | 0
7116 .../media/{dvb => usb}/dvb-usb/cinergyT2-core.c | 0
7117 drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c | 0
7118 drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h | 0
7119 drivers/media/{dvb => usb}/dvb-usb/cxusb.c | 0
7120 drivers/media/{dvb => usb}/dvb-usb/cxusb.h | 0
7121 drivers/media/{dvb => usb}/dvb-usb/dib0700.h | 0
7122 drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c | 6 +-
7123 .../media/{dvb => usb}/dvb-usb/dib0700_devices.c | 0
7124 drivers/media/{dvb => usb}/dvb-usb/dib07x0.h | 0
7125 drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c | 0
7126 drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c | 0
7127 drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c | 0
7128 drivers/media/{dvb => usb}/dvb-usb/dibusb.h | 0
7129 drivers/media/{dvb => usb}/dvb-usb/digitv.c | 0
7130 drivers/media/{dvb => usb}/dvb-usb/digitv.h | 0
7131 drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c | 0
7132 drivers/media/{dvb => usb}/dvb-usb/dtt200u.c | 0
7133 drivers/media/{dvb => usb}/dvb-usb/dtt200u.h | 0
7134 drivers/media/{dvb => usb}/dvb-usb/dtv5100.c | 0
7135 drivers/media/{dvb => usb}/dvb-usb/dtv5100.h | 0
7136 .../media/{dvb => usb}/dvb-usb/dvb-usb-common.h | 0
7137 drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c | 1 -
7138 .../media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c | 0
7139 drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c | 0
7140 drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c | 0
7141 .../media/{dvb => usb}/dvb-usb/dvb-usb-remote.c | 0
7142 drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c | 0
7143 drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h | 2 -
7144 drivers/media/{dvb => usb}/dvb-usb/dw2102.c | 0
7145 drivers/media/{dvb => usb}/dvb-usb/dw2102.h | 0
7146 drivers/media/{dvb => usb}/dvb-usb/friio-fe.c | 0
7147 drivers/media/{dvb => usb}/dvb-usb/friio.c | 0
7148 drivers/media/{dvb => usb}/dvb-usb/friio.h | 0
7149 drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c | 0
7150 drivers/media/{dvb => usb}/dvb-usb/gp8psk.c | 0
7151 drivers/media/{dvb => usb}/dvb-usb/gp8psk.h | 0
7152 drivers/media/{dvb => usb}/dvb-usb/m920x.c | 0
7153 drivers/media/{dvb => usb}/dvb-usb/m920x.h | 0
7154 drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c | 0
7155 drivers/media/{dvb => usb}/dvb-usb/opera1.c | 0
7156 drivers/media/{dvb => usb}/dvb-usb/pctv452e.c | 7 +-
7157 .../media/{dvb => usb}/dvb-usb/technisat-usb2.c | 0
7158 drivers/media/{dvb => usb}/dvb-usb/ttusb2.c | 2 +-
7159 drivers/media/{dvb => usb}/dvb-usb/ttusb2.h | 0
7160 drivers/media/{dvb => usb}/dvb-usb/umt-010.c | 0
7161 drivers/media/{dvb => usb}/dvb-usb/usb-urb.c | 0
7162 drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c | 0
7163 drivers/media/{dvb => usb}/dvb-usb/vp702x.c | 0
7164 drivers/media/{dvb => usb}/dvb-usb/vp702x.h | 0
7165 drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c | 0
7166 drivers/media/{dvb => usb}/dvb-usb/vp7045.c | 0
7167 drivers/media/{dvb => usb}/dvb-usb/vp7045.h | 0
7168 drivers/media/{video => usb}/em28xx/Kconfig | 28 +-
7169 drivers/media/{video => usb}/em28xx/Makefile | 10 +-
7170 drivers/media/{video => usb}/em28xx/em28xx-audio.c | 1 -
7171 drivers/media/{video => usb}/em28xx/em28xx-cards.c | 0
7172 drivers/media/{video => usb}/em28xx/em28xx-core.c | 4 -
7173 drivers/media/{video => usb}/em28xx/em28xx-dvb.c | 0
7174 drivers/media/{video => usb}/em28xx/em28xx-i2c.c | 0
7175 drivers/media/{video => usb}/em28xx/em28xx-input.c | 0
7176 drivers/media/{video => usb}/em28xx/em28xx-reg.h | 0
7177 drivers/media/{video => usb}/em28xx/em28xx-vbi.c | 0
7178 drivers/media/{video => usb}/em28xx/em28xx-video.c | 52 +-
7179 drivers/media/{video => usb}/em28xx/em28xx.h | 0
7180 drivers/media/{video => usb}/gspca/Kconfig | 6 +-
7181 drivers/media/{video => usb}/gspca/Makefile | 0
7182 .../{video => usb}/gspca/autogain_functions.c | 0
7183 .../{video => usb}/gspca/autogain_functions.h | 0
7184 drivers/media/{video => usb}/gspca/benq.c | 0
7185 drivers/media/{video => usb}/gspca/conex.c | 0
7186 drivers/media/{video => usb}/gspca/cpia1.c | 2 +-
7187 drivers/media/{video => usb}/gspca/etoms.c | 0
7188 drivers/media/{video => usb}/gspca/finepix.c | 18 +-
7189 drivers/media/{video => usb}/gspca/gl860/Kconfig | 0
7190 drivers/media/{video => usb}/gspca/gl860/Makefile | 2 +-
7191 .../{video => usb}/gspca/gl860/gl860-mi1320.c | 0
7192 .../{video => usb}/gspca/gl860/gl860-mi2020.c | 0
7193 .../{video => usb}/gspca/gl860/gl860-ov2640.c | 0
7194 .../{video => usb}/gspca/gl860/gl860-ov9655.c | 0
7195 drivers/media/{video => usb}/gspca/gl860/gl860.c | 0
7196 drivers/media/{video => usb}/gspca/gl860/gl860.h | 0
7197 drivers/media/{video => usb}/gspca/gspca.c | 12 +-
7198 drivers/media/{video => usb}/gspca/gspca.h | 0
7199 drivers/media/{video => usb}/gspca/jeilinj.c | 0
7200 drivers/media/{video => usb}/gspca/jl2005bcd.c | 18 +-
7201 drivers/media/{video => usb}/gspca/jpeg.h | 0
7202 drivers/media/{video => usb}/gspca/kinect.c | 0
7203 drivers/media/{video => usb}/gspca/konica.c | 0
7204 drivers/media/{video => usb}/gspca/m5602/Kconfig | 0
7205 drivers/media/{video => usb}/gspca/m5602/Makefile | 2 +-
7206 .../{video => usb}/gspca/m5602/m5602_bridge.h | 0
7207 .../media/{video => usb}/gspca/m5602/m5602_core.c | 0
7208 .../{video => usb}/gspca/m5602/m5602_mt9m111.c | 0
7209 .../{video => usb}/gspca/m5602/m5602_mt9m111.h | 0
7210 .../{video => usb}/gspca/m5602/m5602_ov7660.c | 0
7211 .../{video => usb}/gspca/m5602/m5602_ov7660.h | 0
7212 .../{video => usb}/gspca/m5602/m5602_ov9650.c | 0
7213 .../{video => usb}/gspca/m5602/m5602_ov9650.h | 0
7214 .../{video => usb}/gspca/m5602/m5602_po1030.c | 0
7215 .../{video => usb}/gspca/m5602/m5602_po1030.h | 0
7216 .../{video => usb}/gspca/m5602/m5602_s5k4aa.c | 0
7217 .../{video => usb}/gspca/m5602/m5602_s5k4aa.h | 0
7218 .../{video => usb}/gspca/m5602/m5602_s5k83a.c | 0
7219 .../{video => usb}/gspca/m5602/m5602_s5k83a.h | 0
7220 .../{video => usb}/gspca/m5602/m5602_sensor.h | 0
7221 drivers/media/{video => usb}/gspca/mars.c | 0
7222 drivers/media/{video => usb}/gspca/mr97310a.c | 0
7223 drivers/media/{video => usb}/gspca/nw80x.c | 0
7224 drivers/media/{video => usb}/gspca/ov519.c | 16 +-
7225 drivers/media/{video => usb}/gspca/ov534.c | 0
7226 drivers/media/{video => usb}/gspca/ov534_9.c | 0
7227 drivers/media/{video => usb}/gspca/pac207.c | 0
7228 drivers/media/{video => usb}/gspca/pac7302.c | 47 +-
7229 drivers/media/{video => usb}/gspca/pac7311.c | 0
7230 drivers/media/{video => usb}/gspca/pac_common.h | 0
7231 drivers/media/{video => usb}/gspca/se401.c | 0
7232 drivers/media/{video => usb}/gspca/se401.h | 0
7233 drivers/media/{video => usb}/gspca/sn9c2028.c | 0
7234 drivers/media/{video => usb}/gspca/sn9c2028.h | 0
7235 drivers/media/{video => usb}/gspca/sn9c20x.c | 2 +
7236 drivers/media/{video => usb}/gspca/sonixb.c | 0
7237 drivers/media/{video => usb}/gspca/sonixj.c | 2 +
7238 drivers/media/{video => usb}/gspca/spca1528.c | 0
7239 drivers/media/{video => usb}/gspca/spca500.c | 0
7240 drivers/media/{video => usb}/gspca/spca501.c | 0
7241 drivers/media/{video => usb}/gspca/spca505.c | 0
7242 drivers/media/{video => usb}/gspca/spca506.c | 0
7243 drivers/media/{video => usb}/gspca/spca508.c | 0
7244 drivers/media/{video => usb}/gspca/spca561.c | 0
7245 drivers/media/{video => usb}/gspca/sq905.c | 19 +-
7246 drivers/media/{video => usb}/gspca/sq905c.c | 25 +-
7247 drivers/media/{video => usb}/gspca/sq930x.c | 10 +-
7248 drivers/media/{video => usb}/gspca/stk014.c | 0
7249 drivers/media/{video => usb}/gspca/stv0680.c | 0
7250 drivers/media/{video => usb}/gspca/stv06xx/Kconfig | 0
7251 .../media/{video => usb}/gspca/stv06xx/Makefile | 2 +-
7252 .../media/{video => usb}/gspca/stv06xx/stv06xx.c | 0
7253 .../media/{video => usb}/gspca/stv06xx/stv06xx.h | 0
7254 .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.c | 0
7255 .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.h | 0
7256 .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.c | 0
7257 .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.h | 0
7258 .../{video => usb}/gspca/stv06xx/stv06xx_sensor.h | 0
7259 .../{video => usb}/gspca/stv06xx/stv06xx_st6422.c | 0
7260 .../{video => usb}/gspca/stv06xx/stv06xx_st6422.h | 0
7261 .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.c | 0
7262 .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.h | 0
7263 drivers/media/{video => usb}/gspca/sunplus.c | 0
7264 drivers/media/{video => usb}/gspca/t613.c | 0
7265 drivers/media/{video => usb}/gspca/topro.c | 0
7266 drivers/media/{video => usb}/gspca/tv8532.c | 0
7267 drivers/media/{video => usb}/gspca/vc032x.c | 7 +-
7268 drivers/media/{video => usb}/gspca/vicam.c | 17 +-
7269 drivers/media/{video => usb}/gspca/w996Xcf.c | 0
7270 drivers/media/{video => usb}/gspca/xirlink_cit.c | 4 +-
7271 drivers/media/{video => usb}/gspca/zc3xx-reg.h | 0
7272 drivers/media/{video => usb}/gspca/zc3xx.c | 8 +-
7273 drivers/media/{video => usb}/hdpvr/Kconfig | 0
7274 drivers/media/{video => usb}/hdpvr/Makefile | 2 +-
7275 drivers/media/{video => usb}/hdpvr/hdpvr-control.c | 0
7276 drivers/media/{video => usb}/hdpvr/hdpvr-core.c | 0
7277 drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c | 0
7278 drivers/media/{video => usb}/hdpvr/hdpvr-video.c | 0
7279 drivers/media/{video => usb}/hdpvr/hdpvr.h | 0
7280 drivers/media/{video => usb}/pvrusb2/Kconfig | 14 +-
7281 drivers/media/{video => usb}/pvrusb2/Makefile | 8 +-
7282 .../media/{video => usb}/pvrusb2/pvrusb2-audio.c | 0
7283 .../media/{video => usb}/pvrusb2/pvrusb2-audio.h | 0
7284 .../media/{video => usb}/pvrusb2/pvrusb2-context.c | 0
7285 .../media/{video => usb}/pvrusb2/pvrusb2-context.h | 0
7286 .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.c | 0
7287 .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.h | 0
7288 .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.c | 0
7289 .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.h | 0
7290 .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c | 0
7291 .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h | 0
7292 .../media/{video => usb}/pvrusb2/pvrusb2-debug.h | 0
7293 .../{video => usb}/pvrusb2/pvrusb2-debugifc.c | 0
7294 .../{video => usb}/pvrusb2/pvrusb2-debugifc.h | 0
7295 .../media/{video => usb}/pvrusb2/pvrusb2-devattr.c | 17 +-
7296 .../media/{video => usb}/pvrusb2/pvrusb2-devattr.h | 0
7297 drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c | 0
7298 drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h | 0
7299 .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.c | 0
7300 .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.h | 0
7301 .../media/{video => usb}/pvrusb2/pvrusb2-encoder.c | 0
7302 .../media/{video => usb}/pvrusb2/pvrusb2-encoder.h | 0
7303 .../media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h | 0
7304 .../{video => usb}/pvrusb2/pvrusb2-hdw-internal.h | 0
7305 drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c | 0
7306 drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h | 0
7307 .../{video => usb}/pvrusb2/pvrusb2-i2c-core.c | 0
7308 .../{video => usb}/pvrusb2/pvrusb2-i2c-core.h | 0
7309 drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c | 0
7310 drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h | 0
7311 .../media/{video => usb}/pvrusb2/pvrusb2-ioread.c | 0
7312 .../media/{video => usb}/pvrusb2/pvrusb2-ioread.h | 0
7313 .../media/{video => usb}/pvrusb2/pvrusb2-main.c | 0
7314 drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c | 0
7315 drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h | 0
7316 .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.c | 0
7317 .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.h | 0
7318 .../media/{video => usb}/pvrusb2/pvrusb2-util.h | 0
7319 .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.c | 0
7320 .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.h | 0
7321 .../{video => usb}/pvrusb2/pvrusb2-video-v4l.c | 0
7322 .../{video => usb}/pvrusb2/pvrusb2-video-v4l.h | 0
7323 .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.c | 0
7324 .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.h | 0
7325 drivers/media/{video => usb}/pvrusb2/pvrusb2.h | 0
7326 drivers/media/{video => usb}/pwc/Kconfig | 0
7327 drivers/media/{video => usb}/pwc/Makefile | 2 +-
7328 drivers/media/{video => usb}/pwc/philips.txt | 0
7329 drivers/media/{video => usb}/pwc/pwc-ctrl.c | 0
7330 drivers/media/{video => usb}/pwc/pwc-dec1.c | 0
7331 drivers/media/{video => usb}/pwc/pwc-dec1.h | 0
7332 drivers/media/{video => usb}/pwc/pwc-dec23.c | 0
7333 drivers/media/{video => usb}/pwc/pwc-dec23.h | 0
7334 drivers/media/{video => usb}/pwc/pwc-if.c | 3 +-
7335 drivers/media/{video => usb}/pwc/pwc-kiara.c | 0
7336 drivers/media/{video => usb}/pwc/pwc-kiara.h | 0
7337 drivers/media/{video => usb}/pwc/pwc-misc.c | 0
7338 drivers/media/{video => usb}/pwc/pwc-nala.h | 0
7339 drivers/media/{video => usb}/pwc/pwc-timon.c | 0
7340 drivers/media/{video => usb}/pwc/pwc-timon.h | 0
7341 drivers/media/{video => usb}/pwc/pwc-uncompress.c | 0
7342 drivers/media/{video => usb}/pwc/pwc-v4l.c | 0
7343 drivers/media/{video => usb}/pwc/pwc.h | 0
7344 drivers/media/usb/s2255/Kconfig | 9 +
7345 drivers/media/usb/s2255/Makefile | 2 +
7346 drivers/media/{video => usb/s2255}/s2255drv.c | 43 +-
7347 drivers/media/usb/siano/Kconfig | 10 +
7348 drivers/media/usb/siano/Makefile | 6 +
7349 drivers/media/{dvb => usb}/siano/smsusb.c | 0
7350 drivers/media/{video => usb}/sn9c102/Kconfig | 0
7351 drivers/media/{video => usb}/sn9c102/Makefile | 0
7352 drivers/media/{video => usb}/sn9c102/sn9c102.h | 0
7353 .../media/{video => usb}/sn9c102/sn9c102_config.h | 0
7354 .../media/{video => usb}/sn9c102/sn9c102_core.c | 0
7355 .../{video => usb}/sn9c102/sn9c102_devtable.h | 0
7356 .../media/{video => usb}/sn9c102/sn9c102_hv7131d.c | 0
7357 .../media/{video => usb}/sn9c102/sn9c102_hv7131r.c | 0
7358 .../media/{video => usb}/sn9c102/sn9c102_mi0343.c | 0
7359 .../media/{video => usb}/sn9c102/sn9c102_mi0360.c | 0
7360 .../media/{video => usb}/sn9c102/sn9c102_mt9v111.c | 0
7361 .../media/{video => usb}/sn9c102/sn9c102_ov7630.c | 0
7362 .../media/{video => usb}/sn9c102/sn9c102_ov7660.c | 0
7363 .../media/{video => usb}/sn9c102/sn9c102_pas106b.c | 0
7364 .../{video => usb}/sn9c102/sn9c102_pas202bcb.c | 0
7365 .../media/{video => usb}/sn9c102/sn9c102_sensor.h | 0
7366 .../{video => usb}/sn9c102/sn9c102_tas5110c1b.c | 0
7367 .../{video => usb}/sn9c102/sn9c102_tas5110d.c | 0
7368 .../{video => usb}/sn9c102/sn9c102_tas5130d1b.c | 0
7369 drivers/media/usb/stk1160/Kconfig | 20 +
7370 drivers/media/usb/stk1160/Makefile | 11 +
7371 drivers/media/usb/stk1160/stk1160-ac97.c | 152 +
7372 drivers/media/usb/stk1160/stk1160-core.c | 430 ++
7373 drivers/media/usb/stk1160/stk1160-i2c.c | 294 ++
7374 drivers/media/usb/stk1160/stk1160-reg.h | 93 +
7375 drivers/media/usb/stk1160/stk1160-v4l.c | 739 ++++
7376 drivers/media/usb/stk1160/stk1160-video.c | 518 +++
7377 drivers/media/usb/stk1160/stk1160.h | 208 +
7378 drivers/media/usb/stkwebcam/Kconfig | 13 +
7379 drivers/media/usb/stkwebcam/Makefile | 4 +
7380 .../media/{video => usb/stkwebcam}/stk-sensor.c | 0
7381 .../media/{video => usb/stkwebcam}/stk-webcam.c | 0
7382 .../media/{video => usb/stkwebcam}/stk-webcam.h | 0
7383 drivers/media/{video => usb}/tlg2300/Kconfig | 0
7384 drivers/media/usb/tlg2300/Makefile | 9 +
7385 drivers/media/{video => usb}/tlg2300/pd-alsa.c | 4 +
7386 drivers/media/{video => usb}/tlg2300/pd-common.h | 0
7387 drivers/media/{video => usb}/tlg2300/pd-dvb.c | 0
7388 drivers/media/{video => usb}/tlg2300/pd-main.c | 0
7389 drivers/media/{video => usb}/tlg2300/pd-radio.c | 0
7390 drivers/media/{video => usb}/tlg2300/pd-video.c | 0
7391 drivers/media/{video => usb}/tlg2300/vendorcmds.h | 0
7392 drivers/media/{video => usb}/tm6000/Kconfig | 0
7393 drivers/media/{video => usb}/tm6000/Makefile | 8 +-
7394 drivers/media/{video => usb}/tm6000/tm6000-alsa.c | 3 +-
7395 drivers/media/{video => usb}/tm6000/tm6000-cards.c | 0
7396 drivers/media/{video => usb}/tm6000/tm6000-core.c | 0
7397 drivers/media/{video => usb}/tm6000/tm6000-dvb.c | 0
7398 drivers/media/{video => usb}/tm6000/tm6000-i2c.c | 0
7399 drivers/media/{video => usb}/tm6000/tm6000-input.c | 3 +-
7400 drivers/media/{video => usb}/tm6000/tm6000-regs.h | 0
7401 drivers/media/{video => usb}/tm6000/tm6000-stds.c | 0
7402 .../media/{video => usb}/tm6000/tm6000-usb-isoc.h | 0
7403 drivers/media/{video => usb}/tm6000/tm6000-video.c | 52 +-
7404 drivers/media/{video => usb}/tm6000/tm6000.h | 0
7405 drivers/media/{dvb => usb}/ttusb-budget/Kconfig | 14 +-
7406 drivers/media/usb/ttusb-budget/Makefile | 3 +
7407 .../{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c | 0
7408 drivers/media/{dvb => usb}/ttusb-dec/Kconfig | 0
7409 drivers/media/{dvb => usb}/ttusb-dec/Makefile | 2 +-
7410 drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c | 0
7411 drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c | 0
7412 drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h | 0
7413 drivers/media/{video => usb}/usbvision/Kconfig | 2 +-
7414 drivers/media/{video => usb}/usbvision/Makefile | 4 +-
7415 .../{video => usb}/usbvision/usbvision-cards.c | 0
7416 .../{video => usb}/usbvision/usbvision-cards.h | 0
7417 .../{video => usb}/usbvision/usbvision-core.c | 0
7418 .../media/{video => usb}/usbvision/usbvision-i2c.c | 0
7419 .../{video => usb}/usbvision/usbvision-video.c | 42 +-
7420 drivers/media/{video => usb}/usbvision/usbvision.h | 0
7421 drivers/media/{video => usb}/uvc/Kconfig | 0
7422 drivers/media/{video => usb}/uvc/Makefile | 0
7423 drivers/media/{video => usb}/uvc/uvc_ctrl.c | 0
7424 drivers/media/{video => usb}/uvc/uvc_debugfs.c | 0
7425 drivers/media/{video => usb}/uvc/uvc_driver.c | 40 +-
7426 drivers/media/{video => usb}/uvc/uvc_entity.c | 0
7427 drivers/media/{video => usb}/uvc/uvc_isight.c | 0
7428 drivers/media/{video => usb}/uvc/uvc_queue.c | 0
7429 drivers/media/{video => usb}/uvc/uvc_status.c | 0
7430 drivers/media/{video => usb}/uvc/uvc_v4l2.c | 0
7431 drivers/media/{video => usb}/uvc/uvc_video.c | 30 +-
7432 drivers/media/{video => usb}/uvc/uvcvideo.h | 9 +
7433 drivers/media/usb/zr364xx/Kconfig | 14 +
7434 drivers/media/usb/zr364xx/Makefile | 2 +
7435 drivers/media/{video => usb/zr364xx}/zr364xx.c | 0
7436 drivers/media/v4l2-core/Kconfig | 81 +
7437 drivers/media/v4l2-core/Makefile | 35 +
7438 drivers/media/{video => v4l2-core}/tuner-core.c | 0
7439 drivers/media/{video => v4l2-core}/v4l2-common.c | 360 +-
7440 .../{video => v4l2-core}/v4l2-compat-ioctl32.c | 57 +
7441 drivers/media/{video => v4l2-core}/v4l2-ctrls.c | 174 +-
7442 drivers/media/{video => v4l2-core}/v4l2-dev.c | 51 +-
7443 drivers/media/{video => v4l2-core}/v4l2-device.c | 0
7444 drivers/media/{video => v4l2-core}/v4l2-event.c | 0
7445 drivers/media/{video => v4l2-core}/v4l2-fh.c | 0
7446 .../media/{video => v4l2-core}/v4l2-int-device.c | 0
7447 drivers/media/{video => v4l2-core}/v4l2-ioctl.c | 21 +-
7448 drivers/media/{video => v4l2-core}/v4l2-mem2mem.c | 6 +-
7449 drivers/media/{video => v4l2-core}/v4l2-subdev.c | 6 +
7450 drivers/media/{video => v4l2-core}/videobuf-core.c | 0
7451 .../{video => v4l2-core}/videobuf-dma-contig.c | 0
7452 .../media/{video => v4l2-core}/videobuf-dma-sg.c | 0
7453 drivers/media/{video => v4l2-core}/videobuf-dvb.c | 11 +-
7454 .../media/{video => v4l2-core}/videobuf-vmalloc.c | 0
7455 .../media/{video => v4l2-core}/videobuf2-core.c | 21 +-
7456 .../{video => v4l2-core}/videobuf2-dma-contig.c | 0
7457 .../media/{video => v4l2-core}/videobuf2-dma-sg.c | 0
7458 .../media/{video => v4l2-core}/videobuf2-memops.c | 0
7459 .../media/{video => v4l2-core}/videobuf2-vmalloc.c | 1 +
7460 drivers/media/video/Kconfig | 1263 ------
7461 drivers/media/video/Makefile | 218 -
7462 drivers/media/video/bt8xx/Kconfig | 27 -
7463 drivers/media/video/bt8xx/Makefile | 13 -
7464 drivers/media/video/cx23885/Kconfig | 46 -
7465 drivers/media/video/tlg2300/Makefile | 9 -
7466 drivers/staging/media/Kconfig | 2 -
7467 drivers/staging/media/Makefile | 1 -
7468 drivers/staging/media/as102/Makefile | 2 +-
7469 drivers/staging/media/cxd2099/Makefile | 6 +-
7470 drivers/staging/media/cxd2099/cxd2099.c | 13 +-
7471 drivers/staging/media/dt3155v4l/dt3155v4l.c | 29 +-
7472 drivers/staging/media/easycap/Kconfig | 30 -
7473 drivers/staging/media/easycap/Makefile | 10 -
7474 drivers/staging/media/easycap/README | 141 -
7475 drivers/staging/media/easycap/easycap.h | 567 ---
7476 drivers/staging/media/easycap/easycap_ioctl.c | 2443 -----------
7477 drivers/staging/media/easycap/easycap_low.c | 968 -----
7478 drivers/staging/media/easycap/easycap_main.c | 4239 --------------------
7479 drivers/staging/media/easycap/easycap_settings.c | 696 ----
7480 drivers/staging/media/easycap/easycap_sound.c | 750 ----
7481 drivers/staging/media/easycap/easycap_testcard.c | 155 -
7482 drivers/staging/media/go7007/Makefile | 6 +-
7483 drivers/staging/media/lirc/Kconfig | 6 -
7484 drivers/staging/media/lirc/Makefile | 1 -
7485 drivers/staging/media/lirc/lirc_ene0100.h | 169 -
7486 drivers/staging/media/lirc/lirc_igorplugusb.c | 4 +-
7487 drivers/staging/media/lirc/lirc_ttusbir.c | 376 --
7488 drivers/staging/media/lirc/lirc_zilog.c | 3 +-
7489 include/linux/dvb/frontend.h | 59 +-
7490 include/linux/dvb/version.h | 2 +-
7491 include/linux/omap3isp.h | 6 +-
7492 include/linux/v4l2-common.h | 8 +-
7493 include/linux/v4l2-subdev.h | 10 +
7494 include/linux/videodev2.h | 24 +
7495 include/media/ad9389b.h | 49 +
7496 include/media/adv7604.h | 153 +
7497 include/media/ir-rx51.h | 10 +
7498 include/media/mt9v032.h | 3 +
7499 include/media/omap3isp.h | 14 +-
7500 include/media/saa7146.h | 4 -
7501 include/media/soc_camera.h | 12 +
7502 include/media/v4l2-chip-ident.h | 6 +
7503 include/media/v4l2-common.h | 17 +-
7504 include/media/v4l2-ctrls.h | 23 +
7505 include/media/v4l2-dev.h | 3 -
7506 include/media/v4l2-mem2mem.h | 4 +-
7507 include/media/v4l2-subdev.h | 4 +-
7508 include/media/videobuf-dvb.h | 4 +-
7509 include/sound/tea575x-tuner.h | 4 +
7510 sound/i2c/other/tea575x-tuner.c | 200 +-
7511 sound/pci/Kconfig | 4 +-
7512 1614 files changed, 34031 insertions(+), 24099 deletions(-)
7513 create mode 100644 Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml
7514 create mode 100644 arch/arm/plat-mxc/devices/platform-imx27-coda.c
7515 create mode 100644 drivers/media/common/b2c2/Kconfig
7516 create mode 100644 drivers/media/common/b2c2/Makefile
7517 rename drivers/media/{dvb => common}/b2c2/flexcop-common.h (100%)
7518 rename drivers/media/{dvb => common}/b2c2/flexcop-eeprom.c (100%)
7519 rename drivers/media/{dvb => common}/b2c2/flexcop-fe-tuner.c (100%)
7520 rename drivers/media/{dvb => common}/b2c2/flexcop-hw-filter.c (100%)
7521 rename drivers/media/{dvb => common}/b2c2/flexcop-i2c.c (100%)
7522 rename drivers/media/{dvb => common}/b2c2/flexcop-misc.c (100%)
7523 rename drivers/media/{dvb => common}/b2c2/flexcop-reg.h (100%)
7524 rename drivers/media/{dvb => common}/b2c2/flexcop-sram.c (100%)
7525 rename drivers/media/{dvb => common}/b2c2/flexcop.c (99%)
7526 rename drivers/media/{dvb => common}/b2c2/flexcop.h (100%)
7527 rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_be.h (100%)
7528 rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_le.h (100%)
7529 create mode 100644 drivers/media/common/saa7146/Kconfig
7530 create mode 100644 drivers/media/common/saa7146/Makefile
7531 rename drivers/media/common/{ => saa7146}/saa7146_core.c (98%)
7532 rename drivers/media/common/{ => saa7146}/saa7146_fops.c (94%)
7533 rename drivers/media/common/{ => saa7146}/saa7146_hlp.c (100%)
7534 rename drivers/media/common/{ => saa7146}/saa7146_i2c.c (100%)
7535 rename drivers/media/common/{ => saa7146}/saa7146_vbi.c (100%)
7536 rename drivers/media/common/{ => saa7146}/saa7146_video.c (100%)
7537 create mode 100644 drivers/media/common/siano/Kconfig
7538 rename drivers/media/{dvb => common}/siano/Makefile (57%)
7539 rename drivers/media/{dvb => common}/siano/sms-cards.c (100%)
7540 rename drivers/media/{dvb => common}/siano/sms-cards.h (100%)
7541 rename drivers/media/{dvb => common}/siano/smscoreapi.c (100%)
7542 rename drivers/media/{dvb => common}/siano/smscoreapi.h (100%)
7543 rename drivers/media/{dvb => common}/siano/smsdvb.c (100%)
7544 rename drivers/media/{dvb => common}/siano/smsendian.c (100%)
7545 rename drivers/media/{dvb => common}/siano/smsendian.h (100%)
7546 rename drivers/media/{dvb => common}/siano/smsir.c (100%)
7547 rename drivers/media/{dvb => common}/siano/smsir.h (100%)
7548 create mode 100644 drivers/media/dvb-core/Kconfig
7549 rename drivers/media/{dvb => }/dvb-core/Makefile (100%)
7550 rename drivers/media/{dvb => }/dvb-core/demux.h (100%)
7551 rename drivers/media/{dvb => }/dvb-core/dmxdev.c (99%)
7552 rename drivers/media/{dvb => }/dvb-core/dmxdev.h (100%)
7553 rename drivers/media/{dvb/dvb-usb => dvb-core}/dvb-usb-ids.h (99%)
7554 rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c (100%)
7555 rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h (100%)
7556 rename drivers/media/{dvb => }/dvb-core/dvb_demux.c (98%)
7557 rename drivers/media/{dvb => }/dvb-core/dvb_demux.h (100%)
7558 rename drivers/media/{dvb => }/dvb-core/dvb_filter.c (100%)
7559 rename drivers/media/{dvb => }/dvb-core/dvb_filter.h (100%)
7560 rename drivers/media/{dvb => }/dvb-core/dvb_frontend.c (90%)
7561 rename drivers/media/{dvb => }/dvb-core/dvb_frontend.h (98%)
7562 rename drivers/media/{dvb => }/dvb-core/dvb_math.c (100%)
7563 rename drivers/media/{dvb => }/dvb-core/dvb_math.h (100%)
7564 rename drivers/media/{dvb => }/dvb-core/dvb_net.c (100%)
7565 rename drivers/media/{dvb => }/dvb-core/dvb_net.h (100%)
7566 rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c (100%)
7567 rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h (100%)
7568 rename drivers/media/{dvb => }/dvb-core/dvbdev.c (99%)
7569 rename drivers/media/{dvb => }/dvb-core/dvbdev.h (80%)
7570 rename drivers/media/{dvb/frontends => dvb-frontends}/Kconfig (83%)
7571 rename drivers/media/{dvb/frontends => dvb-frontends}/Makefile (92%)
7572 rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.c (100%)
7573 rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.h (100%)
7574 rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.c (86%)
7575 rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.h (97%)
7576 rename drivers/media/{dvb/frontends => dvb-frontends}/af9013_priv.h (98%)
7577 rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.c (88%)
7578 rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.h (96%)
7579 rename drivers/media/{dvb/frontends => dvb-frontends}/af9033_priv.h (100%)
7580 rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.c (99%)
7581 rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.h (100%)
7582 rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830_priv.h (100%)
7583 rename drivers/media/{dvb/frontends => dvb-frontends}/au8522.h (100%)
7584 rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_common.c (93%)
7585 rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_decoder.c (98%)
7586 rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_dig.c (95%)
7587 rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_priv.h (93%)
7588 rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.c (100%)
7589 rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.h (100%)
7590 rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510_priv.h (100%)
7591 rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1-d01a.h (100%)
7592 rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1.h (100%)
7593 rename drivers/media/{dvb/frontends => dvb-frontends}/bsru6.h (100%)
7594 rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.c (100%)
7595 rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.h (100%)
7596 rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.c (100%)
7597 rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.h (100%)
7598 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.c (100%)
7599 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.h (100%)
7600 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.c (100%)
7601 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.h (100%)
7602 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.c (100%)
7603 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.h (100%)
7604 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.c (100%)
7605 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.h (100%)
7606 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r.h (100%)
7607 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_c.c (100%)
7608 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_core.c (100%)
7609 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_priv.h (100%)
7610 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t.c (99%)
7611 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t2.c (100%)
7612 rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.c (100%)
7613 rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.h (100%)
7614 rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.c (100%)
7615 rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.h (100%)
7616 rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000.h (100%)
7617 rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb.c (100%)
7618 rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb_priv.h (100%)
7619 rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.c (100%)
7620 rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.h (100%)
7621 rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.c (100%)
7622 rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.h (100%)
7623 rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.c (100%)
7624 rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.h (100%)
7625 rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.c (100%)
7626 rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.h (100%)
7627 rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.c (100%)
7628 rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.h (100%)
7629 rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.c (100%)
7630 rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.h (100%)
7631 rename drivers/media/{dvb/frontends => dvb-frontends}/drxd.h (100%)
7632 rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.c (100%)
7633 rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.h (100%)
7634 rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_hard.c (100%)
7635 rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_map_firm.h (100%)
7636 rename drivers/media/{dvb/frontends => dvb-frontends}/drxk.h (100%)
7637 rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.c (100%)
7638 rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.h (100%)
7639 rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_map.h (100%)
7640 rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.c (100%)
7641 rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.h (100%)
7642 rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.c (96%)
7643 rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.h (97%)
7644 rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.c (100%)
7645 rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.h (100%)
7646 rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.c (87%)
7647 rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.h (95%)
7648 rename drivers/media/{dvb/frontends => dvb-frontends}/eds1547.h (100%)
7649 rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.c (89%)
7650 rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.h (96%)
7651 rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2_priv.h (96%)
7652 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.c (100%)
7653 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.h (100%)
7654 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.c (100%)
7655 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.h (100%)
7656 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.c (100%)
7657 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.h (100%)
7658 rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe-priv.h (100%)
7659 rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.c (99%)
7660 rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.h (100%)
7661 rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.c (100%)
7662 rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.h (100%)
7663 rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000_priv.h (100%)
7664 rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.c (100%)
7665 rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.h (100%)
7666 rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.c (100%)
7667 rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.h (100%)
7668 rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.c (100%)
7669 rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.h (100%)
7670 rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.c (100%)
7671 rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.h (100%)
7672 rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.c (100%)
7673 rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.h (100%)
7674 rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x_priv.h (100%)
7675 rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.c (99%)
7676 rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.h (100%)
7677 rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.c (99%)
7678 rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.h (100%)
7679 rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx_priv.h (100%)
7680 rename drivers/media/{dvb/frontends => dvb-frontends}/lnbh24.h (100%)
7681 rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.c (100%)
7682 rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.h (100%)
7683 rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.c (100%)
7684 rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.h (100%)
7685 rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.c (99%)
7686 rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.h (100%)
7687 rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.c (100%)
7688 rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.h (100%)
7689 rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16_priv.h (100%)
7690 rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.c (100%)
7691 rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.h (100%)
7692 rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.c (100%)
7693 rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.h (100%)
7694 rename drivers/media/{dvb/frontends => dvb-frontends}/mt312_priv.h (100%)
7695 rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.c (100%)
7696 rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.h (100%)
7697 rename drivers/media/{dvb/frontends => dvb-frontends}/mt352_priv.h (100%)
7698 rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.c (93%)
7699 rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.h (100%)
7700 rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.c (100%)
7701 rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.h (100%)
7702 rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000_priv.h (100%)
7703 rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.c (100%)
7704 rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.h (100%)
7705 rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.c (100%)
7706 rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.h (100%)
7707 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.c (88%)
7708 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.h (90%)
7709 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830_priv.h (75%)
7710 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832.c (77%)
7711 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832.h (86%)
7712 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832_priv.h (67%)
7713 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.c (100%)
7714 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.h (100%)
7715 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.c (100%)
7716 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.h (100%)
7717 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.c (100%)
7718 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.h (100%)
7719 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420_priv.h (100%)
7720 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.c (100%)
7721 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.h (100%)
7722 rename drivers/media/{dvb/frontends => dvb-frontends}/s921.c (100%)
7723 rename drivers/media/{dvb/frontends => dvb-frontends}/s921.h (100%)
7724 rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.c (100%)
7725 rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.h (100%)
7726 rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.c (100%)
7727 rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.h (100%)
7728 rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.c (100%)
7729 rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.h (100%)
7730 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_algo.c (100%)
7731 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_cfg.h (100%)
7732 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.c (99%)
7733 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.h (100%)
7734 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_priv.h (100%)
7735 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_reg.h (100%)
7736 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.c (100%)
7737 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.h (100%)
7738 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.c (100%)
7739 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.h (100%)
7740 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_cfg.h (100%)
7741 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_proc.h (100%)
7742 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.c (100%)
7743 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.h (100%)
7744 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.c (100%)
7745 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.h (100%)
7746 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.c (100%)
7747 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.h (100%)
7748 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.c (100%)
7749 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.h (100%)
7750 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_priv.h (100%)
7751 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_regs.h (100%)
7752 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900.h (100%)
7753 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_core.c (100%)
7754 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_init.h (100%)
7755 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_priv.h (100%)
7756 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_reg.h (100%)
7757 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_sw.c (100%)
7758 rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.c (99%)
7759 rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.h (100%)
7760 rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_priv.h (100%)
7761 rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_reg.h (100%)
7762 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.c (100%)
7763 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.h (100%)
7764 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.c (100%)
7765 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.h (100%)
7766 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_priv.h (100%)
7767 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_reg.h (100%)
7768 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10021.c (100%)
7769 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10023.c (100%)
7770 rename drivers/media/{dvb/frontends => dvb-frontends}/tda1002x.h (100%)
7771 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.c (100%)
7772 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.h (100%)
7773 rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.c (100%)
7774 rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.h (100%)
7775 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.c (99%)
7776 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.h (100%)
7777 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071_priv.h (98%)
7778 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.c (100%)
7779 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.h (100%)
7780 rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.c (100%)
7781 rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.h (100%)
7782 rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd_maps.h (100%)
7783 rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.c (100%)
7784 rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.h (100%)
7785 rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.c (100%)
7786 rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.h (100%)
7787 rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.c (86%)
7788 rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.h (100%)
7789 rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261_cfg.h (100%)
7790 rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.c (100%)
7791 rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.h (100%)
7792 rename drivers/media/{dvb/frontends => dvb-frontends}/tdhd1.h (100%)
7793 rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.c (100%)
7794 rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.h (100%)
7795 rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.c (100%)
7796 rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.h (100%)
7797 rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.c (100%)
7798 rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.h (100%)
7799 rename drivers/media/{dvb/frontends => dvb-frontends}/z0194a.h (100%)
7800 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.c (100%)
7801 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.h (100%)
7802 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.c (100%)
7803 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.h (100%)
7804 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.c (100%)
7805 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.h (100%)
7806 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353_priv.h (100%)
7807 delete mode 100644 drivers/media/dvb/Kconfig
7808 delete mode 100644 drivers/media/dvb/Makefile
7809 delete mode 100644 drivers/media/dvb/b2c2/Kconfig
7810 delete mode 100644 drivers/media/dvb/b2c2/Makefile
7811 delete mode 100644 drivers/media/dvb/bt8xx/Kconfig
7812 delete mode 100644 drivers/media/dvb/bt8xx/Makefile
7813 delete mode 100644 drivers/media/dvb/dm1105/Makefile
7814 delete mode 100644 drivers/media/dvb/dvb-usb/Kconfig
7815 delete mode 100644 drivers/media/dvb/dvb-usb/Makefile
7816 delete mode 100644 drivers/media/dvb/dvb-usb/af9015.c
7817 delete mode 100644 drivers/media/dvb/dvb-usb/it913x.c
7818 delete mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.c
7819 delete mode 100644 drivers/media/dvb/frontends/ec100_priv.h
7820 delete mode 100644 drivers/media/dvb/ngene/Kconfig
7821 delete mode 100644 drivers/media/dvb/pluto2/Makefile
7822 delete mode 100644 drivers/media/dvb/siano/Kconfig
7823 delete mode 100644 drivers/media/dvb/ttusb-budget/Makefile
7824 rename drivers/media/{dvb => }/firewire/Kconfig (100%)
7825 rename drivers/media/{dvb => }/firewire/Makefile (51%)
7826 rename drivers/media/{dvb => }/firewire/firedtv-avc.c (100%)
7827 rename drivers/media/{dvb => }/firewire/firedtv-ci.c (100%)
7828 rename drivers/media/{dvb => }/firewire/firedtv-dvb.c (100%)
7829 rename drivers/media/{dvb => }/firewire/firedtv-fe.c (100%)
7830 rename drivers/media/{dvb => }/firewire/firedtv-fw.c (100%)
7831 rename drivers/media/{dvb => }/firewire/firedtv-rc.c (100%)
7832 rename drivers/media/{dvb => }/firewire/firedtv.h (100%)
7833 create mode 100644 drivers/media/i2c/Kconfig
7834 create mode 100644 drivers/media/i2c/Makefile
7835 create mode 100644 drivers/media/i2c/ad9389b.c
7836 rename drivers/media/{video => i2c}/adp1653.c (99%)
7837 rename drivers/media/{video => i2c}/adv7170.c (100%)
7838 rename drivers/media/{video => i2c}/adv7175.c (100%)
7839 rename drivers/media/{video => i2c}/adv7180.c (100%)
7840 rename drivers/media/{video => i2c}/adv7183.c (100%)
7841 rename drivers/media/{video => i2c}/adv7183_regs.h (100%)
7842 rename drivers/media/{video => i2c}/adv7343.c (100%)
7843 rename drivers/media/{video => i2c}/adv7343_regs.h (100%)
7844 rename drivers/media/{video => i2c}/adv7393.c (100%)
7845 rename drivers/media/{video => i2c}/adv7393_regs.h (100%)
7846 create mode 100644 drivers/media/i2c/adv7604.c
7847 rename drivers/media/{video => i2c}/ak881x.c (100%)
7848 rename drivers/media/{video => i2c}/aptina-pll.c (100%)
7849 rename drivers/media/{video => i2c}/aptina-pll.h (100%)
7850 rename drivers/media/{video => i2c}/as3645a.c (99%)
7851 rename drivers/media/{video => i2c}/bt819.c (100%)
7852 rename drivers/media/{video => i2c}/bt856.c (100%)
7853 rename drivers/media/{video => i2c}/bt866.c (100%)
7854 rename drivers/media/{video => i2c}/btcx-risc.c (100%)
7855 rename drivers/media/{video => i2c}/btcx-risc.h (100%)
7856 rename drivers/media/{video => i2c}/cs5345.c (100%)
7857 rename drivers/media/{video => i2c}/cs53l32a.c (100%)
7858 rename drivers/media/{video => i2c}/cx2341x.c (100%)
7859 rename drivers/media/{video => i2c}/cx25840/Kconfig (100%)
7860 rename drivers/media/{video => i2c}/cx25840/Makefile (80%)
7861 rename drivers/media/{video => i2c}/cx25840/cx25840-audio.c (100%)
7862 rename drivers/media/{video => i2c}/cx25840/cx25840-core.c (100%)
7863 rename drivers/media/{video => i2c}/cx25840/cx25840-core.h (100%)
7864 rename drivers/media/{video => i2c}/cx25840/cx25840-firmware.c (92%)
7865 rename drivers/media/{video => i2c}/cx25840/cx25840-ir.c (100%)
7866 rename drivers/media/{video => i2c}/cx25840/cx25840-vbi.c (100%)
7867 rename drivers/media/{video => i2c}/ir-kbd-i2c.c (100%)
7868 rename drivers/media/{video => i2c}/ks0127.c (100%)
7869 rename drivers/media/{video => i2c}/ks0127.h (100%)
7870 rename drivers/media/{video => i2c}/m52790.c (100%)
7871 rename drivers/media/{video => i2c}/m5mols/Kconfig (100%)
7872 rename drivers/media/{video => i2c}/m5mols/Makefile (100%)
7873 rename drivers/media/{video => i2c}/m5mols/m5mols.h (99%)
7874 rename drivers/media/{video => i2c}/m5mols/m5mols_capture.c (100%)
7875 rename drivers/media/{video => i2c}/m5mols/m5mols_controls.c (99%)
7876 rename drivers/media/{video => i2c}/m5mols/m5mols_core.c (99%)
7877 rename drivers/media/{video => i2c}/m5mols/m5mols_reg.h (100%)
7878 rename drivers/media/{video => i2c}/msp3400-driver.c (100%)
7879 rename drivers/media/{video => i2c}/msp3400-driver.h (100%)
7880 rename drivers/media/{video => i2c}/msp3400-kthreads.c (100%)
7881 rename drivers/media/{video => i2c}/mt9m032.c (99%)
7882 rename drivers/media/{video => i2c}/mt9p031.c (98%)
7883 rename drivers/media/{video => i2c}/mt9t001.c (100%)
7884 rename drivers/media/{video => i2c}/mt9v011.c (100%)
7885 rename drivers/media/{video => i2c}/mt9v032.c (88%)
7886 rename drivers/media/{video => i2c}/noon010pc30.c (100%)
7887 rename drivers/media/{video => i2c}/ov7670.c (100%)
7888 rename drivers/media/{video => i2c}/s5k6aa.c (99%)
7889 rename drivers/media/{video => i2c}/saa6588.c (100%)
7890 rename drivers/media/{video => i2c}/saa7110.c (100%)
7891 rename drivers/media/{video => i2c}/saa7115.c (100%)
7892 rename drivers/media/{video => i2c}/saa711x_regs.h (100%)
7893 rename drivers/media/{video => i2c}/saa7127.c (99%)
7894 rename drivers/media/{video => i2c}/saa717x.c (100%)
7895 rename drivers/media/{video => i2c}/saa7185.c (100%)
7896 rename drivers/media/{video => i2c}/saa7191.c (100%)
7897 rename drivers/media/{video => i2c}/saa7191.h (100%)
7898 rename drivers/media/{video => i2c}/smiapp-pll.c (99%)
7899 rename drivers/media/{video => i2c}/smiapp-pll.h (98%)
7900 rename drivers/media/{video => i2c}/smiapp/Kconfig (100%)
7901 rename drivers/media/{video => i2c}/smiapp/Makefile (78%)
7902 rename drivers/media/{video => i2c}/smiapp/smiapp-core.c (99%)
7903 rename drivers/media/{video => i2c}/smiapp/smiapp-limits.c (99%)
7904 rename drivers/media/{video => i2c}/smiapp/smiapp-limits.h (99%)
7905 rename drivers/media/{video => i2c}/smiapp/smiapp-quirk.c (99%)
7906 rename drivers/media/{video => i2c}/smiapp/smiapp-quirk.h (98%)
7907 rename drivers/media/{video => i2c}/smiapp/smiapp-reg-defs.h (99%)
7908 rename drivers/media/{video => i2c}/smiapp/smiapp-reg.h (98%)
7909 rename drivers/media/{video => i2c}/smiapp/smiapp-regs.c (99%)
7910 rename drivers/media/{video => i2c}/smiapp/smiapp-regs.h (100%)
7911 rename drivers/media/{video => i2c}/smiapp/smiapp.h (99%)
7912 create mode 100644 drivers/media/i2c/soc_camera/Kconfig
7913 create mode 100644 drivers/media/i2c/soc_camera/Makefile
7914 rename drivers/media/{video => i2c/soc_camera}/imx074.c (95%)
7915 rename drivers/media/{video => i2c/soc_camera}/mt9m001.c (97%)
7916 rename drivers/media/{video => i2c/soc_camera}/mt9m111.c (96%)
7917 rename drivers/media/{video => i2c/soc_camera}/mt9t031.c (98%)
7918 rename drivers/media/{video => i2c/soc_camera}/mt9t112.c (98%)
7919 rename drivers/media/{video => i2c/soc_camera}/mt9v022.c (94%)
7920 rename drivers/media/{video => i2c/soc_camera}/ov2640.c (98%)
7921 rename drivers/media/{video => i2c/soc_camera}/ov5642.c (98%)
7922 rename drivers/media/{video => i2c/soc_camera}/ov6650.c (98%)
7923 rename drivers/media/{video => i2c/soc_camera}/ov772x.c (81%)
7924 rename drivers/media/{video => i2c/soc_camera}/ov9640.c (97%)
7925 rename drivers/media/{video => i2c/soc_camera}/ov9640.h (100%)
7926 rename drivers/media/{video => i2c/soc_camera}/ov9740.c (97%)
7927 rename drivers/media/{video => i2c/soc_camera}/rj54n1cb0c.c (98%)
7928 rename drivers/media/{video => i2c/soc_camera}/tw9910.c (98%)
7929 rename drivers/media/{video => i2c}/sr030pc30.c (100%)
7930 rename drivers/media/{video => i2c}/tcm825x.c (99%)
7931 rename drivers/media/{video => i2c}/tcm825x.h (99%)
7932 rename drivers/media/{video => i2c}/tda7432.c (100%)
7933 rename drivers/media/{video => i2c}/tda9840.c (100%)
7934 rename drivers/media/{video => i2c}/tea6415c.c (99%)
7935 rename drivers/media/{video => i2c}/tea6415c.h (100%)
7936 rename drivers/media/{video => i2c}/tea6420.c (100%)
7937 rename drivers/media/{video => i2c}/tea6420.h (100%)
7938 rename drivers/media/{video => i2c}/ths7303.c (100%)
7939 rename drivers/media/{video => i2c}/tlv320aic23b.c (100%)
7940 rename drivers/media/{video => i2c}/tvaudio.c (100%)
7941 rename drivers/media/{video => i2c}/tveeprom.c (100%)
7942 rename drivers/media/{video => i2c}/tvp514x.c (99%)
7943 rename drivers/media/{video => i2c}/tvp514x_regs.h (99%)
7944 rename drivers/media/{video => i2c}/tvp5150.c (100%)
7945 rename drivers/media/{video => i2c}/tvp5150_reg.h (100%)
7946 rename drivers/media/{video => i2c}/tvp7002.c (100%)
7947 rename drivers/media/{video => i2c}/tvp7002_reg.h (100%)
7948 rename drivers/media/{video => i2c}/upd64031a.c (100%)
7949 rename drivers/media/{video => i2c}/upd64083.c (100%)
7950 rename drivers/media/{video => i2c}/vp27smpx.c (100%)
7951 rename drivers/media/{video => i2c}/vpx3220.c (100%)
7952 rename drivers/media/{video => i2c}/vs6624.c (100%)
7953 rename drivers/media/{video => i2c}/vs6624_regs.h (100%)
7954 rename drivers/media/{video => i2c}/wm8739.c (100%)
7955 rename drivers/media/{video => i2c}/wm8775.c (100%)
7956 create mode 100644 drivers/media/mmc/Kconfig
7957 create mode 100644 drivers/media/mmc/Makefile
7958 create mode 100644 drivers/media/mmc/siano/Kconfig
7959 create mode 100644 drivers/media/mmc/siano/Makefile
7960 rename drivers/media/{dvb => mmc}/siano/smssdio.c (100%)
7961 create mode 100644 drivers/media/parport/Kconfig
7962 create mode 100644 drivers/media/parport/Makefile
7963 rename drivers/media/{video => parport}/bw-qcam.c (100%)
7964 rename drivers/media/{video => parport}/c-qcam.c (100%)
7965 rename drivers/media/{video => parport}/pms.c (100%)
7966 rename drivers/media/{video => parport}/w9966.c (100%)
7967 create mode 100644 drivers/media/pci/Kconfig
7968 create mode 100644 drivers/media/pci/Makefile
7969 create mode 100644 drivers/media/pci/b2c2/Kconfig
7970 create mode 100644 drivers/media/pci/b2c2/Makefile
7971 rename drivers/media/{dvb => pci}/b2c2/flexcop-dma.c (100%)
7972 rename drivers/media/{dvb => pci}/b2c2/flexcop-pci.c (100%)
7973 create mode 100644 drivers/media/pci/bt8xx/Kconfig
7974 create mode 100644 drivers/media/pci/bt8xx/Makefile
7975 rename drivers/media/{video => pci}/bt8xx/bt848.h (100%)
7976 rename drivers/media/{dvb => pci}/bt8xx/bt878.c (100%)
7977 rename drivers/media/{dvb => pci}/bt8xx/bt878.h (100%)
7978 rename drivers/media/{video => pci}/bt8xx/bttv-audio-hook.c (100%)
7979 rename drivers/media/{video => pci}/bt8xx/bttv-audio-hook.h (100%)
7980 rename drivers/media/{video => pci}/bt8xx/bttv-cards.c (100%)
7981 rename drivers/media/{video => pci}/bt8xx/bttv-driver.c (100%)
7982 rename drivers/media/{video => pci}/bt8xx/bttv-gpio.c (100%)
7983 rename drivers/media/{video => pci}/bt8xx/bttv-i2c.c (100%)
7984 rename drivers/media/{video => pci}/bt8xx/bttv-if.c (100%)
7985 rename drivers/media/{video => pci}/bt8xx/bttv-input.c (100%)
7986 rename drivers/media/{video => pci}/bt8xx/bttv-risc.c (100%)
7987 rename drivers/media/{video => pci}/bt8xx/bttv-vbi.c (100%)
7988 rename drivers/media/{video => pci}/bt8xx/bttv.h (100%)
7989 rename drivers/media/{video => pci}/bt8xx/bttvp.h (100%)
7990 rename drivers/media/{dvb => pci}/bt8xx/dst.c (100%)
7991 rename drivers/media/{dvb => pci}/bt8xx/dst_ca.c (99%)
7992 rename drivers/media/{dvb => pci}/bt8xx/dst_ca.h (100%)
7993 rename drivers/media/{dvb => pci}/bt8xx/dst_common.h (100%)
7994 rename drivers/media/{dvb => pci}/bt8xx/dst_priv.h (100%)
7995 rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c (100%)
7996 rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h (100%)
7997 rename drivers/media/{video => pci}/cx18/Kconfig (77%)
7998 rename drivers/media/{video => pci}/cx18/Makefile (78%)
7999 rename drivers/media/{video => pci}/cx18/cx18-alsa-main.c (100%)
8000 rename drivers/media/{video => pci}/cx18/cx18-alsa-mixer.c (100%)
8001 rename drivers/media/{video => pci}/cx18/cx18-alsa-mixer.h (100%)
8002 rename drivers/media/{video => pci}/cx18/cx18-alsa-pcm.c (100%)
8003 rename drivers/media/{video => pci}/cx18/cx18-alsa-pcm.h (100%)
8004 rename drivers/media/{video => pci}/cx18/cx18-alsa.h (100%)
8005 rename drivers/media/{video => pci}/cx18/cx18-audio.c (100%)
8006 rename drivers/media/{video => pci}/cx18/cx18-audio.h (100%)
8007 rename drivers/media/{video => pci}/cx18/cx18-av-audio.c (100%)
8008 rename drivers/media/{video => pci}/cx18/cx18-av-core.c (100%)
8009 rename drivers/media/{video => pci}/cx18/cx18-av-core.h (100%)
8010 rename drivers/media/{video => pci}/cx18/cx18-av-firmware.c (99%)
8011 rename drivers/media/{video => pci}/cx18/cx18-av-vbi.c (100%)
8012 rename drivers/media/{video => pci}/cx18/cx18-cards.c (100%)
8013 rename drivers/media/{video => pci}/cx18/cx18-cards.h (100%)
8014 rename drivers/media/{video => pci}/cx18/cx18-controls.c (100%)
8015 rename drivers/media/{video => pci}/cx18/cx18-controls.h (100%)
8016 rename drivers/media/{video => pci}/cx18/cx18-driver.c (99%)
8017 rename drivers/media/{video => pci}/cx18/cx18-driver.h (100%)
8018 rename drivers/media/{video => pci}/cx18/cx18-dvb.c (99%)
8019 rename drivers/media/{video => pci}/cx18/cx18-dvb.h (100%)
8020 rename drivers/media/{video => pci}/cx18/cx18-fileops.c (100%)
8021 rename drivers/media/{video => pci}/cx18/cx18-fileops.h (100%)
8022 rename drivers/media/{video => pci}/cx18/cx18-firmware.c (98%)
8023 rename drivers/media/{video => pci}/cx18/cx18-firmware.h (100%)
8024 rename drivers/media/{video => pci}/cx18/cx18-gpio.c (100%)
8025 rename drivers/media/{video => pci}/cx18/cx18-gpio.h (100%)
8026 rename drivers/media/{video => pci}/cx18/cx18-i2c.c (100%)
8027 rename drivers/media/{video => pci}/cx18/cx18-i2c.h (100%)
8028 rename drivers/media/{video => pci}/cx18/cx18-io.c (100%)
8029 rename drivers/media/{video => pci}/cx18/cx18-io.h (100%)
8030 rename drivers/media/{video => pci}/cx18/cx18-ioctl.c (100%)
8031 rename drivers/media/{video => pci}/cx18/cx18-ioctl.h (100%)
8032 rename drivers/media/{video => pci}/cx18/cx18-irq.c (100%)
8033 rename drivers/media/{video => pci}/cx18/cx18-irq.h (100%)
8034 rename drivers/media/{video => pci}/cx18/cx18-mailbox.c (100%)
8035 rename drivers/media/{video => pci}/cx18/cx18-mailbox.h (100%)
8036 rename drivers/media/{video => pci}/cx18/cx18-queue.c (100%)
8037 rename drivers/media/{video => pci}/cx18/cx18-queue.h (100%)
8038 rename drivers/media/{video => pci}/cx18/cx18-scb.c (100%)
8039 rename drivers/media/{video => pci}/cx18/cx18-scb.h (100%)
8040 rename drivers/media/{video => pci}/cx18/cx18-streams.c (100%)
8041 rename drivers/media/{video => pci}/cx18/cx18-streams.h (100%)
8042 rename drivers/media/{video => pci}/cx18/cx18-vbi.c (100%)
8043 rename drivers/media/{video => pci}/cx18/cx18-vbi.h (100%)
8044 rename drivers/media/{video => pci}/cx18/cx18-version.h (100%)
8045 rename drivers/media/{video => pci}/cx18/cx18-video.c (100%)
8046 rename drivers/media/{video => pci}/cx18/cx18-video.h (100%)
8047 rename drivers/media/{video => pci}/cx18/cx23418.h (100%)
8048 create mode 100644 drivers/media/pci/cx23885/Kconfig
8049 rename drivers/media/{video => pci}/cx23885/Makefile (72%)
8050 rename drivers/media/{video => pci}/cx23885/altera-ci.c (99%)
8051 rename drivers/media/{video => pci}/cx23885/altera-ci.h (100%)
8052 rename drivers/media/{video => pci}/cx23885/cimax2.c (100%)
8053 rename drivers/media/{video => pci}/cx23885/cimax2.h (100%)
8054 rename drivers/media/{video => pci}/cx23885/cx23885-417.c (99%)
8055 rename drivers/media/{video => pci}/cx23885/cx23885-alsa.c (100%)
8056 rename drivers/media/{video => pci}/cx23885/cx23885-av.c (100%)
8057 rename drivers/media/{video => pci}/cx23885/cx23885-av.h (100%)
8058 rename drivers/media/{video => pci}/cx23885/cx23885-cards.c (98%)
8059 rename drivers/media/{video => pci}/cx23885/cx23885-core.c (100%)
8060 rename drivers/media/{video => pci}/cx23885/cx23885-dvb.c (95%)
8061 rename drivers/media/{video => pci}/cx23885/cx23885-f300.c (100%)
8062 rename drivers/media/{video => pci}/cx23885/cx23885-f300.h (100%)
8063 rename drivers/media/{video => pci}/cx23885/cx23885-i2c.c (100%)
8064 rename drivers/media/{video => pci}/cx23885/cx23885-input.c (96%)
8065 rename drivers/media/{video => pci}/cx23885/cx23885-input.h (100%)
8066 rename drivers/media/{video => pci}/cx23885/cx23885-ioctl.c (100%)
8067 rename drivers/media/{video => pci}/cx23885/cx23885-ioctl.h (100%)
8068 rename drivers/media/{video => pci}/cx23885/cx23885-ir.c (100%)
8069 rename drivers/media/{video => pci}/cx23885/cx23885-ir.h (100%)
8070 rename drivers/media/{video => pci}/cx23885/cx23885-reg.h (100%)
8071 rename drivers/media/{video => pci}/cx23885/cx23885-vbi.c (100%)
8072 rename drivers/media/{video => pci}/cx23885/cx23885-video.c (100%)
8073 rename drivers/media/{video => pci}/cx23885/cx23885.h (99%)
8074 rename drivers/media/{video => pci}/cx23885/cx23888-ir.c (100%)
8075 rename drivers/media/{video => pci}/cx23885/cx23888-ir.h (100%)
8076 rename drivers/media/{video => pci}/cx23885/netup-eeprom.c (100%)
8077 rename drivers/media/{video => pci}/cx23885/netup-eeprom.h (100%)
8078 rename drivers/media/{video => pci}/cx23885/netup-init.c (100%)
8079 rename drivers/media/{video => pci}/cx23885/netup-init.h (100%)
8080 rename drivers/media/{video => pci}/cx25821/Kconfig (100%)
8081 rename drivers/media/{video => pci}/cx25821/Makefile (67%)
8082 rename drivers/media/{video => pci}/cx25821/cx25821-alsa.c (100%)
8083 rename drivers/media/{video => pci}/cx25821/cx25821-audio-upstream.c (100%)
8084 rename drivers/media/{video => pci}/cx25821/cx25821-audio-upstream.h (100%)
8085 rename drivers/media/{video => pci}/cx25821/cx25821-audio.h (100%)
8086 rename drivers/media/{video => pci}/cx25821/cx25821-biffuncs.h (100%)
8087 rename drivers/media/{video => pci}/cx25821/cx25821-cards.c (100%)
8088 rename drivers/media/{video => pci}/cx25821/cx25821-core.c (100%)
8089 rename drivers/media/{video => pci}/cx25821/cx25821-gpio.c (100%)
8090 rename drivers/media/{video => pci}/cx25821/cx25821-i2c.c (100%)
8091 rename drivers/media/{video => pci}/cx25821/cx25821-medusa-defines.h (100%)
8092 rename drivers/media/{video => pci}/cx25821/cx25821-medusa-reg.h (100%)
8093 rename drivers/media/{video => pci}/cx25821/cx25821-medusa-video.c (100%)
8094 rename drivers/media/{video => pci}/cx25821/cx25821-medusa-video.h (100%)
8095 rename drivers/media/{video => pci}/cx25821/cx25821-reg.h (100%)
8096 rename drivers/media/{video => pci}/cx25821/cx25821-sram.h (100%)
8097 rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream-ch2.c (100%)
8098 rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream-ch2.h (100%)
8099 rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream.c (100%)
8100 rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream.h (100%)
8101 rename drivers/media/{video => pci}/cx25821/cx25821-video.c (100%)
8102 rename drivers/media/{video => pci}/cx25821/cx25821-video.h (100%)
8103 rename drivers/media/{video => pci}/cx25821/cx25821.h (100%)
8104 rename drivers/media/{video => pci}/cx88/Kconfig (70%)
8105 rename drivers/media/{video => pci}/cx88/Makefile (73%)
8106 rename drivers/media/{video => pci}/cx88/cx88-alsa.c (99%)
8107 rename drivers/media/{video => pci}/cx88/cx88-blackbird.c (100%)
8108 rename drivers/media/{video => pci}/cx88/cx88-cards.c (99%)
8109 rename drivers/media/{video => pci}/cx88/cx88-core.c (99%)
8110 rename drivers/media/{video => pci}/cx88/cx88-dsp.c (100%)
8111 rename drivers/media/{video => pci}/cx88/cx88-dvb.c (99%)
8112 rename drivers/media/{video => pci}/cx88/cx88-i2c.c (100%)
8113 rename drivers/media/{video => pci}/cx88/cx88-input.c (100%)
8114 rename drivers/media/{video => pci}/cx88/cx88-mpeg.c (100%)
8115 rename drivers/media/{video => pci}/cx88/cx88-reg.h (100%)
8116 rename drivers/media/{video => pci}/cx88/cx88-tvaudio.c (100%)
8117 rename drivers/media/{video => pci}/cx88/cx88-vbi.c (100%)
8118 rename drivers/media/{video => pci}/cx88/cx88-video.c (100%)
8119 rename drivers/media/{video => pci}/cx88/cx88-vp3054-i2c.c (100%)
8120 rename drivers/media/{video => pci}/cx88/cx88-vp3054-i2c.h (100%)
8121 rename drivers/media/{video => pci}/cx88/cx88.h (99%)
8122 rename drivers/media/{dvb => pci}/ddbridge/Kconfig (60%)
8123 rename drivers/media/{dvb => pci}/ddbridge/Makefile (61%)
8124 rename drivers/media/{dvb => pci}/ddbridge/ddbridge-core.c (99%)
8125 rename drivers/media/{dvb => pci}/ddbridge/ddbridge-regs.h (100%)
8126 rename drivers/media/{dvb => pci}/ddbridge/ddbridge.h (100%)
8127 rename drivers/media/{dvb => pci}/dm1105/Kconfig (57%)
8128 create mode 100644 drivers/media/pci/dm1105/Makefile
8129 rename drivers/media/{dvb => pci}/dm1105/dm1105.c (100%)
8130 rename drivers/media/{video => pci}/ivtv/Kconfig (67%)
8131 rename drivers/media/{video => pci}/ivtv/Makefile (53%)
8132 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-main.c
8133 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-mixer.c
8134 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-mixer.h
8135 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-pcm.c
8136 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-pcm.h
8137 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa.h
8138 rename drivers/media/{video => pci}/ivtv/ivtv-cards.c (100%)
8139 rename drivers/media/{video => pci}/ivtv/ivtv-cards.h (100%)
8140 rename drivers/media/{video => pci}/ivtv/ivtv-controls.c (100%)
8141 rename drivers/media/{video => pci}/ivtv/ivtv-controls.h (100%)
8142 rename drivers/media/{video => pci}/ivtv/ivtv-driver.c (98%)
8143 rename drivers/media/{video => pci}/ivtv/ivtv-driver.h (98%)
8144 rename drivers/media/{video => pci}/ivtv/ivtv-fileops.c (96%)
8145 rename drivers/media/{video => pci}/ivtv/ivtv-fileops.h (94%)
8146 rename drivers/media/{video => pci}/ivtv/ivtv-firmware.c (98%)
8147 rename drivers/media/{video => pci}/ivtv/ivtv-firmware.h (100%)
8148 rename drivers/media/{video => pci}/ivtv/ivtv-gpio.c (100%)
8149 rename drivers/media/{video => pci}/ivtv/ivtv-gpio.h (100%)
8150 rename drivers/media/{video => pci}/ivtv/ivtv-i2c.c (100%)
8151 rename drivers/media/{video => pci}/ivtv/ivtv-i2c.h (100%)
8152 rename drivers/media/{video => pci}/ivtv/ivtv-ioctl.c (100%)
8153 rename drivers/media/{video => pci}/ivtv/ivtv-ioctl.h (100%)
8154 rename drivers/media/{video => pci}/ivtv/ivtv-irq.c (95%)
8155 rename drivers/media/{video => pci}/ivtv/ivtv-irq.h (100%)
8156 rename drivers/media/{video => pci}/ivtv/ivtv-mailbox.c (100%)
8157 rename drivers/media/{video => pci}/ivtv/ivtv-mailbox.h (100%)
8158 rename drivers/media/{video => pci}/ivtv/ivtv-queue.c (100%)
8159 rename drivers/media/{video => pci}/ivtv/ivtv-queue.h (100%)
8160 rename drivers/media/{video => pci}/ivtv/ivtv-routing.c (100%)
8161 rename drivers/media/{video => pci}/ivtv/ivtv-routing.h (100%)
8162 rename drivers/media/{video => pci}/ivtv/ivtv-streams.c (99%)
8163 rename drivers/media/{video => pci}/ivtv/ivtv-streams.h (100%)
8164 rename drivers/media/{video => pci}/ivtv/ivtv-udma.c (100%)
8165 rename drivers/media/{video => pci}/ivtv/ivtv-udma.h (100%)
8166 rename drivers/media/{video => pci}/ivtv/ivtv-vbi.c (100%)
8167 rename drivers/media/{video => pci}/ivtv/ivtv-vbi.h (100%)
8168 rename drivers/media/{video => pci}/ivtv/ivtv-version.h (100%)
8169 rename drivers/media/{video => pci}/ivtv/ivtv-yuv.c (100%)
8170 rename drivers/media/{video => pci}/ivtv/ivtv-yuv.h (100%)
8171 rename drivers/media/{video => pci}/ivtv/ivtvfb.c (100%)
8172 rename drivers/media/{dvb => pci}/mantis/Kconfig (62%)
8173 rename drivers/media/{dvb => pci}/mantis/Makefile (88%)
8174 rename drivers/media/{dvb => pci}/mantis/hopper_cards.c (100%)
8175 rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.c (100%)
8176 rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.h (100%)
8177 rename drivers/media/{dvb => pci}/mantis/mantis_ca.c (100%)
8178 rename drivers/media/{dvb => pci}/mantis/mantis_ca.h (100%)
8179 rename drivers/media/{dvb => pci}/mantis/mantis_cards.c (99%)
8180 rename drivers/media/{dvb => pci}/mantis/mantis_common.h (100%)
8181 rename drivers/media/{dvb => pci}/mantis/mantis_core.c (99%)
8182 rename drivers/media/{dvb => pci}/mantis/mantis_core.h (100%)
8183 rename drivers/media/{dvb => pci}/mantis/mantis_dma.c (100%)
8184 rename drivers/media/{dvb => pci}/mantis/mantis_dma.h (100%)
8185 rename drivers/media/{dvb => pci}/mantis/mantis_dvb.c (98%)
8186 rename drivers/media/{dvb => pci}/mantis/mantis_dvb.h (100%)
8187 rename drivers/media/{dvb => pci}/mantis/mantis_evm.c (100%)
8188 rename drivers/media/{dvb => pci}/mantis/mantis_hif.c (100%)
8189 rename drivers/media/{dvb => pci}/mantis/mantis_hif.h (100%)
8190 rename drivers/media/{dvb => pci}/mantis/mantis_i2c.c (100%)
8191 rename drivers/media/{dvb => pci}/mantis/mantis_i2c.h (100%)
8192 rename drivers/media/{dvb => pci}/mantis/mantis_input.c (100%)
8193 rename drivers/media/{dvb => pci}/mantis/mantis_ioc.c (100%)
8194 rename drivers/media/{dvb => pci}/mantis/mantis_ioc.h (100%)
8195 rename drivers/media/{dvb => pci}/mantis/mantis_link.h (100%)
8196 rename drivers/media/{dvb => pci}/mantis/mantis_pci.c (100%)
8197 rename drivers/media/{dvb => pci}/mantis/mantis_pci.h (100%)
8198 rename drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c (100%)
8199 rename drivers/media/{dvb => pci}/mantis/mantis_reg.h (100%)
8200 rename drivers/media/{dvb => pci}/mantis/mantis_uart.c (100%)
8201 rename drivers/media/{dvb => pci}/mantis/mantis_uart.h (100%)
8202 rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.c (100%)
8203 rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.h (100%)
8204 rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.c (100%)
8205 rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.h (100%)
8206 rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.c (100%)
8207 rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.h (100%)
8208 rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.c (100%)
8209 rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.h (100%)
8210 rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.c (100%)
8211 rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.h (100%)
8212 rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.c (100%)
8213 rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.h (100%)
8214 rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.c (100%)
8215 rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.h (100%)
8216 create mode 100644 drivers/media/pci/meye/Kconfig
8217 create mode 100644 drivers/media/pci/meye/Makefile
8218 rename drivers/media/{video => pci/meye}/meye.c (100%)
8219 rename drivers/media/{video => pci/meye}/meye.h (100%)
8220 create mode 100644 drivers/media/pci/ngene/Kconfig
8221 rename drivers/media/{dvb => pci}/ngene/Makefile (63%)
8222 rename drivers/media/{dvb => pci}/ngene/ngene-cards.c (71%)
8223 rename drivers/media/{dvb => pci}/ngene/ngene-core.c (98%)
8224 rename drivers/media/{dvb => pci}/ngene/ngene-dvb.c (100%)
8225 rename drivers/media/{dvb => pci}/ngene/ngene-i2c.c (100%)
8226 rename drivers/media/{dvb => pci}/ngene/ngene.h (100%)
8227 rename drivers/media/{dvb => pci}/pluto2/Kconfig (100%)
8228 create mode 100644 drivers/media/pci/pluto2/Makefile
8229 rename drivers/media/{dvb => pci}/pluto2/pluto2.c (100%)
8230 rename drivers/media/{dvb => pci}/pt1/Kconfig (100%)
8231 rename drivers/media/{dvb => pci}/pt1/Makefile (56%)
8232 rename drivers/media/{dvb => pci}/pt1/pt1.c (100%)
8233 rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c (98%)
8234 rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h (100%)
8235 rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c (100%)
8236 rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h (100%)
8237 rename drivers/media/{video => pci}/saa7134/Kconfig (56%)
8238 rename drivers/media/{video => pci}/saa7134/Makefile (54%)
8239 rename drivers/media/{video => pci}/saa7134/saa6752hs.c (100%)
8240 rename drivers/media/{video => pci}/saa7134/saa7134-alsa.c (100%)
8241 rename drivers/media/{video => pci}/saa7134/saa7134-cards.c (100%)
8242 rename drivers/media/{video => pci}/saa7134/saa7134-core.c (100%)
8243 rename drivers/media/{video => pci}/saa7134/saa7134-dvb.c (99%)
8244 rename drivers/media/{video => pci}/saa7134/saa7134-empress.c (100%)
8245 rename drivers/media/{video => pci}/saa7134/saa7134-i2c.c (100%)
8246 rename drivers/media/{video => pci}/saa7134/saa7134-input.c (99%)
8247 rename drivers/media/{video => pci}/saa7134/saa7134-reg.h (100%)
8248 rename drivers/media/{video => pci}/saa7134/saa7134-ts.c (100%)
8249 rename drivers/media/{video => pci}/saa7134/saa7134-tvaudio.c (100%)
8250 rename drivers/media/{video => pci}/saa7134/saa7134-vbi.c (100%)
8251 rename drivers/media/{video => pci}/saa7134/saa7134-video.c (100%)
8252 rename drivers/media/{video => pci}/saa7134/saa7134.h (99%)
8253 create mode 100644 drivers/media/pci/saa7146/Kconfig
8254 create mode 100644 drivers/media/pci/saa7146/Makefile
8255 rename drivers/media/{video => pci/saa7146}/hexium_gemini.c (100%)
8256 rename drivers/media/{video => pci/saa7146}/hexium_orion.c (100%)
8257 rename drivers/media/{video => pci/saa7146}/mxb.c (100%)
8258 rename drivers/media/{video => pci}/saa7164/Kconfig (62%)
8259 rename drivers/media/{video => pci}/saa7164/Makefile (57%)
8260 rename drivers/media/{video => pci}/saa7164/saa7164-api.c (98%)
8261 rename drivers/media/{video => pci}/saa7164/saa7164-buffer.c (100%)
8262 rename drivers/media/{video => pci}/saa7164/saa7164-bus.c (100%)
8263 rename drivers/media/{video => pci}/saa7164/saa7164-cards.c (100%)
8264 rename drivers/media/{video => pci}/saa7164/saa7164-cmd.c (100%)
8265 rename drivers/media/{video => pci}/saa7164/saa7164-core.c (96%)
8266 rename drivers/media/{video => pci}/saa7164/saa7164-dvb.c (100%)
8267 rename drivers/media/{video => pci}/saa7164/saa7164-encoder.c (100%)
8268 rename drivers/media/{video => pci}/saa7164/saa7164-fw.c (100%)
8269 rename drivers/media/{video => pci}/saa7164/saa7164-i2c.c (100%)
8270 rename drivers/media/{video => pci}/saa7164/saa7164-reg.h (100%)
8271 rename drivers/media/{video => pci}/saa7164/saa7164-types.h (100%)
8272 rename drivers/media/{video => pci}/saa7164/saa7164-vbi.c (100%)
8273 rename drivers/media/{video => pci}/saa7164/saa7164.h (99%)
8274 create mode 100644 drivers/media/pci/sta2x11/Kconfig
8275 create mode 100644 drivers/media/pci/sta2x11/Makefile
8276 rename drivers/media/{video => pci/sta2x11}/sta2x11_vip.c (100%)
8277 rename drivers/media/{video => pci/sta2x11}/sta2x11_vip.h (100%)
8278 rename drivers/media/{dvb => pci}/ttpci/Kconfig (66%)
8279 rename drivers/media/{dvb => pci}/ttpci/Makefile (82%)
8280 rename drivers/media/{dvb => pci}/ttpci/av7110.c (100%)
8281 rename drivers/media/{dvb => pci}/ttpci/av7110.h (100%)
8282 rename drivers/media/{dvb => pci}/ttpci/av7110_av.c (100%)
8283 rename drivers/media/{dvb => pci}/ttpci/av7110_av.h (100%)
8284 rename drivers/media/{dvb => pci}/ttpci/av7110_ca.c (100%)
8285 rename drivers/media/{dvb => pci}/ttpci/av7110_ca.h (100%)
8286 rename drivers/media/{dvb => pci}/ttpci/av7110_hw.c (100%)
8287 rename drivers/media/{dvb => pci}/ttpci/av7110_hw.h (100%)
8288 rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.c (100%)
8289 rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.h (100%)
8290 rename drivers/media/{dvb => pci}/ttpci/av7110_ir.c (100%)
8291 rename drivers/media/{dvb => pci}/ttpci/av7110_v4l.c (100%)
8292 rename drivers/media/{dvb => pci}/ttpci/budget-av.c (100%)
8293 rename drivers/media/{dvb => pci}/ttpci/budget-ci.c (100%)
8294 rename drivers/media/{dvb => pci}/ttpci/budget-core.c (100%)
8295 rename drivers/media/{dvb => pci}/ttpci/budget-patch.c (100%)
8296 rename drivers/media/{dvb => pci}/ttpci/budget.c (91%)
8297 rename drivers/media/{dvb => pci}/ttpci/budget.h (100%)
8298 rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c (100%)
8299 rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h (100%)
8300 rename drivers/media/{video => pci}/zoran/Kconfig (75%)
8301 rename drivers/media/{video => pci}/zoran/Makefile (100%)
8302 rename drivers/media/{video => pci}/zoran/videocodec.c (100%)
8303 rename drivers/media/{video => pci}/zoran/videocodec.h (100%)
8304 rename drivers/media/{video => pci}/zoran/zoran.h (100%)
8305 rename drivers/media/{video => pci}/zoran/zoran_card.c (100%)
8306 rename drivers/media/{video => pci}/zoran/zoran_card.h (100%)
8307 rename drivers/media/{video => pci}/zoran/zoran_device.c (100%)
8308 rename drivers/media/{video => pci}/zoran/zoran_device.h (100%)
8309 rename drivers/media/{video => pci}/zoran/zoran_driver.c (100%)
8310 rename drivers/media/{video => pci}/zoran/zoran_procfs.c (100%)
8311 rename drivers/media/{video => pci}/zoran/zoran_procfs.h (100%)
8312 rename drivers/media/{video => pci}/zoran/zr36016.c (100%)
8313 rename drivers/media/{video => pci}/zoran/zr36016.h (100%)
8314 rename drivers/media/{video => pci}/zoran/zr36050.c (100%)
8315 rename drivers/media/{video => pci}/zoran/zr36050.h (100%)
8316 rename drivers/media/{video => pci}/zoran/zr36057.h (100%)
8317 rename drivers/media/{video => pci}/zoran/zr36060.c (100%)
8318 rename drivers/media/{video => pci}/zoran/zr36060.h (100%)
8319 create mode 100644 drivers/media/platform/Kconfig
8320 create mode 100644 drivers/media/platform/Makefile
8321 rename drivers/media/{video => platform}/arv.c (100%)
8322 rename drivers/media/{video => platform}/blackfin/Kconfig (100%)
8323 rename drivers/media/{video => platform}/blackfin/Makefile (100%)
8324 rename drivers/media/{video => platform}/blackfin/bfin_capture.c (98%)
8325 rename drivers/media/{video => platform}/blackfin/ppi.c (100%)
8326 create mode 100644 drivers/media/platform/coda.c
8327 create mode 100644 drivers/media/platform/coda.h
8328 rename drivers/media/{video => platform}/davinci/Kconfig (97%)
8329 rename drivers/media/{video => platform}/davinci/Makefile (100%)
8330 rename drivers/media/{video => platform}/davinci/ccdc_hw_device.h (100%)
8331 rename drivers/media/{video => platform}/davinci/dm355_ccdc.c (99%)
8332 rename drivers/media/{video => platform}/davinci/dm355_ccdc_regs.h (100%)
8333 rename drivers/media/{video => platform}/davinci/dm644x_ccdc.c (99%)
8334 rename drivers/media/{video => platform}/davinci/dm644x_ccdc_regs.h (100%)
8335 rename drivers/media/{video => platform}/davinci/isif.c (99%)
8336 rename drivers/media/{video => platform}/davinci/isif_regs.h (100%)
8337 rename drivers/media/{video => platform}/davinci/vpbe.c (100%)
8338 rename drivers/media/{video => platform}/davinci/vpbe_display.c (99%)
8339 rename drivers/media/{video => platform}/davinci/vpbe_osd.c (100%)
8340 rename drivers/media/{video => platform}/davinci/vpbe_osd_regs.h (100%)
8341 rename drivers/media/{video => platform}/davinci/vpbe_venc.c (100%)
8342 rename drivers/media/{video => platform}/davinci/vpbe_venc_regs.h (100%)
8343 rename drivers/media/{video => platform}/davinci/vpfe_capture.c (99%)
8344 rename drivers/media/{video => platform}/davinci/vpif.c (99%)
8345 rename drivers/media/{video => platform}/davinci/vpif.h (100%)
8346 rename drivers/media/{video => platform}/davinci/vpif_capture.c (99%)
8347 rename drivers/media/{video => platform}/davinci/vpif_capture.h (100%)
8348 rename drivers/media/{video => platform}/davinci/vpif_display.c (98%)
8349 rename drivers/media/{video => platform}/davinci/vpif_display.h (100%)
8350 rename drivers/media/{video => platform}/davinci/vpss.c (99%)
8351 create mode 100644 drivers/media/platform/exynos-gsc/Makefile
8352 create mode 100644 drivers/media/platform/exynos-gsc/gsc-core.c
8353 create mode 100644 drivers/media/platform/exynos-gsc/gsc-core.h
8354 create mode 100644 drivers/media/platform/exynos-gsc/gsc-m2m.c
8355 create mode 100644 drivers/media/platform/exynos-gsc/gsc-regs.c
8356 create mode 100644 drivers/media/platform/exynos-gsc/gsc-regs.h
8357 rename drivers/media/{video => platform}/fsl-viu.c (98%)
8358 rename drivers/media/{video => platform}/indycam.c (100%)
8359 rename drivers/media/{video => platform}/indycam.h (100%)
8360 create mode 100644 drivers/media/platform/m2m-deinterlace.c
8361 rename drivers/media/{video => platform}/marvell-ccic/Kconfig (100%)
8362 rename drivers/media/{video => platform}/marvell-ccic/Makefile (100%)
8363 rename drivers/media/{video => platform}/marvell-ccic/cafe-driver.c (100%)
8364 rename drivers/media/{video => platform}/marvell-ccic/mcam-core.c (100%)
8365 rename drivers/media/{video => platform}/marvell-ccic/mcam-core.h (100%)
8366 rename drivers/media/{video => platform}/marvell-ccic/mmp-driver.c (100%)
8367 rename drivers/media/{video => platform}/mem2mem_testdev.c (97%)
8368 rename drivers/media/{video => platform}/mx2_emmaprp.c (94%)
8369 rename drivers/media/{video => platform}/omap/Kconfig (100%)
8370 rename drivers/media/{video => platform}/omap/Makefile (81%)
8371 rename drivers/media/{video => platform}/omap/omap_vout.c (100%)
8372 rename drivers/media/{video => platform}/omap/omap_vout_vrfb.c (100%)
8373 rename drivers/media/{video => platform}/omap/omap_vout_vrfb.h (100%)
8374 rename drivers/media/{video => platform}/omap/omap_voutdef.h (100%)
8375 rename drivers/media/{video => platform}/omap/omap_voutlib.c (100%)
8376 rename drivers/media/{video => platform}/omap/omap_voutlib.h (100%)
8377 rename drivers/media/{video => platform}/omap24xxcam-dma.c (99%)
8378 rename drivers/media/{video => platform}/omap24xxcam.c (99%)
8379 rename drivers/media/{video => platform}/omap24xxcam.h (99%)
8380 rename drivers/media/{video => platform}/omap3isp/Makefile (100%)
8381 rename drivers/media/{video => platform}/omap3isp/cfa_coef_table.h (91%)
8382 rename drivers/media/{video => platform}/omap3isp/gamma_table.h (100%)
8383 rename drivers/media/{video => platform}/omap3isp/isp.c (98%)
8384 rename drivers/media/{video => platform}/omap3isp/isp.h (97%)
8385 rename drivers/media/{video => platform}/omap3isp/ispccdc.c (94%)
8386 rename drivers/media/{video => platform}/omap3isp/ispccdc.h (83%)
8387 rename drivers/media/{video => platform}/omap3isp/ispccp2.c (100%)
8388 rename drivers/media/{video => platform}/omap3isp/ispccp2.h (100%)
8389 rename drivers/media/{video => platform}/omap3isp/ispcsi2.c (98%)
8390 rename drivers/media/{video => platform}/omap3isp/ispcsi2.h (100%)
8391 rename drivers/media/{video => platform}/omap3isp/ispcsiphy.c (100%)
8392 rename drivers/media/{video => platform}/omap3isp/ispcsiphy.h (100%)
8393 rename drivers/media/{video => platform}/omap3isp/isph3a.h (100%)
8394 rename drivers/media/{video => platform}/omap3isp/isph3a_aewb.c (96%)
8395 rename drivers/media/{video => platform}/omap3isp/isph3a_af.c (96%)
8396 rename drivers/media/{video => platform}/omap3isp/isphist.c (98%)
8397 rename drivers/media/{video => platform}/omap3isp/isphist.h (100%)
8398 rename drivers/media/{video => platform}/omap3isp/isppreview.c (89%)
8399 rename drivers/media/{video => platform}/omap3isp/isppreview.h (99%)
8400 rename drivers/media/{video => platform}/omap3isp/ispqueue.c (98%)
8401 rename drivers/media/{video => platform}/omap3isp/ispqueue.h (100%)
8402 rename drivers/media/{video => platform}/omap3isp/ispreg.h (100%)
8403 rename drivers/media/{video => platform}/omap3isp/ispresizer.c (99%)
8404 rename drivers/media/{video => platform}/omap3isp/ispresizer.h (100%)
8405 rename drivers/media/{video => platform}/omap3isp/ispstat.c (100%)
8406 rename drivers/media/{video => platform}/omap3isp/ispstat.h (100%)
8407 rename drivers/media/{video => platform}/omap3isp/ispvideo.c (96%)
8408 rename drivers/media/{video => platform}/omap3isp/ispvideo.h (97%)
8409 rename drivers/media/{video => platform}/omap3isp/luma_enhance_table.h (100%)
8410 rename drivers/media/{video => platform}/omap3isp/noise_filter_table.h (100%)
8411 rename drivers/media/{video => platform}/s5p-fimc/Kconfig (96%)
8412 rename drivers/media/{video => platform}/s5p-fimc/Makefile (100%)
8413 rename drivers/media/{video => platform}/s5p-fimc/fimc-capture.c (98%)
8414 rename drivers/media/{video => platform}/s5p-fimc/fimc-core.c (100%)
8415 rename drivers/media/{video => platform}/s5p-fimc/fimc-core.h (99%)
8416 rename drivers/media/{video => platform}/s5p-fimc/fimc-lite-reg.c (99%)
8417 rename drivers/media/{video => platform}/s5p-fimc/fimc-lite-reg.h (100%)
8418 rename drivers/media/{video => platform}/s5p-fimc/fimc-lite.c (98%)
8419 rename drivers/media/{video => platform}/s5p-fimc/fimc-lite.h (99%)
8420 rename drivers/media/{video => platform}/s5p-fimc/fimc-m2m.c (96%)
8421 rename drivers/media/{video => platform}/s5p-fimc/fimc-mdevice.c (99%)
8422 rename drivers/media/{video => platform}/s5p-fimc/fimc-mdevice.h (94%)
8423 rename drivers/media/{video => platform}/s5p-fimc/fimc-reg.c (99%)
8424 rename drivers/media/{video => platform}/s5p-fimc/fimc-reg.h (100%)
8425 rename drivers/media/{video => platform}/s5p-fimc/mipi-csis.c (100%)
8426 rename drivers/media/{video => platform}/s5p-fimc/mipi-csis.h (100%)
8427 rename drivers/media/{video => platform}/s5p-g2d/Makefile (100%)
8428 rename drivers/media/{video => platform}/s5p-g2d/g2d-hw.c (100%)
8429 rename drivers/media/{video => platform}/s5p-g2d/g2d-regs.h (100%)
8430 rename drivers/media/{video => platform}/s5p-g2d/g2d.c (97%)
8431 rename drivers/media/{video => platform}/s5p-g2d/g2d.h (100%)
8432 rename drivers/media/{video => platform}/s5p-jpeg/Makefile (100%)
8433 rename drivers/media/{video => platform}/s5p-jpeg/jpeg-core.c (98%)
8434 rename drivers/media/{video => platform}/s5p-jpeg/jpeg-core.h (98%)
8435 rename drivers/media/{video => platform}/s5p-jpeg/jpeg-hw.h (99%)
8436 rename drivers/media/{video => platform}/s5p-jpeg/jpeg-regs.h (98%)
8437 rename drivers/media/{video => platform}/s5p-mfc/Makefile (100%)
8438 rename drivers/media/{video => platform}/s5p-mfc/regs-mfc.h (100%)
8439 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc.c (98%)
8440 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_cmd.c (98%)
8441 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_cmd.h (93%)
8442 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_common.h (100%)
8443 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_ctrl.c (98%)
8444 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_ctrl.h (93%)
8445 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_debug.h (95%)
8446 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_dec.c (99%)
8447 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_dec.h (93%)
8448 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_enc.c (99%)
8449 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_enc.h (93%)
8450 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_intr.c (97%)
8451 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_intr.h (93%)
8452 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_opr.c (99%)
8453 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_opr.h (98%)
8454 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_pm.c (98%)
8455 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_pm.h (92%)
8456 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_shm.c (96%)
8457 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_shm.h (98%)
8458 rename drivers/media/{video => platform}/s5p-tv/Kconfig (98%)
8459 rename drivers/media/{video => platform}/s5p-tv/Makefile (92%)
8460 rename drivers/media/{video => platform}/s5p-tv/hdmi_drv.c (99%)
8461 rename drivers/media/{video => platform}/s5p-tv/hdmiphy_drv.c (100%)
8462 rename drivers/media/{video => platform}/s5p-tv/mixer.h (100%)
8463 rename drivers/media/{video => platform}/s5p-tv/mixer_drv.c (98%)
8464 rename drivers/media/{video => platform}/s5p-tv/mixer_grp_layer.c (100%)
8465 rename drivers/media/{video => platform}/s5p-tv/mixer_reg.c (100%)
8466 rename drivers/media/{video => platform}/s5p-tv/mixer_video.c (97%)
8467 rename drivers/media/{video => platform}/s5p-tv/mixer_vp_layer.c (100%)
8468 rename drivers/media/{video => platform}/s5p-tv/regs-hdmi.h (100%)
8469 rename drivers/media/{video => platform}/s5p-tv/regs-mixer.h (100%)
8470 rename drivers/media/{video => platform}/s5p-tv/regs-sdo.h (97%)
8471 rename drivers/media/{video => platform}/s5p-tv/regs-vp.h (100%)
8472 rename drivers/media/{video => platform}/s5p-tv/sdo_drv.c (98%)
8473 rename drivers/media/{video => platform}/s5p-tv/sii9234_drv.c (97%)
8474 rename drivers/media/{video => platform}/sh_vou.c (98%)
8475 create mode 100644 drivers/media/platform/soc_camera/Kconfig
8476 create mode 100644 drivers/media/platform/soc_camera/Makefile
8477 rename drivers/media/{video => platform/soc_camera}/atmel-isi.c (100%)
8478 rename drivers/media/{video => platform/soc_camera}/mx1_camera.c (100%)
8479 rename drivers/media/{video => platform/soc_camera}/mx2_camera.c (97%)
8480 rename drivers/media/{video => platform/soc_camera}/mx3_camera.c (99%)
8481 rename drivers/media/{video => platform/soc_camera}/omap1_camera.c (99%)
8482 rename drivers/media/{video => platform/soc_camera}/pxa_camera.c (100%)
8483 rename drivers/media/{video => platform/soc_camera}/sh_mobile_ceu_camera.c (100%)
8484 rename drivers/media/{video => platform/soc_camera}/sh_mobile_csi2.c (100%)
8485 rename drivers/media/{video => platform/soc_camera}/soc_camera.c (92%)
8486 rename drivers/media/{video => platform/soc_camera}/soc_camera_platform.c (94%)
8487 rename drivers/media/{video => platform/soc_camera}/soc_mediabus.c (100%)
8488 rename drivers/media/{video => platform}/timblogiw.c (100%)
8489 rename drivers/media/{video => platform}/via-camera.c (100%)
8490 rename drivers/media/{video => platform}/via-camera.h (100%)
8491 rename drivers/media/{video => platform}/vino.c (100%)
8492 rename drivers/media/{video => platform}/vino.h (100%)
8493 rename drivers/media/{video => platform}/vivi.c (97%)
8494 create mode 100644 drivers/media/rc/ir-rx51.c
8495 create mode 100644 drivers/media/rc/ttusbir.c
8496 rename drivers/media/{common => }/tuners/Kconfig (72%)
8497 rename drivers/media/{common => }/tuners/Makefile (88%)
8498 create mode 100644 drivers/media/tuners/e4000.c
8499 create mode 100644 drivers/media/tuners/e4000.h
8500 create mode 100644 drivers/media/tuners/e4000_priv.h
8501 rename drivers/media/{common => }/tuners/fc0011.c (100%)
8502 rename drivers/media/{common => }/tuners/fc0011.h (100%)
8503 rename drivers/media/{common => }/tuners/fc0012-priv.h (100%)
8504 rename drivers/media/{common => }/tuners/fc0012.c (100%)
8505 rename drivers/media/{common => }/tuners/fc0012.h (100%)
8506 rename drivers/media/{common => }/tuners/fc0013-priv.h (100%)
8507 rename drivers/media/{common => }/tuners/fc0013.c (100%)
8508 rename drivers/media/{common => }/tuners/fc0013.h (100%)
8509 rename drivers/media/{common => }/tuners/fc001x-common.h (100%)
8510 create mode 100644 drivers/media/tuners/fc2580.c
8511 create mode 100644 drivers/media/tuners/fc2580.h
8512 create mode 100644 drivers/media/tuners/fc2580_priv.h
8513 rename drivers/media/{common => }/tuners/max2165.c (100%)
8514 rename drivers/media/{common => }/tuners/max2165.h (100%)
8515 rename drivers/media/{common => }/tuners/max2165_priv.h (100%)
8516 rename drivers/media/{common => }/tuners/mc44s803.c (97%)
8517 rename drivers/media/{common => }/tuners/mc44s803.h (100%)
8518 rename drivers/media/{common => }/tuners/mc44s803_priv.h (100%)
8519 rename drivers/media/{common => }/tuners/mt2060.c (100%)
8520 rename drivers/media/{common => }/tuners/mt2060.h (100%)
8521 rename drivers/media/{common => }/tuners/mt2060_priv.h (100%)
8522 rename drivers/media/{common => }/tuners/mt2063.c (100%)
8523 rename drivers/media/{common => }/tuners/mt2063.h (100%)
8524 rename drivers/media/{common => }/tuners/mt20xx.c (100%)
8525 rename drivers/media/{common => }/tuners/mt20xx.h (100%)
8526 rename drivers/media/{common => }/tuners/mt2131.c (100%)
8527 rename drivers/media/{common => }/tuners/mt2131.h (100%)
8528 rename drivers/media/{common => }/tuners/mt2131_priv.h (100%)
8529 rename drivers/media/{common => }/tuners/mt2266.c (100%)
8530 rename drivers/media/{common => }/tuners/mt2266.h (100%)
8531 rename drivers/media/{common => }/tuners/mxl5005s.c (99%)
8532 rename drivers/media/{common => }/tuners/mxl5005s.h (100%)
8533 rename drivers/media/{common => }/tuners/mxl5007t.c (100%)
8534 rename drivers/media/{common => }/tuners/mxl5007t.h (100%)
8535 rename drivers/media/{common => }/tuners/qt1010.c (90%)
8536 rename drivers/media/{common => }/tuners/qt1010.h (100%)
8537 rename drivers/media/{common => }/tuners/qt1010_priv.h (100%)
8538 rename drivers/media/{common => }/tuners/tda18212.c (91%)
8539 rename drivers/media/{common => }/tuners/tda18212.h (100%)
8540 rename drivers/media/{common => }/tuners/tda18218.c (87%)
8541 rename drivers/media/{common => }/tuners/tda18218.h (100%)
8542 rename drivers/media/{common => }/tuners/tda18218_priv.h (90%)
8543 rename drivers/media/{common => }/tuners/tda18271-common.c (99%)
8544 rename drivers/media/{common => }/tuners/tda18271-fe.c (100%)
8545 rename drivers/media/{common => }/tuners/tda18271-maps.c (100%)
8546 rename drivers/media/{common => }/tuners/tda18271-priv.h (100%)
8547 rename drivers/media/{common => }/tuners/tda18271.h (100%)
8548 rename drivers/media/{common => }/tuners/tda827x.c (100%)
8549 rename drivers/media/{common => }/tuners/tda827x.h (100%)
8550 rename drivers/media/{common => }/tuners/tda8290.c (100%)
8551 rename drivers/media/{common => }/tuners/tda8290.h (100%)
8552 rename drivers/media/{common => }/tuners/tda9887.c (100%)
8553 rename drivers/media/{common => }/tuners/tda9887.h (100%)
8554 rename drivers/media/{common => }/tuners/tea5761.c (100%)
8555 rename drivers/media/{common => }/tuners/tea5761.h (100%)
8556 rename drivers/media/{common => }/tuners/tea5767.c (100%)
8557 rename drivers/media/{common => }/tuners/tea5767.h (100%)
8558 rename drivers/media/{common => }/tuners/tua9001.c (68%)
8559 rename drivers/media/{common => }/tuners/tua9001.h (78%)
8560 rename drivers/media/{common => }/tuners/tua9001_priv.h (100%)
8561 rename drivers/media/{common => }/tuners/tuner-i2c.h (100%)
8562 rename drivers/media/{common => }/tuners/tuner-simple.c (100%)
8563 rename drivers/media/{common => }/tuners/tuner-simple.h (100%)
8564 rename drivers/media/{common => }/tuners/tuner-types.c (100%)
8565 rename drivers/media/{common => }/tuners/tuner-xc2028-types.h (100%)
8566 rename drivers/media/{common => }/tuners/tuner-xc2028.c (99%)
8567 rename drivers/media/{common => }/tuners/tuner-xc2028.h (100%)
8568 rename drivers/media/{common => }/tuners/xc4000.c (99%)
8569 rename drivers/media/{common => }/tuners/xc4000.h (100%)
8570 rename drivers/media/{common => }/tuners/xc5000.c (88%)
8571 rename drivers/media/{common => }/tuners/xc5000.h (100%)
8572 create mode 100644 drivers/media/usb/Kconfig
8573 create mode 100644 drivers/media/usb/Makefile
8574 rename drivers/media/{video => usb}/au0828/Kconfig (54%)
8575 rename drivers/media/{video => usb}/au0828/Makefile (59%)
8576 rename drivers/media/{video => usb}/au0828/au0828-cards.c (99%)
8577 rename drivers/media/{video => usb}/au0828/au0828-cards.h (100%)
8578 rename drivers/media/{video => usb}/au0828/au0828-core.c (85%)
8579 rename drivers/media/{video => usb}/au0828/au0828-dvb.c (90%)
8580 rename drivers/media/{video => usb}/au0828/au0828-i2c.c (93%)
8581 rename drivers/media/{video => usb}/au0828/au0828-reg.h (98%)
8582 rename drivers/media/{video => usb}/au0828/au0828-vbi.c (100%)
8583 rename drivers/media/{video => usb}/au0828/au0828-video.c (96%)
8584 rename drivers/media/{video => usb}/au0828/au0828.h (98%)
8585 create mode 100644 drivers/media/usb/b2c2/Kconfig
8586 create mode 100644 drivers/media/usb/b2c2/Makefile
8587 rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.c (99%)
8588 rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.h (100%)
8589 rename drivers/media/{video => usb}/cpia2/Kconfig (100%)
8590 rename drivers/media/{video => usb}/cpia2/Makefile (100%)
8591 rename drivers/media/{video => usb}/cpia2/cpia2.h (100%)
8592 rename drivers/media/{video => usb}/cpia2/cpia2_core.c (99%)
8593 rename drivers/media/{video => usb}/cpia2/cpia2_registers.h (100%)
8594 rename drivers/media/{video => usb}/cpia2/cpia2_usb.c (100%)
8595 rename drivers/media/{video => usb}/cpia2/cpia2_v4l.c (97%)
8596 rename drivers/media/{video => usb}/cx231xx/Kconfig (86%)
8597 rename drivers/media/{video => usb}/cx231xx/Makefile (65%)
8598 rename drivers/media/{video => usb}/cx231xx/cx231xx-417.c (99%)
8599 rename drivers/media/{video => usb}/cx231xx/cx231xx-audio.c (100%)
8600 rename drivers/media/{video => usb}/cx231xx/cx231xx-avcore.c (100%)
8601 rename drivers/media/{video => usb}/cx231xx/cx231xx-cards.c (100%)
8602 rename drivers/media/{video => usb}/cx231xx/cx231xx-conf-reg.h (100%)
8603 rename drivers/media/{video => usb}/cx231xx/cx231xx-core.c (100%)
8604 rename drivers/media/{video => usb}/cx231xx/cx231xx-dif.h (100%)
8605 rename drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c (100%)
8606 rename drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c (100%)
8607 rename drivers/media/{video => usb}/cx231xx/cx231xx-input.c (100%)
8608 rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c (100%)
8609 rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h (100%)
8610 rename drivers/media/{video => usb}/cx231xx/cx231xx-reg.h (100%)
8611 rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c (100%)
8612 rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h (100%)
8613 rename drivers/media/{video => usb}/cx231xx/cx231xx-video.c (98%)
8614 rename drivers/media/{video => usb}/cx231xx/cx231xx.h (100%)
8615 create mode 100644 drivers/media/usb/dvb-usb-v2/Kconfig
8616 create mode 100644 drivers/media/usb/dvb-usb-v2/Makefile
8617 create mode 100644 drivers/media/usb/dvb-usb-v2/af9015.c
8618 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9015.h (78%)
8619 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.c (57%)
8620 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.h (96%)
8621 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.c (67%)
8622 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.h (97%)
8623 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.c (64%)
8624 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.h (80%)
8625 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/az6007.c (63%)
8626 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.c (58%)
8627 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.h (58%)
8628 create mode 100644 drivers/media/usb/dvb-usb-v2/cypress_firmware.c
8629 create mode 100644 drivers/media/usb/dvb-usb-v2/cypress_firmware.h
8630 create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb.h
8631 create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
8632 create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
8633 create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
8634 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.c (57%)
8635 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.h (62%)
8636 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.c (54%)
8637 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.h (59%)
8638 create mode 100644 drivers/media/usb/dvb-usb-v2/it913x.c
8639 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.c (69%)
8640 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.h (100%)
8641 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.c (100%)
8642 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.h (100%)
8643 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.c (100%)
8644 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.h (100%)
8645 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.c (100%)
8646 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.h (100%)
8647 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.c (100%)
8648 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.h (100%)
8649 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-reg.h (100%)
8650 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.c (99%)
8651 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.h (100%)
8652 create mode 100644 drivers/media/usb/dvb-usb-v2/mxl111sf.c
8653 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf.h (98%)
8654 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.c (66%)
8655 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.h (91%)
8656 create mode 100644 drivers/media/usb/dvb-usb-v2/usb_urb.c
8657 create mode 100644 drivers/media/usb/dvb-usb/Kconfig
8658 create mode 100644 drivers/media/usb/dvb-usb/Makefile
8659 rename drivers/media/{dvb => usb}/dvb-usb/a800.c (100%)
8660 rename drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c (100%)
8661 rename drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c (100%)
8662 rename drivers/media/{dvb => usb}/dvb-usb/af9005-script.h (100%)
8663 rename drivers/media/{dvb => usb}/dvb-usb/af9005.c (100%)
8664 rename drivers/media/{dvb => usb}/dvb-usb/af9005.h (100%)
8665 rename drivers/media/{dvb => usb}/dvb-usb/az6027.c (100%)
8666 rename drivers/media/{dvb => usb}/dvb-usb/az6027.h (100%)
8667 rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-core.c (100%)
8668 rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c (100%)
8669 rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h (100%)
8670 rename drivers/media/{dvb => usb}/dvb-usb/cxusb.c (100%)
8671 rename drivers/media/{dvb => usb}/dvb-usb/cxusb.h (100%)
8672 rename drivers/media/{dvb => usb}/dvb-usb/dib0700.h (100%)
8673 rename drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c (99%)
8674 rename drivers/media/{dvb => usb}/dvb-usb/dib0700_devices.c (100%)
8675 rename drivers/media/{dvb => usb}/dvb-usb/dib07x0.h (100%)
8676 rename drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c (100%)
8677 rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c (100%)
8678 rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c (100%)
8679 rename drivers/media/{dvb => usb}/dvb-usb/dibusb.h (100%)
8680 rename drivers/media/{dvb => usb}/dvb-usb/digitv.c (100%)
8681 rename drivers/media/{dvb => usb}/dvb-usb/digitv.h (100%)
8682 rename drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c (100%)
8683 rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.c (100%)
8684 rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.h (100%)
8685 rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.c (100%)
8686 rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.h (100%)
8687 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-common.h (100%)
8688 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c (99%)
8689 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c (100%)
8690 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c (100%)
8691 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c (100%)
8692 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-remote.c (100%)
8693 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c (100%)
8694 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h (99%)
8695 rename drivers/media/{dvb => usb}/dvb-usb/dw2102.c (100%)
8696 rename drivers/media/{dvb => usb}/dvb-usb/dw2102.h (100%)
8697 rename drivers/media/{dvb => usb}/dvb-usb/friio-fe.c (100%)
8698 rename drivers/media/{dvb => usb}/dvb-usb/friio.c (100%)
8699 rename drivers/media/{dvb => usb}/dvb-usb/friio.h (100%)
8700 rename drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c (100%)
8701 rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.c (100%)
8702 rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.h (100%)
8703 rename drivers/media/{dvb => usb}/dvb-usb/m920x.c (100%)
8704 rename drivers/media/{dvb => usb}/dvb-usb/m920x.h (100%)
8705 rename drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c (100%)
8706 rename drivers/media/{dvb => usb}/dvb-usb/opera1.c (100%)
8707 rename drivers/media/{dvb => usb}/dvb-usb/pctv452e.c (99%)
8708 rename drivers/media/{dvb => usb}/dvb-usb/technisat-usb2.c (100%)
8709 rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.c (99%)
8710 rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.h (100%)
8711 rename drivers/media/{dvb => usb}/dvb-usb/umt-010.c (100%)
8712 rename drivers/media/{dvb => usb}/dvb-usb/usb-urb.c (100%)
8713 rename drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c (100%)
8714 rename drivers/media/{dvb => usb}/dvb-usb/vp702x.c (100%)
8715 rename drivers/media/{dvb => usb}/dvb-usb/vp702x.h (100%)
8716 rename drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c (100%)
8717 rename drivers/media/{dvb => usb}/dvb-usb/vp7045.c (100%)
8718 rename drivers/media/{dvb => usb}/dvb-usb/vp7045.h (100%)
8719 rename drivers/media/{video => usb}/em28xx/Kconfig (67%)
8720 rename drivers/media/{video => usb}/em28xx/Makefile (57%)
8721 rename drivers/media/{video => usb}/em28xx/em28xx-audio.c (99%)
8722 rename drivers/media/{video => usb}/em28xx/em28xx-cards.c (100%)
8723 rename drivers/media/{video => usb}/em28xx/em28xx-core.c (99%)
8724 rename drivers/media/{video => usb}/em28xx/em28xx-dvb.c (100%)
8725 rename drivers/media/{video => usb}/em28xx/em28xx-i2c.c (100%)
8726 rename drivers/media/{video => usb}/em28xx/em28xx-input.c (100%)
8727 rename drivers/media/{video => usb}/em28xx/em28xx-reg.h (100%)
8728 rename drivers/media/{video => usb}/em28xx/em28xx-vbi.c (100%)
8729 rename drivers/media/{video => usb}/em28xx/em28xx-video.c (98%)
8730 rename drivers/media/{video => usb}/em28xx/em28xx.h (100%)
8731 rename drivers/media/{video => usb}/gspca/Kconfig (98%)
8732 rename drivers/media/{video => usb}/gspca/Makefile (100%)
8733 rename drivers/media/{video => usb}/gspca/autogain_functions.c (100%)
8734 rename drivers/media/{video => usb}/gspca/autogain_functions.h (100%)
8735 rename drivers/media/{video => usb}/gspca/benq.c (100%)
8736 rename drivers/media/{video => usb}/gspca/conex.c (100%)
8737 rename drivers/media/{video => usb}/gspca/cpia1.c (99%)
8738 rename drivers/media/{video => usb}/gspca/etoms.c (100%)
8739 rename drivers/media/{video => usb}/gspca/finepix.c (92%)
8740 rename drivers/media/{video => usb}/gspca/gl860/Kconfig (100%)
8741 rename drivers/media/{video => usb}/gspca/gl860/Makefile (75%)
8742 rename drivers/media/{video => usb}/gspca/gl860/gl860-mi1320.c (100%)
8743 rename drivers/media/{video => usb}/gspca/gl860/gl860-mi2020.c (100%)
8744 rename drivers/media/{video => usb}/gspca/gl860/gl860-ov2640.c (100%)
8745 rename drivers/media/{video => usb}/gspca/gl860/gl860-ov9655.c (100%)
8746 rename drivers/media/{video => usb}/gspca/gl860/gl860.c (100%)
8747 rename drivers/media/{video => usb}/gspca/gl860/gl860.h (100%)
8748 rename drivers/media/{video => usb}/gspca/gspca.c (99%)
8749 rename drivers/media/{video => usb}/gspca/gspca.h (100%)
8750 rename drivers/media/{video => usb}/gspca/jeilinj.c (100%)
8751 rename drivers/media/{video => usb}/gspca/jl2005bcd.c (95%)
8752 rename drivers/media/{video => usb}/gspca/jpeg.h (100%)
8753 rename drivers/media/{video => usb}/gspca/kinect.c (100%)
8754 rename drivers/media/{video => usb}/gspca/konica.c (100%)
8755 rename drivers/media/{video => usb}/gspca/m5602/Kconfig (100%)
8756 rename drivers/media/{video => usb}/gspca/m5602/Makefile (80%)
8757 rename drivers/media/{video => usb}/gspca/m5602/m5602_bridge.h (100%)
8758 rename drivers/media/{video => usb}/gspca/m5602/m5602_core.c (100%)
8759 rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.c (100%)
8760 rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.h (100%)
8761 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.c (100%)
8762 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.h (100%)
8763 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.c (100%)
8764 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.h (100%)
8765 rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.c (100%)
8766 rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.h (100%)
8767 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.c (100%)
8768 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.h (100%)
8769 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.c (100%)
8770 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.h (100%)
8771 rename drivers/media/{video => usb}/gspca/m5602/m5602_sensor.h (100%)
8772 rename drivers/media/{video => usb}/gspca/mars.c (100%)
8773 rename drivers/media/{video => usb}/gspca/mr97310a.c (100%)
8774 rename drivers/media/{video => usb}/gspca/nw80x.c (100%)
8775 rename drivers/media/{video => usb}/gspca/ov519.c (99%)
8776 rename drivers/media/{video => usb}/gspca/ov534.c (100%)
8777 rename drivers/media/{video => usb}/gspca/ov534_9.c (100%)
8778 rename drivers/media/{video => usb}/gspca/pac207.c (100%)
8779 rename drivers/media/{video => usb}/gspca/pac7302.c (95%)
8780 rename drivers/media/{video => usb}/gspca/pac7311.c (100%)
8781 rename drivers/media/{video => usb}/gspca/pac_common.h (100%)
8782 rename drivers/media/{video => usb}/gspca/se401.c (100%)
8783 rename drivers/media/{video => usb}/gspca/se401.h (100%)
8784 rename drivers/media/{video => usb}/gspca/sn9c2028.c (100%)
8785 rename drivers/media/{video => usb}/gspca/sn9c2028.h (100%)
8786 rename drivers/media/{video => usb}/gspca/sn9c20x.c (99%)
8787 rename drivers/media/{video => usb}/gspca/sonixb.c (100%)
8788 rename drivers/media/{video => usb}/gspca/sonixj.c (99%)
8789 rename drivers/media/{video => usb}/gspca/spca1528.c (100%)
8790 rename drivers/media/{video => usb}/gspca/spca500.c (100%)
8791 rename drivers/media/{video => usb}/gspca/spca501.c (100%)
8792 rename drivers/media/{video => usb}/gspca/spca505.c (100%)
8793 rename drivers/media/{video => usb}/gspca/spca506.c (100%)
8794 rename drivers/media/{video => usb}/gspca/spca508.c (100%)
8795 rename drivers/media/{video => usb}/gspca/spca561.c (100%)
8796 rename drivers/media/{video => usb}/gspca/sq905.c (95%)
8797 rename drivers/media/{video => usb}/gspca/sq905c.c (91%)
8798 rename drivers/media/{video => usb}/gspca/sq930x.c (99%)
8799 rename drivers/media/{video => usb}/gspca/stk014.c (100%)
8800 rename drivers/media/{video => usb}/gspca/stv0680.c (100%)
8801 rename drivers/media/{video => usb}/gspca/stv06xx/Kconfig (100%)
8802 rename drivers/media/{video => usb}/gspca/stv06xx/Makefile (78%)
8803 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.c (100%)
8804 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.h (100%)
8805 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.c (100%)
8806 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.h (100%)
8807 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.c (100%)
8808 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.h (100%)
8809 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_sensor.h (100%)
8810 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.c (100%)
8811 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.h (100%)
8812 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.c (100%)
8813 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.h (100%)
8814 rename drivers/media/{video => usb}/gspca/sunplus.c (100%)
8815 rename drivers/media/{video => usb}/gspca/t613.c (100%)
8816 rename drivers/media/{video => usb}/gspca/topro.c (100%)
8817 rename drivers/media/{video => usb}/gspca/tv8532.c (100%)
8818 rename drivers/media/{video => usb}/gspca/vc032x.c (99%)
8819 rename drivers/media/{video => usb}/gspca/vicam.c (94%)
8820 rename drivers/media/{video => usb}/gspca/w996Xcf.c (100%)
8821 rename drivers/media/{video => usb}/gspca/xirlink_cit.c (99%)
8822 rename drivers/media/{video => usb}/gspca/zc3xx-reg.h (100%)
8823 rename drivers/media/{video => usb}/gspca/zc3xx.c (99%)
8824 rename drivers/media/{video => usb}/hdpvr/Kconfig (100%)
8825 rename drivers/media/{video => usb}/hdpvr/Makefile (81%)
8826 rename drivers/media/{video => usb}/hdpvr/hdpvr-control.c (100%)
8827 rename drivers/media/{video => usb}/hdpvr/hdpvr-core.c (100%)
8828 rename drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c (100%)
8829 rename drivers/media/{video => usb}/hdpvr/hdpvr-video.c (100%)
8830 rename drivers/media/{video => usb}/hdpvr/hdpvr.h (100%)
8831 rename drivers/media/{video => usb}/pvrusb2/Kconfig (82%)
8832 rename drivers/media/{video => usb}/pvrusb2/Makefile (80%)
8833 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.c (100%)
8834 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.h (100%)
8835 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.c (100%)
8836 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.h (100%)
8837 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.c (100%)
8838 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.h (100%)
8839 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.c (100%)
8840 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.h (100%)
8841 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c (100%)
8842 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h (100%)
8843 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debug.h (100%)
8844 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.c (100%)
8845 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.h (100%)
8846 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.c (97%)
8847 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.h (100%)
8848 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c (100%)
8849 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h (100%)
8850 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.c (100%)
8851 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.h (100%)
8852 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.c (100%)
8853 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.h (100%)
8854 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h (100%)
8855 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw-internal.h (100%)
8856 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c (100%)
8857 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h (100%)
8858 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.c (100%)
8859 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.h (100%)
8860 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c (100%)
8861 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h (100%)
8862 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.c (100%)
8863 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.h (100%)
8864 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-main.c (100%)
8865 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c (100%)
8866 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h (100%)
8867 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.c (100%)
8868 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.h (100%)
8869 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-util.h (100%)
8870 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.c (100%)
8871 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.h (100%)
8872 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.c (100%)
8873 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.h (100%)
8874 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.c (100%)
8875 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.h (100%)
8876 rename drivers/media/{video => usb}/pvrusb2/pvrusb2.h (100%)
8877 rename drivers/media/{video => usb}/pwc/Kconfig (100%)
8878 rename drivers/media/{video => usb}/pwc/Makefile (60%)
8879 rename drivers/media/{video => usb}/pwc/philips.txt (100%)
8880 rename drivers/media/{video => usb}/pwc/pwc-ctrl.c (100%)
8881 rename drivers/media/{video => usb}/pwc/pwc-dec1.c (100%)
8882 rename drivers/media/{video => usb}/pwc/pwc-dec1.h (100%)
8883 rename drivers/media/{video => usb}/pwc/pwc-dec23.c (100%)
8884 rename drivers/media/{video => usb}/pwc/pwc-dec23.h (100%)
8885 rename drivers/media/{video => usb}/pwc/pwc-if.c (99%)
8886 rename drivers/media/{video => usb}/pwc/pwc-kiara.c (100%)
8887 rename drivers/media/{video => usb}/pwc/pwc-kiara.h (100%)
8888 rename drivers/media/{video => usb}/pwc/pwc-misc.c (100%)
8889 rename drivers/media/{video => usb}/pwc/pwc-nala.h (100%)
8890 rename drivers/media/{video => usb}/pwc/pwc-timon.c (100%)
8891 rename drivers/media/{video => usb}/pwc/pwc-timon.h (100%)
8892 rename drivers/media/{video => usb}/pwc/pwc-uncompress.c (100%)
8893 rename drivers/media/{video => usb}/pwc/pwc-v4l.c (100%)
8894 rename drivers/media/{video => usb}/pwc/pwc.h (100%)
8895 create mode 100644 drivers/media/usb/s2255/Kconfig
8896 create mode 100644 drivers/media/usb/s2255/Makefile
8897 rename drivers/media/{video => usb/s2255}/s2255drv.c (99%)
8898 create mode 100644 drivers/media/usb/siano/Kconfig
8899 create mode 100644 drivers/media/usb/siano/Makefile
8900 rename drivers/media/{dvb => usb}/siano/smsusb.c (100%)
8901 rename drivers/media/{video => usb}/sn9c102/Kconfig (100%)
8902 rename drivers/media/{video => usb}/sn9c102/Makefile (100%)
8903 rename drivers/media/{video => usb}/sn9c102/sn9c102.h (100%)
8904 rename drivers/media/{video => usb}/sn9c102/sn9c102_config.h (100%)
8905 rename drivers/media/{video => usb}/sn9c102/sn9c102_core.c (100%)
8906 rename drivers/media/{video => usb}/sn9c102/sn9c102_devtable.h (100%)
8907 rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131d.c (100%)
8908 rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131r.c (100%)
8909 rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0343.c (100%)
8910 rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0360.c (100%)
8911 rename drivers/media/{video => usb}/sn9c102/sn9c102_mt9v111.c (100%)
8912 rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7630.c (100%)
8913 rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7660.c (100%)
8914 rename drivers/media/{video => usb}/sn9c102/sn9c102_pas106b.c (100%)
8915 rename drivers/media/{video => usb}/sn9c102/sn9c102_pas202bcb.c (100%)
8916 rename drivers/media/{video => usb}/sn9c102/sn9c102_sensor.h (100%)
8917 rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110c1b.c (100%)
8918 rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110d.c (100%)
8919 rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5130d1b.c (100%)
8920 create mode 100644 drivers/media/usb/stk1160/Kconfig
8921 create mode 100644 drivers/media/usb/stk1160/Makefile
8922 create mode 100644 drivers/media/usb/stk1160/stk1160-ac97.c
8923 create mode 100644 drivers/media/usb/stk1160/stk1160-core.c
8924 create mode 100644 drivers/media/usb/stk1160/stk1160-i2c.c
8925 create mode 100644 drivers/media/usb/stk1160/stk1160-reg.h
8926 create mode 100644 drivers/media/usb/stk1160/stk1160-v4l.c
8927 create mode 100644 drivers/media/usb/stk1160/stk1160-video.c
8928 create mode 100644 drivers/media/usb/stk1160/stk1160.h
8929 create mode 100644 drivers/media/usb/stkwebcam/Kconfig
8930 create mode 100644 drivers/media/usb/stkwebcam/Makefile
8931 rename drivers/media/{video => usb/stkwebcam}/stk-sensor.c (100%)
8932 rename drivers/media/{video => usb/stkwebcam}/stk-webcam.c (100%)
8933 rename drivers/media/{video => usb/stkwebcam}/stk-webcam.h (100%)
8934 rename drivers/media/{video => usb}/tlg2300/Kconfig (100%)
8935 create mode 100644 drivers/media/usb/tlg2300/Makefile
8936 rename drivers/media/{video => usb}/tlg2300/pd-alsa.c (99%)
8937 rename drivers/media/{video => usb}/tlg2300/pd-common.h (100%)
8938 rename drivers/media/{video => usb}/tlg2300/pd-dvb.c (100%)
8939 rename drivers/media/{video => usb}/tlg2300/pd-main.c (100%)
8940 rename drivers/media/{video => usb}/tlg2300/pd-radio.c (100%)
8941 rename drivers/media/{video => usb}/tlg2300/pd-video.c (100%)
8942 rename drivers/media/{video => usb}/tlg2300/vendorcmds.h (100%)
8943 rename drivers/media/{video => usb}/tm6000/Kconfig (100%)
8944 rename drivers/media/{video => usb}/tm6000/Makefile (62%)
8945 rename drivers/media/{video => usb}/tm6000/tm6000-alsa.c (99%)
8946 rename drivers/media/{video => usb}/tm6000/tm6000-cards.c (100%)
8947 rename drivers/media/{video => usb}/tm6000/tm6000-core.c (100%)
8948 rename drivers/media/{video => usb}/tm6000/tm6000-dvb.c (100%)
8949 rename drivers/media/{video => usb}/tm6000/tm6000-i2c.c (100%)
8950 rename drivers/media/{video => usb}/tm6000/tm6000-input.c (99%)
8951 rename drivers/media/{video => usb}/tm6000/tm6000-regs.h (100%)
8952 rename drivers/media/{video => usb}/tm6000/tm6000-stds.c (100%)
8953 rename drivers/media/{video => usb}/tm6000/tm6000-usb-isoc.h (100%)
8954 rename drivers/media/{video => usb}/tm6000/tm6000-video.c (97%)
8955 rename drivers/media/{video => usb}/tm6000/tm6000.h (100%)
8956 rename drivers/media/{dvb => usb}/ttusb-budget/Kconfig (56%)
8957 create mode 100644 drivers/media/usb/ttusb-budget/Makefile
8958 rename drivers/media/{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c (100%)
8959 rename drivers/media/{dvb => usb}/ttusb-dec/Kconfig (100%)
8960 rename drivers/media/{dvb => usb}/ttusb-dec/Makefile (57%)
8961 rename drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c (100%)
8962 rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c (100%)
8963 rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h (100%)
8964 rename drivers/media/{video => usb}/usbvision/Kconfig (88%)
8965 rename drivers/media/{video => usb}/usbvision/Makefile (63%)
8966 rename drivers/media/{video => usb}/usbvision/usbvision-cards.c (100%)
8967 rename drivers/media/{video => usb}/usbvision/usbvision-cards.h (100%)
8968 rename drivers/media/{video => usb}/usbvision/usbvision-core.c (100%)
8969 rename drivers/media/{video => usb}/usbvision/usbvision-i2c.c (100%)
8970 rename drivers/media/{video => usb}/usbvision/usbvision-video.c (97%)
8971 rename drivers/media/{video => usb}/usbvision/usbvision.h (100%)
8972 rename drivers/media/{video => usb}/uvc/Kconfig (100%)
8973 rename drivers/media/{video => usb}/uvc/Makefile (100%)
8974 rename drivers/media/{video => usb}/uvc/uvc_ctrl.c (100%)
8975 rename drivers/media/{video => usb}/uvc/uvc_debugfs.c (100%)
8976 rename drivers/media/{video => usb}/uvc/uvc_driver.c (98%)
8977 rename drivers/media/{video => usb}/uvc/uvc_entity.c (100%)
8978 rename drivers/media/{video => usb}/uvc/uvc_isight.c (100%)
8979 rename drivers/media/{video => usb}/uvc/uvc_queue.c (100%)
8980 rename drivers/media/{video => usb}/uvc/uvc_status.c (100%)
8981 rename drivers/media/{video => usb}/uvc/uvc_v4l2.c (100%)
8982 rename drivers/media/{video => usb}/uvc/uvc_video.c (98%)
8983 rename drivers/media/{video => usb}/uvc/uvcvideo.h (98%)
8984 create mode 100644 drivers/media/usb/zr364xx/Kconfig
8985 create mode 100644 drivers/media/usb/zr364xx/Makefile
8986 rename drivers/media/{video => usb/zr364xx}/zr364xx.c (100%)
8987 create mode 100644 drivers/media/v4l2-core/Kconfig
8988 create mode 100644 drivers/media/v4l2-core/Makefile
8989 rename drivers/media/{video => v4l2-core}/tuner-core.c (100%)
8990 rename drivers/media/{video => v4l2-core}/v4l2-common.c (62%)
8991 rename drivers/media/{video => v4l2-core}/v4l2-compat-ioctl32.c (94%)
8992 rename drivers/media/{video => v4l2-core}/v4l2-ctrls.c (95%)
8993 rename drivers/media/{video => v4l2-core}/v4l2-dev.c (95%)
8994 rename drivers/media/{video => v4l2-core}/v4l2-device.c (100%)
8995 rename drivers/media/{video => v4l2-core}/v4l2-event.c (100%)
8996 rename drivers/media/{video => v4l2-core}/v4l2-fh.c (100%)
8997 rename drivers/media/{video => v4l2-core}/v4l2-int-device.c (100%)
8998 rename drivers/media/{video => v4l2-core}/v4l2-ioctl.c (99%)
8999 rename drivers/media/{video => v4l2-core}/v4l2-mem2mem.c (98%)
9000 rename drivers/media/{video => v4l2-core}/v4l2-subdev.c (98%)
9001 rename drivers/media/{video => v4l2-core}/videobuf-core.c (100%)
9002 rename drivers/media/{video => v4l2-core}/videobuf-dma-contig.c (100%)
9003 rename drivers/media/{video => v4l2-core}/videobuf-dma-sg.c (100%)
9004 rename drivers/media/{video => v4l2-core}/videobuf-dvb.c (96%)
9005 rename drivers/media/{video => v4l2-core}/videobuf-vmalloc.c (100%)
9006 rename drivers/media/{video => v4l2-core}/videobuf2-core.c (98%)
9007 rename drivers/media/{video => v4l2-core}/videobuf2-dma-contig.c (100%)
9008 rename drivers/media/{video => v4l2-core}/videobuf2-dma-sg.c (100%)
9009 rename drivers/media/{video => v4l2-core}/videobuf2-memops.c (100%)
9010 rename drivers/media/{video => v4l2-core}/videobuf2-vmalloc.c (99%)
9011 delete mode 100644 drivers/media/video/Kconfig
9012 delete mode 100644 drivers/media/video/Makefile
9013 delete mode 100644 drivers/media/video/bt8xx/Kconfig
9014 delete mode 100644 drivers/media/video/bt8xx/Makefile
9015 delete mode 100644 drivers/media/video/cx23885/Kconfig
9016 delete mode 100644 drivers/media/video/tlg2300/Makefile
9017 delete mode 100644 drivers/staging/media/easycap/Kconfig
9018 delete mode 100644 drivers/staging/media/easycap/Makefile
9019 delete mode 100644 drivers/staging/media/easycap/README
9020 delete mode 100644 drivers/staging/media/easycap/easycap.h
9021 delete mode 100644 drivers/staging/media/easycap/easycap_ioctl.c
9022 delete mode 100644 drivers/staging/media/easycap/easycap_low.c
9023 delete mode 100644 drivers/staging/media/easycap/easycap_main.c
9024 delete mode 100644 drivers/staging/media/easycap/easycap_settings.c
9025 delete mode 100644 drivers/staging/media/easycap/easycap_sound.c
9026 delete mode 100644 drivers/staging/media/easycap/easycap_testcard.c
9027 delete mode 100644 drivers/staging/media/lirc/lirc_ene0100.h
9028 delete mode 100644 drivers/staging/media/lirc/lirc_ttusbir.c
9029 create mode 100644 include/media/ad9389b.h
9030 create mode 100644 include/media/adv7604.h
9031 create mode 100644 include/media/ir-rx51.h
9032 Merging kbuild/for-next (ea8fafa Merge branches 'kbuild/rc-fixes', 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
9033 $ git merge kbuild/for-next
9034 Auto-merging tools/testing/ktest/ktest.pl
9035 Auto-merging scripts/kernel-doc
9036 Auto-merging Makefile
9037 Auto-merging MAINTAINERS
9038 Merge made by the 'recursive' strategy.
9041 scripts/Makefile.modinst | 2 +-
9042 scripts/Makefile.modpost | 2 +-
9043 scripts/coccinelle/api/ptr_ret.cocci | 26 ++++
9044 scripts/kconfig/Makefile | 12 +-
9045 scripts/kconfig/conf.c | 25 ++--
9046 scripts/kconfig/expr.h | 11 ++
9047 scripts/kconfig/lkc_proto.h | 6 +-
9048 scripts/kconfig/lxdialog/dialog.h | 9 +-
9049 scripts/kconfig/lxdialog/textbox.c | 171 +++++++++++----------
9050 scripts/kconfig/lxdialog/util.c | 7 +
9051 scripts/kconfig/mconf.c | 123 +++++++++++----
9052 scripts/kconfig/menu.c | 53 +++++--
9053 scripts/kconfig/nconf.c | 2 +-
9054 scripts/kernel-doc | 273 +++++++++++++++++++++++++++++++++-
9055 scripts/package/buildtar | 6 +-
9056 scripts/tags.sh | 8 +-
9057 tools/testing/ktest/ktest.pl | 15 +-
9058 19 files changed, 602 insertions(+), 173 deletions(-)
9059 Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
9060 $ git merge kconfig/for-next
9062 Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
9063 $ git merge libata/NEXT
9064 Auto-merging drivers/ata/libata-core.c
9065 Merge made by the 'recursive' strategy.
9066 .../devicetree/bindings/arm/calxeda/combophy.txt | 17 +
9067 .../devicetree/bindings/ata/ahci-platform.txt | 8 +
9068 .../devicetree/bindings/ata/pata-arasan.txt | 17 +
9069 arch/arm/boot/dts/highbank.dts | 17 +
9070 drivers/ata/Kconfig | 8 +
9071 drivers/ata/Makefile | 1 +
9072 drivers/ata/ahci.h | 16 +
9073 drivers/ata/ahci_platform.c | 58 ++-
9074 drivers/ata/libahci.c | 97 ++++-
9075 drivers/ata/libata-core.c | 32 +-
9076 drivers/ata/libata-eh.c | 12 +-
9077 drivers/ata/libata-scsi.c | 255 ++++++++++-
9078 drivers/ata/libata.h | 2 +
9079 drivers/ata/pata_arasan_cf.c | 14 +-
9080 drivers/ata/sata_fsl.c | 39 +-
9081 drivers/ata/sata_highbank.c | 450 ++++++++++++++++++++
9082 drivers/ata/sata_mv.c | 8 +-
9083 include/linux/ata.h | 30 +-
9084 include/linux/libata.h | 4 +
9085 19 files changed, 1025 insertions(+), 60 deletions(-)
9086 create mode 100644 Documentation/devicetree/bindings/arm/calxeda/combophy.txt
9087 create mode 100644 Documentation/devicetree/bindings/ata/pata-arasan.txt
9088 create mode 100644 drivers/ata/sata_highbank.c
9089 Merging infiniband/for-next (e3e5475 Merge branch 'qib' into for-next)
9090 $ git merge infiniband/for-next
9092 Merge made by the 'recursive' strategy.
9093 Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
9094 $ git merge pstore/master
9095 Auto-merging kernel/trace/trace_functions.c
9096 Auto-merging MAINTAINERS
9097 Merge made by the 'recursive' strategy.
9098 Documentation/ramoops.txt | 4 +-
9099 MAINTAINERS | 12 +++++
9100 fs/pstore/Kconfig | 1 +
9101 fs/pstore/ftrace.c | 96 +++++++++++++++++++++++++++++++++++++++-
9102 fs/pstore/internal.h | 6 +++
9103 fs/pstore/platform.c | 9 +++-
9104 fs/pstore/ram.c | 28 ++++++------
9105 include/linux/pstore.h | 8 ----
9106 kernel/trace/trace_functions.c | 15 +------
9107 9 files changed, 139 insertions(+), 40 deletions(-)
9108 Merging acpi/next (10eaea0 Merge branch 'misc' into next)
9109 $ git merge acpi/next
9110 Resolved 'drivers/usb/core/usb-acpi.c' using previous resolution.
9111 Auto-merging drivers/usb/core/usb-acpi.c
9112 CONFLICT (content): Merge conflict in drivers/usb/core/usb-acpi.c
9113 Automatic merge failed; fix conflicts and then commit the result.
9115 [master 34a20bf] Merge remote-tracking branch 'acpi/next'
9116 $ git diff -M --stat --summary HEAD^..
9117 .../ABI/testing/sysfs-devices-firmware_node | 17 +
9118 drivers/acpi/acpica/Makefile | 1 +
9119 drivers/acpi/acpica/achware.h | 3 +-
9120 drivers/acpi/acpica/aclocal.h | 23 +-
9121 drivers/acpi/acpica/acmacros.h | 29 +-
9122 drivers/acpi/acpica/dswload.c | 14 +
9123 drivers/acpi/acpica/dswload2.c | 14 +
9124 drivers/acpi/acpica/evgpe.c | 24 +-
9125 drivers/acpi/acpica/evxfgpe.c | 3 +-
9126 drivers/acpi/acpica/hwgpe.c | 15 +-
9127 drivers/acpi/acpica/hwxfsleep.c | 1 -
9128 drivers/acpi/acpica/nsdump.c | 2 +-
9129 drivers/acpi/acpica/tbinstal.c | 20 +-
9130 drivers/acpi/acpica/tbxface.c | 41 +-
9131 drivers/acpi/acpica/utosi.c | 1 +
9132 drivers/acpi/acpica/utxface.c | 354 +++----------
9133 drivers/acpi/acpica/utxfinit.c | 317 +++++++++++
9134 drivers/acpi/bus.c | 8 +-
9135 drivers/acpi/button.c | 13 +-
9136 drivers/acpi/fan.c | 22 +-
9137 drivers/acpi/glue.c | 135 +++--
9138 drivers/acpi/hed.c | 20 +-
9139 drivers/acpi/proc.c | 57 +-
9140 drivers/acpi/sbshc.c | 18 +-
9141 drivers/acpi/scan.c | 60 ++-
9142 drivers/acpi/utils.c | 11 +-
9143 drivers/i2c/busses/i2c-scmi.c | 14 +-
9144 drivers/idle/intel_idle.c | 1 +
9145 drivers/input/misc/atlas_btns.c | 17 +-
9146 drivers/platform/x86/hp_accel.c | 25 +-
9147 drivers/platform/x86/ideapad-laptop.c | 14 +-
9148 drivers/platform/x86/topstar-laptop.c | 22 +-
9149 drivers/platform/x86/toshiba_bluetooth.c | 22 +-
9150 drivers/platform/x86/xo15-ebook.c | 14 +-
9151 drivers/pnp/pnpacpi/core.c | 7 +-
9152 include/acpi/acbuffer.h | 235 ++++++++
9153 include/acpi/acnames.h | 3 +-
9154 include/acpi/acpi_bus.h | 60 +--
9155 include/acpi/acpixf.h | 7 +-
9156 include/acpi/actbl.h | 60 ++-
9157 include/acpi/actbl1.h | 16 +-
9158 include/acpi/actbl2.h | 123 ++++-
9159 include/acpi/actbl3.h | 13 +-
9160 include/acpi/actypes.h | 7 -
9161 tools/power/acpi/Makefile | 18 +
9162 tools/power/acpi/acpidump.8 | 59 +++
9163 tools/power/acpi/acpidump.c | 560 ++++++++++++++++++++
9164 tools/power/x86/turbostat/turbostat.8 | 22 +-
9165 tools/power/x86/turbostat/turbostat.c | 202 ++++++-
9166 49 files changed, 2027 insertions(+), 717 deletions(-)
9167 create mode 100644 Documentation/ABI/testing/sysfs-devices-firmware_node
9168 create mode 100644 drivers/acpi/acpica/utxfinit.c
9169 create mode 100644 include/acpi/acbuffer.h
9170 create mode 100644 tools/power/acpi/Makefile
9171 create mode 100644 tools/power/acpi/acpidump.8
9172 create mode 100644 tools/power/acpi/acpidump.c
9173 $ git am -3 ../patches/0001-usb-acpi-Comply-with-the-ACPI-API-change-after-usb-t.patch
9174 Applying: usb-acpi: Comply with the ACPI API change after usb tree merge
9176 Unstaged changes after reset:
9177 M drivers/usb/core/usb-acpi.c
9179 $ git commit -v -a --amend
9180 [master fdc3b3e] Merge remote-tracking branch 'acpi/next'
9181 Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
9182 $ git merge cpuidle/cpuidle-next
9183 Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
9184 Resolved 'include/linux/cpuidle.h' using previous resolution.
9185 Auto-merging include/linux/cpuidle.h
9186 CONFLICT (content): Merge conflict in include/linux/cpuidle.h
9187 Auto-merging drivers/cpuidle/coupled.c
9188 CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
9189 Automatic merge failed; fix conflicts and then commit the result.
9191 [master b09cac5] Merge remote-tracking branch 'cpuidle/cpuidle-next'
9192 $ git diff -M --stat --summary HEAD^..
9193 Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
9194 $ git merge cpupowerutils/master
9196 Merging thermal/next (4b69a04 thermal: user_space: Add missing static storage class specifiers)
9197 $ git merge thermal/next
9198 Resolved 'drivers/staging/omap-thermal/omap-thermal-common.c' using previous resolution.
9199 Resolved 'drivers/thermal/thermal_sys.c' using previous resolution.
9200 Auto-merging include/linux/platform_data/exynos_thermal.h
9201 Auto-merging drivers/thermal/thermal_sys.c
9202 CONFLICT (content): Merge conflict in drivers/thermal/thermal_sys.c
9203 Auto-merging drivers/staging/omap-thermal/omap-thermal-common.c
9204 CONFLICT (content): Merge conflict in drivers/staging/omap-thermal/omap-thermal-common.c
9205 Removing drivers/hwmon/exynos4_tmu.c
9206 Auto-merging drivers/hwmon/Makefile
9207 Auto-merging drivers/hwmon/Kconfig
9208 Auto-merging drivers/acpi/thermal.c
9209 Auto-merging Documentation/thermal/exynos_thermal
9210 Automatic merge failed; fix conflicts and then commit the result.
9212 [master 0bb326e] Merge remote-tracking branch 'thermal/next'
9213 $ git diff -M --stat --summary HEAD^..
9214 Documentation/thermal/cpu-cooling-api.txt | 32 +
9215 .../{hwmon/exynos4_tmu => thermal/exynos_thermal} | 35 +-
9216 Documentation/thermal/sysfs-api.txt | 73 +-
9217 drivers/acpi/thermal.c | 97 +-
9218 drivers/hwmon/Kconfig | 10 -
9219 drivers/hwmon/Makefile | 1 -
9220 drivers/hwmon/exynos4_tmu.c | 518 ----------
9221 drivers/platform/x86/acerhdf.c | 5 +-
9222 drivers/platform/x86/intel_mid_thermal.c | 2 +-
9223 drivers/power/power_supply_core.c | 2 +-
9224 drivers/staging/omap-thermal/omap-thermal-common.c | 8 +-
9225 drivers/thermal/Kconfig | 75 ++
9226 drivers/thermal/Makefile | 8 +-
9227 drivers/thermal/cpu_cooling.c | 449 +++++++++
9228 drivers/thermal/exynos_thermal.c | 997 ++++++++++++++++++++
9229 drivers/thermal/fair_share.c | 133 +++
9230 drivers/thermal/rcar_thermal.c | 260 +++++
9231 drivers/thermal/spear_thermal.c | 2 +-
9232 drivers/thermal/step_wise.c | 194 ++++
9233 drivers/thermal/thermal_core.h | 53 ++
9234 drivers/thermal/thermal_sys.c | 761 ++++++++++-----
9235 drivers/thermal/user_space.c | 68 ++
9236 include/linux/cpu_cooling.h | 58 ++
9237 .../{exynos4_tmu.h => exynos_thermal.h} | 47 +-
9238 include/linux/thermal.h | 150 ++-
9239 25 files changed, 3161 insertions(+), 877 deletions(-)
9240 create mode 100644 Documentation/thermal/cpu-cooling-api.txt
9241 rename Documentation/{hwmon/exynos4_tmu => thermal/exynos_thermal} (71%)
9242 delete mode 100644 drivers/hwmon/exynos4_tmu.c
9243 create mode 100644 drivers/thermal/cpu_cooling.c
9244 create mode 100644 drivers/thermal/exynos_thermal.c
9245 create mode 100644 drivers/thermal/fair_share.c
9246 create mode 100644 drivers/thermal/rcar_thermal.c
9247 create mode 100644 drivers/thermal/step_wise.c
9248 create mode 100644 drivers/thermal/thermal_core.h
9249 create mode 100644 drivers/thermal/user_space.c
9250 create mode 100644 include/linux/cpu_cooling.h
9251 rename include/linux/platform_data/{exynos4_tmu.h => exynos_thermal.h} (64%)
9252 Merging ieee1394/for-next (4d50c44 firewire: addendum to address handler RCU conversion)
9253 $ git merge ieee1394/for-next
9254 Merge made by the 'recursive' strategy.
9255 drivers/firewire/core-device.c | 3 +++
9256 drivers/firewire/core-transaction.c | 33 +++++++++++++++++++--------------
9257 drivers/firewire/ohci.c | 28 +++++++++++++++++++++++++++-
9258 include/linux/firewire.h | 12 ++++++++++--
9259 4 files changed, 59 insertions(+), 17 deletions(-)
9260 Merging ubi/linux-next (2d23729 UBI: Wire-up fastmap)
9261 $ git merge ubi/linux-next
9262 Auto-merging drivers/mtd/ubi/vtbl.c
9263 Auto-merging MAINTAINERS
9264 Merge made by the 'recursive' strategy.
9266 arch/arm/configs/sam9_l9260_defconfig | 2 +-
9267 drivers/mtd/mtdpart.c | 12 +-
9268 drivers/mtd/ubi/Kconfig | 61 +-
9269 drivers/mtd/ubi/Makefile | 1 +
9270 drivers/mtd/ubi/attach.c | 428 +++++----
9271 drivers/mtd/ubi/build.c | 274 ++++--
9272 drivers/mtd/ubi/cdev.c | 18 +-
9273 drivers/mtd/ubi/debug.c | 153 ++--
9274 drivers/mtd/ubi/debug.h | 12 +-
9275 drivers/mtd/ubi/eba.c | 159 +++-
9276 drivers/mtd/ubi/fastmap.c | 1560 +++++++++++++++++++++++++++++++++
9277 drivers/mtd/ubi/gluebi.c | 30 +-
9278 drivers/mtd/ubi/io.c | 80 +-
9279 drivers/mtd/ubi/misc.c | 14 +-
9280 drivers/mtd/ubi/ubi-media.h | 137 +++
9281 drivers/mtd/ubi/ubi.h | 134 ++-
9282 drivers/mtd/ubi/vtbl.c | 10 +-
9283 drivers/mtd/ubi/wl.c | 647 ++++++++++++--
9284 include/linux/mtd/partitions.h | 3 +-
9285 include/mtd/ubi-user.h | 16 +-
9286 21 files changed, 3223 insertions(+), 534 deletions(-)
9287 create mode 100644 drivers/mtd/ubi/fastmap.c
9288 $ git reset --hard HEAD^
9289 HEAD is now at d78e000 Merge remote-tracking branch 'ieee1394/for-next'
9290 Merging refs/next/20121002/ubi
9291 $ git merge refs/next/20121002/ubi
9292 Auto-merging drivers/mtd/ubi/vtbl.c
9293 Merge made by the 'recursive' strategy.
9294 arch/arm/configs/sam9_l9260_defconfig | 2 +-
9295 drivers/mtd/mtdpart.c | 12 +-
9296 drivers/mtd/ubi/Kconfig | 40 ++++---
9297 drivers/mtd/ubi/attach.c | 46 ++++----
9298 drivers/mtd/ubi/build.c | 204 ++++++++++++++++++++-------------
9299 drivers/mtd/ubi/cdev.c | 18 +--
9300 drivers/mtd/ubi/debug.c | 153 ++++++++++++-------------
9301 drivers/mtd/ubi/debug.h | 12 +-
9302 drivers/mtd/ubi/eba.c | 33 +++---
9303 drivers/mtd/ubi/gluebi.c | 30 +++--
9304 drivers/mtd/ubi/io.c | 80 +++++++------
9305 drivers/mtd/ubi/misc.c | 14 ++-
9306 drivers/mtd/ubi/ubi.h | 16 +--
9307 drivers/mtd/ubi/vtbl.c | 10 +-
9308 drivers/mtd/ubi/wl.c | 48 +++++---
9309 include/linux/mtd/partitions.h | 3 +-
9310 include/mtd/ubi-user.h | 16 ++-
9311 17 files changed, 412 insertions(+), 325 deletions(-)
9312 Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
9313 $ git merge dlm/next
9315 Merging scsi/for-next (3da4202 Merge branch 'misc' into for-next)
9316 $ git merge scsi/for-next
9317 Resolved 'drivers/scsi/ipr.c' using previous resolution.
9318 Resolved 'drivers/scsi/qla2xxx/qla_nx.c' using previous resolution.
9319 Auto-merging include/linux/pci_ids.h
9320 Auto-merging include/linux/libata.h
9321 Auto-merging drivers/scsi/qla4xxx/ql4_os.c
9322 Auto-merging drivers/scsi/qla4xxx/ql4_nx.c
9323 Auto-merging drivers/scsi/qla2xxx/qla_os.c
9324 Auto-merging drivers/scsi/qla2xxx/qla_nx.c
9325 CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_nx.c
9326 Auto-merging drivers/scsi/mpt2sas/mpt2sas_scsih.c
9327 Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c
9328 Auto-merging drivers/scsi/lpfc/lpfc_sli.c
9329 Auto-merging drivers/scsi/lpfc/lpfc_init.c
9330 Auto-merging drivers/scsi/isci/init.c
9331 Auto-merging drivers/scsi/isci/host.c
9332 Auto-merging drivers/scsi/ipr.c
9333 CONFLICT (content): Merge conflict in drivers/scsi/ipr.c
9334 Removing drivers/scsi/ibmvscsi/rpa_vscsi.c
9335 Auto-merging drivers/scsi/hpsa.c
9336 Auto-merging drivers/scsi/bfa/bfa_ioc.h
9337 Auto-merging drivers/scsi/bfa/bfa_ioc.c
9338 Auto-merging drivers/ata/libata-eh.c
9339 Auto-merging drivers/ata/libata-core.c
9340 Auto-merging MAINTAINERS
9341 Auto-merging Documentation/kernel-parameters.txt
9342 Automatic merge failed; fix conflicts and then commit the result.
9344 [master 73c28a0] Merge remote-tracking branch 'scsi/for-next'
9345 $ git diff -M --stat --summary HEAD^..
9346 Documentation/kernel-parameters.txt | 3 +
9347 Documentation/scsi/ChangeLog.megaraid_sas | 10 +
9348 Documentation/scsi/LICENSE.qla2xxx | 2 +-
9349 Documentation/scsi/LICENSE.qla4xxx | 2 +-
9350 Documentation/scsi/st.txt | 6 +-
9352 drivers/ata/libata-core.c | 69 +-
9353 drivers/ata/libata-eh.c | 2 +
9354 drivers/message/fusion/mptbase.c | 18 +-
9355 drivers/s390/scsi/zfcp_aux.c | 1 +
9356 drivers/s390/scsi/zfcp_ccw.c | 80 +-
9357 drivers/s390/scsi/zfcp_cfdc.c | 2 +-
9358 drivers/s390/scsi/zfcp_dbf.c | 22 +-
9359 drivers/s390/scsi/zfcp_dbf.h | 1 +
9360 drivers/s390/scsi/zfcp_def.h | 2 +
9361 drivers/s390/scsi/zfcp_erp.c | 2 +-
9362 drivers/s390/scsi/zfcp_ext.h | 4 +
9363 drivers/s390/scsi/zfcp_fc.c | 23 +-
9364 drivers/s390/scsi/zfcp_fsf.c | 59 +-
9365 drivers/s390/scsi/zfcp_qdio.c | 16 +-
9366 drivers/s390/scsi/zfcp_sysfs.c | 18 +-
9367 drivers/s390/scsi/zfcp_unit.c | 36 +-
9368 drivers/scsi/be2iscsi/be_cmds.c | 160 ++-
9369 drivers/scsi/be2iscsi/be_cmds.h | 27 +
9370 drivers/scsi/be2iscsi/be_iscsi.c | 355 ++++--
9371 drivers/scsi/be2iscsi/be_main.c | 890 +++++++++------
9372 drivers/scsi/be2iscsi/be_main.h | 40 +-
9373 drivers/scsi/be2iscsi/be_mgmt.c | 314 +++++-
9374 drivers/scsi/be2iscsi/be_mgmt.h | 11 +
9375 drivers/scsi/bfa/bfa_core.c | 21 +-
9376 drivers/scsi/bfa/bfa_cs.h | 4 +-
9377 drivers/scsi/bfa/bfa_defs_fcs.h | 18 +
9378 drivers/scsi/bfa/bfa_fc.h | 10 +
9379 drivers/scsi/bfa/bfa_fcbuild.c | 21 +
9380 drivers/scsi/bfa/bfa_fcbuild.h | 2 +
9381 drivers/scsi/bfa/bfa_fcpim.c | 12 +-
9382 drivers/scsi/bfa/bfa_fcs.c | 182 ++-
9383 drivers/scsi/bfa/bfa_fcs.h | 66 +-
9384 drivers/scsi/bfa/bfa_fcs_fcpim.c | 129 ++-
9385 drivers/scsi/bfa/bfa_fcs_lport.c | 632 ++++++++++-
9386 drivers/scsi/bfa/bfa_fcs_rport.c | 466 ++++++--
9387 drivers/scsi/bfa/bfa_ioc.c | 24 +-
9388 drivers/scsi/bfa/bfa_ioc.h | 2 +
9389 drivers/scsi/bfa/bfa_modules.h | 1 +
9390 drivers/scsi/bfa/bfa_svc.c | 95 +-
9391 drivers/scsi/bfa/bfa_svc.h | 23 +-
9392 drivers/scsi/bfa/bfad.c | 236 +++-
9393 drivers/scsi/bfa/bfad_attr.c | 46 +-
9394 drivers/scsi/bfa/bfad_bsg.c | 39 +-
9395 drivers/scsi/bfa/bfad_bsg.h | 2 +
9396 drivers/scsi/bfa/bfad_drv.h | 5 +-
9397 drivers/scsi/bfa/bfad_im.c | 9 +
9398 drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +-
9399 drivers/scsi/constants.c | 3 +-
9400 drivers/scsi/device_handler/scsi_dh_alua.c | 3 +-
9401 drivers/scsi/device_handler/scsi_dh_rdac.c | 26 +-
9402 drivers/scsi/hpsa.c | 39 +-
9403 drivers/scsi/ibmvscsi/Makefile | 6 +-
9404 drivers/scsi/ibmvscsi/ibmvfc.c | 36 +-
9405 drivers/scsi/ibmvscsi/ibmvfc.h | 4 +-
9406 drivers/scsi/ibmvscsi/ibmvscsi.c | 352 +++++-
9407 drivers/scsi/ibmvscsi/ibmvscsi.h | 22 -
9408 drivers/scsi/ibmvscsi/rpa_vscsi.c | 368 ------
9409 drivers/scsi/ipr.c | 168 ++-
9410 drivers/scsi/ipr.h | 5 +-
9411 drivers/scsi/isci/host.c | 24 +-
9412 drivers/scsi/isci/host.h | 2 +-
9413 drivers/scsi/isci/init.c | 59 +-
9414 drivers/scsi/isci/phy.c | 4 +-
9415 drivers/scsi/isci/probe_roms.c | 1 -
9416 drivers/scsi/isci/remote_node_context.h | 2 +-
9417 drivers/scsi/iscsi_tcp.c | 2 +-
9418 drivers/scsi/libsas/sas_ata.c | 91 +-
9419 drivers/scsi/libsas/sas_discover.c | 69 +-
9420 drivers/scsi/libsas/sas_dump.c | 1 +
9421 drivers/scsi/libsas/sas_event.c | 4 +-
9422 drivers/scsi/libsas/sas_init.c | 90 +-
9423 drivers/scsi/libsas/sas_internal.h | 1 +
9424 drivers/scsi/libsas/sas_phy.c | 21 +
9425 drivers/scsi/libsas/sas_port.c | 52 +-
9426 drivers/scsi/lpfc/lpfc.h | 6 +-
9427 drivers/scsi/lpfc/lpfc_attr.c | 76 +-
9428 drivers/scsi/lpfc/lpfc_bsg.c | 8 +-
9429 drivers/scsi/lpfc/lpfc_crtn.h | 6 +-
9430 drivers/scsi/lpfc/lpfc_ct.c | 16 +-
9431 drivers/scsi/lpfc/lpfc_debugfs.c | 494 ++++----
9432 drivers/scsi/lpfc/lpfc_debugfs.h | 72 +-
9433 drivers/scsi/lpfc/lpfc_disc.h | 10 +-
9434 drivers/scsi/lpfc/lpfc_els.c | 186 +++-
9435 drivers/scsi/lpfc/lpfc_hbadisc.c | 98 +-
9436 drivers/scsi/lpfc/lpfc_hw.h | 18 +-
9437 drivers/scsi/lpfc/lpfc_hw4.h | 42 +-
9438 drivers/scsi/lpfc/lpfc_init.c | 839 +++++++-------
9439 drivers/scsi/lpfc/lpfc_mbox.c | 38 +-
9440 drivers/scsi/lpfc/lpfc_mem.c | 6 +-
9441 drivers/scsi/lpfc/lpfc_nportdisc.c | 127 +++
9442 drivers/scsi/lpfc/lpfc_scsi.c | 144 ++-
9443 drivers/scsi/lpfc/lpfc_sli.c | 621 ++++++-----
9444 drivers/scsi/lpfc/lpfc_sli.h | 42 +-
9445 drivers/scsi/lpfc/lpfc_sli4.h | 63 +-
9446 drivers/scsi/lpfc/lpfc_version.h | 7 +-
9447 drivers/scsi/megaraid/megaraid_sas.h | 8 +-
9448 drivers/scsi/megaraid/megaraid_sas_base.c | 39 +-
9449 drivers/scsi/megaraid/megaraid_sas_fusion.c | 12 +-
9450 drivers/scsi/mpt2sas/Kconfig | 2 +-
9451 drivers/scsi/mpt2sas/mpi/mpi2.h | 14 +-
9452 drivers/scsi/mpt2sas/mpi/mpi2_init.h | 9 +-
9453 drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 8 +-
9454 drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 7 +-
9455 drivers/scsi/mpt2sas/mpt2sas_base.c | 6 +-
9456 drivers/scsi/mpt2sas/mpt2sas_base.h | 14 +-
9457 drivers/scsi/mpt2sas/mpt2sas_config.c | 38 +-
9458 drivers/scsi/mpt2sas/mpt2sas_ctl.c | 80 +-
9459 drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +-
9460 drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +-
9461 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 59 +-
9462 drivers/scsi/mpt2sas/mpt2sas_transport.c | 2 +-
9463 drivers/scsi/mvsas/mv_sas.c | 2 +-
9464 drivers/scsi/qla2xxx/qla_attr.c | 147 ++-
9465 drivers/scsi/qla2xxx/qla_bsg.c | 376 ++++++-
9466 drivers/scsi/qla2xxx/qla_bsg.h | 30 +-
9467 drivers/scsi/qla2xxx/qla_dbg.c | 29 +-
9468 drivers/scsi/qla2xxx/qla_dbg.h | 2 +-
9469 drivers/scsi/qla2xxx/qla_def.h | 166 ++-
9470 drivers/scsi/qla2xxx/qla_dfs.c | 2 +-
9471 drivers/scsi/qla2xxx/qla_fw.h | 49 +-
9472 drivers/scsi/qla2xxx/qla_gbl.h | 39 +-
9473 drivers/scsi/qla2xxx/qla_gs.c | 4 +-
9474 drivers/scsi/qla2xxx/qla_init.c | 565 ++++++++--
9475 drivers/scsi/qla2xxx/qla_inline.h | 28 +-
9476 drivers/scsi/qla2xxx/qla_iocb.c | 261 ++++-
9477 drivers/scsi/qla2xxx/qla_isr.c | 437 +++++++-
9478 drivers/scsi/qla2xxx/qla_mbx.c | 224 +++-
9479 drivers/scsi/qla2xxx/qla_mid.c | 5 +-
9480 drivers/scsi/qla2xxx/qla_nx.c | 151 +--
9481 drivers/scsi/qla2xxx/qla_nx.h | 17 +-
9482 drivers/scsi/qla2xxx/qla_os.c | 770 ++++++++++++-
9483 drivers/scsi/qla2xxx/qla_settings.h | 2 +-
9484 drivers/scsi/qla2xxx/qla_sup.c | 67 +-
9485 drivers/scsi/qla2xxx/qla_version.h | 6 +-
9486 drivers/scsi/qla4xxx/Kconfig | 4 +-
9487 drivers/scsi/qla4xxx/Makefile | 2 +-
9488 drivers/scsi/qla4xxx/ql4_83xx.c | 1611 +++++++++++++++++++++++++++
9489 drivers/scsi/qla4xxx/ql4_83xx.h | 283 +++++
9490 drivers/scsi/qla4xxx/ql4_attr.c | 26 +-
9491 drivers/scsi/qla4xxx/ql4_dbg.c | 32 +-
9492 drivers/scsi/qla4xxx/ql4_dbg.h | 2 +-
9493 drivers/scsi/qla4xxx/ql4_def.h | 65 +-
9494 drivers/scsi/qla4xxx/ql4_fw.h | 59 +-
9495 drivers/scsi/qla4xxx/ql4_glbl.h | 94 +-
9496 drivers/scsi/qla4xxx/ql4_init.c | 23 +-
9497 drivers/scsi/qla4xxx/ql4_inline.h | 2 +-
9498 drivers/scsi/qla4xxx/ql4_iocb.c | 28 +-
9499 drivers/scsi/qla4xxx/ql4_isr.c | 406 +++++--
9500 drivers/scsi/qla4xxx/ql4_mbx.c | 186 ++--
9501 drivers/scsi/qla4xxx/ql4_nvram.c | 2 +-
9502 drivers/scsi/qla4xxx/ql4_nvram.h | 2 +-
9503 drivers/scsi/qla4xxx/ql4_nx.c | 1432 ++++++++++++++++--------
9504 drivers/scsi/qla4xxx/ql4_nx.h | 198 ++--
9505 drivers/scsi/qla4xxx/ql4_os.c | 494 +++++---
9506 drivers/scsi/qla4xxx/ql4_version.h | 4 +-
9507 drivers/scsi/scsi_debug.c | 30 +-
9508 drivers/scsi/scsi_devinfo.c | 1 +
9509 drivers/scsi/scsi_lib.c | 3 +-
9510 drivers/scsi/scsi_scan.c | 3 +
9511 drivers/scsi/scsi_sysfs.c | 30 +-
9512 drivers/scsi/sd.c | 80 +-
9513 drivers/scsi/sd.h | 2 +-
9514 drivers/scsi/sd_dif.c | 25 +-
9515 drivers/scsi/st.c | 416 +++----
9516 drivers/scsi/st.h | 5 +-
9517 include/linux/libata.h | 15 +-
9518 include/linux/pci_ids.h | 1 +
9519 include/scsi/libsas.h | 20 +-
9520 include/scsi/sas_ata.h | 10 +
9521 include/scsi/scsi_bsg_fc.h | 2 -
9522 include/scsi/scsi_device.h | 4 +
9523 include/scsi/scsi_devinfo.h | 1 +
9524 include/scsi/scsi_host.h | 6 +
9525 179 files changed, 13464 insertions(+), 4430 deletions(-)
9526 delete mode 100644 drivers/scsi/ibmvscsi/rpa_vscsi.c
9527 create mode 100644 drivers/scsi/qla4xxx/ql4_83xx.c
9528 create mode 100644 drivers/scsi/qla4xxx/ql4_83xx.h
9529 Merging target-updates/for-next (cea0b4c iscsit: add missing endianess conversion in iscsit_check_inaddr_any)
9530 $ git merge target-updates/for-next
9531 Auto-merging drivers/usb/gadget/tcm_usb_gadget.c
9532 Auto-merging drivers/target/iscsi/iscsi_target_parameters.c
9533 Auto-merging drivers/scsi/qla2xxx/qla_target.c
9534 Merge made by the 'recursive' strategy.
9535 Documentation/target/tcm_mod_builder.py | 16 --
9536 drivers/infiniband/ulp/srpt/ib_srpt.c | 12 -
9537 drivers/scsi/qla2xxx/qla_target.c | 2 +-
9538 drivers/scsi/qla2xxx/tcm_qla2xxx.c | 15 --
9539 drivers/target/iscsi/iscsi_target.c | 43 ++--
9540 drivers/target/iscsi/iscsi_target.h | 5 +
9541 drivers/target/iscsi/iscsi_target_configfs.c | 39 +---
9542 drivers/target/iscsi/iscsi_target_core.h | 2 +
9543 drivers/target/iscsi/iscsi_target_erl0.c | 14 +-
9544 drivers/target/iscsi/iscsi_target_erl2.c | 5 +-
9545 drivers/target/iscsi/iscsi_target_login.c | 4 -
9546 drivers/target/iscsi/iscsi_target_nego.c | 7 +-
9547 drivers/target/iscsi/iscsi_target_parameters.c | 71 +++++-
9548 drivers/target/iscsi/iscsi_target_parameters.h | 7 +-
9549 drivers/target/iscsi/iscsi_target_seq_pdu_list.c | 61 ++---
9550 drivers/target/iscsi/iscsi_target_tmr.c | 15 +-
9551 drivers/target/iscsi/iscsi_target_tpg.c | 12 +
9552 drivers/target/iscsi/iscsi_target_tq.c | 6 +-
9553 drivers/target/iscsi/iscsi_target_tq.h | 1 -
9554 drivers/target/loopback/tcm_loop.c | 74 +-----
9555 drivers/target/sbp/sbp_target.c | 27 +--
9556 drivers/target/target_core_alua.c | 2 +-
9557 drivers/target/target_core_configfs.c | 18 +-
9558 drivers/target/target_core_device.c | 16 +-
9559 drivers/target/target_core_fabric_configfs.c | 1 -
9560 drivers/target/target_core_fabric_lib.c | 8 +-
9561 drivers/target/target_core_file.c | 43 +++-
9562 drivers/target/target_core_file.h | 1 +
9563 drivers/target/target_core_iblock.c | 17 +-
9564 drivers/target/target_core_pr.c | 14 +-
9565 drivers/target/target_core_pscsi.c | 2 +-
9566 drivers/target/target_core_sbc.c | 23 +-
9567 drivers/target/target_core_spc.c | 48 ++--
9568 drivers/target/target_core_stat.c | 1 -
9569 drivers/target/target_core_tpg.c | 2 +-
9570 drivers/target/target_core_transport.c | 268 ++++++++++++----------
9571 drivers/target/tcm_fc/tfc_cmd.c | 1 -
9572 drivers/target/tcm_fc/tfc_conf.c | 12 -
9573 drivers/target/tcm_fc/tfc_io.c | 4 +-
9574 drivers/target/tcm_fc/tfc_sess.c | 1 -
9575 drivers/usb/gadget/tcm_usb_gadget.c | 15 +-
9576 drivers/vhost/tcm_vhost.c | 81 ++-----
9577 drivers/vhost/tcm_vhost.h | 8 +
9578 include/target/target_core_backend.h | 3 -
9579 include/target/target_core_fabric.h | 5 +-
9580 45 files changed, 481 insertions(+), 551 deletions(-)
9581 Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2)
9582 $ git merge target-merge/for-next-merge
9584 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
9585 $ git merge ibft/linux-next
9587 Merging isci/all (6734092 isci: add a couple __iomem annotations)
9588 $ git merge isci/all
9590 Merging slave-dma/next (3d4f860 dw_dmac: fix a regression in dwc_prep_dma_memcpy)
9591 $ git merge slave-dma/next
9592 Resolved 'drivers/dma/mmp_tdma.c' using previous resolution.
9593 Resolved 'drivers/mmc/host/davinci_mmc.c' using previous resolution.
9594 Resolved 'drivers/spi/spi-davinci.c' using previous resolution.
9595 Auto-merging drivers/spi/spi-davinci.c
9596 CONFLICT (content): Merge conflict in drivers/spi/spi-davinci.c
9597 Auto-merging drivers/spi/Kconfig
9598 Auto-merging drivers/mmc/host/davinci_mmc.c
9599 CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
9600 Auto-merging drivers/dma/tegra20-apb-dma.c
9601 Auto-merging drivers/dma/pl330.c
9602 Auto-merging drivers/dma/mmp_tdma.c
9603 CONFLICT (content): Merge conflict in drivers/dma/mmp_tdma.c
9604 Auto-merging arch/arm/mach-spear13xx/spear13xx.c
9605 Automatic merge failed; fix conflicts and then commit the result.
9607 [master 4440cca] Merge remote-tracking branch 'slave-dma/next'
9608 $ git diff -M --stat --summary HEAD^..
9609 arch/arm/mach-exynos/dma.c | 2 +
9610 arch/arm/mach-spear13xx/spear13xx.c | 3 +
9611 arch/avr32/mach-at32ap/at32ap700x.c | 3 +
9612 drivers/dma/Kconfig | 17 +
9613 drivers/dma/Makefile | 2 +
9614 drivers/dma/amba-pl08x.c | 2 +
9615 drivers/dma/dw_dmac.c | 258 +++++++---
9616 drivers/dma/dw_dmac_regs.h | 48 +-
9617 drivers/dma/edma.c | 671 +++++++++++++++++++++++++
9618 drivers/dma/ioat/dma_v2.c | 3 +-
9619 drivers/dma/ioat/pci.c | 22 +
9620 drivers/dma/mmp_pdma.c | 875 +++++++++++++++++++++++++++++++++
9621 drivers/dma/mmp_tdma.c | 51 +-
9622 drivers/dma/mxs-dma.c | 14 +-
9623 drivers/dma/pl330.c | 76 +--
9624 drivers/dma/sirf-dma.c | 23 +-
9625 drivers/dma/ste_dma40.c | 14 +-
9626 drivers/dma/tegra20-apb-dma.c | 6 +-
9627 drivers/mmc/host/davinci_mmc.c | 271 +++-------
9628 drivers/spi/Kconfig | 1 +
9629 drivers/spi/spi-davinci.c | 292 +++++------
9630 include/linux/dw_dmac.h | 7 +
9631 include/linux/edma.h | 29 ++
9632 include/linux/platform_data/mmp_dma.h | 19 +
9633 24 files changed, 2163 insertions(+), 546 deletions(-)
9634 create mode 100644 drivers/dma/edma.c
9635 create mode 100644 drivers/dma/mmp_pdma.c
9636 create mode 100644 include/linux/edma.h
9637 create mode 100644 include/linux/platform_data/mmp_dma.h
9638 $ git am -3 ../patches/DMA__PL330__Fix_build_error_on_linux-next-20120924.patch
9639 Applying: DMA: PL330: Fix build error (on linux-next-20120924)
9641 Unstaged changes after reset:
9642 M drivers/dma/pl330.c
9644 $ git commit -v -a --amend
9645 [master b7a7e38] Merge remote-tracking branch 'slave-dma/next'
9646 Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
9647 $ git merge dmaengine/next
9649 Merging net-next/master (a3a6cab hyperv: Add buffer for extended info after the RNDIS response message.)
9650 $ git merge net-next/master
9652 Merging wireless-next/master (5160b46 ath9k: Fix BTCOEX weight initialization)
9653 $ git merge wireless-next/master
9655 Merging bluetooth/master (dfee1eb Bluetooth: remove unused member of hci_dev.)
9656 $ git merge bluetooth/master
9657 Auto-merging net/bluetooth/rfcomm/tty.c
9658 Auto-merging net/bluetooth/rfcomm/sock.c
9659 Auto-merging net/bluetooth/mgmt.c
9660 Auto-merging net/bluetooth/l2cap_core.c
9661 Auto-merging net/bluetooth/hci_core.c
9662 Merge made by the 'recursive' strategy.
9663 drivers/bluetooth/btmrvl_sdio.c | 24 +-
9664 include/net/bluetooth/a2mp.h | 22 ++
9665 include/net/bluetooth/amp.h | 50 ++++
9666 include/net/bluetooth/bluetooth.h | 1 -
9667 include/net/bluetooth/hci.h | 39 +++-
9668 include/net/bluetooth/hci_core.h | 13 +-
9669 include/net/bluetooth/l2cap.h | 4 +
9670 net/bluetooth/Kconfig | 1 +
9671 net/bluetooth/Makefile | 2 +-
9672 net/bluetooth/a2mp.c | 458 ++++++++++++++++++++++++++++++++++---
9673 net/bluetooth/af_bluetooth.c | 10 +-
9674 net/bluetooth/amp.c | 367 +++++++++++++++++++++++++++++
9675 net/bluetooth/bnep/core.c | 3 +-
9676 net/bluetooth/cmtp/core.c | 2 +-
9677 net/bluetooth/hci_conn.c | 6 +-
9678 net/bluetooth/hci_core.c | 30 +--
9679 net/bluetooth/hci_event.c | 141 +++++++++++-
9680 net/bluetooth/hci_sysfs.c | 10 +-
9681 net/bluetooth/hidp/core.c | 8 +-
9682 net/bluetooth/l2cap_core.c | 84 ++++---
9683 net/bluetooth/lib.c | 14 --
9684 net/bluetooth/mgmt.c | 5 +-
9685 net/bluetooth/rfcomm/core.c | 15 +-
9686 net/bluetooth/rfcomm/sock.c | 9 +-
9687 net/bluetooth/rfcomm/tty.c | 6 +-
9688 net/bluetooth/sco.c | 12 +-
9689 26 files changed, 1185 insertions(+), 151 deletions(-)
9690 create mode 100644 include/net/bluetooth/amp.h
9691 create mode 100644 net/bluetooth/amp.c
9692 Merging mtd/master (e2d3a35 mtd: nand: detect Samsung K9GBG08U0A, K9GAG08U0F ID)
9693 $ git merge mtd/master
9694 Resolved 'MAINTAINERS' using previous resolution.
9695 Resolved 'arch/arm/mach-imx/clk-imx51-imx53.c' using previous resolution.
9696 Resolved 'drivers/mtd/nand/Kconfig' using previous resolution.
9697 Resolved 'drivers/mtd/nand/orion_nand.c' using previous resolution.
9698 Auto-merging fs/jffs2/super.c
9699 Auto-merging drivers/mtd/nand/s3c2410.c
9700 Auto-merging drivers/mtd/nand/pxa3xx_nand.c
9701 Auto-merging drivers/mtd/nand/orion_nand.c
9702 CONFLICT (content): Merge conflict in drivers/mtd/nand/orion_nand.c
9703 Auto-merging drivers/mtd/nand/omap2.c
9704 CONFLICT (modify/delete): drivers/mtd/nand/nand_bcm_umi.h deleted in mtd/master and modified in HEAD. Version HEAD of drivers/mtd/nand/nand_bcm_umi.h left in tree.
9705 Removing drivers/mtd/nand/nand_bcm_umi.c
9706 Auto-merging drivers/mtd/nand/mxc_nand.c
9707 Auto-merging drivers/mtd/nand/fsl_ifc_nand.c
9708 Auto-merging drivers/mtd/nand/davinci_nand.c
9709 CONFLICT (modify/delete): drivers/mtd/nand/bcm_umi_nand.c deleted in mtd/master and modified in HEAD. Version HEAD of drivers/mtd/nand/bcm_umi_nand.c left in tree.
9710 Removing drivers/mtd/nand/bcm_umi_bch.c
9711 Auto-merging drivers/mtd/nand/ams-delta.c
9712 Auto-merging drivers/mtd/nand/Kconfig
9713 CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig
9714 Auto-merging drivers/mtd/mtdpart.c
9715 Auto-merging drivers/mtd/mtdoops.c
9716 Removing drivers/mtd/maps/wr_sbc82xx_flash.c
9717 Auto-merging arch/powerpc/configs/mpc83xx_defconfig
9718 Auto-merging arch/arm/mach-imx/clk-imx51-imx53.c
9719 CONFLICT (content): Merge conflict in arch/arm/mach-imx/clk-imx51-imx53.c
9720 CONFLICT (modify/delete): arch/arm/configs/bcmring_defconfig deleted in HEAD and modified in mtd/master. Version mtd/master of arch/arm/configs/bcmring_defconfig left in tree.
9721 Auto-merging arch/arm/boot/dts/imx53.dtsi
9722 Auto-merging arch/arm/boot/dts/imx51.dtsi
9723 Auto-merging MAINTAINERS
9724 CONFLICT (content): Merge conflict in MAINTAINERS
9725 Automatic merge failed; fix conflicts and then commit the result.
9726 $ git rm -f arch/arm/configs/bcmring_defconfig drivers/mtd/nand/bcm_umi_nand.c drivers/mtd/nand/nand_bcm_umi.h
9727 arch/arm/configs/bcmring_defconfig: needs merge
9728 drivers/mtd/nand/bcm_umi_nand.c: needs merge
9729 drivers/mtd/nand/nand_bcm_umi.h: needs merge
9730 rm 'arch/arm/configs/bcmring_defconfig'
9731 rm 'drivers/mtd/nand/bcm_umi_nand.c'
9732 rm 'drivers/mtd/nand/nand_bcm_umi.h'
9734 [master d5e3e3c] Merge remote-tracking branch 'mtd/master'
9735 $ git diff -M --stat --summary HEAD^..
9736 Documentation/DocBook/mtdnand.tmpl | 2 -
9737 .../devicetree/bindings/arm/davinci/nand.txt | 51 +
9738 .../devicetree/bindings/mtd/atmel-nand.txt | 40 +-
9739 .../devicetree/bindings/mtd/gpmi-nand.txt | 4 +
9740 .../devicetree/bindings/mtd/lpc32xx-mlc.txt | 50 +
9741 .../devicetree/bindings/mtd/lpc32xx-slc.txt | 52 +
9742 .../devicetree/bindings/mtd/mtd-physmap.txt | 7 +
9743 arch/arm/boot/dts/imx51.dtsi | 7 +
9744 arch/arm/boot/dts/imx53.dtsi | 7 +
9745 arch/arm/configs/cam60_defconfig | 1 -
9746 arch/arm/configs/corgi_defconfig | 1 -
9747 arch/arm/configs/ep93xx_defconfig | 1 -
9748 arch/arm/configs/mini2440_defconfig | 1 -
9749 arch/arm/configs/mv78xx0_defconfig | 1 -
9750 arch/arm/configs/nhk8815_defconfig | 1 -
9751 arch/arm/configs/orion5x_defconfig | 1 -
9752 arch/arm/configs/pxa3xx_defconfig | 1 -
9753 arch/arm/configs/spitz_defconfig | 1 -
9754 arch/arm/mach-clps711x/autcpu12.c | 19 +
9755 arch/arm/mach-imx/clk-imx51-imx53.c | 2 +
9756 arch/arm/plat-mxc/devices/platform-mxc_nand.c | 11 +-
9757 arch/blackfin/configs/BF561-ACVILON_defconfig | 1 -
9758 arch/mips/configs/rb532_defconfig | 1 -
9759 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 1 -
9760 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 1 -
9761 arch/powerpc/configs/mpc83xx_defconfig | 1 -
9762 drivers/mtd/Kconfig | 7 +
9763 drivers/mtd/Makefile | 1 +
9764 drivers/mtd/bcm47xxpart.c | 202 ++++
9765 drivers/mtd/chips/Kconfig | 11 +-
9766 drivers/mtd/chips/cfi_cmdset_0001.c | 14 +-
9767 drivers/mtd/chips/cfi_cmdset_0002.c | 67 ++
9768 drivers/mtd/cmdlinepart.c | 183 ++--
9769 drivers/mtd/devices/Kconfig | 10 +-
9770 drivers/mtd/devices/Makefile | 1 +
9771 drivers/mtd/devices/bcm47xxsflash.c | 105 ++
9772 drivers/mtd/devices/doc2001plus.c | 14 +-
9773 drivers/mtd/devices/docg3.c | 12 +-
9774 drivers/mtd/devices/m25p80.c | 24 +-
9775 drivers/mtd/devices/spear_smi.c | 141 +--
9776 drivers/mtd/maps/Kconfig | 16 +-
9777 drivers/mtd/maps/Makefile | 1 -
9778 drivers/mtd/maps/autcpu12-nvram.c | 153 +--
9779 drivers/mtd/maps/pci.c | 23 -
9780 drivers/mtd/maps/physmap_of.c | 14 +
9781 drivers/mtd/maps/rbtx4939-flash.c | 2 -
9782 drivers/mtd/maps/uclinux.c | 15 +-
9783 drivers/mtd/maps/wr_sbc82xx_flash.c | 174 ----
9784 drivers/mtd/mtdcore.c | 21 +
9785 drivers/mtd/mtdoops.c | 14 +-
9786 drivers/mtd/mtdpart.c | 5 +-
9787 drivers/mtd/nand/Kconfig | 63 +-
9788 drivers/mtd/nand/Makefile | 4 +-
9789 drivers/mtd/nand/ams-delta.c | 13 -
9790 drivers/mtd/nand/atmel_nand.c | 987 +++++++++++++++++--
9791 drivers/mtd/nand/atmel_nand_ecc.h | 114 ++-
9792 drivers/mtd/nand/au1550nd.c | 46 -
9793 drivers/mtd/nand/bcm_umi_bch.c | 217 ----
9794 drivers/mtd/nand/bcm_umi_nand.c | 555 -----------
9795 drivers/mtd/nand/bf5xx_nand.c | 6 +-
9796 drivers/mtd/nand/cafe_nand.c | 20 +-
9797 drivers/mtd/nand/cmx270_nand.c | 13 -
9798 drivers/mtd/nand/davinci_nand.c | 78 +-
9799 drivers/mtd/nand/denali.c | 12 +-
9800 drivers/mtd/nand/diskonchip.c | 63 --
9801 drivers/mtd/nand/docg4.c | 43 +-
9802 drivers/mtd/nand/fsl_elbc_nand.c | 51 +-
9803 drivers/mtd/nand/fsl_ifc_nand.c | 52 +-
9804 drivers/mtd/nand/gpio.c | 54 +-
9805 drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 322 +++++-
9806 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 152 ++-
9807 drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 26 +-
9808 drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 12 +
9809 drivers/mtd/nand/lpc32xx_mlc.c | 924 +++++++++++++++++
9810 drivers/mtd/nand/lpc32xx_slc.c | 1039 ++++++++++++++++++++
9811 drivers/mtd/nand/mpc5121_nfc.c | 22 -
9812 drivers/mtd/nand/mxc_nand.c | 168 ++--
9813 drivers/mtd/nand/nand_base.c | 529 ++++++----
9814 drivers/mtd/nand/nand_bbt.c | 148 +--
9815 drivers/mtd/nand/nand_bcm_umi.c | 149 ---
9816 drivers/mtd/nand/nand_bcm_umi.h | 336 -------
9817 drivers/mtd/nand/nand_ids.c | 7 +-
9818 drivers/mtd/nand/nandsim.c | 17 +-
9819 drivers/mtd/nand/ndfc.c | 13 -
9820 drivers/mtd/nand/nuc900_nand.c | 17 -
9821 drivers/mtd/nand/omap2.c | 36 +-
9822 drivers/mtd/nand/orion_nand.c | 1 -
9823 drivers/mtd/nand/plat_nand.c | 5 +
9824 drivers/mtd/nand/pxa3xx_nand.c | 12 +-
9825 drivers/mtd/nand/r852.c | 22 -
9826 drivers/mtd/nand/s3c2410.c | 191 ++--
9827 drivers/mtd/nand/sh_flctl.c | 327 +++---
9828 drivers/mtd/nand/socrates_nand.c | 19 -
9829 drivers/mtd/nand/tmio_nand.c | 13 -
9830 drivers/mtd/nand/txx9ndfmc.c | 13 -
9831 drivers/mtd/nand/xway_nand.c | 201 ++++
9832 drivers/mtd/sm_ftl.c | 1 -
9833 drivers/mtd/tests/Makefile | 1 +
9834 drivers/mtd/tests/mtd_nandbiterrs.c | 460 +++++++++
9835 drivers/mtd/tests/mtd_nandecctest.c | 294 +++++-
9836 drivers/mtd/tests/mtd_speedtest.c | 16 +-
9837 drivers/mtd/tests/mtd_stresstest.c | 39 +-
9838 fs/jffs2/super.c | 4 +
9839 fs/jffs2/wbuf.c | 8 +-
9840 include/linux/bcma/bcma_driver_chipcommon.h | 2 +
9841 include/linux/mtd/bbm.h | 7 +-
9842 include/linux/mtd/lpc32xx_mlc.h | 20 +
9843 include/linux/mtd/lpc32xx_slc.h | 20 +
9844 include/linux/mtd/mtd.h | 9 +-
9845 include/linux/mtd/nand.h | 72 +-
9846 include/linux/mtd/sh_flctl.h | 23 +-
9847 111 files changed, 6351 insertions(+), 3233 deletions(-)
9848 create mode 100644 Documentation/devicetree/bindings/arm/davinci/nand.txt
9849 create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt
9850 create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt
9851 create mode 100644 drivers/mtd/bcm47xxpart.c
9852 create mode 100644 drivers/mtd/devices/bcm47xxsflash.c
9853 delete mode 100644 drivers/mtd/maps/wr_sbc82xx_flash.c
9854 delete mode 100644 drivers/mtd/nand/bcm_umi_bch.c
9855 delete mode 100644 drivers/mtd/nand/bcm_umi_nand.c
9856 create mode 100644 drivers/mtd/nand/lpc32xx_mlc.c
9857 create mode 100644 drivers/mtd/nand/lpc32xx_slc.c
9858 delete mode 100644 drivers/mtd/nand/nand_bcm_umi.c
9859 delete mode 100644 drivers/mtd/nand/nand_bcm_umi.h
9860 create mode 100644 drivers/mtd/nand/xway_nand.c
9861 create mode 100644 drivers/mtd/tests/mtd_nandbiterrs.c
9862 create mode 100644 include/linux/mtd/lpc32xx_mlc.h
9863 create mode 100644 include/linux/mtd/lpc32xx_slc.h
9864 Merging l2-mtd/master (e2d3a35 mtd: nand: detect Samsung K9GBG08U0A, K9GAG08U0F ID)
9865 $ git merge l2-mtd/master
9867 Merging crypto/master (200429c crypto: cast5/avx - fix storing of new IV in CBC encryption)
9868 $ git merge crypto/master
9869 Resolved 'crypto/Kconfig' using previous resolution.
9870 Auto-merging drivers/crypto/ux500/hash/hash_core.c
9871 Auto-merging drivers/crypto/ux500/cryp/cryp_core.c
9872 Auto-merging drivers/crypto/hifn_795x.c
9873 Auto-merging drivers/crypto/caam/key_gen.c
9874 Auto-merging crypto/crypto_user.c
9875 Auto-merging crypto/cast6_generic.c
9876 Auto-merging crypto/cast5_generic.c
9877 Auto-merging crypto/Kconfig
9878 CONFLICT (content): Merge conflict in crypto/Kconfig
9879 Auto-merging arch/powerpc/kernel/prom_init.c
9880 Auto-merging arch/powerpc/configs/pseries_defconfig
9881 Auto-merging arch/powerpc/configs/ppc64_defconfig
9882 Auto-merging arch/arm/Makefile
9883 Auto-merging MAINTAINERS
9884 Automatic merge failed; fix conflicts and then commit the result.
9886 [master abd0d08] Merge remote-tracking branch 'crypto/master'
9887 $ git diff -M --stat --summary HEAD^..
9889 arch/arm/Makefile | 1 +
9890 arch/arm/crypto/Makefile | 9 +
9891 arch/arm/crypto/aes-armv4.S | 1112 ++++++
9892 arch/arm/crypto/aes_glue.c | 108 +
9893 arch/arm/crypto/sha1-armv4-large.S | 503 +++
9894 arch/arm/crypto/sha1_glue.c | 179 +
9895 arch/powerpc/configs/ppc64_defconfig | 3 +-
9896 arch/powerpc/configs/pseries_defconfig | 3 +-
9897 arch/powerpc/kernel/prom_init.c | 4 +-
9898 arch/s390/crypto/aes_s390.c | 5 -
9899 arch/s390/crypto/des_s390.c | 10 -
9900 arch/s390/crypto/ghash_s390.c | 1 -
9901 arch/x86/crypto/Makefile | 4 +
9902 arch/x86/crypto/aes_glue.c | 1 -
9903 arch/x86/crypto/aesni-intel_glue.c | 258 +-
9904 arch/x86/crypto/blowfish_glue.c | 4 -
9905 arch/x86/crypto/camellia_glue.c | 1382 ++++---
9906 arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 376 ++
9907 arch/x86/crypto/cast5_avx_glue.c | 530 +++
9908 arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 383 ++
9909 arch/x86/crypto/cast6_avx_glue.c | 648 ++++
9910 arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 -
9911 arch/x86/crypto/salsa20_glue.c | 1 -
9912 arch/x86/crypto/serpent_avx_glue.c | 10 -
9913 arch/x86/crypto/serpent_sse2_glue.c | 10 -
9914 arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 227 +-
9915 arch/x86/crypto/twofish_avx_glue.c | 10 -
9916 arch/x86/crypto/twofish_glue.c | 1 -
9917 arch/x86/crypto/twofish_glue_3way.c | 5 -
9918 crypto/842.c | 182 +
9919 crypto/Kconfig | 75 +
9920 crypto/Makefile | 5 +-
9921 crypto/aes_generic.c | 1 -
9922 crypto/ansi_cprng.c | 63 +-
9923 crypto/anubis.c | 1 -
9924 crypto/blowfish_generic.c | 1 -
9925 crypto/camellia_generic.c | 1 -
9926 crypto/{cast5.c => cast5_generic.c} | 80 +-
9927 crypto/{cast6.c => cast6_generic.c} | 73 +-
9928 crypto/crypto_null.c | 57 +-
9929 crypto/crypto_user.c | 2 +-
9930 crypto/deflate.c | 1 -
9931 crypto/des_generic.c | 25 +-
9932 crypto/fcrypt.c | 1 -
9933 crypto/ghash-generic.c | 1 -
9934 crypto/khazad.c | 1 -
9937 crypto/salsa20_generic.c | 1 -
9939 crypto/serpent_generic.c | 53 +-
9940 crypto/sha256_generic.c | 25 +-
9941 crypto/sha512_generic.c | 20 +-
9942 crypto/shash.c | 36 +
9943 crypto/tcrypt.c | 95 +-
9944 crypto/tcrypt.h | 1 +
9945 crypto/tea.c | 41 +-
9946 crypto/testmgr.c | 472 ++-
9947 crypto/testmgr.h | 5165 ++++++++++++++++++++++-----
9948 crypto/tgr192.c | 38 +-
9949 crypto/twofish_generic.c | 1 -
9950 crypto/vmac.c | 10 +-
9951 crypto/wp512.c | 39 +-
9952 drivers/char/hw_random/mxc-rnga.c | 108 +-
9953 drivers/char/hw_random/octeon-rng.c | 17 +-
9954 drivers/crypto/Kconfig | 22 +-
9955 drivers/crypto/amcc/crypto4xx_core.c | 1 +
9956 drivers/crypto/atmel-aes.c | 7 -
9957 drivers/crypto/atmel-sha.c | 5 -
9958 drivers/crypto/atmel-tdes.c | 6 -
9959 drivers/crypto/caam/caamalg.c | 51 +-
9960 drivers/crypto/caam/caamhash.c | 22 +-
9961 drivers/crypto/caam/caamrng.c | 9 +-
9962 drivers/crypto/caam/compat.h | 1 +
9963 drivers/crypto/caam/ctrl.c | 6 +-
9964 drivers/crypto/caam/error.c | 2 -
9965 drivers/crypto/caam/key_gen.c | 4 +
9966 drivers/crypto/geode-aes.c | 18 +-
9967 drivers/crypto/hifn_795x.c | 5 +-
9968 drivers/crypto/nx/Kconfig | 26 +
9969 drivers/crypto/nx/Makefile | 5 +-
9970 drivers/crypto/nx/nx-842.c | 1617 +++++++++
9971 drivers/crypto/nx/nx-aes-cbc.c | 1 -
9972 drivers/crypto/nx/nx-aes-ccm.c | 2 -
9973 drivers/crypto/nx/nx-aes-ctr.c | 2 -
9974 drivers/crypto/nx/nx-aes-ecb.c | 1 -
9975 drivers/crypto/nx/nx-aes-gcm.c | 2 -
9976 drivers/crypto/omap-aes.c | 1 -
9977 drivers/crypto/padlock-aes.c | 3 -
9978 drivers/crypto/s5p-sss.c | 1 -
9979 drivers/crypto/talitos.c | 442 +--
9980 drivers/crypto/tegra-aes.c | 3 +-
9981 drivers/crypto/ux500/cryp/cryp_core.c | 1 +
9982 drivers/crypto/ux500/hash/hash_core.c | 1 -
9983 include/crypto/cast5.h | 27 +
9984 include/crypto/cast6.h | 28 +
9985 include/crypto/internal/hash.h | 2 +
9986 include/linux/nx842.h | 11 +
9987 99 files changed, 12276 insertions(+), 2556 deletions(-)
9988 create mode 100644 arch/arm/crypto/Makefile
9989 create mode 100644 arch/arm/crypto/aes-armv4.S
9990 create mode 100644 arch/arm/crypto/aes_glue.c
9991 create mode 100644 arch/arm/crypto/sha1-armv4-large.S
9992 create mode 100644 arch/arm/crypto/sha1_glue.c
9993 create mode 100644 arch/x86/crypto/cast5-avx-x86_64-asm_64.S
9994 create mode 100644 arch/x86/crypto/cast5_avx_glue.c
9995 create mode 100644 arch/x86/crypto/cast6-avx-x86_64-asm_64.S
9996 create mode 100644 arch/x86/crypto/cast6_avx_glue.c
9997 create mode 100644 crypto/842.c
9998 rename crypto/{cast5.c => cast5_generic.c} (95%)
9999 rename crypto/{cast6.c => cast6_generic.c} (93%)
10000 create mode 100644 drivers/crypto/nx/Kconfig
10001 create mode 100644 drivers/crypto/nx/nx-842.c
10002 create mode 100644 include/crypto/cast5.h
10003 create mode 100644 include/crypto/cast6.h
10004 create mode 100644 include/linux/nx842.h
10005 Merging drm/drm-next (df86b57 drm/savage: re-add busmaster enable, regression fix)
10006 $ git merge drm/drm-next
10007 Auto-merging include/drm/drmP.h
10008 Auto-merging drivers/gpu/drm/udl/udl_connector.c
10009 Auto-merging drivers/gpu/drm/radeon/radeon_irq_kms.c
10010 Auto-merging drivers/gpu/drm/radeon/evergreen.c
10011 Removing drivers/gpu/drm/gma500/gem_glue.h
10012 Removing drivers/gpu/drm/gma500/gem_glue.c
10013 Merge made by the 'recursive' strategy.
10014 Documentation/DocBook/drm.tmpl | 2835 ++++++++++++++++++-----
10015 drivers/acpi/video.c | 8 +-
10016 drivers/char/agp/intel-gtt.c | 62 +-
10017 drivers/gpu/drm/Kconfig | 19 +-
10018 drivers/gpu/drm/Makefile | 3 +
10019 drivers/gpu/drm/ast/ast_drv.h | 1 -
10020 drivers/gpu/drm/ast/ast_mode.c | 2 +-
10021 drivers/gpu/drm/cirrus/cirrus_drv.h | 1 -
10022 drivers/gpu/drm/drm_cache.c | 28 +-
10023 drivers/gpu/drm/drm_crtc.c | 139 +-
10024 drivers/gpu/drm/drm_drv.c | 22 +-
10025 drivers/gpu/drm/drm_edid.c | 208 +-
10026 drivers/gpu/drm/drm_edid_load.c | 29 +-
10027 drivers/gpu/drm/drm_edid_modes.h | 42 +-
10028 drivers/gpu/drm/drm_fb_cma_helper.c | 406 ++++
10029 drivers/gpu/drm/drm_fb_helper.c | 10 +-
10030 drivers/gpu/drm/drm_gem_cma_helper.c | 251 ++
10031 drivers/gpu/drm/drm_irq.c | 2 +-
10032 drivers/gpu/drm/drm_vm.c | 11 +-
10033 drivers/gpu/drm/exynos/exynos_drm_connector.c | 4 +-
10034 drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +-
10035 drivers/gpu/drm/exynos/exynos_drm_vidi.c | 13 -
10036 drivers/gpu/drm/gma500/Makefile | 5 +-
10037 drivers/gpu/drm/gma500/backlight.c | 45 +
10038 drivers/gpu/drm/gma500/cdv_device.c | 72 +-
10039 drivers/gpu/drm/gma500/cdv_intel_display.c | 236 +-
10040 drivers/gpu/drm/gma500/cdv_intel_dp.c | 1951 ++++++++++++++++
10041 drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 6 +-
10042 drivers/gpu/drm/gma500/cdv_intel_lvds.c | 12 +-
10043 drivers/gpu/drm/gma500/framebuffer.c | 7 +
10044 drivers/gpu/drm/gma500/gem.c | 9 +-
10045 drivers/gpu/drm/gma500/gem_glue.c | 90 -
10046 drivers/gpu/drm/gma500/gem_glue.h | 2 -
10047 drivers/gpu/drm/gma500/intel_bios.c | 101 +
10048 drivers/gpu/drm/gma500/intel_bios.h | 46 +
10049 drivers/gpu/drm/gma500/mdfld_dsi_output.c | 13 +-
10050 drivers/gpu/drm/gma500/mid_bios.c | 8 +-
10051 drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 -
10052 drivers/gpu/drm/gma500/opregion.c | 3 +-
10053 drivers/gpu/drm/gma500/psb_device.c | 1 +
10054 drivers/gpu/drm/gma500/psb_drv.h | 20 +-
10055 drivers/gpu/drm/gma500/psb_intel_drv.h | 28 +-
10056 drivers/gpu/drm/gma500/psb_intel_lvds.c | 13 +-
10057 drivers/gpu/drm/gma500/psb_intel_reg.h | 197 +-
10058 drivers/gpu/drm/gma500/psb_intel_sdvo.c | 4 -
10059 drivers/gpu/drm/i2c/ch7006_drv.c | 16 +-
10060 drivers/gpu/drm/i915/Makefile | 1 +
10061 drivers/gpu/drm/i915/dvo.h | 16 +-
10062 drivers/gpu/drm/i915/dvo_ch7017.c | 21 +-
10063 drivers/gpu/drm/i915/dvo_ch7xxx.c | 17 +-
10064 drivers/gpu/drm/i915/dvo_ivch.c | 23 +-
10065 drivers/gpu/drm/i915/dvo_ns2501.c | 588 +++++
10066 drivers/gpu/drm/i915/dvo_sil164.c | 20 +-
10067 drivers/gpu/drm/i915/dvo_tfp410.c | 18 +-
10068 drivers/gpu/drm/i915/i915_debugfs.c | 251 +-
10069 drivers/gpu/drm/i915/i915_dma.c | 73 +-
10070 drivers/gpu/drm/i915/i915_drv.c | 61 +-
10071 drivers/gpu/drm/i915/i915_drv.h | 239 +-
10072 drivers/gpu/drm/i915/i915_gem.c | 1548 +++++++------
10073 drivers/gpu/drm/i915/i915_gem_context.c | 65 +-
10074 drivers/gpu/drm/i915/i915_gem_dmabuf.c | 174 +-
10075 drivers/gpu/drm/i915/i915_gem_evict.c | 44 +-
10076 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 391 +---
10077 drivers/gpu/drm/i915/i915_gem_gtt.c | 144 +-
10078 drivers/gpu/drm/i915/i915_gem_tiling.c | 16 +-
10079 drivers/gpu/drm/i915/i915_irq.c | 194 +-
10080 drivers/gpu/drm/i915/i915_reg.h | 328 ++-
10081 drivers/gpu/drm/i915/i915_sysfs.c | 220 +-
10082 drivers/gpu/drm/i915/i915_trace.h | 25 +-
10083 drivers/gpu/drm/i915/intel_crt.c | 165 +-
10084 drivers/gpu/drm/i915/intel_ddi.c | 144 +-
10085 drivers/gpu/drm/i915/intel_display.c | 2173 ++++++++++++-----
10086 drivers/gpu/drm/i915/intel_dp.c | 401 ++--
10087 drivers/gpu/drm/i915/intel_drv.h | 147 +-
10088 drivers/gpu/drm/i915/intel_dvo.c | 115 +-
10089 drivers/gpu/drm/i915/intel_hdmi.c | 221 +-
10090 drivers/gpu/drm/i915/intel_lvds.c | 99 +-
10091 drivers/gpu/drm/i915/intel_modes.c | 1 -
10092 drivers/gpu/drm/i915/intel_opregion.c | 23 +-
10093 drivers/gpu/drm/i915/intel_overlay.c | 60 +-
10094 drivers/gpu/drm/i915/intel_pm.c | 420 ++--
10095 drivers/gpu/drm/i915/intel_ringbuffer.c | 152 +-
10096 drivers/gpu/drm/i915/intel_ringbuffer.h | 20 +-
10097 drivers/gpu/drm/i915/intel_sdvo.c | 210 +-
10098 drivers/gpu/drm/i915/intel_tv.c | 70 +-
10099 drivers/gpu/drm/mgag200/mgag200_drv.h | 1 -
10100 drivers/gpu/drm/mgag200/mgag200_mode.c | 1 -
10101 drivers/gpu/drm/nouveau/nouveau_dp.c | 4 +-
10102 drivers/gpu/drm/radeon/atombios_crtc.c | 663 ++++--
10103 drivers/gpu/drm/radeon/atombios_dp.c | 4 +-
10104 drivers/gpu/drm/radeon/atombios_encoders.c | 367 ++-
10105 drivers/gpu/drm/radeon/evergreen.c | 282 ++-
10106 drivers/gpu/drm/radeon/evergreen_cs.c | 61 +-
10107 drivers/gpu/drm/radeon/evergreen_reg.h | 2 +
10108 drivers/gpu/drm/radeon/evergreend.h | 7 +
10109 drivers/gpu/drm/radeon/ni.c | 134 +-
10110 drivers/gpu/drm/radeon/nid.h | 1 +
10111 drivers/gpu/drm/radeon/r100.c | 96 +-
10112 drivers/gpu/drm/radeon/r300.c | 4 +-
10113 drivers/gpu/drm/radeon/r520.c | 4 +-
10114 drivers/gpu/drm/radeon/r600.c | 37 +-
10115 drivers/gpu/drm/radeon/r600_blit.c | 115 +-
10116 drivers/gpu/drm/radeon/r600_blit_kms.c | 52 +-
10117 drivers/gpu/drm/radeon/r600_blit_shaders.h | 1 +
10118 drivers/gpu/drm/radeon/r600_cs.c | 5 +-
10119 drivers/gpu/drm/radeon/r600_hdmi.c | 2 +-
10120 drivers/gpu/drm/radeon/radeon.h | 192 +-
10121 drivers/gpu/drm/radeon/radeon_acpi.c | 607 ++++-
10122 drivers/gpu/drm/radeon/radeon_acpi.h | 445 ++++
10123 drivers/gpu/drm/radeon/radeon_asic.c | 93 +-
10124 drivers/gpu/drm/radeon/radeon_asic.h | 28 +-
10125 drivers/gpu/drm/radeon/radeon_atombios.c | 15 +-
10126 drivers/gpu/drm/radeon/radeon_atpx_handler.c | 411 +++-
10127 drivers/gpu/drm/radeon/radeon_combios.c | 9 -
10128 drivers/gpu/drm/radeon/radeon_connectors.c | 43 +-
10129 drivers/gpu/drm/radeon/radeon_cs.c | 83 +-
10130 drivers/gpu/drm/radeon/radeon_device.c | 11 +-
10131 drivers/gpu/drm/radeon/radeon_drv.c | 4 +-
10132 drivers/gpu/drm/radeon/radeon_encoders.c | 19 +-
10133 drivers/gpu/drm/radeon/radeon_fb.c | 16 -
10134 drivers/gpu/drm/radeon/radeon_fence.c | 2 +-
10135 drivers/gpu/drm/radeon/radeon_gart.c | 602 +++--
10136 drivers/gpu/drm/radeon/radeon_gem.c | 54 +-
10137 drivers/gpu/drm/radeon/radeon_ioc32.c | 2 +-
10138 drivers/gpu/drm/radeon/radeon_irq_kms.c | 43 +-
10139 drivers/gpu/drm/radeon/radeon_kms.c | 17 +-
10140 drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 7 +-
10141 drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 65 +-
10142 drivers/gpu/drm/radeon/radeon_mode.h | 49 +-
10143 drivers/gpu/drm/radeon/radeon_object.c | 22 +-
10144 drivers/gpu/drm/radeon/radeon_object.h | 4 +-
10145 drivers/gpu/drm/radeon/radeon_pm.c | 104 +-
10146 drivers/gpu/drm/radeon/radeon_ring.c | 30 +-
10147 drivers/gpu/drm/radeon/radeon_sa.c | 20 +-
10148 drivers/gpu/drm/radeon/radeon_test.c | 2 +-
10149 drivers/gpu/drm/radeon/radeon_ttm.c | 2 +-
10150 drivers/gpu/drm/radeon/rs400.c | 6 +-
10151 drivers/gpu/drm/radeon/rs600.c | 49 +-
10152 drivers/gpu/drm/radeon/rs690.c | 6 +-
10153 drivers/gpu/drm/radeon/rv515.c | 18 +-
10154 drivers/gpu/drm/radeon/rv770.c | 10 +-
10155 drivers/gpu/drm/radeon/si.c | 113 +-
10156 drivers/gpu/drm/radeon/sid.h | 15 +
10157 drivers/gpu/drm/savage/savage_bci.c | 2 +
10158 drivers/gpu/drm/shmobile/Kconfig | 10 +
10159 drivers/gpu/drm/shmobile/Makefile | 7 +
10160 drivers/gpu/drm/shmobile/shmob_drm_backlight.c | 90 +
10161 drivers/gpu/drm/shmobile/shmob_drm_backlight.h | 23 +
10162 drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 763 ++++++
10163 drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 60 +
10164 drivers/gpu/drm/shmobile/shmob_drm_drv.c | 361 +++
10165 drivers/gpu/drm/shmobile/shmob_drm_drv.h | 47 +
10166 drivers/gpu/drm/shmobile/shmob_drm_kms.c | 160 ++
10167 drivers/gpu/drm/shmobile/shmob_drm_kms.h | 34 +
10168 drivers/gpu/drm/shmobile/shmob_drm_plane.c | 268 +++
10169 drivers/gpu/drm/shmobile/shmob_drm_plane.h | 22 +
10170 drivers/gpu/drm/shmobile/shmob_drm_regs.h | 311 +++
10171 drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +-
10172 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 5 +-
10173 drivers/gpu/drm/ttm/ttm_tt.c | 16 +-
10174 drivers/gpu/drm/udl/udl_connector.c | 3 -
10175 drivers/gpu/drm/udl/udl_encoder.c | 2 +-
10176 drivers/gpu/drm/udl/udl_fb.c | 26 +-
10177 drivers/gpu/drm/udl/udl_gem.c | 7 -
10178 drivers/gpu/drm/udl/udl_main.c | 7 +-
10179 drivers/gpu/drm/udl/udl_modeset.c | 2 +-
10180 drivers/gpu/drm/udl/udl_transfer.c | 8 +-
10181 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 -
10182 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 1 -
10183 drivers/staging/omapdrm/omap_connector.c | 5 +-
10184 drivers/staging/omapdrm/omap_fbdev.c | 4 +-
10185 include/drm/drmP.h | 1 +
10186 include/drm/drm_crtc.h | 24 +-
10187 include/drm/drm_fb_cma_helper.h | 27 +
10188 include/drm/drm_fourcc.h | 2 +
10189 include/drm/drm_gem_cma_helper.h | 44 +
10190 include/drm/drm_sarea.h | 2 +
10191 include/drm/i915_drm.h | 36 +-
10192 include/drm/intel-gtt.h | 10 +-
10193 include/linux/platform_data/shmob_drm.h | 99 +
10194 180 files changed, 17697 insertions(+), 5740 deletions(-)
10195 create mode 100644 drivers/gpu/drm/drm_fb_cma_helper.c
10196 create mode 100644 drivers/gpu/drm/drm_gem_cma_helper.c
10197 create mode 100644 drivers/gpu/drm/gma500/cdv_intel_dp.c
10198 delete mode 100644 drivers/gpu/drm/gma500/gem_glue.c
10199 delete mode 100644 drivers/gpu/drm/gma500/gem_glue.h
10200 create mode 100644 drivers/gpu/drm/i915/dvo_ns2501.c
10201 create mode 100644 drivers/gpu/drm/radeon/radeon_acpi.h
10202 create mode 100644 drivers/gpu/drm/shmobile/Kconfig
10203 create mode 100644 drivers/gpu/drm/shmobile/Makefile
10204 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_backlight.c
10205 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_backlight.h
10206 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_crtc.c
10207 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_crtc.h
10208 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_drv.c
10209 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_drv.h
10210 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_kms.c
10211 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_kms.h
10212 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_plane.c
10213 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_plane.h
10214 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_regs.h
10215 create mode 100644 include/drm/drm_fb_cma_helper.h
10216 create mode 100644 include/drm/drm_gem_cma_helper.h
10217 create mode 100644 include/linux/platform_data/shmob_drm.h
10218 Merging sound/for-next (b7ef37d ARM: SAMSUNG: dma-ops: Fix dmaengine_prep_dma_cyclic() parameter list)
10219 $ git merge sound/for-next
10220 Resolved 'arch/arm/mach-davinci/davinci.h' using previous resolution.
10221 Resolved 'arch/arm/mach-davinci/dm355.c' using previous resolution.
10222 Resolved 'arch/arm/mach-davinci/dm365.c' using previous resolution.
10223 Resolved 'arch/arm/mach-davinci/include/mach/da8xx.h' using previous resolution.
10224 Resolved 'arch/arm/mach-imx/mach-imx27_visstrim_m10.c' using previous resolution.
10225 Resolved 'sound/soc/omap/omap-mcbsp.c' using previous resolution.
10226 Resolved 'sound/soc/omap/omap-pcm.c' using previous resolution.
10227 Auto-merging sound/usb/endpoint.c
10228 Auto-merging sound/soc/ux500/ux500_msp_i2s.c
10229 Auto-merging sound/soc/ux500/ux500_msp_dai.c
10230 Auto-merging sound/soc/soc-core.c
10231 Auto-merging sound/soc/omap/zoom2.c
10232 CONFLICT (modify/delete): sound/soc/omap/overo.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/overo.c left in tree.
10233 CONFLICT (modify/delete): sound/soc/omap/omap3evm.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/omap3evm.c left in tree.
10234 CONFLICT (modify/delete): sound/soc/omap/omap3beagle.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/omap3beagle.c left in tree.
10235 Auto-merging sound/soc/omap/omap-pcm.c
10236 CONFLICT (content): Merge conflict in sound/soc/omap/omap-pcm.c
10237 Auto-merging sound/soc/omap/omap-mcpdm.c
10238 Auto-merging sound/soc/omap/omap-mcbsp.c
10239 CONFLICT (content): Merge conflict in sound/soc/omap/omap-mcbsp.c
10240 Auto-merging sound/soc/omap/omap-abe-twl6040.c
10241 Auto-merging sound/soc/omap/mcbsp.c
10242 CONFLICT (modify/delete): sound/soc/omap/igep0020.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/igep0020.c left in tree.
10243 Auto-merging sound/soc/omap/am3517evm.c
10244 Auto-merging sound/soc/fsl/imx-ssi.c
10245 Auto-merging sound/soc/fsl/imx-pcm-dma.c
10246 Auto-merging sound/soc/codecs/wm2000.c
10247 Auto-merging sound/soc/codecs/ab8500-codec.c
10248 Auto-merging sound/pci/oxygen/oxygen_lib.c
10249 Removing include/sound/version.h
10250 Auto-merging include/sound/tegra_wm8903.h
10251 Auto-merging include/linux/platform_data/davinci_asp.h
10252 Auto-merging include/linux/platform_data/asoc-ti-mcbsp.h
10253 Auto-merging include/linux/i2c/twl.h
10254 Auto-merging drivers/mfd/twl-core.c
10255 Auto-merging drivers/dma/tegra20-apb-dma.c
10256 Auto-merging drivers/dma/ste_dma40.c
10257 Auto-merging drivers/dma/sirf-dma.c
10258 Auto-merging drivers/dma/pl330.c
10259 Auto-merging drivers/dma/omap-dma.c
10260 Auto-merging drivers/dma/mxs-dma.c
10261 Auto-merging drivers/dma/mmp_tdma.c
10262 Auto-merging drivers/dma/imx-sdma.c
10263 Auto-merging drivers/dma/imx-dma.c
10264 Auto-merging drivers/dma/ep93xx_dma.c
10265 Auto-merging drivers/dma/at_hdmac.c
10266 Auto-merging arch/arm/mach-omap2/twl-common.h
10267 Auto-merging arch/arm/mach-omap2/twl-common.c
10268 Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
10269 Auto-merging arch/arm/mach-omap2/mcbsp.c
10270 Auto-merging arch/arm/mach-omap2/board-zoom-peripherals.c
10271 Auto-merging arch/arm/mach-omap2/board-overo.c
10272 Auto-merging arch/arm/mach-omap2/board-omap3evm.c
10273 Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
10274 Auto-merging arch/arm/mach-omap2/board-igep0020.c
10275 Auto-merging arch/arm/mach-omap2/board-devkit8000.c
10276 Auto-merging arch/arm/mach-omap2/board-cm-t35.c
10277 Auto-merging arch/arm/mach-omap2/board-am3517evm.c
10278 Auto-merging arch/arm/mach-imx/mach-imx27_visstrim_m10.c
10279 CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
10280 Auto-merging arch/arm/mach-davinci/include/mach/da8xx.h
10281 CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/da8xx.h
10282 Auto-merging arch/arm/mach-davinci/dm365.c
10283 CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm365.c
10284 Auto-merging arch/arm/mach-davinci/dm355.c
10285 CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
10286 Auto-merging arch/arm/mach-davinci/devices.c
10287 Auto-merging arch/arm/mach-davinci/davinci.h
10288 CONFLICT (content): Merge conflict in arch/arm/mach-davinci/davinci.h
10289 Automatic merge failed; fix conflicts and then commit the result.
10290 $ git rm -f sound/soc/omap/igep0020.c sound/soc/omap/omap3beagle.c sound/soc/omap/omap3evm.c sound/soc/omap/overo.c
10291 sound/soc/omap/igep0020.c: needs merge
10292 sound/soc/omap/omap3beagle.c: needs merge
10293 sound/soc/omap/omap3evm.c: needs merge
10294 sound/soc/omap/overo.c: needs merge
10295 rm 'sound/soc/omap/igep0020.c'
10296 rm 'sound/soc/omap/omap3beagle.c'
10297 rm 'sound/soc/omap/omap3evm.c'
10298 rm 'sound/soc/omap/overo.c'
10300 [master 3d6b524] Merge remote-tracking branch 'sound/for-next'
10301 $ git diff -M --stat --summary HEAD^..
10302 .../devicetree/bindings/mfd/twl4030-audio.txt | 46 +
10303 Documentation/devicetree/bindings/sound/cs4270.txt | 21 +
10304 .../bindings/sound/davinci-mcasp-audio.txt | 45 +
10305 .../devicetree/bindings/sound/omap-abe-twl6040.txt | 91 ++
10306 .../devicetree/bindings/sound/omap-mcbsp.txt | 37 +
10307 .../devicetree/bindings/sound/omap-twl4030.txt | 17 +
10308 .../devicetree/bindings/sound/tlv320aic3x.txt | 20 +
10309 Documentation/sound/alsa/ALSA-Configuration.txt | 10 +-
10310 Documentation/sound/alsa/Channel-Mapping-API.txt | 153 ++++
10311 Documentation/sound/alsa/HD-Audio-Models.txt | 3 +-
10312 arch/arm/mach-davinci/asp.h | 49 +
10313 arch/arm/mach-davinci/davinci.h | 3 +-
10314 arch/arm/mach-davinci/devices-da8xx.c | 8 +-
10315 arch/arm/mach-davinci/devices.c | 11 -
10316 arch/arm/mach-davinci/dm355.c | 2 +-
10317 arch/arm/mach-davinci/dm365.c | 2 +-
10318 arch/arm/mach-davinci/dm644x.c | 2 +-
10319 arch/arm/mach-davinci/dm646x.c | 2 +-
10320 arch/arm/mach-davinci/include/mach/da8xx.h | 2 +-
10321 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 42 +-
10322 arch/arm/mach-omap2/board-am3517evm.c | 13 +
10323 arch/arm/mach-omap2/board-cm-t35.c | 1 +
10324 arch/arm/mach-omap2/board-devkit8000.c | 1 +
10325 arch/arm/mach-omap2/board-igep0020.c | 1 +
10326 arch/arm/mach-omap2/board-omap3beagle.c | 1 +
10327 arch/arm/mach-omap2/board-omap3evm.c | 1 +
10328 arch/arm/mach-omap2/board-overo.c | 1 +
10329 arch/arm/mach-omap2/board-zoom-peripherals.c | 9 +-
10330 arch/arm/mach-omap2/include/mach/board-zoom.h | 2 -
10331 arch/arm/mach-omap2/mcbsp.c | 126 +--
10332 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +
10333 arch/arm/mach-omap2/twl-common.c | 27 +
10334 arch/arm/mach-omap2/twl-common.h | 2 +
10335 arch/arm/plat-samsung/dma-ops.c | 3 +-
10336 arch/blackfin/mach-bf527/boards/ezkit.c | 20 +
10337 arch/blackfin/mach-bf533/boards/stamp.c | 20 +
10338 arch/blackfin/mach-bf537/boards/stamp.c | 20 +
10339 arch/blackfin/mach-bf561/boards/ezkit.c | 20 +
10340 arch/blackfin/mach-bf609/boards/ezkit.c | 19 +
10341 drivers/dma/at_hdmac.c | 3 +-
10342 drivers/dma/ep93xx_dma.c | 4 +-
10343 drivers/dma/imx-dma.c | 2 +-
10344 drivers/dma/imx-sdma.c | 2 +-
10345 drivers/dma/mmp_tdma.c | 2 +-
10346 drivers/dma/mxs-dma.c | 2 +-
10347 drivers/dma/omap-dma.c | 45 +-
10348 drivers/dma/pl330.c | 2 +-
10349 drivers/dma/sa11x0-dma.c | 2 +-
10350 drivers/dma/sirf-dma.c | 2 +-
10351 drivers/dma/ste_dma40.c | 3 +-
10352 drivers/dma/tegra20-apb-dma.c | 2 +-
10353 drivers/input/misc/twl4030-vibra.c | 18 +-
10354 drivers/mfd/twl-core.c | 32 +
10355 drivers/mfd/twl4030-audio.c | 105 ++-
10356 include/linux/dmaengine.h | 7 +-
10357 include/linux/i2c/twl.h | 3 +-
10358 include/linux/mfd/wm8994/pdata.h | 4 +
10359 include/linux/of.h | 6 +
10360 include/linux/platform_data/asoc-mx27vis.h | 11 +
10361 include/linux/platform_data/asoc-ti-mcbsp.h | 2 -
10362 .../linux/platform_data/davinci_asp.h | 74 +-
10363 include/linux/platform_data/omap-twl4030.h | 32 +
10364 include/sound/ac97_codec.h | 3 +
10365 include/sound/ad1816a.h | 9 +-
10366 include/sound/asound.h | 39 +
10367 include/sound/compress_driver.h | 1 +
10368 include/sound/compress_params.h | 1 +
10369 include/sound/emu10k1.h | 4 +-
10370 include/sound/initval.h | 14 +
10371 include/sound/memalloc.h | 27 +-
10372 include/sound/pcm.h | 87 +-
10373 include/sound/soc-dai.h | 3 +
10374 include/sound/soc-dapm.h | 7 +-
10375 include/sound/soc.h | 20 +-
10376 .../sound/tegra_wm8903.h | 7 +-
10377 include/sound/tlv.h | 8 +
10378 include/sound/version.h | 3 -
10379 include/sound/wm0010.h | 27 +
10380 include/sound/wm8960.h | 2 +-
10381 include/sound/wm8993.h | 4 +
10382 sound/core/compress_offload.c | 26 +
10383 sound/core/control.c | 1 +
10384 sound/core/info.c | 7 +-
10385 sound/core/info_oss.c | 3 +-
10386 sound/core/oss/mixer_oss.c | 2 +
10387 sound/core/pcm.c | 4 +
10388 sound/core/pcm_lib.c | 214 +++++
10389 sound/core/pcm_memory.c | 26 -
10390 sound/core/seq/seq_device.c | 2 +
10391 sound/core/sgbuf.c | 27 +
10392 sound/core/sound.c | 3 +-
10393 sound/drivers/opl4/opl4_synth.c | 9 +-
10394 sound/isa/Kconfig | 12 +
10395 sound/isa/Makefile | 2 +
10396 sound/isa/ad1816a/ad1816a.c | 64 +-
10397 sound/isa/ad1816a/ad1816a_lib.c | 38 +-
10398 sound/isa/cmi8328.c | 483 ++++++++++
10399 sound/isa/gus/interwave.c | 5 +-
10400 sound/isa/opti9xx/miro.c | 15 +-
10401 sound/isa/opti9xx/opti92x-ad1848.c | 14 +-
10402 sound/isa/sb/emu8000.c | 15 +-
10404 sound/pci/ac97/ac97_patch.c | 24 +-
10405 sound/pci/ali5451/ali5451.c | 10 +-
10406 sound/pci/als300.c | 2 +-
10407 sound/pci/als4000.c | 4 +-
10408 sound/pci/asihpi/asihpi.c | 2 +-
10409 sound/pci/atiixp.c | 15 +-
10410 sound/pci/atiixp_modem.c | 6 +-
10411 sound/pci/azt3328.c | 6 +-
10412 sound/pci/ca0106/ca0106.h | 4 +-
10413 sound/pci/ca0106/ca0106_main.c | 30 +-
10414 sound/pci/ca0106/ca0106_mixer.c | 4 +-
10415 sound/pci/cmipci.c | 12 +-
10416 sound/pci/cs4281.c | 6 +-
10417 sound/pci/cs46xx/cs46xx.c | 2 +-
10418 sound/pci/cs46xx/cs46xx.h | 2 +-
10419 sound/pci/cs46xx/cs46xx_lib.c | 8 +-
10420 sound/pci/cs46xx/cs46xx_lib.h | 2 +-
10421 sound/pci/cs46xx/dsp_spos.c | 8 +-
10422 sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +-
10423 sound/pci/cs5530.c | 3 +-
10424 sound/pci/cs5535audio/Makefile | 2 +-
10425 sound/pci/cs5535audio/cs5535audio.c | 2 +-
10426 sound/pci/ctxfi/ctatc.c | 4 +-
10427 sound/pci/ctxfi/ctatc.h | 2 +-
10428 sound/pci/ctxfi/cthardware.h | 2 +-
10429 sound/pci/ctxfi/cthw20k1.c | 4 +-
10430 sound/pci/ctxfi/cthw20k2.c | 4 +-
10431 sound/pci/ctxfi/ctmixer.c | 4 +-
10432 sound/pci/ctxfi/ctmixer.h | 2 +-
10433 sound/pci/ctxfi/ctpcm.c | 52 +-
10434 sound/pci/ctxfi/xfi.c | 2 +-
10435 sound/pci/echoaudio/echoaudio.c | 12 +-
10436 sound/pci/echoaudio/echoaudio.h | 2 +-
10437 sound/pci/emu10k1/emu10k1.c | 4 +-
10438 sound/pci/emu10k1/emu10k1_main.c | 8 +-
10439 sound/pci/emu10k1/emu10k1x.c | 21 +
10440 sound/pci/emu10k1/emufx.c | 2 +-
10441 sound/pci/emu10k1/memory.c | 4 +-
10442 sound/pci/emu10k1/p16v.c | 2 +-
10443 sound/pci/ens1370.c | 70 +-
10444 sound/pci/es1938.c | 6 +-
10445 sound/pci/es1968.c | 12 +-
10446 sound/pci/fm801.c | 13 +-
10447 sound/pci/hda/Kconfig | 10 +-
10448 sound/pci/hda/hda_auto_parser.c | 7 +-
10449 sound/pci/hda/hda_codec.c | 270 +++---
10450 sound/pci/hda/hda_codec.h | 82 +-
10451 sound/pci/hda/hda_generic.c | 8 +-
10452 sound/pci/hda/hda_hwdep.c | 43 +-
10453 sound/pci/hda/hda_intel.c | 306 +++++--
10454 sound/pci/hda/hda_jack.c | 5 +-
10455 sound/pci/hda/hda_local.h | 2 +-
10456 sound/pci/hda/hda_proc.c | 9 +-
10457 sound/pci/hda/hda_trace.h | 26 +
10458 sound/pci/hda/patch_analog.c | 90 +-
10459 sound/pci/hda/patch_cirrus.c | 225 +++--
10460 sound/pci/hda/patch_conexant.c | 31 +-
10461 sound/pci/hda/patch_hdmi.c | 407 ++++++++-
10462 sound/pci/hda/patch_realtek.c | 19 +-
10463 sound/pci/hda/patch_sigmatel.c | 95 +-
10464 sound/pci/hda/patch_via.c | 37 +-
10465 sound/pci/ice1712/aureon.c | 4 +-
10466 sound/pci/ice1712/ice1712.h | 2 +-
10467 sound/pci/ice1712/ice1724.c | 4 +-
10468 sound/pci/ice1712/juli.c | 4 +-
10469 sound/pci/ice1712/prodigy_hifi.c | 4 +-
10470 sound/pci/intel8x0.c | 24 +-
10471 sound/pci/intel8x0m.c | 4 +-
10472 sound/pci/korg1212/korg1212.c | 4 +-
10473 sound/pci/maestro3.c | 10 +-
10474 sound/pci/nm256/nm256.c | 4 +-
10475 sound/pci/oxygen/oxygen.c | 2 +-
10476 sound/pci/oxygen/oxygen.h | 2 +-
10477 sound/pci/oxygen/oxygen_lib.c | 4 +-
10478 sound/pci/oxygen/virtuoso.c | 2 +-
10479 sound/pci/pcxhr/pcxhr.c | 24 +
10480 sound/pci/pcxhr/pcxhr_hwdep.c | 6 +-
10481 sound/pci/riptide/riptide.c | 6 +-
10482 sound/pci/sis7019.c | 6 +-
10483 sound/pci/trident/trident.c | 2 +-
10484 sound/pci/trident/trident_main.c | 4 +-
10485 sound/pci/via82xx.c | 33 +-
10486 sound/pci/via82xx_modem.c | 4 +-
10487 sound/pci/vx222/vx222.c | 2 +-
10488 sound/pci/ymfpci/ymfpci.c | 2 +-
10489 sound/pci/ymfpci/ymfpci.h | 2 +-
10490 sound/pci/ymfpci/ymfpci_main.c | 26 +-
10491 sound/soc/Kconfig | 3 +-
10492 sound/soc/Makefile | 4 +-
10493 sound/soc/blackfin/bf5xx-ad1836.c | 73 +-
10494 sound/soc/{ep93xx => cirrus}/Kconfig | 0
10495 sound/soc/{ep93xx => cirrus}/Makefile | 0
10496 sound/soc/{ep93xx => cirrus}/edb93xx.c | 0
10497 sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c | 0
10498 sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c | 0
10499 sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c | 0
10500 sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h | 0
10501 sound/soc/{ep93xx => cirrus}/simone.c | 0
10502 sound/soc/{ep93xx => cirrus}/snappercl15.c | 0
10503 sound/soc/codecs/Kconfig | 4 +
10504 sound/soc/codecs/Makefile | 2 +
10505 sound/soc/codecs/ab8500-codec.c | 13 +-
10506 sound/soc/codecs/ad1836.c | 88 +-
10507 sound/soc/codecs/ad193x.c | 50 +-
10508 sound/soc/codecs/ad1980.c | 1 -
10509 sound/soc/codecs/adau1373.c | 12 +-
10510 sound/soc/codecs/adau1701.c | 12 +-
10511 sound/soc/codecs/ak4671.c | 12 +-
10512 sound/soc/codecs/arizona.c | 68 +-
10513 sound/soc/codecs/arizona.h | 6 +-
10514 sound/soc/codecs/cs4270.c | 152 ++--
10515 sound/soc/codecs/cs42l51.c | 19 +-
10516 sound/soc/codecs/cs42l52.c | 1 -
10517 sound/soc/codecs/isabelle.c | 1 -
10518 sound/soc/codecs/lm4857.c | 12 +-
10519 sound/soc/codecs/max98088.c | 18 +-
10520 sound/soc/codecs/max98095.c | 18 +-
10521 sound/soc/codecs/max9850.c | 12 +-
10522 sound/soc/codecs/max9877.c | 12 +-
10523 sound/soc/codecs/mc13783.c | 60 +-
10524 sound/soc/codecs/sta32x.c | 151 ++--
10525 sound/soc/codecs/sta529.c | 2 +-
10526 sound/soc/codecs/stac9766.c | 1 -
10527 sound/soc/codecs/tlv320aic26.c | 12 +-
10528 sound/soc/codecs/tlv320aic32x4.c | 19 +-
10529 sound/soc/codecs/tlv320aic3x.c | 49 +-
10530 sound/soc/codecs/tlv320dac33.c | 19 +-
10531 sound/soc/codecs/tpa6130a2.c | 13 +-
10532 sound/soc/codecs/twl4030.c | 157 +++-
10533 sound/soc/codecs/twl6040.c | 43 +-
10534 sound/soc/codecs/wm0010.c | 944 ++++++++++++++++++++
10535 sound/soc/codecs/wm2000.c | 12 +-
10536 sound/soc/codecs/wm2200.c | 16 +-
10537 sound/soc/codecs/wm5100.c | 6 +-
10538 sound/soc/codecs/wm5102.c | 52 +-
10539 sound/soc/codecs/wm5110.c | 18 +-
10540 sound/soc/codecs/wm8510.c | 129 ++-
10541 sound/soc/codecs/wm8523.c | 184 ++--
10542 sound/soc/codecs/wm8580.c | 149 ++-
10543 sound/soc/codecs/wm8711.c | 65 +-
10544 sound/soc/codecs/wm8728.c | 60 +-
10545 sound/soc/codecs/wm8737.c | 132 +--
10546 sound/soc/codecs/wm8741.c | 115 ++-
10547 sound/soc/codecs/wm8770.c | 19 +-
10548 sound/soc/codecs/wm8776.c | 75 +-
10549 sound/soc/codecs/wm8900.c | 166 ++--
10550 sound/soc/codecs/wm8903.c | 18 +-
10551 sound/soc/codecs/wm8904.c | 2 -
10552 sound/soc/codecs/wm8940.c | 18 +-
10553 sound/soc/codecs/wm8955.c | 18 +-
10554 sound/soc/codecs/wm8958-dsp2.c | 28 +-
10555 sound/soc/codecs/wm8960.c | 150 +++-
10556 sound/soc/codecs/wm8961.c | 492 ++++------
10557 sound/soc/codecs/wm8971.c | 18 +-
10558 sound/soc/codecs/wm8974.c | 18 +-
10559 sound/soc/codecs/wm8978.c | 18 +-
10560 sound/soc/codecs/wm8983.c | 162 ++--
10561 sound/soc/codecs/wm8990.c | 8 +-
10562 sound/soc/codecs/wm8991.c | 25 +-
10563 sound/soc/codecs/wm8993.c | 2 +
10564 sound/soc/codecs/wm8994.c | 132 ++-
10565 sound/soc/codecs/wm8994.h | 12 +-
10566 sound/soc/codecs/wm8996.c | 2 +-
10567 sound/soc/codecs/wm9090.c | 12 +-
10568 sound/soc/codecs/wm9712.c | 12 +-
10569 sound/soc/codecs/wm9713.c | 1 -
10570 sound/soc/codecs/wm_hubs.c | 114 ++-
10571 sound/soc/codecs/wm_hubs.h | 6 +
10572 sound/soc/davinci/davinci-evm.c | 19 +-
10573 sound/soc/davinci/davinci-i2s.c | 13 +-
10574 sound/soc/davinci/davinci-mcasp.c | 260 +++++-
10575 sound/soc/davinci/davinci-mcasp.h | 6 +-
10576 sound/soc/davinci/davinci-pcm.c | 24 +-
10577 sound/soc/davinci/davinci-pcm.h | 6 +-
10578 sound/soc/davinci/davinci-sffsdr.c | 2 +-
10579 sound/soc/davinci/davinci-vcif.c | 8 +
10580 sound/soc/fsl/Kconfig | 2 +-
10581 sound/soc/fsl/fsl_dma.c | 6 -
10582 sound/soc/fsl/imx-audmux.c | 3 -
10583 sound/soc/fsl/imx-pcm-dma.c | 5 +-
10584 sound/soc/fsl/imx-ssi.c | 30 +-
10585 sound/soc/fsl/mpc5200_dma.c | 24 +-
10586 sound/soc/fsl/mpc5200_dma.h | 3 +
10587 sound/soc/fsl/mpc5200_psc_ac97.c | 10 +
10588 sound/soc/fsl/mpc5200_psc_i2s.c | 8 +
10589 sound/soc/fsl/mpc8610_hpcd.c | 32 +-
10590 sound/soc/fsl/mx27vis-aic32x4.c | 42 +-
10591 sound/soc/fsl/p1022_ds.c | 31 +-
10592 sound/soc/fsl/pcm030-audio-fabric.c | 100 ++-
10593 sound/soc/mid-x86/mfld_machine.c | 9 +
10594 sound/soc/mid-x86/sst_dsp.h | 134 +++
10595 sound/soc/mid-x86/sst_platform.c | 204 ++++-
10596 sound/soc/mid-x86/sst_platform.h | 26 +-
10597 sound/soc/mxs/mxs-saif.c | 20 +-
10598 sound/soc/omap/Kconfig | 51 +-
10599 sound/soc/omap/Makefile | 10 +-
10600 sound/soc/omap/am3517evm.c | 21 +-
10601 sound/soc/omap/igep0020.c | 120 ---
10602 sound/soc/omap/mcbsp.c | 54 +-
10603 sound/soc/omap/mcbsp.h | 3 -
10604 sound/soc/omap/omap-abe-twl6040.c | 145 ++-
10605 sound/soc/omap/omap-dmic.c | 9 +-
10606 sound/soc/omap/omap-hdmi.c | 17 +-
10607 sound/soc/omap/omap-mcbsp.c | 230 ++---
10608 sound/soc/omap/omap-mcbsp.h | 20 -
10609 sound/soc/omap/omap-mcpdm.c | 92 +-
10610 sound/soc/omap/omap-pcm.c | 236 ++---
10611 sound/soc/omap/omap-pcm.h | 4 +-
10612 sound/soc/omap/omap-twl4030.c | 188 ++++
10613 sound/soc/omap/omap3beagle.c | 150 ----
10614 sound/soc/omap/omap3evm.c | 118 ---
10615 sound/soc/omap/overo.c | 122 ---
10616 sound/soc/omap/zoom2.c | 4 -
10617 sound/soc/samsung/Kconfig | 11 +-
10618 sound/soc/samsung/Makefile | 2 +
10619 sound/soc/samsung/bells.c | 346 +++++++
10620 sound/soc/samsung/speyside.c | 42 +-
10621 sound/soc/sh/fsi.c | 28 +-
10622 sound/soc/soc-compress.c | 294 ++++++
10623 sound/soc/soc-core.c | 100 ++-
10624 sound/soc/soc-dapm.c | 44 +-
10625 sound/soc/soc-dmaengine-pcm.c | 6 +-
10626 sound/soc/soc-jack.c | 6 -
10627 sound/soc/tegra/tegra_wm8903.c | 3 +-
10628 sound/soc/ux500/ux500_msp_dai.c | 3 +
10629 sound/soc/ux500/ux500_msp_i2s.c | 2 +
10630 sound/usb/6fire/firmware.c | 5 +-
10631 sound/usb/card.c | 2 +
10632 sound/usb/card.h | 7 +-
10633 sound/usb/endpoint.c | 39 +-
10634 sound/usb/endpoint.h | 5 +-
10635 sound/usb/helper.c | 5 +
10636 sound/usb/mixer.c | 7 +
10637 sound/usb/pcm.c | 126 ++-
10638 sound/usb/quirks-table.h | 53 ++
10639 sound/usb/quirks.c | 24 +
10640 sound/usb/quirks.h | 10 +
10641 339 files changed, 8984 insertions(+), 4046 deletions(-)
10642 create mode 100644 Documentation/devicetree/bindings/mfd/twl4030-audio.txt
10643 create mode 100644 Documentation/devicetree/bindings/sound/cs4270.txt
10644 create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
10645 create mode 100644 Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
10646 create mode 100644 Documentation/devicetree/bindings/sound/omap-mcbsp.txt
10647 create mode 100644 Documentation/devicetree/bindings/sound/omap-twl4030.txt
10648 create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt
10649 create mode 100644 Documentation/sound/alsa/Channel-Mapping-API.txt
10650 create mode 100644 arch/arm/mach-davinci/asp.h
10651 create mode 100644 include/linux/platform_data/asoc-mx27vis.h
10652 rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/davinci_asp.h (56%)
10653 create mode 100644 include/linux/platform_data/omap-twl4030.h
10654 rename arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h => include/sound/tegra_wm8903.h (89%)
10655 delete mode 100644 include/sound/version.h
10656 create mode 100644 include/sound/wm0010.h
10657 create mode 100644 sound/isa/cmi8328.c
10658 rename sound/soc/{ep93xx => cirrus}/Kconfig (100%)
10659 rename sound/soc/{ep93xx => cirrus}/Makefile (100%)
10660 rename sound/soc/{ep93xx => cirrus}/edb93xx.c (100%)
10661 rename sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c (100%)
10662 rename sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c (100%)
10663 rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c (100%)
10664 rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h (100%)
10665 rename sound/soc/{ep93xx => cirrus}/simone.c (100%)
10666 rename sound/soc/{ep93xx => cirrus}/snappercl15.c (100%)
10667 create mode 100644 sound/soc/codecs/wm0010.c
10668 create mode 100644 sound/soc/mid-x86/sst_dsp.h
10669 delete mode 100644 sound/soc/omap/igep0020.c
10670 create mode 100644 sound/soc/omap/omap-twl4030.c
10671 delete mode 100644 sound/soc/omap/omap3beagle.c
10672 delete mode 100644 sound/soc/omap/omap3evm.c
10673 delete mode 100644 sound/soc/omap/overo.c
10674 create mode 100644 sound/soc/samsung/bells.c
10675 create mode 100644 sound/soc/soc-compress.c
10676 Merging sound-asoc/for-next (fbe18b4 Merge branch 'for-3.7' into asoc-next)
10677 $ git merge sound-asoc/for-next
10678 Merge made by the 'recursive' strategy.
10679 Documentation/devicetree/bindings/sound/cs4271.txt | 36 +
10680 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 1 +
10681 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 1 +
10682 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 1 +
10683 arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 1 +
10684 include/sound/da9055.h | 33 +
10685 include/sound/soc-dapm.h | 3 +
10686 sound/soc/codecs/Kconfig | 4 +
10687 sound/soc/codecs/Makefile | 2 +
10688 sound/soc/codecs/arizona.c | 42 +
10689 sound/soc/codecs/arizona.h | 2 +-
10690 sound/soc/codecs/cs4270.c | 4 +-
10691 sound/soc/codecs/cs4271.c | 24 +-
10692 sound/soc/codecs/da9055.c | 1510 ++++++++++++++++++++
10693 sound/soc/codecs/wm0010.c | 18 +-
10694 sound/soc/codecs/wm2000.c | 60 +-
10695 sound/soc/codecs/wm5102.c | 2 +-
10696 sound/soc/codecs/wm5110.c | 79 +-
10697 sound/soc/codecs/wm_hubs.c | 5 +
10698 sound/soc/fsl/eukrea-tlv320.c | 37 +-
10699 sound/soc/soc-dapm.c | 23 +-
10700 21 files changed, 1822 insertions(+), 66 deletions(-)
10701 create mode 100644 Documentation/devicetree/bindings/sound/cs4271.txt
10702 create mode 100644 include/sound/da9055.h
10703 create mode 100644 sound/soc/codecs/da9055.c
10704 Merging modules/modules-next (8921e2e MODSIGN: Make mrproper should remove generated files.)
10705 $ git merge modules/modules-next
10706 Resolved 'arch/Kconfig' using previous resolution.
10707 Resolved 'arch/x86/Kconfig' using previous resolution.
10708 Resolved 'arch/x86/um/Kconfig' using previous resolution.
10709 Resolved 'arch/xtensa/Kconfig' using previous resolution.
10710 Auto-merging security/keys/keyring.c
10711 Auto-merging security/keys/keyctl.c
10712 Auto-merging security/keys/key.c
10713 Auto-merging scripts/Makefile.modpost
10714 Auto-merging net/rxrpc/ar-key.c
10715 Auto-merging net/dns_resolver/dns_key.c
10716 Auto-merging kernel/Makefile
10717 Auto-merging init/Kconfig
10718 Auto-merging fs/cifs/cifsacl.c
10719 Auto-merging crypto/Makefile
10720 Auto-merging crypto/Kconfig
10721 Auto-merging arch/xtensa/Kconfig
10722 CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
10723 Auto-merging arch/x86/um/Kconfig
10724 CONFLICT (content): Merge conflict in arch/x86/um/Kconfig
10725 Auto-merging arch/x86/Kconfig
10726 CONFLICT (content): Merge conflict in arch/x86/Kconfig
10727 Auto-merging arch/unicore32/Kconfig
10728 Auto-merging arch/tile/Kconfig
10729 Removing arch/sparc/include/asm/module.h
10730 Auto-merging arch/s390/Kconfig
10731 Auto-merging arch/powerpc/Kconfig
10732 Auto-merging arch/mips/Kconfig
10733 Removing arch/m32r/include/asm/module.h
10734 Auto-merging arch/ia64/Kconfig
10735 Removing arch/h8300/include/asm/module.h
10736 Removing arch/cris/include/asm/module.h
10737 Auto-merging arch/cris/Kconfig
10738 Auto-merging arch/arm/Kconfig
10739 Auto-merging arch/Kconfig
10740 CONFLICT (content): Merge conflict in arch/Kconfig
10741 Auto-merging Makefile
10742 Auto-merging Documentation/kernel-parameters.txt
10743 Automatic merge failed; fix conflicts and then commit the result.
10745 [master 2fc9a39] Merge remote-tracking branch 'modules/modules-next'
10746 $ git diff -M --stat --summary HEAD^..
10748 Documentation/crypto/asymmetric-keys.txt | 312 ++++++
10749 Documentation/kernel-parameters.txt | 6 +
10750 Documentation/security/keys.txt | 50 +-
10752 arch/Kconfig | 19 +
10753 arch/alpha/Kconfig | 2 +
10754 arch/alpha/include/asm/module.h | 10 +-
10755 arch/arm/Kconfig | 2 +
10756 arch/arm/include/asm/module.h | 8 +-
10757 arch/avr32/Kconfig | 2 +
10758 arch/avr32/include/asm/module.h | 6 +-
10759 arch/blackfin/Kconfig | 2 +
10760 arch/blackfin/include/asm/module.h | 4 +-
10761 arch/c6x/Kconfig | 1 +
10762 arch/c6x/include/asm/module.h | 12 +-
10763 arch/cris/Kconfig | 1 +
10764 arch/cris/include/asm/Kbuild | 2 +
10765 arch/cris/include/asm/module.h | 9 -
10766 arch/frv/include/asm/module.h | 8 +-
10767 arch/h8300/Kconfig | 1 +
10768 arch/h8300/include/asm/Kbuild | 2 +
10769 arch/h8300/include/asm/module.h | 11 -
10770 arch/hexagon/Kconfig | 1 +
10771 arch/ia64/Kconfig | 2 +
10772 arch/ia64/include/asm/module.h | 6 +-
10773 arch/m32r/Kconfig | 1 +
10774 arch/m32r/include/asm/Kbuild | 2 +
10775 arch/m32r/include/asm/module.h | 10 -
10776 arch/m32r/kernel/module.c | 15 -
10777 arch/m68k/Kconfig | 3 +
10778 arch/m68k/include/asm/module.h | 6 +-
10779 arch/microblaze/Kconfig | 1 +
10780 arch/mips/Kconfig | 3 +
10781 arch/mips/include/asm/module.h | 10 +-
10782 arch/mips/kernel/Makefile | 1 +
10783 arch/mips/kernel/module-rela.c | 145 +++
10784 arch/mips/kernel/module.c | 121 +--
10785 arch/mn10300/Kconfig | 1 +
10786 arch/mn10300/include/asm/module.h | 7 +-
10787 arch/openrisc/Kconfig | 1 +
10788 arch/parisc/Kconfig | 2 +
10789 arch/parisc/include/asm/module.h | 16 +-
10790 arch/powerpc/Kconfig | 2 +
10791 arch/powerpc/include/asm/module.h | 7 +-
10792 arch/s390/Kconfig | 2 +
10793 arch/s390/include/asm/module.h | 18 +-
10794 arch/score/Kconfig | 2 +
10795 arch/score/include/asm/module.h | 6 +-
10796 arch/score/kernel/module.c | 10 -
10797 arch/sh/Kconfig | 2 +
10798 arch/sh/include/asm/module.h | 14 +-
10799 arch/sparc/Kconfig | 1 +
10800 arch/sparc/include/asm/Kbuild | 1 +
10801 arch/sparc/include/asm/module.h | 24 -
10802 arch/tile/Kconfig | 1 +
10803 arch/unicore32/Kconfig | 1 +
10804 arch/x86/Kconfig | 2 +
10805 arch/x86/um/Kconfig | 2 +
10806 arch/xtensa/include/asm/module.h | 9 +-
10807 crypto/Kconfig | 1 +
10808 crypto/Makefile | 1 +
10809 crypto/asymmetric_keys/.gitignore | 1 +
10810 crypto/asymmetric_keys/Kconfig | 38 +
10811 crypto/asymmetric_keys/Makefile | 27 +
10812 crypto/asymmetric_keys/asymmetric_keys.h | 15 +
10813 crypto/asymmetric_keys/asymmetric_type.c | 274 +++++
10814 crypto/asymmetric_keys/public_key.c | 108 ++
10815 crypto/asymmetric_keys/public_key.h | 30 +
10816 crypto/asymmetric_keys/rsa.c | 277 ++++++
10817 crypto/asymmetric_keys/signature.c | 49 +
10818 crypto/asymmetric_keys/x509.asn1 | 60 ++
10819 crypto/asymmetric_keys/x509_cert_parser.c | 497 ++++++++++
10820 crypto/asymmetric_keys/x509_parser.h | 36 +
10821 crypto/asymmetric_keys/x509_public_key.c | 207 ++++
10822 crypto/asymmetric_keys/x509_rsakey.asn1 | 4 +
10823 fs/cifs/cifs_spnego.c | 6 +-
10824 fs/cifs/cifsacl.c | 8 +-
10825 include/asm-generic/bitops/count_zeros.h | 57 ++
10826 include/asm-generic/module.h | 40 +-
10827 include/crypto/public_key.h | 108 ++
10828 include/keys/asymmetric-parser.h | 37 +
10829 include/keys/asymmetric-subtype.h | 55 +
10830 include/keys/asymmetric-type.h | 25 +
10831 include/keys/user-type.h | 6 +-
10832 include/linux/asn1.h | 67 ++
10833 include/linux/asn1_ber_bytecode.h | 87 ++
10834 include/linux/asn1_decoder.h | 24 +
10835 include/linux/key-type.h | 35 +-
10836 include/linux/module.h | 8 +
10837 include/linux/moduleloader.h | 36 +-
10838 include/linux/mpi.h | 1 +
10839 include/linux/oid_registry.h | 92 ++
10840 init/Kconfig | 68 ++
10841 kernel/Makefile | 85 ++
10842 kernel/modsign_pubkey.c | 112 +++
10843 kernel/module-internal.h | 15 +
10844 kernel/module.c | 157 ++-
10845 kernel/module_signing.c | 243 +++++
10846 lib/.gitignore | 2 +-
10848 lib/Makefile | 18 +
10849 lib/asn1_decoder.c | 477 +++++++++
10850 lib/build_OID_registry | 209 ++++
10851 lib/mpi/Makefile | 1 +
10852 lib/mpi/longlong.h | 138 +--
10853 lib/mpi/mpi-bit.c | 2 +-
10854 lib/mpi/mpi-cmp.c | 70 ++
10855 lib/mpi/mpi-pow.c | 4 +-
10856 lib/mpi/mpicoder.c | 55 +
10857 lib/oid_registry.c | 170 ++++
10858 net/ceph/crypto.c | 9 +-
10859 net/dns_resolver/dns_key.c | 6 +-
10860 net/rxrpc/ar-key.c | 40 +-
10861 scripts/.gitignore | 1 +
10862 scripts/Makefile | 2 +
10863 scripts/Makefile.build | 11 +
10864 scripts/Makefile.modpost | 77 +-
10865 scripts/asn1_compiler.c | 1545 +++++++++++++++++++++++++++++
10866 scripts/sign-file | 115 +++
10867 scripts/x509keyid | 268 +++++
10868 security/keys/encrypted-keys/encrypted.c | 16 +-
10869 security/keys/key.c | 114 ++-
10870 security/keys/keyctl.c | 18 +-
10871 security/keys/keyring.c | 6 +-
10872 security/keys/request_key_auth.c | 8 +-
10873 security/keys/trusted.c | 16 +-
10874 security/keys/user_defined.c | 14 +-
10875 128 files changed, 6768 insertions(+), 594 deletions(-)
10876 create mode 100644 Documentation/crypto/asymmetric-keys.txt
10877 delete mode 100644 arch/cris/include/asm/module.h
10878 delete mode 100644 arch/h8300/include/asm/module.h
10879 delete mode 100644 arch/m32r/include/asm/module.h
10880 create mode 100644 arch/mips/kernel/module-rela.c
10881 delete mode 100644 arch/sparc/include/asm/module.h
10882 create mode 100644 crypto/asymmetric_keys/.gitignore
10883 create mode 100644 crypto/asymmetric_keys/Kconfig
10884 create mode 100644 crypto/asymmetric_keys/Makefile
10885 create mode 100644 crypto/asymmetric_keys/asymmetric_keys.h
10886 create mode 100644 crypto/asymmetric_keys/asymmetric_type.c
10887 create mode 100644 crypto/asymmetric_keys/public_key.c
10888 create mode 100644 crypto/asymmetric_keys/public_key.h
10889 create mode 100644 crypto/asymmetric_keys/rsa.c
10890 create mode 100644 crypto/asymmetric_keys/signature.c
10891 create mode 100644 crypto/asymmetric_keys/x509.asn1
10892 create mode 100644 crypto/asymmetric_keys/x509_cert_parser.c
10893 create mode 100644 crypto/asymmetric_keys/x509_parser.h
10894 create mode 100644 crypto/asymmetric_keys/x509_public_key.c
10895 create mode 100644 crypto/asymmetric_keys/x509_rsakey.asn1
10896 create mode 100644 include/asm-generic/bitops/count_zeros.h
10897 create mode 100644 include/crypto/public_key.h
10898 create mode 100644 include/keys/asymmetric-parser.h
10899 create mode 100644 include/keys/asymmetric-subtype.h
10900 create mode 100644 include/keys/asymmetric-type.h
10901 create mode 100644 include/linux/asn1.h
10902 create mode 100644 include/linux/asn1_ber_bytecode.h
10903 create mode 100644 include/linux/asn1_decoder.h
10904 create mode 100644 include/linux/oid_registry.h
10905 create mode 100644 kernel/modsign_pubkey.c
10906 create mode 100644 kernel/module-internal.h
10907 create mode 100644 kernel/module_signing.c
10908 create mode 100644 lib/asn1_decoder.c
10909 create mode 100755 lib/build_OID_registry
10910 create mode 100644 lib/mpi/mpi-cmp.c
10911 create mode 100644 lib/oid_registry.c
10912 create mode 100644 scripts/asn1_compiler.c
10913 create mode 100644 scripts/sign-file
10914 create mode 100755 scripts/x509keyid
10915 Merging virtio/virtio-next (bb81110 virtio-blk: Disable callback in virtblk_done())
10916 $ git merge virtio/virtio-next
10917 Auto-merging kernel/trace/trace.c
10918 Auto-merging drivers/char/virtio_console.c
10919 Auto-merging arch/s390/Kconfig
10920 Merge made by the 'recursive' strategy.
10921 arch/s390/Kconfig | 1 -
10922 arch/x86/lguest/Kconfig | 1 -
10923 drivers/block/virtio_blk.c | 306 +++++++++++++++++++++++----
10924 drivers/char/virtio_console.c | 198 +++++++++++++++--
10925 drivers/lguest/lguest_device.c | 5 +-
10926 drivers/remoteproc/remoteproc_virtio.c | 5 +-
10927 drivers/rpmsg/Kconfig | 1 -
10928 drivers/s390/kvm/kvm_virtio.c | 5 +-
10929 drivers/virtio/Kconfig | 17 +-
10930 drivers/virtio/Makefile | 3 +-
10931 drivers/virtio/virtio.c | 2 +-
10932 drivers/virtio/virtio_mmio.c | 29 ++-
10933 drivers/virtio/virtio_pci.c | 68 +++++-
10934 drivers/virtio/virtio_ring.c | 14 +-
10935 include/linux/virtio.h | 2 +
10936 include/linux/virtio_config.h | 23 ++
10937 include/linux/virtio_ring.h | 3 +-
10938 kernel/trace/trace.c | 8 +-
10939 tools/virtio/virtio-trace/Makefile | 13 ++
10940 tools/virtio/virtio-trace/README | 118 +++++++++++
10941 tools/virtio/virtio-trace/trace-agent-ctl.c | 137 ++++++++++++
10942 tools/virtio/virtio-trace/trace-agent-rw.c | 192 +++++++++++++++++
10943 tools/virtio/virtio-trace/trace-agent.c | 270 +++++++++++++++++++++++
10944 tools/virtio/virtio-trace/trace-agent.h | 75 +++++++
10945 24 files changed, 1390 insertions(+), 106 deletions(-)
10946 create mode 100644 tools/virtio/virtio-trace/Makefile
10947 create mode 100644 tools/virtio/virtio-trace/README
10948 create mode 100644 tools/virtio/virtio-trace/trace-agent-ctl.c
10949 create mode 100644 tools/virtio/virtio-trace/trace-agent-rw.c
10950 create mode 100644 tools/virtio/virtio-trace/trace-agent.c
10951 create mode 100644 tools/virtio/virtio-trace/trace-agent.h
10952 Merging input/next (7774036 Merge branch 'for-next' of git://github.com/rydberg/linux into next)
10953 $ git merge input/next
10954 Already up-to-date!
10955 Merge made by the 'recursive' strategy.
10956 Merging input-mt/for-next (51c80b7 Input: bcm5974 - Convert to MT-B)
10957 $ git merge input-mt/for-next
10958 Already up-to-date.
10959 Merging cgroup/for-next (c0a93e2 Merge branch 'for-3.7-hierarchy' into for-next)
10960 $ git merge cgroup/for-next
10961 Already up-to-date!
10962 Merge made by the 'recursive' strategy.
10963 Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
10964 $ git merge block/for-next
10965 Recorded preimage for 'init/Kconfig'
10966 Auto-merging init/Kconfig
10967 CONFLICT (content): Merge conflict in init/Kconfig
10968 Auto-merging include/linux/fs.h
10969 Auto-merging drivers/target/target_core_iblock.c
10970 Auto-merging drivers/md/md.c
10971 Auto-merging drivers/md/dm.c
10972 Auto-merging drivers/block/mtip32xx/mtip32xx.h
10973 Auto-merging drivers/block/mtip32xx/mtip32xx.c
10974 Auto-merging drivers/block/loop.c
10975 Auto-merging drivers/block/floppy.c
10976 Auto-merging drivers/block/Kconfig
10977 Auto-merging block/ioctl.c
10978 Auto-merging block/genhd.c
10979 Auto-merging block/blk-core.c
10980 Auto-merging MAINTAINERS
10981 Automatic merge failed; fix conflicts and then commit the result.
10983 Recorded resolution for 'init/Kconfig'.
10984 [master c795ce5] Merge remote-tracking branch 'block/for-next'
10985 $ git diff -M --stat --summary HEAD^..
10986 Documentation/ABI/testing/sysfs-block | 14 +
10987 Documentation/block/biodoc.txt | 5 -
10988 Documentation/percpu-rw-semaphore.txt | 27 +
10990 block/blk-core.c | 51 +-
10991 block/blk-lib.c | 104 +-
10992 block/blk-merge.c | 53 +-
10993 block/blk-settings.c | 16 +
10994 block/blk-sysfs.c | 44 +-
10995 block/blk-tag.c | 6 +-
10997 block/elevator.c | 6 +-
10998 block/genhd.c | 6 +-
10999 block/ioctl.c | 27 +
11000 drivers/block/Kconfig | 1 +
11001 drivers/block/cciss.c | 1 -
11002 drivers/block/drbd/drbd_main.c | 13 +-
11003 drivers/block/floppy.c | 97 +-
11004 drivers/block/loop.c | 17 +-
11005 drivers/block/mtip32xx/mtip32xx.c | 19 +-
11006 drivers/block/mtip32xx/mtip32xx.h | 3 +
11007 drivers/block/osdblk.c | 3 +-
11008 drivers/block/pktcdvd.c | 52 +-
11009 drivers/block/xen-blkback/common.h | 4 +-
11010 drivers/block/xen-blkback/xenbus.c | 9 +-
11011 drivers/char/raw.c | 2 +-
11012 drivers/md/dm-crypt.c | 16 +-
11013 drivers/md/dm-io.c | 11 -
11014 drivers/md/dm.c | 74 +-
11015 drivers/md/md.c | 44 +-
11016 drivers/md/raid0.c | 1 +
11017 drivers/memstick/core/Kconfig | 12 +
11018 drivers/memstick/core/Makefile | 2 +-
11019 drivers/memstick/core/ms_block.c | 2395 +++++++++++++++++++++++++++++++++
11020 drivers/memstick/core/ms_block.h | 293 ++++
11021 drivers/target/target_core_iblock.c | 9 -
11022 fs/bio-integrity.c | 44 +-
11023 fs/bio.c | 231 ++--
11024 fs/block_dev.c | 69 +-
11025 fs/exofs/ore.c | 5 +-
11026 include/linux/bio.h | 70 +-
11027 include/linux/blk_types.h | 36 +-
11028 include/linux/blkdev.h | 82 +-
11029 include/linux/fs.h | 6 +
11030 include/linux/percpu-rwsem.h | 89 ++
11031 include/linux/scatterlist.h | 1 +
11032 lib/scatterlist.c | 19 +
11033 47 files changed, 3568 insertions(+), 533 deletions(-)
11034 create mode 100644 Documentation/percpu-rw-semaphore.txt
11035 create mode 100644 drivers/memstick/core/ms_block.c
11036 create mode 100644 drivers/memstick/core/ms_block.h
11037 create mode 100644 include/linux/percpu-rwsem.h
11038 Merging quilt/device-mapper (1ca30da Use the recently-added bio front_pad field to allocate struct dm_target_io.)
11039 $ git merge quilt/device-mapper
11040 Resolved 'drivers/md/dm-thin.c' using previous resolution.
11041 Resolved 'drivers/md/dm.c' using previous resolution.
11042 Auto-merging drivers/md/dm.c
11043 CONFLICT (content): Merge conflict in drivers/md/dm.c
11044 Auto-merging drivers/md/dm-verity.c
11045 Auto-merging drivers/md/dm-thin.c
11046 CONFLICT (content): Merge conflict in drivers/md/dm-thin.c
11047 Auto-merging drivers/md/dm-mpath.c
11048 Automatic merge failed; fix conflicts and then commit the result.
11050 [master 11d1159] Merge branch 'quilt/device-mapper'
11051 $ git diff -M --stat --summary HEAD^..
11052 drivers/md/Kconfig | 7 +
11053 drivers/md/Makefile | 1 +
11054 drivers/md/dm-bio-prison.c | 415 +++++++++++++++++
11055 drivers/md/dm-bio-prison.h | 72 +++
11056 drivers/md/dm-bufio.c | 13 +-
11057 drivers/md/dm-mpath.c | 3 +-
11058 drivers/md/dm-thin.c | 514 ++++------------------
11059 drivers/md/dm-verity.c | 2 +-
11060 drivers/md/dm.c | 80 ++--
11061 drivers/md/persistent-data/dm-space-map-common.c | 4 +-
11062 10 files changed, 618 insertions(+), 493 deletions(-)
11063 create mode 100644 drivers/md/dm-bio-prison.c
11064 create mode 100644 drivers/md/dm-bio-prison.h
11065 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
11066 $ git merge embedded/master
11067 Already up-to-date.
11068 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
11069 $ git merge firmware/master
11070 Already up-to-date.
11071 Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
11072 $ git merge pcmcia/master
11073 Already up-to-date.
11074 Merging mmc/mmc-next (0f59ede mmc: sdhci-spear: Add clk_{un}prepare() support)
11075 $ git merge mmc/mmc-next
11076 Recorded preimage for 'drivers/mmc/host/davinci_mmc.c'
11077 Resolved 'drivers/mmc/host/omap.c' using previous resolution.
11078 Auto-merging drivers/mmc/host/vub300.c
11079 Auto-merging drivers/mmc/host/sdhci-tegra.c
11080 Auto-merging drivers/mmc/host/pxamci.c
11081 Auto-merging drivers/mmc/host/omap_hsmmc.c
11082 Auto-merging drivers/mmc/host/omap.c
11083 CONFLICT (content): Merge conflict in drivers/mmc/host/omap.c
11084 Auto-merging drivers/mmc/host/mxcmmc.c
11085 Auto-merging drivers/mmc/host/davinci_mmc.c
11086 CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
11087 Auto-merging drivers/mmc/host/atmel-mci.c
11088 Auto-merging MAINTAINERS
11089 Automatic merge failed; fix conflicts and then commit the result.
11091 Recorded resolution for 'drivers/mmc/host/davinci_mmc.c'.
11092 [master 0edf22b] Merge remote-tracking branch 'mmc/mmc-next'
11093 $ git diff -M --stat --summary HEAD^..
11094 .../devicetree/bindings/mmc/atmel-hsmci.txt | 68 +
11095 .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 87 ++
11096 Documentation/devicetree/bindings/mmc/mmc.txt | 9 +-
11097 Documentation/devicetree/bindings/mmc/pxa-mmc.txt | 25 +
11098 .../devicetree/bindings/mmc/samsung-sdhci.txt | 53 +
11099 .../devicetree/bindings/mmc/sdhci-dove.txt | 14 +
11100 .../devicetree/bindings/mmc/sdhci-spear.txt | 18 +
11101 .../devicetree/bindings/mmc/synposis-dw-mshc.txt | 79 ++
11103 arch/arm/boot/dts/spear300-evb.dts | 3 +-
11104 arch/arm/boot/dts/spear320-evb.dts | 2 -
11105 drivers/mmc/core/core.c | 178 ++-
11106 drivers/mmc/core/debugfs.c | 2 +-
11107 drivers/mmc/core/mmc.c | 11 +
11108 drivers/mmc/core/mmc_ops.c | 84 +-
11109 drivers/mmc/core/sdio_bus.c | 7 -
11110 drivers/mmc/core/slot-gpio.c | 8 +-
11111 drivers/mmc/host/Kconfig | 16 +
11112 drivers/mmc/host/Makefile | 2 +
11113 drivers/mmc/host/atmel-mci-regs.h | 7 +
11114 drivers/mmc/host/atmel-mci.c | 113 +-
11115 drivers/mmc/host/bfin_sdh.c | 210 +--
11116 drivers/mmc/host/dw_mmc-exynos.c | 253 ++++
11117 drivers/mmc/host/dw_mmc-pci.c | 15 +-
11118 drivers/mmc/host/dw_mmc-pltfm.c | 62 +-
11119 drivers/mmc/host/dw_mmc-pltfm.h | 20 +
11120 drivers/mmc/host/dw_mmc.c | 321 ++++-
11121 drivers/mmc/host/dw_mmc.h | 24 +
11122 drivers/mmc/host/mmc_spi.c | 15 +-
11123 drivers/mmc/host/mmci.c | 13 +-
11124 drivers/mmc/host/mxcmmc.c | 76 +-
11125 drivers/mmc/host/omap.c | 37 +-
11126 drivers/mmc/host/omap_hsmmc.c | 125 +-
11127 drivers/mmc/host/pxamci.c | 52 +
11128 drivers/mmc/host/rtsx_pci_sdmmc.c | 1332 ++++++++++++++++++++
11129 drivers/mmc/host/sdhci-dove.c | 8 +
11130 drivers/mmc/host/sdhci-of-esdhc.c | 36 +-
11131 drivers/mmc/host/sdhci-pci.c | 19 +-
11132 drivers/mmc/host/sdhci-pltfm.c | 3 +
11133 drivers/mmc/host/sdhci-pxav2.c | 6 +-
11134 drivers/mmc/host/sdhci-pxav3.c | 35 +-
11135 drivers/mmc/host/sdhci-s3c.c | 216 +++-
11136 drivers/mmc/host/sdhci-spear.c | 67 +-
11137 drivers/mmc/host/sdhci-tegra.c | 7 +-
11138 drivers/mmc/host/sdhci.c | 196 ++-
11139 drivers/mmc/host/sh_mmcif.c | 8 +-
11140 drivers/mmc/host/via-sdmmc.c | 16 +-
11141 drivers/mmc/host/vub300.c | 4 +-
11142 include/linux/mmc/card.h | 8 +
11143 include/linux/mmc/core.h | 4 +
11144 include/linux/mmc/dw_mmc.h | 15 +-
11145 include/linux/mmc/host.h | 1 +
11146 include/linux/mmc/mmc.h | 19 +
11147 include/linux/mmc/sdhci.h | 3 +-
11148 include/linux/platform_data/pxa_sdhci.h | 1 +
11149 55 files changed, 3499 insertions(+), 520 deletions(-)
11150 create mode 100644 Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
11151 create mode 100644 Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
11152 create mode 100644 Documentation/devicetree/bindings/mmc/pxa-mmc.txt
11153 create mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt
11154 create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt
11155 create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-spear.txt
11156 create mode 100644 Documentation/devicetree/bindings/mmc/synposis-dw-mshc.txt
11157 create mode 100644 drivers/mmc/host/dw_mmc-exynos.c
11158 create mode 100644 drivers/mmc/host/dw_mmc-pltfm.h
11159 create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
11160 Merging kgdb/kgdb-next (08f9553 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
11161 $ git merge kgdb/kgdb-next
11162 Auto-merging drivers/tty/serial/kgdboc.c
11163 Merge made by the 'recursive' strategy.
11164 arch/mips/kernel/kgdb.c | 9 +++++++++
11165 arch/x86/kernel/kgdb.c | 2 ++
11166 drivers/tty/serial/kgdboc.c | 3 ++-
11167 include/linux/console.h | 10 ++++++++--
11168 4 files changed, 21 insertions(+), 3 deletions(-)
11169 Merging slab/for-next (2f5f5d8 Merge branch 'slab/tracing' into for-next)
11170 $ git merge slab/for-next
11171 Auto-merging mm/slub.c
11172 Auto-merging mm/slab.c
11173 Merge made by the 'recursive' strategy.
11174 include/linux/slab.h | 6 +-
11175 include/linux/slab_def.h | 27 ++--
11176 include/linux/slob_def.h | 6 +-
11177 mm/slab.c | 343 +++++++++++++++++++---------------------------
11179 mm/slab_common.c | 159 +++++++++++++++------
11180 mm/slob.c | 91 +++++++-----
11181 mm/slub.c | 204 +++++++++++++--------------
11182 mm/util.c | 35 +++--
11183 9 files changed, 458 insertions(+), 432 deletions(-)
11184 Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
11185 $ git merge uclinux/for-next
11186 Already up-to-date.
11187 Merging md/for-next (c0c6d3f md: writing to sync_action should clear the read-auto state.)
11188 $ git merge md/for-next
11189 Resolved 'drivers/md/raid0.c' using previous resolution.
11190 Resolved 'fs/bio.c' using previous resolution.
11191 Auto-merging fs/bio.c
11192 CONFLICT (content): Merge conflict in fs/bio.c
11193 Auto-merging drivers/md/raid0.c
11194 CONFLICT (content): Merge conflict in drivers/md/raid0.c
11195 Auto-merging drivers/md/md.c
11196 Auto-merging block/blk-core.c
11197 Automatic merge failed; fix conflicts and then commit the result.
11199 [master aba82d1] Merge remote-tracking branch 'md/for-next'
11200 $ git diff -M --stat --summary HEAD^..
11201 Documentation/device-mapper/dm-raid.txt | 9 +
11202 block/blk-core.c | 1 +
11203 crypto/xor.c | 4 +-
11204 drivers/md/bitmap.c | 17 +-
11205 drivers/md/dm-raid.c | 124 ++++--
11206 drivers/md/linear.c | 25 +-
11207 drivers/md/md.c | 148 +++++--
11208 drivers/md/md.h | 17 +-
11209 drivers/md/multipath.c | 3 +-
11210 drivers/md/raid0.c | 19 +-
11211 drivers/md/raid1.c | 34 +-
11212 drivers/md/raid10.c | 91 ++++-
11213 drivers/md/raid5.c | 664 ++++++++++++++++++++++++++++---
11214 drivers/md/raid5.h | 20 +
11215 14 files changed, 1022 insertions(+), 154 deletions(-)
11216 Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic)
11217 $ git merge mfd/for-next
11218 Recorded preimage for 'drivers/video/backlight/88pm860x_bl.c'
11219 Resolved 'Documentation/devicetree/bindings/regulator/tps6586x.txt' using previous resolution.
11220 Resolved 'drivers/mfd/88pm860x-core.c' using previous resolution.
11221 Resolved 'drivers/mfd/db8500-prcmu.c' using previous resolution.
11222 Resolved 'drivers/mfd/max8925-core.c' using previous resolution.
11223 Resolved 'drivers/mfd/tc3589x.c' using previous resolution.
11224 Resolved 'drivers/mfd/tps65217.c' using previous resolution.
11225 Resolved 'drivers/regulator/anatop-regulator.c' using previous resolution.
11226 Auto-merging include/linux/mfd/twl6040.h
11227 Auto-merging include/linux/mfd/tps6586x.h
11228 Auto-merging include/linux/mfd/tps65217.h
11229 Removing include/linux/mfd/anatop.h
11230 Auto-merging drivers/video/backlight/88pm860x_bl.c
11231 CONFLICT (content): Merge conflict in drivers/video/backlight/88pm860x_bl.c
11232 Auto-merging drivers/regulator/wm831x-ldo.c
11233 Auto-merging drivers/regulator/wm831x-dcdc.c
11234 Auto-merging drivers/regulator/palmas-regulator.c
11235 Auto-merging drivers/regulator/anatop-regulator.c
11236 CONFLICT (content): Merge conflict in drivers/regulator/anatop-regulator.c
11237 Auto-merging drivers/regulator/ab3100.c
11238 Auto-merging drivers/regulator/Kconfig
11239 Auto-merging drivers/pwm/pwm-twl6030.c
11240 Auto-merging drivers/pwm/Kconfig
11241 Auto-merging drivers/mfd/wm8994-core.c
11242 Auto-merging drivers/mfd/wm831x-core.c
11243 Auto-merging drivers/mfd/twl6040-core.c
11244 Auto-merging drivers/mfd/twl-core.c
11245 Auto-merging drivers/mfd/tps65910.c
11246 Auto-merging drivers/mfd/tps6586x.c
11247 Auto-merging drivers/mfd/tps65217.c
11248 CONFLICT (content): Merge conflict in drivers/mfd/tps65217.c
11249 Auto-merging drivers/mfd/tps65090.c
11250 Auto-merging drivers/mfd/tc3589x.c
11251 CONFLICT (content): Merge conflict in drivers/mfd/tc3589x.c
11252 Auto-merging drivers/mfd/rc5t583.c
11253 Auto-merging drivers/mfd/palmas.c
11254 Auto-merging drivers/mfd/mc13xxx-core.c
11255 Auto-merging drivers/mfd/max8925-core.c
11256 CONFLICT (content): Merge conflict in drivers/mfd/max8925-core.c
11257 Auto-merging drivers/mfd/lpc_ich.c
11258 Auto-merging drivers/mfd/db8500-prcmu.c
11259 CONFLICT (content): Merge conflict in drivers/mfd/db8500-prcmu.c
11260 Removing drivers/mfd/anatop-mfd.c
11261 Auto-merging drivers/mfd/ab8500-core.c
11262 Auto-merging drivers/mfd/ab3100-core.c
11263 Auto-merging drivers/mfd/Kconfig
11264 Auto-merging drivers/mfd/88pm860x-core.c
11265 CONFLICT (content): Merge conflict in drivers/mfd/88pm860x-core.c
11266 Auto-merging drivers/gpio/Makefile
11267 Auto-merging drivers/gpio/Kconfig
11268 Auto-merging arch/arm/plat-omap/include/plat/usb.h
11269 Auto-merging arch/arm/mach-u300/i2c.c
11270 Auto-merging arch/arm/mach-omap2/usb-host.c
11271 Auto-merging arch/arm/mach-imx/mach-imx6q.c
11272 Auto-merging arch/arm/mach-imx/Kconfig
11273 Auto-merging arch/arm/boot/dts/pxa910.dtsi
11274 Auto-merging arch/arm/boot/dts/imx6q.dtsi
11275 Auto-merging Documentation/devicetree/bindings/regulator/tps6586x.txt
11276 CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/regulator/tps6586x.txt
11277 Automatic merge failed; fix conflicts and then commit the result.
11279 Recorded resolution for 'drivers/video/backlight/88pm860x_bl.c'.
11280 [master 341cf15] Merge remote-tracking branch 'mfd/for-next'
11281 $ git diff -M --stat --summary HEAD^..
11282 Documentation/devicetree/bindings/mfd/88pm860x.txt | 85 +++
11283 Documentation/devicetree/bindings/mfd/syscon.txt | 20 +
11284 Documentation/devicetree/bindings/mfd/tps65910.txt | 4 +
11285 Documentation/devicetree/bindings/mfd/twl6040.txt | 9 +-
11286 .../devicetree/bindings/regulator/88pm860x.txt | 30 +
11287 .../devicetree/bindings/regulator/max8907.txt | 69 ++
11288 .../devicetree/bindings/regulator/tps6586x.txt | 6 +
11289 .../bindings/video/backlight/88pm860x.txt | 15 +
11290 Documentation/smsc_ece1099.txt | 56 ++
11291 arch/arm/boot/dts/imx6q.dtsi | 9 +-
11292 arch/arm/boot/dts/pxa910-dkb.dts | 137 ++++
11293 arch/arm/boot/dts/pxa910.dtsi | 4 +
11294 arch/arm/mach-imx/Kconfig | 2 +-
11295 arch/arm/mach-imx/mach-imx6q.c | 47 +-
11296 arch/arm/mach-omap2/usb-host.c | 31 +-
11297 arch/arm/mach-u300/i2c.c | 2 +-
11298 arch/arm/plat-omap/include/plat/usb.h | 7 +
11299 drivers/gpio/Kconfig | 7 +
11300 drivers/gpio/Makefile | 1 +
11301 drivers/gpio/gpio-ich.c | 79 +-
11302 drivers/gpio/gpio-twl6040.c | 137 ++++
11303 drivers/input/touchscreen/88pm860x-ts.c | 127 ++-
11304 drivers/leds/leds-88pm860x.c | 205 +++--
11305 drivers/mfd/88pm860x-core.c | 805 ++++++++++++++------
11306 drivers/mfd/88pm860x-i2c.c | 174 +----
11307 drivers/mfd/Kconfig | 75 +-
11308 drivers/mfd/Makefile | 12 +-
11309 drivers/mfd/ab3100-core.c | 1 +
11310 drivers/mfd/ab8500-core.c | 37 +-
11311 drivers/mfd/anatop-mfd.c | 124 ---
11312 drivers/mfd/arizona-irq.c | 56 +-
11313 drivers/mfd/da9055-core.c | 423 ++++++++++
11314 drivers/mfd/da9055-i2c.c | 93 +++
11315 drivers/mfd/db8500-prcmu.c | 48 +-
11316 drivers/mfd/lp8788-irq.c | 198 +++++
11317 drivers/mfd/lp8788.c | 245 ++++++
11318 drivers/mfd/lpc_ich.c | 43 +-
11319 drivers/mfd/max8907.c | 351 +++++++++
11320 drivers/mfd/max8925-core.c | 427 ++++++++---
11321 drivers/mfd/mc13xxx-core.c | 1 -
11322 drivers/mfd/omap-usb-host.c | 238 +-----
11323 drivers/mfd/omap-usb-tll.c | 471 ++++++++++++
11324 drivers/mfd/palmas.c | 149 ++--
11325 drivers/mfd/rc5t583-irq.c | 2 +-
11326 drivers/mfd/rc5t583.c | 2 +-
11327 drivers/mfd/smsc-ece1099.c | 113 +++
11328 drivers/mfd/syscon.c | 176 +++++
11329 drivers/mfd/tc3589x.c | 112 ++-
11330 drivers/mfd/tps65090.c | 2 +-
11331 drivers/mfd/tps65217.c | 3 +
11332 drivers/mfd/tps6586x.c | 19 +
11333 drivers/mfd/tps65910.c | 32 +
11334 drivers/mfd/twl-core.c | 124 +--
11335 drivers/mfd/twl6040-core.c | 17 +-
11336 drivers/mfd/wm5110-tables.c | 96 ++-
11337 drivers/mfd/wm831x-core.c | 66 +-
11338 drivers/mfd/wm8994-core.c | 2 +-
11339 drivers/mfd/wm8994-regmap.c | 2 +-
11340 drivers/pwm/Kconfig | 9 +
11341 drivers/pwm/Makefile | 1 +
11342 drivers/{mfd/twl6030-pwm.c => pwm/pwm-twl6030.c} | 119 +--
11343 drivers/regulator/88pm8607.c | 136 +++-
11344 drivers/regulator/Kconfig | 2 +-
11345 drivers/regulator/ab3100.c | 1 +
11346 drivers/regulator/anatop-regulator.c | 31 +-
11347 drivers/regulator/max8925-regulator.c | 35 +-
11348 drivers/regulator/palmas-regulator.c | 127 ++-
11349 drivers/regulator/wm831x-dcdc.c | 12 +-
11350 drivers/regulator/wm831x-isink.c | 4 +-
11351 drivers/regulator/wm831x-ldo.c | 12 +-
11352 drivers/rtc/rtc-88pm860x.c | 43 +-
11353 drivers/video/backlight/88pm860x_bl.c | 146 ++--
11354 drivers/video/backlight/Kconfig | 7 +
11355 drivers/video/backlight/Makefile | 1 +
11356 drivers/video/backlight/max8925_bl.c | 79 +-
11357 drivers/video/backlight/tps65217_bl.c | 342 +++++++++
11358 drivers/watchdog/iTCO_wdt.c | 1 +
11359 include/linux/ioport.h | 3 +-
11360 include/linux/mfd/88pm860x.h | 48 +-
11361 include/linux/mfd/ab3100.h | 129 ++++
11362 include/linux/mfd/abx500.h | 117 +--
11363 include/linux/mfd/abx500/ab8500.h | 2 -
11364 include/linux/mfd/anatop.h | 40 -
11365 include/linux/mfd/da9055/core.h | 94 +++
11366 include/linux/mfd/da9055/pdata.h | 32 +
11367 include/linux/mfd/da9055/reg.h | 699 +++++++++++++++++
11368 include/linux/mfd/lp8788-isink.h | 52 ++
11369 include/linux/mfd/lp8788.h | 364 +++++++++
11370 include/linux/mfd/lpc_ich.h | 1 +
11371 include/linux/mfd/max8907.h | 252 ++++++
11372 include/linux/mfd/max8925.h | 26 +-
11373 include/linux/mfd/palmas.h | 232 +++++-
11374 include/linux/mfd/smsc.h | 109 +++
11375 include/linux/mfd/syscon.h | 23 +
11376 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 319 ++++++++
11377 include/linux/mfd/tc3589x.h | 1 +
11378 include/linux/mfd/tps65217.h | 18 +
11379 include/linux/mfd/tps6586x.h | 1 +
11380 include/linux/mfd/tps65910.h | 3 +
11381 include/linux/mfd/twl6040.h | 11 +-
11382 100 files changed, 7731 insertions(+), 1781 deletions(-)
11383 create mode 100644 Documentation/devicetree/bindings/mfd/88pm860x.txt
11384 create mode 100644 Documentation/devicetree/bindings/mfd/syscon.txt
11385 create mode 100644 Documentation/devicetree/bindings/regulator/88pm860x.txt
11386 create mode 100644 Documentation/devicetree/bindings/regulator/max8907.txt
11387 create mode 100644 Documentation/devicetree/bindings/video/backlight/88pm860x.txt
11388 create mode 100644 Documentation/smsc_ece1099.txt
11389 create mode 100644 drivers/gpio/gpio-twl6040.c
11390 delete mode 100644 drivers/mfd/anatop-mfd.c
11391 create mode 100644 drivers/mfd/da9055-core.c
11392 create mode 100644 drivers/mfd/da9055-i2c.c
11393 create mode 100644 drivers/mfd/lp8788-irq.c
11394 create mode 100644 drivers/mfd/lp8788.c
11395 create mode 100644 drivers/mfd/max8907.c
11396 create mode 100644 drivers/mfd/omap-usb-tll.c
11397 create mode 100644 drivers/mfd/smsc-ece1099.c
11398 create mode 100644 drivers/mfd/syscon.c
11399 rename drivers/{mfd/twl6030-pwm.c => pwm/pwm-twl6030.c} (55%)
11400 create mode 100644 drivers/video/backlight/tps65217_bl.c
11401 create mode 100644 include/linux/mfd/ab3100.h
11402 delete mode 100644 include/linux/mfd/anatop.h
11403 create mode 100644 include/linux/mfd/da9055/core.h
11404 create mode 100644 include/linux/mfd/da9055/pdata.h
11405 create mode 100644 include/linux/mfd/da9055/reg.h
11406 create mode 100644 include/linux/mfd/lp8788-isink.h
11407 create mode 100644 include/linux/mfd/lp8788.h
11408 create mode 100644 include/linux/mfd/max8907.h
11409 create mode 100644 include/linux/mfd/smsc.h
11410 create mode 100644 include/linux/mfd/syscon.h
11411 create mode 100644 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
11412 Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
11413 $ git merge battery/master
11414 Recorded preimage for 'include/linux/mfd/88pm860x.h'
11415 Auto-merging include/linux/mfd/88pm860x.h
11416 CONFLICT (content): Merge conflict in include/linux/mfd/88pm860x.h
11417 Auto-merging drivers/power/wm97xx_battery.c
11418 Auto-merging drivers/power/charger-manager.c
11419 Auto-merging drivers/power/ab8500_fg.c
11420 Auto-merging drivers/power/ab8500_charger.c
11421 Auto-merging drivers/power/ab8500_btemp.c
11422 Auto-merging drivers/power/Makefile
11423 Auto-merging drivers/power/Kconfig
11424 Auto-merging drivers/mfd/88pm860x-core.c
11425 Automatic merge failed; fix conflicts and then commit the result.
11427 Recorded resolution for 'include/linux/mfd/88pm860x.h'.
11428 [master 79890dc] Merge remote-tracking branch 'battery/master'
11429 $ git diff -M --stat --summary HEAD^..
11430 Documentation/power/power_supply_class.txt | 7 +
11431 drivers/mfd/88pm860x-core.c | 22 +-
11432 drivers/power/88pm860x_battery.c | 1041 ++++++++++++++++++++++++++++
11433 drivers/power/88pm860x_charger.c | 746 ++++++++++++++++++++
11434 drivers/power/Kconfig | 20 +-
11435 drivers/power/Makefile | 3 +
11436 drivers/power/ab8500_btemp.c | 1 +
11437 drivers/power/ab8500_charger.c | 1 +
11438 drivers/power/ab8500_fg.c | 1 +
11439 drivers/power/bq27x00_battery.c | 3 +-
11440 drivers/power/charger-manager.c | 434 ++++++++++--
11441 drivers/power/da9030_battery.c | 4 +-
11442 drivers/power/da9052-battery.c | 11 +-
11443 drivers/power/ds2781_battery.c | 28 +-
11444 drivers/power/lp8727_charger.c | 360 ++++++----
11445 drivers/power/lp8788-charger.c | 795 +++++++++++++++++++++
11446 drivers/power/pda_power.c | 13 +-
11447 drivers/power/power_supply_sysfs.c | 3 +
11448 drivers/power/sbs-battery.c | 10 +
11449 drivers/power/smb347-charger.c | 97 ++-
11450 drivers/power/twl4030_charger.c | 25 +-
11451 drivers/power/wm97xx_battery.c | 4 +-
11452 include/linux/mfd/88pm860x.h | 84 ++-
11453 include/linux/platform_data/lp8727.h | 51 +-
11454 include/linux/power/charger-manager.h | 47 +-
11455 include/linux/power_supply.h | 5 +
11456 26 files changed, 3519 insertions(+), 297 deletions(-)
11457 create mode 100644 drivers/power/88pm860x_battery.c
11458 create mode 100644 drivers/power/88pm860x_charger.c
11459 create mode 100644 drivers/power/lp8788-charger.c
11460 Merging fbdev/fbdev-next (ebe9f7b video: exynos_mipi_dsi: Remove unnecessary NULL check)
11461 $ git merge fbdev/fbdev-next
11462 Resolved 'arch/arm/mach-s3c64xx/mach-mini6410.c' using previous resolution.
11463 Resolved 'arch/arm/mach-s3c64xx/mach-real6410.c' using previous resolution.
11464 Resolved 'drivers/video/msm/mddi.c' using previous resolution.
11465 Resolved 'drivers/video/msm/mdp.c' using previous resolution.
11466 Auto-merging include/video/samsung_fimd.h
11467 Auto-merging drivers/video/ps3fb.c
11468 Removing drivers/video/pnx4008/sdum.h
11469 Removing drivers/video/pnx4008/sdum.c
11470 Removing drivers/video/pnx4008/pnxrgbfb.c
11471 Removing drivers/video/pnx4008/fbcommon.h
11472 Removing drivers/video/pnx4008/dum.h
11473 Removing drivers/video/pnx4008/Makefile
11474 Auto-merging drivers/video/msm/mdp_hw.h
11475 CONFLICT (content): Merge conflict in drivers/video/msm/mdp_hw.h
11476 Auto-merging drivers/video/msm/mdp.c
11477 CONFLICT (content): Merge conflict in drivers/video/msm/mdp.c
11478 Auto-merging drivers/video/msm/mddi_client_nt35399.c
11479 Auto-merging drivers/video/msm/mddi.c
11480 CONFLICT (content): Merge conflict in drivers/video/msm/mddi.c
11481 Auto-merging drivers/video/imxfb.c
11482 Auto-merging drivers/video/exynos/exynos_mipi_dsi.c
11483 CONFLICT (modify/delete): drivers/video/epson1355fb.c deleted in HEAD and modified in fbdev/fbdev-next. Version fbdev/fbdev-next of drivers/video/epson1355fb.c left in tree.
11484 Auto-merging drivers/video/ep93xx-fb.c
11485 Auto-merging drivers/video/da8xx-fb.c
11486 Auto-merging drivers/video/Makefile
11487 Auto-merging drivers/video/Kconfig
11488 Auto-merging drivers/gpu/drm/exynos/exynos_drm_fimd.c
11489 Removing arch/arm/plat-samsung/include/plat/regs-fb-v4.h
11490 Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c
11491 Auto-merging arch/arm/mach-s5pv210/mach-goni.c
11492 Auto-merging arch/arm/mach-s5pc100/mach-smdkc100.c
11493 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
11494 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
11495 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
11496 Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
11497 CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-real6410.c
11498 Auto-merging arch/arm/mach-s3c64xx/mach-ncp.c
11499 Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
11500 CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-mini6410.c
11501 Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c
11502 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
11503 Auto-merging arch/arm/mach-s3c64xx/mach-anw6410.c
11504 Auto-merging arch/arm/mach-s3c24xx/mach-smdk2416.c
11505 Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
11506 Auto-merging arch/arm/mach-exynos/mach-smdkv310.c
11507 Auto-merging arch/arm/mach-exynos/mach-smdk4x12.c
11508 Auto-merging arch/arm/mach-exynos/mach-origen.c
11509 Auto-merging arch/arm/mach-exynos/mach-nuri.c
11510 Automatic merge failed; fix conflicts and then commit the result.
11511 $ git rm -f drivers/video/epson1355fb.c
11512 drivers/video/epson1355fb.c: needs merge
11513 rm 'drivers/video/epson1355fb.c'
11515 Recorded resolution for 'drivers/video/msm/mdp_hw.h'.
11516 [master 4ef4903] Merge remote-tracking branch 'fbdev/fbdev-next'
11517 $ git diff -M --stat --summary HEAD^..
11518 arch/arm/mach-exynos/mach-nuri.c | 2 +-
11519 arch/arm/mach-exynos/mach-origen.c | 2 +-
11520 arch/arm/mach-exynos/mach-smdk4x12.c | 2 +-
11521 arch/arm/mach-exynos/mach-smdkv310.c | 2 +-
11522 arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
11523 arch/arm/mach-exynos/setup-fimd0.c | 2 +-
11524 arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 +-
11525 arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
11526 arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
11527 arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
11528 arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
11529 arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
11530 arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
11531 arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
11532 arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
11533 arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
11534 arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +-
11535 arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +-
11536 arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +-
11537 arch/arm/mach-s5pv210/mach-aquila.c | 2 +-
11538 arch/arm/mach-s5pv210/mach-goni.c | 2 +-
11539 arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +-
11540 arch/arm/plat-samsung/include/plat/regs-fb-v4.h | 159 ----
11541 drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +-
11542 drivers/video/Kconfig | 15 -
11543 drivers/video/Makefile | 2 -
11544 drivers/video/amifb.c | 2 -
11545 drivers/video/arcfb.c | 1 +
11546 drivers/video/atmel_lcdfb.c | 5 +-
11547 drivers/video/bf537-lq035.c | 12 +-
11548 drivers/video/bf54x-lq043fb.c | 9 +-
11549 drivers/video/bfin-lq035q1-fb.c | 13 +-
11550 drivers/video/bfin-t350mcqb-fb.c | 1 +
11551 drivers/video/bw2.c | 4 +-
11552 drivers/video/cg3.c | 3 +-
11553 drivers/video/cobalt_lcdfb.c | 5 +-
11554 drivers/video/console/font_mini_4x6.c | 2 +-
11555 drivers/video/console/font_sun8x16.c | 2 +-
11556 drivers/video/cyber2000fb.c | 4 +-
11557 drivers/video/da8xx-fb.c | 191 +++--
11558 drivers/video/ep93xx-fb.c | 17 +-
11559 drivers/video/exynos/exynos_dp_core.c | 314 ++++---
11560 drivers/video/exynos/exynos_dp_core.h | 6 +-
11561 drivers/video/exynos/exynos_dp_reg.c | 58 +-
11562 drivers/video/exynos/exynos_dp_reg.h | 3 +-
11563 drivers/video/exynos/exynos_mipi_dsi.c | 6 +-
11564 drivers/video/exynos/exynos_mipi_dsi_common.c | 8 -
11565 drivers/video/fsl-diu-fb.c | 10 +-
11566 drivers/video/gbefb.c | 15 +-
11567 drivers/video/hpfb.c | 28 +-
11568 drivers/video/imxfb.c | 1 +
11569 drivers/video/jz4740_fb.c | 44 +-
11570 drivers/video/mb862xx/mb862xxfbdrv.c | 10 +-
11571 drivers/video/mbx/mbxfb.c | 25 +-
11572 drivers/video/msm/mddi.c | 3 -
11573 drivers/video/msm/mddi_client_nt35399.c | 6 +-
11574 drivers/video/msm/mdp.c | 1 -
11575 drivers/video/msm/mdp_hw.h | 1 -
11576 drivers/video/pnx4008/Makefile | 7 -
11577 drivers/video/pnx4008/dum.h | 211 -----
11578 drivers/video/pnx4008/fbcommon.h | 43 -
11579 drivers/video/pnx4008/pnxrgbfb.c | 198 -----
11580 drivers/video/pnx4008/sdum.c | 861 --------------------
11581 drivers/video/pnx4008/sdum.h | 136 ----
11582 drivers/video/ps3fb.c | 7 +-
11583 drivers/video/s3c-fb.c | 26 +-
11584 drivers/video/s3c2410fb.c | 34 +-
11585 drivers/video/sis/initextlfb.c | 2 +-
11586 drivers/video/sunxvr1000.c | 4 +-
11587 drivers/video/sunxvr2500.c | 4 +-
11588 drivers/video/sunxvr500.c | 8 +-
11589 drivers/video/uvesafb.c | 2 +
11590 drivers/video/vermilion/vermilion.c | 3 +-
11591 drivers/video/via/via_clock.c | 19 +
11592 .../plat/regs-fb.h => include/video/samsung_fimd.h | 152 +++-
11593 75 files changed, 665 insertions(+), 2084 deletions(-)
11594 delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb-v4.h
11595 delete mode 100644 drivers/video/pnx4008/Makefile
11596 delete mode 100644 drivers/video/pnx4008/dum.h
11597 delete mode 100644 drivers/video/pnx4008/fbcommon.h
11598 delete mode 100644 drivers/video/pnx4008/pnxrgbfb.c
11599 delete mode 100644 drivers/video/pnx4008/sdum.c
11600 delete mode 100644 drivers/video/pnx4008/sdum.h
11601 rename arch/arm/plat-samsung/include/plat/regs-fb.h => include/video/samsung_fimd.h (73%)
11602 Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
11603 $ git merge viafb/viafb-next
11604 Already up-to-date.
11605 Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
11606 $ git merge omap_dss2/for-next
11607 Resolved 'drivers/video/omap/lcd_ams_delta.c' using previous resolution.
11608 Resolved 'drivers/video/omap2/displays/panel-taal.c' using previous resolution.
11609 Resolved 'drivers/video/omap2/dss/dispc.c' using previous resolution.
11610 Auto-merging drivers/video/omap2/omapfb/omapfb-main.c
11611 Auto-merging drivers/video/omap2/dss/dsi.c
11612 Auto-merging drivers/video/omap2/dss/dispc.c
11613 CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c
11614 Auto-merging drivers/video/omap2/displays/panel-taal.c
11615 CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-taal.c
11616 Auto-merging drivers/video/omap/lcd_ams_delta.c
11617 CONFLICT (content): Merge conflict in drivers/video/omap/lcd_ams_delta.c
11618 Auto-merging drivers/staging/omapdrm/omap_drv.c
11619 Auto-merging drivers/media/platform/omap/omap_vout.c
11620 Auto-merging arch/arm/mach-omap2/twl-common.c
11621 Auto-merging arch/arm/mach-omap2/board-omap4panda.c
11622 Auto-merging arch/arm/mach-omap2/board-4430sdp.c
11623 Automatic merge failed; fix conflicts and then commit the result.
11625 [master 8f94278] Merge remote-tracking branch 'omap_dss2/for-next'
11626 $ git diff -M --stat --summary HEAD^..
11627 arch/arm/mach-omap2/board-4430sdp.c | 73 +-
11628 arch/arm/mach-omap2/board-omap4panda.c | 27 +-
11629 arch/arm/mach-omap2/display.c | 1 -
11630 arch/arm/mach-omap2/twl-common.c | 6 +
11631 drivers/media/platform/omap/omap_vout.c | 75 +-
11632 drivers/staging/omapdrm/omap_drv.c | 5 +-
11633 drivers/video/omap/hwa742.c | 1 -
11634 drivers/video/omap/lcd_palmte.c | 1 -
11635 drivers/video/omap/omapfb_main.c | 9 -
11636 drivers/video/omap2/displays/panel-acx565akm.c | 14 +-
11637 drivers/video/omap2/displays/panel-generic-dpi.c | 76 +-
11638 .../omap2/displays/panel-lgphilips-lb035q02.c | 3 +
11639 drivers/video/omap2/displays/panel-n8x0.c | 31 +-
11640 .../omap2/displays/panel-nec-nl8048hl11-01b.c | 3 +
11641 drivers/video/omap2/displays/panel-picodlp.c | 4 +
11642 .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 3 +
11643 drivers/video/omap2/displays/panel-taal.c | 239 ++---
11644 drivers/video/omap2/displays/panel-tfp410.c | 20 +-
11645 .../video/omap2/displays/panel-tpo-td043mtea1.c | 7 +-
11646 drivers/video/omap2/dss/Kconfig | 2 +-
11647 drivers/video/omap2/dss/Makefile | 4 +-
11648 drivers/video/omap2/dss/apply.c | 330 ++-----
11649 drivers/video/omap2/dss/core.c | 91 +-
11650 drivers/video/omap2/dss/dispc.c | 1018 ++++++++++++++------
11651 drivers/video/omap2/dss/dispc.h | 37 +
11652 drivers/video/omap2/dss/display.c | 108 ++-
11653 drivers/video/omap2/dss/dpi.c | 181 +++-
11654 drivers/video/omap2/dss/dsi.c | 675 ++++++++++---
11655 drivers/video/omap2/dss/dss.c | 257 +++--
11656 drivers/video/omap2/dss/dss.h | 79 +-
11657 drivers/video/omap2/dss/dss_features.c | 278 +++++-
11658 drivers/video/omap2/dss/dss_features.h | 7 +
11659 drivers/video/omap2/dss/hdmi.c | 247 +++--
11660 drivers/video/omap2/dss/hdmi_panel.c | 31 +-
11661 drivers/video/omap2/dss/manager-sysfs.c | 512 ++++++++++
11662 drivers/video/omap2/dss/manager.c | 473 +--------
11663 drivers/video/omap2/dss/output.c | 148 +++
11664 drivers/video/omap2/dss/overlay-sysfs.c | 456 +++++++++
11665 drivers/video/omap2/dss/overlay.c | 492 +---------
11666 drivers/video/omap2/dss/rfbi.c | 222 +++--
11667 drivers/video/omap2/dss/sdi.c | 126 ++-
11668 drivers/video/omap2/dss/venc.c | 337 +++----
11669 drivers/video/omap2/dss/venc_panel.c | 251 +++++
11670 drivers/video/omap2/omapfb/omapfb-ioctl.c | 7 +-
11671 drivers/video/omap2/omapfb/omapfb-main.c | 32 +-
11672 drivers/video/omap2/omapfb/omapfb.h | 5 +-
11673 drivers/video/omap2/vram.c | 56 --
11674 include/video/omapdss.h | 112 ++-
11675 48 files changed, 4575 insertions(+), 2597 deletions(-)
11676 create mode 100644 drivers/video/omap2/dss/manager-sysfs.c
11677 create mode 100644 drivers/video/omap2/dss/output.c
11678 create mode 100644 drivers/video/omap2/dss/overlay-sysfs.c
11679 create mode 100644 drivers/video/omap2/dss/venc_panel.c
11680 Merging regulator/for-next (6a2027a Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next)
11681 $ git merge regulator/for-next
11682 Already up-to-date.
11683 Merging security/next (bf53083 Merge tag 'v3.6-rc7' into next)
11684 $ git merge security/next
11685 Resolved 'kernel/auditsc.c' using previous resolution.
11686 Resolved 'security/integrity/ima/ima_policy.c' using previous resolution.
11687 Auto-merging security/security.c
11688 Auto-merging security/keys/trusted.c
11689 Auto-merging security/integrity/ima/ima_policy.c
11690 CONFLICT (content): Merge conflict in security/integrity/ima/ima_policy.c
11691 Auto-merging kernel/auditsc.c
11692 CONFLICT (content): Merge conflict in kernel/auditsc.c
11693 Auto-merging include/linux/xattr.h
11694 Auto-merging include/linux/security.h
11695 Auto-merging include/linux/audit.h
11696 Auto-merging fs/xattr.c
11697 Auto-merging fs/file_table.c
11698 Auto-merging drivers/char/tpm/tpm_eventlog.c
11699 Auto-merging drivers/char/tpm/tpm.c
11700 Auto-merging arch/powerpc/kernel/prom_init.c
11701 Auto-merging Documentation/kernel-parameters.txt
11702 Automatic merge failed; fix conflicts and then commit the result.
11704 [master 69012fb] Merge remote-tracking branch 'security/next'
11705 $ git diff -M --stat --summary HEAD^..
11706 Documentation/ABI/testing/ima_policy | 25 +-
11707 Documentation/ABI/testing/sysfs-driver-ppi | 70 +++
11708 Documentation/kernel-parameters.txt | 8 +
11709 Documentation/security/Smack.txt | 10 +-
11710 arch/powerpc/kernel/prom_init.c | 62 ++
11711 drivers/char/hw_random/Kconfig | 13 +
11712 drivers/char/hw_random/Makefile | 1 +
11713 drivers/char/hw_random/tpm-rng.c | 50 ++
11714 drivers/char/tpm/Kconfig | 19 +
11715 drivers/char/tpm/Makefile | 8 +
11716 drivers/char/tpm/tpm.c | 74 ++-
11717 drivers/char/tpm/tpm.h | 35 +-
11718 drivers/char/tpm/tpm_acpi.c | 109 ++++
11719 drivers/char/tpm/{tpm_bios.c => tpm_eventlog.c} | 147 +----
11720 drivers/char/tpm/tpm_eventlog.h | 86 +++
11721 drivers/char/tpm/tpm_i2c_infineon.c | 695 +++++++++++++++++++++
11722 drivers/char/tpm/tpm_ibmvtpm.c | 749 +++++++++++++++++++++++
11723 drivers/char/tpm/tpm_ibmvtpm.h | 77 +++
11724 drivers/char/tpm/tpm_of.c | 73 +++
11725 drivers/char/tpm/tpm_ppi.c | 461 ++++++++++++++
11726 drivers/char/tpm/tpm_tis.c | 3 +-
11728 fs/file_table.c | 2 +-
11730 include/linux/audit.h | 2 +
11731 include/linux/ima.h | 27 +
11732 include/linux/integrity.h | 7 +-
11733 include/linux/ptrace.h | 2 -
11734 include/linux/security.h | 31 +
11735 include/linux/tpm.h | 4 +
11736 include/linux/xattr.h | 3 +
11737 kernel/auditsc.c | 85 ++-
11738 kernel/ptrace.c | 3 +-
11739 samples/seccomp/Makefile | 24 +-
11740 samples/seccomp/bpf-helper.h | 15 +-
11741 security/integrity/evm/evm_main.c | 3 +
11742 security/integrity/iint.c | 64 +-
11743 security/integrity/ima/Kconfig | 16 +
11744 security/integrity/ima/Makefile | 1 +
11745 security/integrity/ima/ima.h | 39 +-
11746 security/integrity/ima/ima_api.c | 86 ++-
11747 security/integrity/ima/ima_appraise.c | 263 ++++++++
11748 security/integrity/ima/ima_crypto.c | 8 +-
11749 security/integrity/ima/ima_main.c | 93 ++-
11750 security/integrity/ima/ima_policy.c | 195 ++++--
11751 security/integrity/integrity.h | 22 +-
11752 security/keys/trusted.c | 54 +-
11753 security/security.c | 27 +
11754 security/smack/smack_lsm.c | 51 +-
11755 security/smack/smackfs.c | 75 +++
11756 security/yama/Kconfig | 8 +
11757 security/yama/yama_lsm.c | 16 +-
11758 52 files changed, 3546 insertions(+), 463 deletions(-)
11759 create mode 100644 Documentation/ABI/testing/sysfs-driver-ppi
11760 create mode 100644 drivers/char/hw_random/tpm-rng.c
11761 create mode 100644 drivers/char/tpm/tpm_acpi.c
11762 rename drivers/char/tpm/{tpm_bios.c => tpm_eventlog.c} (75%)
11763 create mode 100644 drivers/char/tpm/tpm_eventlog.h
11764 create mode 100644 drivers/char/tpm/tpm_i2c_infineon.c
11765 create mode 100644 drivers/char/tpm/tpm_ibmvtpm.c
11766 create mode 100644 drivers/char/tpm/tpm_ibmvtpm.h
11767 create mode 100644 drivers/char/tpm/tpm_of.c
11768 create mode 100644 drivers/char/tpm/tpm_ppi.c
11769 create mode 100644 security/integrity/ima/ima_appraise.c
11770 Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
11771 $ git merge selinux/master
11772 Already up-to-date!
11773 Merge made by the 'recursive' strategy.
11774 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
11775 $ git merge lblnet/master
11776 Already up-to-date.
11777 Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
11778 $ git merge watchdog/master
11779 Merge made by the 'recursive' strategy.
11780 drivers/watchdog/davinci_wdt.c | 4 ++--
11781 1 file changed, 2 insertions(+), 2 deletions(-)
11782 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
11783 $ git merge dwmw2-iommu/master
11784 Already up-to-date.
11785 Merging iommu/next (0094872 Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next)
11786 $ git merge iommu/next
11787 Auto-merging drivers/iommu/intel-iommu.c
11788 Removing arch/arm/mach-tegra/include/mach/smmu.h
11789 Merge made by the 'recursive' strategy.
11790 arch/arm/mach-tegra/include/mach/smmu.h | 63 ----
11791 drivers/iommu/Kconfig | 2 +-
11792 drivers/iommu/amd_iommu.c | 514 ++++++++++++++++++++++++++++++-
11793 drivers/iommu/amd_iommu_init.c | 253 +++++++++++++--
11794 drivers/iommu/amd_iommu_proto.h | 8 +
11795 drivers/iommu/amd_iommu_types.h | 59 +++-
11796 drivers/iommu/exynos-iommu.c | 3 +-
11797 drivers/iommu/intel-iommu.c | 4 +-
11798 drivers/iommu/irq_remapping.c | 5 +
11799 drivers/iommu/irq_remapping.h | 6 +
11800 drivers/iommu/tegra-smmu.c | 261 +++++++++++++++-
11801 lib/dma-debug.c | 5 -
11802 12 files changed, 1071 insertions(+), 112 deletions(-)
11803 delete mode 100644 arch/arm/mach-tegra/include/mach/smmu.h
11804 Merging vfio/next (b68e7fa vfio: Fix virqfd release race)
11805 $ git merge vfio/next
11806 Already up-to-date.
11807 Merging osd/linux-next (b8017d2 exofs: check for allocation failure in uri_store())
11808 $ git merge osd/linux-next
11809 Merge made by the 'recursive' strategy.
11810 fs/exofs/sys.c | 7 ++++++-
11811 1 file changed, 6 insertions(+), 1 deletion(-)
11812 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
11813 $ git merge jc_docs/docs-next
11814 Already up-to-date.
11815 Merging trivial/for-next (9c33c51 doc: fix old config name of kprobetrace)
11816 $ git merge trivial/for-next
11817 Already up-to-date.
11818 Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
11819 $ git merge audit/for-next
11820 Already up-to-date.
11821 Merging pm/linux-next (1ac9af7 Merge branch 'master' into linux-next)
11822 $ git merge pm/linux-next
11823 Resolved 'arch/arm/mach-shmobile/include/mach/common.h' using previous resolution.
11824 Auto-merging include/linux/pm.h
11825 Auto-merging include/linux/device.h
11826 Auto-merging drivers/pci/pci-driver.c
11827 Auto-merging drivers/cpufreq/cpufreq_ondemand.c
11828 Auto-merging drivers/cpufreq/cpufreq_conservative.c
11829 Auto-merging drivers/base/power/main.c
11830 Auto-merging drivers/base/platform.c
11831 Auto-merging arch/arm/mach-shmobile/pm-sh7372.c
11832 Auto-merging arch/arm/mach-shmobile/pm-rmobile.c
11833 Auto-merging arch/arm/mach-shmobile/include/mach/r8a7779.h
11834 Auto-merging arch/arm/mach-shmobile/include/mach/common.h
11835 CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/common.h
11836 Removing arch/arm/mach-shmobile/common.c
11837 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
11838 Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
11839 Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
11840 Auto-merging arch/arm/kernel/smp.c
11841 Automatic merge failed; fix conflicts and then commit the result.
11843 [master 1db2581] Merge remote-tracking branch 'pm/linux-next'
11844 $ git diff -M --stat --summary HEAD^..
11845 Documentation/ABI/testing/sysfs-devices-system-cpu | 11 +
11846 Documentation/cpu-freq/boost.txt | 93 +++++
11847 Documentation/cpuidle/sysfs.txt | 10 +-
11848 .../devicetree/bindings/cpufreq/cpufreq-cpu0.txt | 55 +++
11849 Documentation/devicetree/bindings/power/opp.txt | 25 ++
11850 arch/arm/kernel/smp.c | 54 +++
11851 arch/arm/mach-shmobile/Makefile | 2 +-
11852 arch/arm/mach-shmobile/board-ap4evb.c | 21 +-
11853 arch/arm/mach-shmobile/board-armadillo800eva.c | 6 +-
11854 arch/arm/mach-shmobile/board-mackerel.c | 34 +-
11855 arch/arm/mach-shmobile/common.c | 24 --
11856 arch/arm/mach-shmobile/cpuidle.c | 39 +-
11857 arch/arm/mach-shmobile/include/mach/common.h | 14 +-
11858 arch/arm/mach-shmobile/include/mach/pm-rmobile.h | 35 +-
11859 arch/arm/mach-shmobile/include/mach/r8a7740.h | 6 +-
11860 arch/arm/mach-shmobile/include/mach/r8a7779.h | 12 +-
11861 arch/arm/mach-shmobile/include/mach/sh7372.h | 20 +-
11862 arch/arm/mach-shmobile/pm-r8a7740.c | 42 +-
11863 arch/arm/mach-shmobile/pm-r8a7779.c | 71 ++--
11864 arch/arm/mach-shmobile/pm-rmobile.c | 33 +-
11865 arch/arm/mach-shmobile/pm-sh7372.c | 283 +++++++++-----
11866 arch/arm/mach-shmobile/setup-r8a7740.c | 27 +-
11867 arch/arm/mach-shmobile/setup-r8a7779.c | 5 +-
11868 arch/arm/mach-shmobile/setup-sh7372.c | 69 ++--
11869 arch/x86/include/asm/msr-index.h | 3 +
11870 drivers/acpi/processor_driver.c | 8 +-
11871 drivers/acpi/processor_idle.c | 40 +-
11872 drivers/acpi/processor_perflib.c | 30 ++
11873 drivers/base/platform.c | 2 +
11874 drivers/base/power/domain.c | 244 ++++++++++--
11875 drivers/base/power/main.c | 66 +++-
11876 drivers/base/power/opp.c | 47 +++
11877 drivers/base/power/power.h | 36 +-
11878 drivers/base/power/runtime.c | 3 +
11879 drivers/base/power/wakeup.c | 46 ++-
11880 drivers/clocksource/sh_cmt.c | 71 +++-
11881 drivers/clocksource/sh_mtu2.c | 41 +-
11882 drivers/clocksource/sh_tmu.c | 112 +++++-
11883 drivers/cpufreq/Kconfig | 11 +
11884 drivers/cpufreq/Kconfig.x86 | 18 +-
11885 drivers/cpufreq/Makefile | 4 +-
11886 drivers/cpufreq/acpi-cpufreq.c | 272 ++++++++++++-
11887 drivers/cpufreq/cpufreq-cpu0.c | 269 +++++++++++++
11888 drivers/cpufreq/cpufreq_conservative.c | 2 +
11889 drivers/cpufreq/cpufreq_ondemand.c | 1 +
11890 drivers/cpufreq/longhaul.h | 26 +-
11891 drivers/cpufreq/omap-cpufreq.c | 39 +-
11892 drivers/cpufreq/powernow-k8.c | 406 ++------------------
11893 drivers/cpufreq/powernow-k8.h | 32 --
11894 drivers/cpuidle/driver.c | 18 +-
11895 drivers/cpuidle/governors/ladder.c | 6 +-
11896 drivers/pci/pci-driver.c | 17 -
11897 drivers/xen/xen-acpi-processor.c | 1 -
11898 include/acpi/processor.h | 9 +-
11899 include/linux/clockchips.h | 8 +
11900 include/linux/device.h | 7 +
11901 include/linux/opp.h | 8 +
11902 include/linux/pm.h | 2 +
11903 include/linux/pm_domain.h | 92 ++++-
11904 kernel/power/Kconfig | 4 +
11905 kernel/power/poweroff.c | 2 +-
11906 kernel/power/process.c | 2 +-
11907 kernel/power/qos.c | 1 +
11908 kernel/time/clockevents.c | 24 ++
11909 kernel/time/timekeeping.c | 2 +
11910 65 files changed, 2061 insertions(+), 962 deletions(-)
11911 create mode 100644 Documentation/cpu-freq/boost.txt
11912 create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
11913 create mode 100644 Documentation/devicetree/bindings/power/opp.txt
11914 delete mode 100644 arch/arm/mach-shmobile/common.c
11915 create mode 100644 drivers/cpufreq/cpufreq-cpu0.c
11916 Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
11917 $ git merge apm/for-next
11918 Already up-to-date.
11919 Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
11920 $ git merge fsnotify/for-next
11921 Resolved 'kernel/audit_tree.c' using previous resolution.
11922 Auto-merging kernel/audit_watch.c
11923 Auto-merging kernel/audit_tree.c
11924 CONFLICT (content): Merge conflict in kernel/audit_tree.c
11925 Auto-merging include/linux/fsnotify_backend.h
11926 Auto-merging fs/notify/notification.c
11927 Auto-merging fs/notify/inotify/inotify_user.c
11928 Auto-merging fs/notify/fanotify/fanotify_user.c
11929 Automatic merge failed; fix conflicts and then commit the result.
11931 [master efc4f59] Merge remote-tracking branch 'fsnotify/for-next'
11932 $ git diff -M --stat --summary HEAD^..
11933 fs/notify/dnotify/dnotify.c | 4 +-
11934 fs/notify/fanotify/fanotify.c | 6 +++
11935 fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
11936 fs/notify/group.c | 47 ++++++++++--------
11937 fs/notify/inode_mark.c | 14 ++++--
11938 fs/notify/inotify/inotify_fsnotify.c | 4 +-
11939 fs/notify/inotify/inotify_user.c | 34 ++++++-------
11940 fs/notify/mark.c | 91 +++++++++++++++++++---------------
11941 fs/notify/notification.c | 1 +
11942 fs/notify/vfsmount_mark.c | 14 ++++--
11943 include/linux/fsnotify_backend.h | 31 ++++++++----
11944 kernel/audit_tree.c | 10 ++--
11945 kernel/audit_watch.c | 4 +-
11946 13 files changed, 178 insertions(+), 119 deletions(-)
11947 Merging edac/linux_next (cfe5031 edac: edac_mc no longer deals with kobjects directly)
11948 $ git merge edac/linux_next
11949 Auto-merging drivers/edac/edac_mc.c
11950 Merge made by the 'recursive' strategy.
11951 drivers/edac/edac_mc.c | 7 -------
11952 include/linux/edac.h | 1 -
11953 2 files changed, 8 deletions(-)
11954 Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
11955 $ git merge edac-amd/for-next
11956 Resolved 'Documentation/edac.txt' using previous resolution.
11957 Resolved 'drivers/edac/amd64_edac.c' using previous resolution.
11958 Auto-merging drivers/edac/amd64_edac.c
11959 CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
11960 Auto-merging Documentation/edac.txt
11961 CONFLICT (content): Merge conflict in Documentation/edac.txt
11962 Automatic merge failed; fix conflicts and then commit the result.
11964 [master 484ab6b] Merge remote-tracking branch 'edac-amd/for-next'
11965 $ git diff -M --stat --summary HEAD^..
11966 Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
11967 $ git merge devicetree/devicetree/next
11968 Already up-to-date.
11969 Merging dt-rh/for-next (36165f5 MAINTAINERS: add scripts/dtc under Devicetree maintainers)
11970 $ git merge dt-rh/for-next
11971 Resolved 'drivers/of/base.c' using previous resolution.
11972 Resolved 'include/linux/of.h' using previous resolution.
11973 Auto-merging include/linux/of.h
11974 CONFLICT (content): Merge conflict in include/linux/of.h
11975 Auto-merging drivers/spi/spi-s3c64xx.c
11976 Auto-merging drivers/of/base.c
11977 CONFLICT (content): Merge conflict in drivers/of/base.c
11978 Auto-merging MAINTAINERS
11979 Automatic merge failed; fix conflicts and then commit the result.
11981 [master e2cc471] Merge remote-tracking branch 'dt-rh/for-next'
11982 $ git diff -M --stat --summary HEAD^..
11983 .../bindings/interrupt-controller/interrupts.txt | 95 +++
11984 Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 2 +-
11985 .../devicetree/bindings/serial/fsl-imx-uart.txt | 35 +
11987 drivers/of/address.c | 35 +-
11988 drivers/of/base.c | 23 +
11989 drivers/of/irq.c | 1 +
11990 drivers/of/of_i2c.c | 3 +
11991 drivers/of/platform.c | 16 +-
11992 drivers/spi/spi-s3c64xx.c | 7 +-
11993 include/linux/of.h | 2 +
11994 include/linux/of_address.h | 1 +
11995 scripts/dtc/Makefile.dtc | 13 +-
11996 scripts/dtc/checks.c | 203 +++--
11997 scripts/dtc/data.c | 124 +---
11998 scripts/dtc/dtc-lexer.l | 65 +-
11999 scripts/dtc/dtc-lexer.lex.c_shipped | 503 +++++++++----
12000 scripts/dtc/dtc-parser.tab.c_shipped | 780 ++++++++++++++++----
12001 scripts/dtc/dtc-parser.tab.h_shipped | 47 +-
12002 scripts/dtc/dtc-parser.y | 255 ++++++-
12003 scripts/dtc/dtc.c | 21 +-
12004 scripts/dtc/dtc.h | 51 +-
12005 scripts/dtc/fdtdump.c | 162 ++++
12006 scripts/dtc/fdtget.c | 366 +++++++++
12007 scripts/dtc/fdtput.c | 362 +++++++++
12008 scripts/dtc/flattree.c | 3 +
12009 scripts/dtc/libfdt/Makefile.libfdt | 6 +-
12010 scripts/dtc/libfdt/fdt.c | 61 +-
12011 scripts/dtc/libfdt/fdt_empty_tree.c | 84 +++
12012 scripts/dtc/libfdt/fdt_ro.c | 275 ++++---
12013 scripts/dtc/libfdt/fdt_rw.c | 29 +
12014 scripts/dtc/libfdt/fdt_sw.c | 11 +-
12015 scripts/dtc/libfdt/fdt_wip.c | 41 +-
12016 scripts/dtc/libfdt/libfdt.h | 440 ++++++++++-
12017 scripts/dtc/libfdt/libfdt_env.h | 16 +-
12018 scripts/dtc/libfdt/libfdt_internal.h | 2 +-
12019 scripts/dtc/livetree.c | 128 +++-
12020 scripts/dtc/srcpos.c | 98 ++-
12021 scripts/dtc/srcpos.h | 31 +
12022 scripts/dtc/treesource.c | 2 +
12023 scripts/dtc/util.c | 272 +++++++
12024 scripts/dtc/util.h | 97 +++
12025 42 files changed, 4057 insertions(+), 712 deletions(-)
12026 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
12027 create mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
12028 create mode 100644 scripts/dtc/fdtdump.c
12029 create mode 100644 scripts/dtc/fdtget.c
12030 create mode 100644 scripts/dtc/fdtput.c
12031 create mode 100644 scripts/dtc/libfdt/fdt_empty_tree.c
12032 Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
12033 $ git merge spi/spi/next
12034 Already up-to-date.
12035 Merging spi-mb/spi-next (536a53a spi: remove completely broken Tegra driver)
12036 $ git merge spi-mb/spi-next
12037 Already up-to-date.
12038 Merging tip/auto-latest (e029a27 Merge branch 'x86/smap')
12039 $ git merge tip/auto-latest
12040 Auto-merging scripts/kconfig/Makefile
12041 Auto-merging mm/vmstat.c
12042 Auto-merging lib/Makefile
12043 Auto-merging kernel/sysctl.c
12044 Auto-merging init/Kconfig
12045 Auto-merging include/linux/sched.h
12046 Auto-merging include/linux/init_task.h
12047 Auto-merging include/linux/acpi.h
12048 Auto-merging arch/x86/Kconfig
12049 Auto-merging MAINTAINERS
12050 Merge made by the 'recursive' strategy.
12051 Documentation/acpi/initrd_table_override.txt | 94 ++
12053 arch/sh/mm/Kconfig | 1 +
12054 arch/x86/Kconfig | 31 +
12055 arch/x86/include/asm/pgtable.h | 1 +
12056 arch/x86/kernel/acpi/boot.c | 6 +
12057 arch/x86/kernel/setup.c | 4 +
12058 arch/x86/realmode/rm/wakeup_asm.S | 15 +-
12059 drivers/acpi/Kconfig | 9 +
12060 drivers/acpi/osl.c | 202 +++-
12061 drivers/base/node.c | 2 +-
12062 include/linux/acpi.h | 16 +
12063 include/linux/earlycpio.h | 17 +
12064 include/linux/huge_mm.h | 19 +
12065 include/linux/init_task.h | 9 +
12066 include/linux/mempolicy.h | 30 +-
12067 include/linux/migrate.h | 7 +
12068 include/linux/migrate_mode.h | 3 +
12069 include/linux/mm.h | 115 +-
12070 include/linux/mm_types.h | 34 +
12071 include/linux/mmzone.h | 15 +-
12072 include/linux/page-flags-layout.h | 83 ++
12073 include/linux/sched.h | 27 +-
12074 init/Kconfig | 11 +
12075 kernel/sched/core.c | 73 +-
12076 kernel/sched/debug.c | 3 +
12077 kernel/sched/fair.c | 545 ++++++++-
12078 kernel/sched/features.h | 10 +
12079 kernel/sched/sched.h | 37 +
12080 kernel/sysctl.c | 13 +-
12081 lib/Makefile | 2 +-
12082 lib/earlycpio.c | 145 +++
12083 mm/huge_memory.c | 176 ++-
12084 mm/memory.c | 105 +-
12085 mm/mempolicy.c | 295 +++--
12086 mm/migrate.c | 85 +-
12087 mm/mprotect.c | 31 +-
12089 scripts/kconfig/Makefile | 7 +-
12090 tools/kvm/.gitignore | 12 +
12091 tools/kvm/CREDITS-Git | 30 +
12092 tools/kvm/Documentation/kernel-debugging.txt | 15 +
12093 tools/kvm/Documentation/kvm-balloon.txt | 24 +
12094 tools/kvm/Documentation/kvm-debug.txt | 16 +
12095 tools/kvm/Documentation/kvm-list.txt | 16 +
12096 tools/kvm/Documentation/kvm-pause.txt | 16 +
12097 tools/kvm/Documentation/kvm-resume.txt | 16 +
12098 tools/kvm/Documentation/kvm-run.txt | 62 ++
12099 tools/kvm/Documentation/kvm-sandbox.txt | 16 +
12100 tools/kvm/Documentation/kvm-setup.txt | 15 +
12101 tools/kvm/Documentation/kvm-stat.txt | 19 +
12102 tools/kvm/Documentation/kvm-stop.txt | 16 +
12103 tools/kvm/Documentation/kvm-version.txt | 21 +
12104 tools/kvm/Documentation/virtio-console.txt | 41 +
12105 tools/kvm/Makefile | 457 ++++++++
12106 tools/kvm/README | 112 ++
12107 tools/kvm/builtin-balloon.c | 80 ++
12108 tools/kvm/builtin-debug.c | 110 ++
12109 tools/kvm/builtin-help.c | 63 ++
12110 tools/kvm/builtin-list.c | 149 +++
12111 tools/kvm/builtin-pause.c | 88 ++
12112 tools/kvm/builtin-resume.c | 88 ++
12113 tools/kvm/builtin-run.c | 697 ++++++++++++
12114 tools/kvm/builtin-sandbox.c | 9 +
12115 tools/kvm/builtin-setup.c | 262 +++++
12116 tools/kvm/builtin-stat.c | 127 +++
12117 tools/kvm/builtin-stop.c | 70 ++
12118 tools/kvm/builtin-version.c | 15 +
12119 tools/kvm/code16gcc.h | 15 +
12120 tools/kvm/command-list.txt | 15 +
12121 tools/kvm/config/feature-tests.mak | 177 +++
12122 tools/kvm/config/utilities.mak | 196 ++++
12123 tools/kvm/disk/blk.c | 76 ++
12124 tools/kvm/disk/core.c | 354 ++++++
12125 tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++++++++
12126 tools/kvm/disk/raw.c | 141 +++
12127 tools/kvm/framebuffer.c | 80 ++
12128 tools/kvm/guest/init.c | 72 ++
12129 tools/kvm/guest_compat.c | 99 ++
12130 tools/kvm/hw/i8042.c | 355 ++++++
12131 tools/kvm/hw/pci-shmem.c | 405 +++++++
12132 tools/kvm/hw/rtc.c | 139 +++
12133 tools/kvm/hw/serial.c | 452 ++++++++
12134 tools/kvm/hw/vesa.c | 89 ++
12135 tools/kvm/include/asm/hweight.h | 8 +
12136 tools/kvm/include/bios/memcpy.h | 9 +
12137 tools/kvm/include/kvm/8250-serial.h | 11 +
12138 tools/kvm/include/kvm/apic.h | 17 +
12139 tools/kvm/include/kvm/brlock.h | 41 +
12140 tools/kvm/include/kvm/builtin-balloon.h | 9 +
12141 tools/kvm/include/kvm/builtin-debug.h | 20 +
12142 tools/kvm/include/kvm/builtin-help.h | 6 +
12143 tools/kvm/include/kvm/builtin-list.h | 10 +
12144 tools/kvm/include/kvm/builtin-pause.h | 9 +
12145 tools/kvm/include/kvm/builtin-resume.h | 9 +
12146 tools/kvm/include/kvm/builtin-run.h | 11 +
12147 tools/kvm/include/kvm/builtin-sandbox.h | 6 +
12148 tools/kvm/include/kvm/builtin-setup.h | 11 +
12149 tools/kvm/include/kvm/builtin-stat.h | 9 +
12150 tools/kvm/include/kvm/builtin-stop.h | 9 +
12151 tools/kvm/include/kvm/builtin-version.h | 6 +
12152 tools/kvm/include/kvm/compiler.h | 10 +
12153 tools/kvm/include/kvm/disk-image.h | 96 ++
12154 tools/kvm/include/kvm/e820.h | 13 +
12155 tools/kvm/include/kvm/framebuffer.h | 36 +
12156 tools/kvm/include/kvm/guest_compat.h | 9 +
12157 tools/kvm/include/kvm/i8042.h | 12 +
12158 tools/kvm/include/kvm/ioeventfd.h | 28 +
12159 tools/kvm/include/kvm/ioport.h | 70 ++
12160 tools/kvm/include/kvm/irq.h | 33 +
12161 tools/kvm/include/kvm/kvm-cmd.h | 17 +
12162 tools/kvm/include/kvm/kvm-config.h | 60 +
12163 tools/kvm/include/kvm/kvm-cpu.h | 26 +
12164 tools/kvm/include/kvm/kvm-ipc.h | 26 +
12165 tools/kvm/include/kvm/kvm.h | 121 ++
12166 tools/kvm/include/kvm/msi.h | 10 +
12167 tools/kvm/include/kvm/mutex.h | 33 +
12168 tools/kvm/include/kvm/parse-options.h | 218 ++++
12169 tools/kvm/include/kvm/pci-shmem.h | 32 +
12170 tools/kvm/include/kvm/pci.h | 95 ++
12171 tools/kvm/include/kvm/qcow.h | 133 +++
12172 tools/kvm/include/kvm/rbtree-interval.h | 28 +
12173 tools/kvm/include/kvm/read-write.h | 43 +
12174 tools/kvm/include/kvm/rtc.h | 9 +
12175 tools/kvm/include/kvm/rwsem.h | 39 +
12176 tools/kvm/include/kvm/sdl.h | 28 +
12177 tools/kvm/include/kvm/segment.h | 21 +
12178 tools/kvm/include/kvm/strbuf.h | 20 +
12179 tools/kvm/include/kvm/symbol.h | 30 +
12180 tools/kvm/include/kvm/term.h | 24 +
12181 tools/kvm/include/kvm/threadpool.h | 38 +
12182 tools/kvm/include/kvm/types.h | 7 +
12183 tools/kvm/include/kvm/uip.h | 360 ++++++
12184 tools/kvm/include/kvm/util-init.h | 51 +
12185 tools/kvm/include/kvm/util.h | 97 ++
12186 tools/kvm/include/kvm/vesa.h | 18 +
12187 tools/kvm/include/kvm/virtio-9p.h | 76 ++
12188 tools/kvm/include/kvm/virtio-balloon.h | 9 +
12189 tools/kvm/include/kvm/virtio-blk.h | 12 +
12190 tools/kvm/include/kvm/virtio-console.h | 10 +
12191 tools/kvm/include/kvm/virtio-mmio.h | 58 +
12192 tools/kvm/include/kvm/virtio-net.h | 30 +
12193 tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
12194 tools/kvm/include/kvm/virtio-pci.h | 49 +
12195 tools/kvm/include/kvm/virtio-rng.h | 9 +
12196 tools/kvm/include/kvm/virtio-scsi.h | 26 +
12197 tools/kvm/include/kvm/virtio.h | 102 ++
12198 tools/kvm/include/kvm/vnc.h | 22 +
12199 tools/kvm/include/linux/bitops.h | 33 +
12200 tools/kvm/include/linux/byteorder.h | 7 +
12201 tools/kvm/include/linux/compiler.h | 20 +
12202 tools/kvm/include/linux/kernel.h | 39 +
12203 tools/kvm/include/linux/module.h | 6 +
12204 tools/kvm/include/linux/prefetch.h | 6 +
12205 tools/kvm/include/linux/stddef.h | 16 +
12206 tools/kvm/include/linux/types.h | 51 +
12207 tools/kvm/ioeventfd.c | 216 ++++
12208 tools/kvm/ioport.c | 198 ++++
12209 tools/kvm/kvm-cmd.c | 91 ++
12210 tools/kvm/kvm-cpu.c | 242 ++++
12211 tools/kvm/kvm-ipc.c | 498 +++++++++
12212 tools/kvm/kvm.c | 458 ++++++++
12213 tools/kvm/main.c | 19 +
12214 tools/kvm/mmio.c | 139 +++
12215 tools/kvm/net/uip/arp.c | 30 +
12216 tools/kvm/net/uip/buf.c | 114 ++
12217 tools/kvm/net/uip/core.c | 190 ++++
12218 tools/kvm/net/uip/csum.c | 92 ++
12219 tools/kvm/net/uip/dhcp.c | 202 ++++
12220 tools/kvm/net/uip/icmp.c | 29 +
12221 tools/kvm/net/uip/ipv4.c | 29 +
12222 tools/kvm/net/uip/tcp.c | 345 ++++++
12223 tools/kvm/net/uip/udp.c | 236 ++++
12224 tools/kvm/pci.c | 215 ++++
12225 tools/kvm/powerpc/boot.c | 8 +
12226 tools/kvm/powerpc/cpu_info.c | 195 ++++
12227 tools/kvm/powerpc/cpu_info.h | 42 +
12228 tools/kvm/powerpc/include/kvm/barrier.h | 6 +
12229 tools/kvm/powerpc/include/kvm/kvm-arch.h | 68 ++
12230 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 ++
12231 tools/kvm/powerpc/ioport.c | 18 +
12232 tools/kvm/powerpc/irq.c | 75 ++
12233 tools/kvm/powerpc/kvm-cpu.c | 293 +++++
12234 tools/kvm/powerpc/kvm.c | 529 +++++++++
12235 tools/kvm/powerpc/spapr.h | 93 ++
12236 tools/kvm/powerpc/spapr_hcall.c | 134 +++
12237 tools/kvm/powerpc/spapr_hvcons.c | 108 ++
12238 tools/kvm/powerpc/spapr_hvcons.h | 19 +
12239 tools/kvm/powerpc/spapr_pci.c | 423 +++++++
12240 tools/kvm/powerpc/spapr_pci.h | 57 +
12241 tools/kvm/powerpc/spapr_rtas.c | 229 ++++
12242 tools/kvm/powerpc/xics.c | 514 +++++++++
12243 tools/kvm/powerpc/xics.h | 23 +
12244 tools/kvm/symbol.c | 133 +++
12245 tools/kvm/term.c | 171 +++
12246 tools/kvm/tests/Makefile | 19 +
12247 tools/kvm/tests/boot/Makefile | 13 +
12248 tools/kvm/tests/boot/init.c | 11 +
12249 tools/kvm/tests/kernel/.gitignore | 2 +
12250 tools/kvm/tests/kernel/Makefile | 20 +
12251 tools/kvm/tests/kernel/README | 16 +
12252 tools/kvm/tests/kernel/kernel.S | 8 +
12253 tools/kvm/tests/pit/.gitignore | 2 +
12254 tools/kvm/tests/pit/Makefile | 20 +
12255 tools/kvm/tests/pit/README | 16 +
12256 tools/kvm/tests/pit/tick.S | 101 ++
12257 tools/kvm/ui/sdl.c | 321 ++++++
12258 tools/kvm/ui/vnc.c | 248 +++++
12259 tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
12260 tools/kvm/util/generate-cmdlist.sh | 23 +
12261 tools/kvm/util/init.c | 69 ++
12262 tools/kvm/util/kvm-ifup-vbr0 | 6 +
12263 tools/kvm/util/parse-options.c | 577 ++++++++++
12264 tools/kvm/util/rbtree-interval.c | 89 ++
12265 tools/kvm/util/read-write.c | 354 ++++++
12266 tools/kvm/util/set_private_br.sh | 51 +
12267 tools/kvm/util/strbuf.c | 62 ++
12268 tools/kvm/util/threadpool.c | 173 +++
12269 tools/kvm/util/util.c | 133 +++
12270 tools/kvm/virtio/9p-pdu.c | 287 +++++
12271 tools/kvm/virtio/9p.c | 1448 ++++++++++++++++++++++++
12272 tools/kvm/virtio/balloon.c | 270 +++++
12273 tools/kvm/virtio/blk.c | 315 ++++++
12274 tools/kvm/virtio/console.c | 203 ++++
12275 tools/kvm/virtio/core.c | 233 ++++
12276 tools/kvm/virtio/mmio.c | 264 +++++
12277 tools/kvm/virtio/net.c | 670 +++++++++++
12278 tools/kvm/virtio/pci.c | 398 +++++++
12279 tools/kvm/virtio/rng.c | 193 ++++
12280 tools/kvm/virtio/scsi.c | 309 ++++++
12281 tools/kvm/x86/bios.c | 174 +++
12282 tools/kvm/x86/bios/.gitignore | 3 +
12283 tools/kvm/x86/bios/bios-rom.S | 12 +
12284 tools/kvm/x86/bios/e820.c | 72 ++
12285 tools/kvm/x86/bios/entry.S | 92 ++
12286 tools/kvm/x86/bios/gen-offsets.sh | 14 +
12287 tools/kvm/x86/bios/int10.c | 110 ++
12288 tools/kvm/x86/bios/int15.c | 18 +
12289 tools/kvm/x86/bios/local.S | 7 +
12290 tools/kvm/x86/bios/macro.S | 25 +
12291 tools/kvm/x86/bios/memcpy.c | 23 +
12292 tools/kvm/x86/bios/rom.ld.S | 16 +
12293 tools/kvm/x86/boot.c | 41 +
12294 tools/kvm/x86/cpuid.c | 60 +
12295 tools/kvm/x86/include/kvm/assembly.h | 24 +
12296 tools/kvm/x86/include/kvm/barrier.h | 20 +
12297 tools/kvm/x86/include/kvm/bios-export.h | 13 +
12298 tools/kvm/x86/include/kvm/bios.h | 93 ++
12299 tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
12300 tools/kvm/x86/include/kvm/cpufeature.h | 41 +
12301 tools/kvm/x86/include/kvm/interrupt.h | 26 +
12302 tools/kvm/x86/include/kvm/kvm-arch.h | 43 +
12303 tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
12304 tools/kvm/x86/include/kvm/mptable.h | 9 +
12305 tools/kvm/x86/interrupt.c | 28 +
12306 tools/kvm/x86/ioport.c | 77 ++
12307 tools/kvm/x86/irq.c | 224 ++++
12308 tools/kvm/x86/kvm-cpu.c | 425 +++++++
12309 tools/kvm/x86/kvm.c | 362 ++++++
12310 tools/kvm/x86/mptable.c | 289 +++++
12311 260 files changed, 27510 insertions(+), 271 deletions(-)
12312 create mode 100644 Documentation/acpi/initrd_table_override.txt
12313 create mode 100644 include/linux/earlycpio.h
12314 create mode 100644 include/linux/page-flags-layout.h
12315 create mode 100644 lib/earlycpio.c
12316 create mode 100644 tools/kvm/.gitignore
12317 create mode 100644 tools/kvm/CREDITS-Git
12318 create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
12319 create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
12320 create mode 100644 tools/kvm/Documentation/kvm-debug.txt
12321 create mode 100644 tools/kvm/Documentation/kvm-list.txt
12322 create mode 100644 tools/kvm/Documentation/kvm-pause.txt
12323 create mode 100644 tools/kvm/Documentation/kvm-resume.txt
12324 create mode 100644 tools/kvm/Documentation/kvm-run.txt
12325 create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
12326 create mode 100644 tools/kvm/Documentation/kvm-setup.txt
12327 create mode 100644 tools/kvm/Documentation/kvm-stat.txt
12328 create mode 100644 tools/kvm/Documentation/kvm-stop.txt
12329 create mode 100644 tools/kvm/Documentation/kvm-version.txt
12330 create mode 100644 tools/kvm/Documentation/virtio-console.txt
12331 create mode 100644 tools/kvm/Makefile
12332 create mode 100644 tools/kvm/README
12333 create mode 100644 tools/kvm/builtin-balloon.c
12334 create mode 100644 tools/kvm/builtin-debug.c
12335 create mode 100644 tools/kvm/builtin-help.c
12336 create mode 100644 tools/kvm/builtin-list.c
12337 create mode 100644 tools/kvm/builtin-pause.c
12338 create mode 100644 tools/kvm/builtin-resume.c
12339 create mode 100644 tools/kvm/builtin-run.c
12340 create mode 100644 tools/kvm/builtin-sandbox.c
12341 create mode 100644 tools/kvm/builtin-setup.c
12342 create mode 100644 tools/kvm/builtin-stat.c
12343 create mode 100644 tools/kvm/builtin-stop.c
12344 create mode 100644 tools/kvm/builtin-version.c
12345 create mode 100644 tools/kvm/code16gcc.h
12346 create mode 100644 tools/kvm/command-list.txt
12347 create mode 100644 tools/kvm/config/feature-tests.mak
12348 create mode 100644 tools/kvm/config/utilities.mak
12349 create mode 100644 tools/kvm/disk/blk.c
12350 create mode 100644 tools/kvm/disk/core.c
12351 create mode 100644 tools/kvm/disk/qcow.c
12352 create mode 100644 tools/kvm/disk/raw.c
12353 create mode 100644 tools/kvm/framebuffer.c
12354 create mode 100644 tools/kvm/guest/init.c
12355 create mode 100644 tools/kvm/guest_compat.c
12356 create mode 100644 tools/kvm/hw/i8042.c
12357 create mode 100644 tools/kvm/hw/pci-shmem.c
12358 create mode 100644 tools/kvm/hw/rtc.c
12359 create mode 100644 tools/kvm/hw/serial.c
12360 create mode 100644 tools/kvm/hw/vesa.c
12361 create mode 100644 tools/kvm/include/asm/hweight.h
12362 create mode 100644 tools/kvm/include/bios/memcpy.h
12363 create mode 100644 tools/kvm/include/kvm/8250-serial.h
12364 create mode 100644 tools/kvm/include/kvm/apic.h
12365 create mode 100644 tools/kvm/include/kvm/brlock.h
12366 create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
12367 create mode 100644 tools/kvm/include/kvm/builtin-debug.h
12368 create mode 100644 tools/kvm/include/kvm/builtin-help.h
12369 create mode 100644 tools/kvm/include/kvm/builtin-list.h
12370 create mode 100644 tools/kvm/include/kvm/builtin-pause.h
12371 create mode 100644 tools/kvm/include/kvm/builtin-resume.h
12372 create mode 100644 tools/kvm/include/kvm/builtin-run.h
12373 create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
12374 create mode 100644 tools/kvm/include/kvm/builtin-setup.h
12375 create mode 100644 tools/kvm/include/kvm/builtin-stat.h
12376 create mode 100644 tools/kvm/include/kvm/builtin-stop.h
12377 create mode 100644 tools/kvm/include/kvm/builtin-version.h
12378 create mode 100644 tools/kvm/include/kvm/compiler.h
12379 create mode 100644 tools/kvm/include/kvm/disk-image.h
12380 create mode 100644 tools/kvm/include/kvm/e820.h
12381 create mode 100644 tools/kvm/include/kvm/framebuffer.h
12382 create mode 100644 tools/kvm/include/kvm/guest_compat.h
12383 create mode 100644 tools/kvm/include/kvm/i8042.h
12384 create mode 100644 tools/kvm/include/kvm/ioeventfd.h
12385 create mode 100644 tools/kvm/include/kvm/ioport.h
12386 create mode 100644 tools/kvm/include/kvm/irq.h
12387 create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
12388 create mode 100644 tools/kvm/include/kvm/kvm-config.h
12389 create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
12390 create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
12391 create mode 100644 tools/kvm/include/kvm/kvm.h
12392 create mode 100644 tools/kvm/include/kvm/msi.h
12393 create mode 100644 tools/kvm/include/kvm/mutex.h
12394 create mode 100644 tools/kvm/include/kvm/parse-options.h
12395 create mode 100644 tools/kvm/include/kvm/pci-shmem.h
12396 create mode 100644 tools/kvm/include/kvm/pci.h
12397 create mode 100644 tools/kvm/include/kvm/qcow.h
12398 create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
12399 create mode 100644 tools/kvm/include/kvm/read-write.h
12400 create mode 100644 tools/kvm/include/kvm/rtc.h
12401 create mode 100644 tools/kvm/include/kvm/rwsem.h
12402 create mode 100644 tools/kvm/include/kvm/sdl.h
12403 create mode 100644 tools/kvm/include/kvm/segment.h
12404 create mode 100644 tools/kvm/include/kvm/strbuf.h
12405 create mode 100644 tools/kvm/include/kvm/symbol.h
12406 create mode 100644 tools/kvm/include/kvm/term.h
12407 create mode 100644 tools/kvm/include/kvm/threadpool.h
12408 create mode 100644 tools/kvm/include/kvm/types.h
12409 create mode 100644 tools/kvm/include/kvm/uip.h
12410 create mode 100644 tools/kvm/include/kvm/util-init.h
12411 create mode 100644 tools/kvm/include/kvm/util.h
12412 create mode 100644 tools/kvm/include/kvm/vesa.h
12413 create mode 100644 tools/kvm/include/kvm/virtio-9p.h
12414 create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
12415 create mode 100644 tools/kvm/include/kvm/virtio-blk.h
12416 create mode 100644 tools/kvm/include/kvm/virtio-console.h
12417 create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
12418 create mode 100644 tools/kvm/include/kvm/virtio-net.h
12419 create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
12420 create mode 100644 tools/kvm/include/kvm/virtio-pci.h
12421 create mode 100644 tools/kvm/include/kvm/virtio-rng.h
12422 create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
12423 create mode 100644 tools/kvm/include/kvm/virtio.h
12424 create mode 100644 tools/kvm/include/kvm/vnc.h
12425 create mode 100644 tools/kvm/include/linux/bitops.h
12426 create mode 100644 tools/kvm/include/linux/byteorder.h
12427 create mode 100644 tools/kvm/include/linux/compiler.h
12428 create mode 100644 tools/kvm/include/linux/kernel.h
12429 create mode 100644 tools/kvm/include/linux/module.h
12430 create mode 100644 tools/kvm/include/linux/prefetch.h
12431 create mode 100644 tools/kvm/include/linux/stddef.h
12432 create mode 100644 tools/kvm/include/linux/types.h
12433 create mode 100644 tools/kvm/ioeventfd.c
12434 create mode 100644 tools/kvm/ioport.c
12435 create mode 100644 tools/kvm/kvm-cmd.c
12436 create mode 100644 tools/kvm/kvm-cpu.c
12437 create mode 100644 tools/kvm/kvm-ipc.c
12438 create mode 100644 tools/kvm/kvm.c
12439 create mode 100644 tools/kvm/main.c
12440 create mode 100644 tools/kvm/mmio.c
12441 create mode 100644 tools/kvm/net/uip/arp.c
12442 create mode 100644 tools/kvm/net/uip/buf.c
12443 create mode 100644 tools/kvm/net/uip/core.c
12444 create mode 100644 tools/kvm/net/uip/csum.c
12445 create mode 100644 tools/kvm/net/uip/dhcp.c
12446 create mode 100644 tools/kvm/net/uip/icmp.c
12447 create mode 100644 tools/kvm/net/uip/ipv4.c
12448 create mode 100644 tools/kvm/net/uip/tcp.c
12449 create mode 100644 tools/kvm/net/uip/udp.c
12450 create mode 100644 tools/kvm/pci.c
12451 create mode 100644 tools/kvm/powerpc/boot.c
12452 create mode 100644 tools/kvm/powerpc/cpu_info.c
12453 create mode 100644 tools/kvm/powerpc/cpu_info.h
12454 create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
12455 create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
12456 create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
12457 create mode 100644 tools/kvm/powerpc/ioport.c
12458 create mode 100644 tools/kvm/powerpc/irq.c
12459 create mode 100644 tools/kvm/powerpc/kvm-cpu.c
12460 create mode 100644 tools/kvm/powerpc/kvm.c
12461 create mode 100644 tools/kvm/powerpc/spapr.h
12462 create mode 100644 tools/kvm/powerpc/spapr_hcall.c
12463 create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
12464 create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
12465 create mode 100644 tools/kvm/powerpc/spapr_pci.c
12466 create mode 100644 tools/kvm/powerpc/spapr_pci.h
12467 create mode 100644 tools/kvm/powerpc/spapr_rtas.c
12468 create mode 100644 tools/kvm/powerpc/xics.c
12469 create mode 100644 tools/kvm/powerpc/xics.h
12470 create mode 100644 tools/kvm/symbol.c
12471 create mode 100644 tools/kvm/term.c
12472 create mode 100644 tools/kvm/tests/Makefile
12473 create mode 100644 tools/kvm/tests/boot/Makefile
12474 create mode 100644 tools/kvm/tests/boot/init.c
12475 create mode 100644 tools/kvm/tests/kernel/.gitignore
12476 create mode 100644 tools/kvm/tests/kernel/Makefile
12477 create mode 100644 tools/kvm/tests/kernel/README
12478 create mode 100644 tools/kvm/tests/kernel/kernel.S
12479 create mode 100644 tools/kvm/tests/pit/.gitignore
12480 create mode 100644 tools/kvm/tests/pit/Makefile
12481 create mode 100644 tools/kvm/tests/pit/README
12482 create mode 100644 tools/kvm/tests/pit/tick.S
12483 create mode 100644 tools/kvm/ui/sdl.c
12484 create mode 100644 tools/kvm/ui/vnc.c
12485 create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
12486 create mode 100755 tools/kvm/util/generate-cmdlist.sh
12487 create mode 100644 tools/kvm/util/init.c
12488 create mode 100755 tools/kvm/util/kvm-ifup-vbr0
12489 create mode 100644 tools/kvm/util/parse-options.c
12490 create mode 100644 tools/kvm/util/rbtree-interval.c
12491 create mode 100644 tools/kvm/util/read-write.c
12492 create mode 100755 tools/kvm/util/set_private_br.sh
12493 create mode 100644 tools/kvm/util/strbuf.c
12494 create mode 100644 tools/kvm/util/threadpool.c
12495 create mode 100644 tools/kvm/util/util.c
12496 create mode 100644 tools/kvm/virtio/9p-pdu.c
12497 create mode 100644 tools/kvm/virtio/9p.c
12498 create mode 100644 tools/kvm/virtio/balloon.c
12499 create mode 100644 tools/kvm/virtio/blk.c
12500 create mode 100644 tools/kvm/virtio/console.c
12501 create mode 100644 tools/kvm/virtio/core.c
12502 create mode 100644 tools/kvm/virtio/mmio.c
12503 create mode 100644 tools/kvm/virtio/net.c
12504 create mode 100644 tools/kvm/virtio/pci.c
12505 create mode 100644 tools/kvm/virtio/rng.c
12506 create mode 100644 tools/kvm/virtio/scsi.c
12507 create mode 100644 tools/kvm/x86/bios.c
12508 create mode 100644 tools/kvm/x86/bios/.gitignore
12509 create mode 100644 tools/kvm/x86/bios/bios-rom.S
12510 create mode 100644 tools/kvm/x86/bios/e820.c
12511 create mode 100644 tools/kvm/x86/bios/entry.S
12512 create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
12513 create mode 100644 tools/kvm/x86/bios/int10.c
12514 create mode 100644 tools/kvm/x86/bios/int15.c
12515 create mode 100644 tools/kvm/x86/bios/local.S
12516 create mode 100644 tools/kvm/x86/bios/macro.S
12517 create mode 100644 tools/kvm/x86/bios/memcpy.c
12518 create mode 100644 tools/kvm/x86/bios/rom.ld.S
12519 create mode 100644 tools/kvm/x86/boot.c
12520 create mode 100644 tools/kvm/x86/cpuid.c
12521 create mode 100644 tools/kvm/x86/include/kvm/assembly.h
12522 create mode 100644 tools/kvm/x86/include/kvm/barrier.h
12523 create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
12524 create mode 100644 tools/kvm/x86/include/kvm/bios.h
12525 create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
12526 create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
12527 create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
12528 create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
12529 create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
12530 create mode 100644 tools/kvm/x86/include/kvm/mptable.h
12531 create mode 100644 tools/kvm/x86/interrupt.c
12532 create mode 100644 tools/kvm/x86/ioport.c
12533 create mode 100644 tools/kvm/x86/irq.c
12534 create mode 100644 tools/kvm/x86/kvm-cpu.c
12535 create mode 100644 tools/kvm/x86/kvm.c
12536 create mode 100644 tools/kvm/x86/mptable.c
12537 Merging rcu/rcu/next (593d100 Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b)
12538 $ git merge rcu/rcu/next
12539 Already up-to-date.
12540 Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
12541 $ git merge cputime/cputime
12542 Already up-to-date.
12543 Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
12544 $ git merge uprobes/for-next
12545 Already up-to-date.
12546 Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
12547 $ git merge kmemleak/kmemleak
12548 Auto-merging mm/kmemleak.c
12549 Merge made by the 'recursive' strategy.
12550 mm/kmemleak.c | 1 +
12551 1 file changed, 1 insertion(+)
12552 Merging kvm/linux-next (1e08ec4 KVM: optimize apic interrupt delivery)
12553 $ git merge kvm/linux-next
12554 Resolved 'arch/s390/include/asm/processor.h' using previous resolution.
12555 Resolved 'arch/x86/kvm/i8259.c' using previous resolution.
12556 Auto-merging virt/kvm/kvm_main.c
12557 Auto-merging include/linux/kvm_host.h
12558 Auto-merging arch/x86/kvm/x86.c
12559 Auto-merging arch/x86/kvm/vmx.c
12560 Removing arch/x86/kvm/timer.c
12561 Removing arch/x86/kvm/kvm_timer.h
12562 Auto-merging arch/x86/kvm/i8259.c
12563 CONFLICT (content): Merge conflict in arch/x86/kvm/i8259.c
12564 Auto-merging arch/x86/kernel/setup.c
12565 Auto-merging arch/x86/kernel/Makefile
12566 Auto-merging arch/x86/include/asm/kvm_host.h
12567 Auto-merging arch/x86/include/asm/kvm.h
12568 Auto-merging arch/x86/Kconfig
12569 Auto-merging arch/s390/kvm/priv.c
12570 Auto-merging arch/s390/kvm/Kconfig
12571 Auto-merging arch/s390/kernel/dis.c
12572 Auto-merging arch/s390/include/asm/processor.h
12573 CONFLICT (content): Merge conflict in arch/s390/include/asm/processor.h
12574 Automatic merge failed; fix conflicts and then commit the result.
12576 [master 4b50fb4a] Merge remote-tracking branch 'kvm/linux-next'
12577 $ git diff -M --stat --summary HEAD^..
12578 Documentation/virtual/kvm/api.txt | 22 +-
12579 Documentation/virtual/kvm/hypercalls.txt | 66 ++++
12580 Documentation/virtual/kvm/msr.txt | 32 +-
12581 Documentation/virtual/kvm/ppc-pv.txt | 22 ++
12582 arch/ia64/kvm/kvm-ia64.c | 41 +--
12583 arch/powerpc/include/asm/kvm_host.h | 3 +
12584 arch/powerpc/kvm/44x_tlb.c | 1 -
12585 arch/powerpc/kvm/book3s_64_mmu_hv.c | 51 ++-
12586 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 +-
12587 arch/powerpc/kvm/book3s_pr.c | 4 +-
12588 arch/powerpc/kvm/e500_tlb.c | 3 +-
12589 arch/powerpc/kvm/powerpc.c | 14 +-
12590 arch/s390/include/asm/processor.h | 1 +
12591 arch/s390/kernel/dis.c | 27 ++
12592 arch/s390/kvm/Kconfig | 1 +
12593 arch/s390/kvm/diag.c | 4 +
12594 arch/s390/kvm/intercept.c | 11 +
12595 arch/s390/kvm/interrupt.c | 23 ++
12596 arch/s390/kvm/kvm-s390.c | 17 +-
12597 arch/s390/kvm/priv.c | 9 +-
12598 arch/s390/kvm/sigp.c | 2 +
12599 arch/s390/kvm/trace-s390.h | 210 ++++++++++++
12600 arch/s390/kvm/trace.h | 341 +++++++++++++++++++
12601 arch/x86/Kconfig | 21 +-
12602 arch/x86/include/asm/kvm.h | 1 +
12603 arch/x86/include/asm/kvm_emulate.h | 48 ++-
12604 arch/x86/include/asm/kvm_host.h | 32 +-
12605 arch/x86/include/asm/kvm_para.h | 6 +-
12606 arch/x86/kernel/Makefile | 3 +-
12607 arch/x86/kernel/kvm.c | 3 +-
12608 arch/x86/kernel/setup.c | 2 +-
12609 arch/x86/kvm/Kconfig | 2 +
12610 arch/x86/kvm/Makefile | 2 +-
12611 arch/x86/kvm/cpuid.c | 14 +-
12612 arch/x86/kvm/emulate.c | 538 ++++++++++++++++-------------
12613 arch/x86/kvm/i8254.c | 64 ++--
12614 arch/x86/kvm/i8254.h | 6 +-
12615 arch/x86/kvm/i8259.c | 70 ++--
12616 arch/x86/kvm/irq.h | 2 +-
12617 arch/x86/kvm/kvm_timer.h | 18 -
12618 arch/x86/kvm/lapic.c | 484 ++++++++++++++++++--------
12619 arch/x86/kvm/lapic.h | 61 +++-
12620 arch/x86/kvm/mmu.c | 240 +++++++++----
12621 arch/x86/kvm/mmu.h | 25 +-
12622 arch/x86/kvm/mmu_audit.c | 8 +-
12623 arch/x86/kvm/paging_tmpl.h | 199 +++++------
12624 arch/x86/kvm/pmu.c | 2 +-
12625 arch/x86/kvm/svm.c | 59 ++--
12626 arch/x86/kvm/timer.c | 47 ---
12627 arch/x86/kvm/vmx.c | 219 ++++++------
12628 arch/x86/kvm/x86.c | 354 ++++++++++---------
12629 arch/x86/kvm/x86.h | 1 +
12630 include/linux/kvm.h | 13 +-
12631 include/linux/kvm_host.h | 140 ++++++--
12632 kernel/jump_label.c | 1 +
12633 virt/kvm/Kconfig | 3 +
12634 virt/kvm/async_pf.c | 11 +-
12635 virt/kvm/ioapic.c | 37 +-
12636 virt/kvm/iommu.c | 16 +-
12637 virt/kvm/irq_comm.c | 11 +-
12638 virt/kvm/kvm_main.c | 541 ++++++++++++++++++------------
12639 61 files changed, 2799 insertions(+), 1416 deletions(-)
12640 create mode 100644 Documentation/virtual/kvm/hypercalls.txt
12641 create mode 100644 arch/s390/kvm/trace-s390.h
12642 create mode 100644 arch/s390/kvm/trace.h
12643 delete mode 100644 arch/x86/kvm/kvm_timer.h
12644 delete mode 100644 arch/x86/kvm/timer.c
12645 Merging kvm-ppc/kvm-ppc-next (d1805bf arch/powerpc/kvm/e500_tlb.c: fix error return code)
12646 $ git merge kvm-ppc/kvm-ppc-next
12647 Auto-merging include/linux/kvm_host.h
12648 Auto-merging drivers/tty/Kconfig
12649 Auto-merging arch/powerpc/sysdev/fsl_msi.c
12650 Auto-merging arch/powerpc/kvm/trace.h
12651 Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c
12652 Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c
12653 Auto-merging arch/powerpc/include/asm/kvm_book3s.h
12654 Merge made by the 'recursive' strategy.
12655 Documentation/virtual/kvm/api.txt | 49 +++-
12656 arch/powerpc/include/asm/Kbuild | 1 +
12657 arch/powerpc/include/asm/epapr_hcalls.h | 36 +--
12658 arch/powerpc/include/asm/fsl_hcalls.h | 36 +--
12659 arch/powerpc/include/asm/kvm.h | 59 +++++
12660 arch/powerpc/include/asm/kvm_book3s.h | 2 +-
12661 arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 +-
12662 arch/powerpc/include/asm/kvm_host.h | 38 ++-
12663 arch/powerpc/include/asm/kvm_para.h | 21 +-
12664 arch/powerpc/include/asm/kvm_ppc.h | 64 ++++-
12665 arch/powerpc/include/asm/reg_booke.h | 7 +
12666 arch/powerpc/kernel/epapr_hcalls.S | 28 +++
12667 arch/powerpc/kernel/epapr_paravirt.c | 11 +-
12668 arch/powerpc/kernel/kvm.c | 2 +-
12669 arch/powerpc/kernel/ppc_ksyms.c | 5 +
12670 arch/powerpc/kvm/44x.c | 1 +
12671 arch/powerpc/kvm/44x_emulate.c | 110 +++++----
12672 arch/powerpc/kvm/Kconfig | 3 +
12673 arch/powerpc/kvm/book3s.c | 125 ++++++++++
12674 arch/powerpc/kvm/book3s_32_mmu_host.c | 1 +
12675 arch/powerpc/kvm/book3s_64_mmu_host.c | 1 +
12676 arch/powerpc/kvm/book3s_64_mmu_hv.c | 65 ++++--
12677 arch/powerpc/kvm/book3s_hv.c | 337 +++++++++++++++++++++------
12678 arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-
12679 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 +-
12680 arch/powerpc/kvm/book3s_mmu_hpte.c | 5 -
12681 arch/powerpc/kvm/book3s_pr.c | 180 ++++++++++----
12682 arch/powerpc/kvm/book3s_rmhandlers.S | 15 +-
12683 arch/powerpc/kvm/booke.c | 310 ++++++++++++++++++++----
12684 arch/powerpc/kvm/booke_emulate.c | 22 +-
12685 arch/powerpc/kvm/e500.h | 3 +-
12686 arch/powerpc/kvm/e500_tlb.c | 92 ++++++--
12687 arch/powerpc/kvm/powerpc.c | 150 ++++++++++--
12688 arch/powerpc/kvm/trace.h | 200 +++++++++++++---
12689 arch/powerpc/platforms/Kconfig | 1 +
12690 arch/powerpc/sysdev/fsl_msi.c | 9 +-
12691 arch/powerpc/sysdev/fsl_soc.c | 2 +
12692 drivers/tty/Kconfig | 1 +
12693 drivers/virt/Kconfig | 1 +
12694 include/linux/kvm.h | 10 +-
12695 include/linux/kvm_host.h | 1 +
12696 41 files changed, 1635 insertions(+), 381 deletions(-)
12697 Merging oprofile/for-next (61bccf1 oprofile: Remove 'WQ on CPUx, prefer CPUy' warning)
12698 $ git merge oprofile/for-next
12699 Already up-to-date.
12700 Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
12701 $ git merge xen/upstream/xen
12702 Already up-to-date.
12703 Merging xen-two/linux-next (1f793bc Merge branch 'stable/for-linus-3.7' into linux-next)
12704 $ git merge xen-two/linux-next
12705 Resolved 'arch/arm/Kconfig' using previous resolution.
12706 Auto-merging include/xen/interface/physdev.h
12707 Auto-merging drivers/xen/xen-pciback/pci_stub.c
12708 Auto-merging drivers/xen/Makefile
12709 CONFLICT (content): Merge conflict in drivers/xen/Makefile
12710 Auto-merging drivers/pci/xen-pcifront.c
12711 Auto-merging drivers/net/xen-netfront.c
12712 Auto-merging arch/arm/mach-vexpress/v2m.c
12713 CONFLICT (modify/delete): arch/arm/mach-vexpress/Makefile.boot deleted in HEAD and modified in xen-two/linux-next. Version xen-two/linux-next of arch/arm/mach-vexpress/Makefile.boot left in tree.
12714 Auto-merging arch/arm/Makefile
12715 Auto-merging arch/arm/Kconfig
12716 CONFLICT (content): Merge conflict in arch/arm/Kconfig
12717 Auto-merging MAINTAINERS
12718 Automatic merge failed; fix conflicts and then commit the result.
12719 $ git rm -f arch/arm/mach-vexpress/Makefile.boot
12720 arch/arm/mach-vexpress/Makefile.boot: needs merge
12721 rm 'arch/arm/mach-vexpress/Makefile.boot'
12723 Recorded resolution for 'drivers/xen/Makefile'.
12724 [master 772d0a3] Merge remote-tracking branch 'xen-two/linux-next'
12725 $ git diff -M --stat --summary HEAD^..
12726 Documentation/devicetree/bindings/arm/xen.txt | 25 ++++
12728 arch/arm/Kconfig | 10 ++
12729 arch/arm/Makefile | 1 +
12730 arch/arm/boot/dts/xenvm-4.2.dts | 68 +++++++++
12731 arch/arm/include/asm/hypervisor.h | 6 +
12732 arch/arm/include/asm/sync_bitops.h | 27 ++++
12733 arch/arm/include/asm/xen/events.h | 18 +++
12734 arch/arm/include/asm/xen/hypercall.h | 69 +++++++++
12735 arch/arm/include/asm/xen/hypervisor.h | 19 +++
12736 arch/arm/include/asm/xen/interface.h | 73 ++++++++++
12737 arch/arm/include/asm/xen/page.h | 82 +++++++++++
12738 arch/arm/mach-vexpress/v2m.c | 1 +
12739 arch/arm/xen/Makefile | 1 +
12740 arch/arm/xen/enlighten.c | 168 ++++++++++++++++++++++
12741 arch/arm/xen/grant-table.c | 53 +++++++
12742 arch/arm/xen/hypercall.S | 106 ++++++++++++++
12743 arch/ia64/include/asm/xen/interface.h | 8 +-
12744 arch/x86/include/asm/xen/interface.h | 8 ++
12745 arch/x86/include/asm/xen/swiotlb-xen.h | 2 +
12746 arch/x86/xen/apic.c | 3 +-
12747 arch/x86/xen/enlighten.c | 16 ++-
12748 arch/x86/xen/irq.c | 1 +
12749 arch/x86/xen/mmu.c | 190 ++++++++++++++++++++-----
12750 arch/x86/xen/p2m.c | 92 +++++++++++-
12751 arch/x86/xen/pci-swiotlb-xen.c | 52 ++++++-
12752 arch/x86/xen/platform-pci-unplug.c | 1 +
12753 arch/x86/xen/setup.c | 18 +++
12754 arch/x86/xen/vga.c | 7 +
12755 arch/x86/xen/xen-head.S | 56 +++++++-
12756 arch/x86/xen/xen-ops.h | 4 +-
12757 drivers/block/xen-blkback/blkback.c | 1 +
12758 drivers/net/xen-netback/netback.c | 1 +
12759 drivers/net/xen-netfront.c | 1 +
12760 drivers/pci/xen-pcifront.c | 15 +-
12761 drivers/tty/hvc/hvc_xen.c | 2 +
12762 drivers/xen/Makefile | 14 +-
12763 drivers/xen/events.c | 32 ++++-
12764 drivers/xen/gntdev.c | 2 +-
12765 drivers/xen/grant-table.c | 14 +-
12766 drivers/xen/privcmd.c | 135 +++++++++++++-----
12767 drivers/xen/swiotlb-xen.c | 119 ++++++++++------
12768 drivers/xen/sys-hypervisor.c | 13 +-
12769 drivers/xen/tmem.c | 1 +
12770 drivers/xen/xen-pciback/pci_stub.c | 136 ++++++++++++++----
12771 drivers/xen/xenbus/xenbus_comms.c | 2 +-
12772 drivers/xen/xenbus/xenbus_dev_backend.c | 2 +-
12773 drivers/xen/xenbus/xenbus_probe.c | 56 +++++---
12774 drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
12775 drivers/xen/xenbus/xenbus_xs.c | 3 +-
12776 include/linux/swiotlb.h | 1 +
12777 include/xen/events.h | 2 +
12778 include/xen/interface/features.h | 3 +
12779 include/xen/interface/grant_table.h | 12 +-
12780 include/xen/interface/io/protocols.h | 3 +
12781 include/xen/interface/memory.h | 21 +--
12782 include/xen/interface/physdev.h | 2 +-
12783 include/xen/interface/platform.h | 7 +-
12784 include/xen/interface/version.h | 5 +-
12785 include/xen/interface/xen.h | 8 +-
12786 include/xen/privcmd.h | 27 +++-
12787 include/xen/swiotlb-xen.h | 11 +-
12788 include/xen/xen.h | 2 +-
12789 lib/swiotlb.c | 33 +++--
12790 64 files changed, 1626 insertions(+), 253 deletions(-)
12791 create mode 100644 Documentation/devicetree/bindings/arm/xen.txt
12792 create mode 100644 arch/arm/boot/dts/xenvm-4.2.dts
12793 create mode 100644 arch/arm/include/asm/hypervisor.h
12794 create mode 100644 arch/arm/include/asm/sync_bitops.h
12795 create mode 100644 arch/arm/include/asm/xen/events.h
12796 create mode 100644 arch/arm/include/asm/xen/hypercall.h
12797 create mode 100644 arch/arm/include/asm/xen/hypervisor.h
12798 create mode 100644 arch/arm/include/asm/xen/interface.h
12799 create mode 100644 arch/arm/include/asm/xen/page.h
12800 create mode 100644 arch/arm/xen/Makefile
12801 create mode 100644 arch/arm/xen/enlighten.c
12802 create mode 100644 arch/arm/xen/grant-table.c
12803 create mode 100644 arch/arm/xen/hypercall.S
12804 $ git am -3 ../patches/0001-The-Xen-tree-tries-to-add-a-line-to.patch
12805 Applying: The Xen tree tries to add a line to arch/arm/mach-vexpress/Makefile.boot that has been removed by the following commit in Linus' master:
12807 Unstaged changes after reset:
12808 M arch/arm/boot/dts/Makefile
12810 $ git commit -v -a --amend
12811 [master 18fc875] Merge remote-tracking branch 'xen-two/linux-next'
12812 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
12813 $ git merge xen-pvhvm/linux-next
12814 Already up-to-date.
12815 Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
12816 $ git merge percpu/for-next
12817 Already up-to-date.
12818 Merging workqueues/for-next (2b0f620 Merge branch 'for-3.7' into for-next)
12819 $ git merge workqueues/for-next
12820 Already up-to-date!
12821 Merge made by the 'recursive' strategy.
12822 Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
12823 $ git merge drivers-x86/linux-next
12824 Auto-merging drivers/platform/x86/asus-wmi.c
12825 Merge made by the 'recursive' strategy.
12826 drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
12827 1 file changed, 76 insertions(+)
12828 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
12829 $ git merge hwpoison/hwpoison
12830 Already up-to-date.
12831 Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
12832 $ git merge sysctl/master
12833 Already up-to-date.
12834 Merging regmap/for-next (613dac3 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/irq' into regmap-next)
12835 $ git merge regmap/for-next
12836 Already up-to-date.
12837 Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
12838 $ git merge hsi/for-next
12839 Already up-to-date.
12840 Merging leds/for-next (2f73c39 leds: add output driver configuration for pca9633 led driver)
12841 $ git merge leds/for-next
12842 Removing include/linux/platform_data/leds-lm3556.h
12843 Auto-merging include/linux/leds.h
12844 Auto-merging drivers/leds/leds-wm8350.c
12845 Removing drivers/leds/leds-lm3556.c
12846 Auto-merging drivers/leds/Makefile
12847 Auto-merging drivers/leds/Kconfig
12848 Merge made by the 'recursive' strategy.
12849 Documentation/leds/leds-lp5523.txt | 21 +-
12850 drivers/leds/Kconfig | 26 +-
12851 drivers/leds/Makefile | 3 +-
12852 drivers/leds/led-class.c | 15 +
12853 drivers/leds/led-core.c | 16 +-
12854 drivers/leds/led-triggers.c | 17 +-
12855 drivers/leds/leds-clevo-mail.c | 10 +-
12856 drivers/leds/leds-gpio.c | 19 +-
12857 drivers/leds/leds-lm3530.c | 16 +-
12858 drivers/leds/leds-lm3556.c | 512 -------------------------
12859 drivers/leds/leds-lm355x.c | 572 ++++++++++++++++++++++++++++
12860 drivers/leds/leds-lm3642.c | 462 ++++++++++++++++++++++
12861 drivers/leds/leds-lp5523.c | 75 ++--
12862 drivers/leds/leds-pca9633.c | 19 +-
12863 drivers/leds/leds-wm8350.c | 29 +-
12864 drivers/leds/leds.h | 2 +
12865 include/linux/leds-lp5523.h | 1 +
12866 include/linux/leds.h | 4 +
12867 include/linux/platform_data/leds-lm3556.h | 50 ---
12868 include/linux/platform_data/leds-lm355x.h | 66 ++++
12869 include/linux/platform_data/leds-lm3642.h | 38 ++
12870 include/linux/platform_data/leds-pca9633.h | 35 ++
12871 22 files changed, 1350 insertions(+), 658 deletions(-)
12872 delete mode 100644 drivers/leds/leds-lm3556.c
12873 create mode 100644 drivers/leds/leds-lm355x.c
12874 create mode 100644 drivers/leds/leds-lm3642.c
12875 delete mode 100644 include/linux/platform_data/leds-lm3556.h
12876 create mode 100644 include/linux/platform_data/leds-lm355x.h
12877 create mode 100644 include/linux/platform_data/leds-lm3642.h
12878 create mode 100644 include/linux/platform_data/leds-pca9633.h
12879 Merging driver-core/driver-core-next (e0f21e6 memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl())
12880 $ git merge driver-core/driver-core-next
12881 Already up-to-date.
12882 Merging tty/tty-next (0c57dfc tty/serial: Add kgdb_nmi driver)
12883 $ git merge tty/tty-next
12884 Already up-to-date.
12885 Merging usb/usb-next (70c048a USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc)
12886 $ git merge usb/usb-next
12887 Already up-to-date.
12888 Merging staging/staging-next (e187895 staging: comedi: jr3_pci: fix iomem dereference)
12889 $ git merge staging/staging-next
12890 Already up-to-date.
12891 Merging char-misc/char-misc-next (5dc2db0 drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init)
12892 $ git merge char-misc/char-misc-next
12893 Already up-to-date.
12894 Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
12895 $ git merge tmem/linux-next
12896 Auto-merging include/xen/xen.h
12897 Auto-merging include/xen/interface/xen.h
12898 Auto-merging arch/x86/xen/smp.c
12899 Auto-merging arch/x86/xen/setup.c
12900 Auto-merging arch/x86/include/asm/xen/page.h
12901 Auto-merging arch/x86/include/asm/xen/interface.h
12902 Merge made by the 'recursive' strategy.
12903 arch/x86/include/asm/xen/interface.h | 3 ++-
12904 arch/x86/include/asm/xen/page.h | 3 +++
12905 arch/x86/xen/setup.c | 13 +++++++++---
12906 arch/x86/xen/smp.c | 39 ++++++++++++++++++----------------
12907 drivers/xen/cpu_hotplug.c | 3 ++-
12908 include/linux/frontswap.h | 2 ++
12909 include/xen/interface/xen.h | 1 +
12910 include/xen/xen.h | 4 ++++
12911 mm/frontswap.c | 34 +++++++++++++++++++++++++----
12912 9 files changed, 75 insertions(+), 27 deletions(-)
12913 Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
12914 $ git merge writeback/writeback-for-next
12915 Auto-merging fs/fs-writeback.c
12916 Merge made by the 'recursive' strategy.
12917 fs/fs-writeback.c | 2 +-
12918 mm/backing-dev.c | 50 ++++++++++++++++++++++++++------------------------
12919 mm/page-writeback.c | 14 +++++++++++---
12920 3 files changed, 38 insertions(+), 28 deletions(-)
12921 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
12922 $ git merge arm-dt/devicetree/arm-next
12923 Already up-to-date.
12924 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
12925 $ git merge hwspinlock/linux-next
12926 Already up-to-date.
12927 Merging pinctrl/for-next (e1b2dc7 pinctrl: add bcm2835 driver)
12928 $ git merge pinctrl/for-next
12929 Already up-to-date.
12930 Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
12931 $ git merge vhost/linux-next
12932 Resolved 'drivers/net/tun.c' using previous resolution.
12933 Auto-merging drivers/net/tun.c
12934 CONFLICT (content): Merge conflict in drivers/net/tun.c
12935 Automatic merge failed; fix conflicts and then commit the result.
12937 [master e9fabd4] Merge remote-tracking branch 'vhost/linux-next'
12938 $ git diff -M --stat --summary HEAD^..
12939 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
12940 $ git merge memblock/memblock-kill-early_node_map
12941 Already up-to-date.
12942 Merging remoteproc/for-next (d09f53a remoteproc: Fix use of format specifyer)
12943 $ git merge remoteproc/for-next
12944 Auto-merging include/linux/platform_data/remoteproc-omap.h
12945 Auto-merging drivers/remoteproc/omap_remoteproc.c
12946 Merge made by the 'recursive' strategy.
12947 Documentation/remoteproc.txt | 7 +
12948 drivers/remoteproc/Kconfig | 14 ++
12949 drivers/remoteproc/Makefile | 1 +
12950 drivers/remoteproc/omap_remoteproc.c | 3 +
12951 drivers/remoteproc/remoteproc_core.c | 209 +++++++++++++---
12952 drivers/remoteproc/remoteproc_debugfs.c | 85 ++++++-
12953 drivers/remoteproc/remoteproc_internal.h | 1 +
12954 drivers/remoteproc/ste_modem_rproc.c | 322 +++++++++++++++++++++++++
12955 include/linux/platform_data/remoteproc-omap.h | 2 +
12956 include/linux/remoteproc.h | 24 ++
12957 include/linux/ste_modem_shm.h | 56 +++++
12958 11 files changed, 682 insertions(+), 42 deletions(-)
12959 create mode 100644 drivers/remoteproc/ste_modem_rproc.c
12960 create mode 100644 include/linux/ste_modem_shm.h
12961 Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
12962 $ git merge irqdomain/irqdomain/next
12963 Already up-to-date.
12964 Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
12965 $ git merge gpio/gpio/next
12966 Already up-to-date.
12967 Merging gpio-lw/for-next (901acf5 gpio: pcf857x: select IRQ_DOMAIN)
12968 $ git merge gpio-lw/for-next
12969 Already up-to-date.
12970 Merging arm-soc/for-next (5a5571c Merge branch 'fixes' into for-next)
12971 $ git merge arm-soc/for-next
12972 Auto-merging drivers/spi/spi-omap2-mcspi.c
12973 Auto-merging drivers/pinctrl/Makefile
12974 Auto-merging drivers/pinctrl/Kconfig
12975 Auto-merging drivers/mmc/host/sdhci-tegra.c
12976 Auto-merging drivers/gpio/Makefile
12977 Auto-merging drivers/gpio/Kconfig
12978 Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
12979 Auto-merging arch/arm/mach-omap2/display.c
12980 Auto-merging arch/arm/mach-omap2/board-omap4panda.c
12981 Auto-merging arch/arm/boot/dts/Makefile
12982 Auto-merging arch/arm/Kconfig
12983 Merge made by the 'recursive' strategy.
12984 .../devicetree/bindings/crypto/mv_cesa.txt | 20 +
12985 .../devicetree/bindings/gpio/gpio-fan.txt | 25 +
12986 .../devicetree/bindings/gpio/gpio-mvebu.txt | 53 ++
12987 .../pinctrl/marvell,armada-370-pinctrl.txt | 95 +++
12988 .../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 100 +++
12989 .../bindings/pinctrl/marvell,dove-pinctrl.txt | 72 ++
12990 .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 279 ++++++++
12991 .../bindings/pinctrl/marvell,mvebu-pinctrl.txt | 46 ++
12992 arch/arm/Kconfig | 17 +-
12993 arch/arm/arm-soc-for-next-contents.txt | 339 +++++++++
12994 arch/arm/boot/dts/Makefile | 6 +
12995 arch/arm/boot/dts/armada-370-xp.dtsi | 5 +
12996 arch/arm/boot/dts/armada-370.dtsi | 44 ++
12997 arch/arm/boot/dts/armada-xp-db.dts | 4 +-
12998 arch/arm/boot/dts/armada-xp-mv78230.dtsi | 57 ++
12999 arch/arm/boot/dts/armada-xp-mv78260.dtsi | 70 ++
13000 arch/arm/boot/dts/armada-xp-mv78460.dtsi | 70 ++
13001 arch/arm/boot/dts/dove-cm-a510.dts | 38 +
13002 arch/arm/boot/dts/dove-cubox.dts | 42 ++
13003 arch/arm/boot/dts/dove-dove-db.dts | 38 +
13004 arch/arm/boot/dts/dove.dtsi | 143 ++++
13005 arch/arm/boot/dts/kirkwood-dnskw.dtsi | 10 +
13006 arch/arm/boot/dts/kirkwood-dockstar.dts | 57 ++
13007 arch/arm/boot/dts/kirkwood-iconnect.dts | 50 +-
13008 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 105 +++
13009 arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 29 +
13010 arch/arm/boot/dts/kirkwood.dtsi | 12 +-
13011 arch/arm/configs/imx_v6_v7_defconfig | 4 +-
13012 arch/arm/configs/kirkwood_defconfig | 38 +-
13013 arch/arm/configs/lpc32xx_defconfig | 7 +-
13014 arch/arm/configs/marzen_defconfig | 15 +-
13015 arch/arm/configs/mvebu_defconfig | 2 +
13016 arch/arm/configs/mxs_defconfig | 36 +-
13017 arch/arm/configs/s3c6400_defconfig | 3 +
13018 arch/arm/configs/tegra_defconfig | 51 +-
13019 arch/arm/mach-dove/Kconfig | 7 +
13020 arch/arm/mach-dove/Makefile | 4 +-
13021 arch/arm/mach-dove/common.c | 157 +++-
13022 arch/arm/mach-dove/common.h | 4 +
13023 arch/arm/mach-dove/include/mach/bridge-regs.h | 16 +-
13024 arch/arm/mach-dove/include/mach/dove.h | 126 ++--
13025 arch/arm/mach-dove/include/mach/pm.h | 54 +-
13026 arch/arm/mach-dove/irq.c | 10 +-
13027 arch/arm/mach-dove/pcie.c | 6 +-
13028 arch/arm/mach-kirkwood/Kconfig | 21 +
13029 arch/arm/mach-kirkwood/Makefile | 3 +
13030 arch/arm/mach-kirkwood/addr-map.c | 3 +-
13031 arch/arm/mach-kirkwood/board-dnskw.c | 35 -
13032 arch/arm/mach-kirkwood/board-dockstar.c | 61 ++
13033 arch/arm/mach-kirkwood/board-dt.c | 14 +-
13034 arch/arm/mach-kirkwood/board-iconnect.c | 48 --
13035 arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 57 ++
13036 arch/arm/mach-kirkwood/board-km_kirkwood.c | 57 ++
13037 arch/arm/mach-kirkwood/common.c | 8 +-
13038 arch/arm/mach-kirkwood/common.h | 18 +
13039 arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 20 +-
13040 arch/arm/mach-kirkwood/include/mach/kirkwood.h | 112 +--
13041 arch/arm/mach-kirkwood/irq.c | 9 +-
13042 arch/arm/mach-kirkwood/pcie.c | 12 +-
13043 arch/arm/mach-kirkwood/ts41x-setup.c | 3 +-
13044 arch/arm/mach-mv78xx0/addr-map.c | 6 +-
13045 arch/arm/mach-mv78xx0/common.c | 4 +-
13046 arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | 12 +-
13047 arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 86 +--
13048 arch/arm/mach-mv78xx0/irq.c | 9 +-
13049 arch/arm/mach-mv78xx0/pcie.c | 12 +-
13050 arch/arm/mach-mvebu/Kconfig | 20 +-
13051 arch/arm/mach-mvebu/Makefile | 5 +-
13052 arch/arm/mach-mvebu/addr-map.c | 134 ++++
13053 arch/arm/mach-mvebu/armada-370-xp.c | 2 +-
13054 arch/arm/mach-mvebu/armada-370-xp.h | 2 +-
13055 arch/arm/mach-mvebu/include/mach/gpio.h | 1 +
13056 arch/arm/mach-omap1/devices.c | 28 +
13057 arch/arm/mach-omap1/timer.c | 2 +-
13058 arch/arm/mach-omap2/Makefile | 1 +
13059 arch/arm/mach-omap2/board-apollon.c | 4 +-
13060 arch/arm/mach-omap2/board-h4.c | 6 +-
13061 arch/arm/mach-omap2/board-omap4panda.c | 2 +-
13062 arch/arm/mach-omap2/clkt2xxx_apll.c | 2 +-
13063 arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 10 +-
13064 arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 20 +-
13065 arch/arm/mach-omap2/clkt_clksel.c | 86 ++-
13066 arch/arm/mach-omap2/clkt_dpll.c | 26 +-
13067 arch/arm/mach-omap2/clock.c | 9 +-
13068 arch/arm/mach-omap2/clock2420_data.c | 24 +-
13069 arch/arm/mach-omap2/clock2430_data.c | 23 +
13070 arch/arm/mach-omap2/clock33xx_data.c | 1 +
13071 arch/arm/mach-omap2/clock3xxx.c | 8 +-
13072 arch/arm/mach-omap2/clock3xxx_data.c | 37 +-
13073 arch/arm/mach-omap2/clock44xx_data.c | 21 +
13074 arch/arm/mach-omap2/clockdomain.c | 17 +
13075 arch/arm/mach-omap2/clockdomain.h | 20 +-
13076 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 49 +-
13077 arch/arm/mach-omap2/clockdomain44xx.c | 11 +
13078 arch/arm/mach-omap2/clockdomains3xxx_data.c | 7 +-
13079 arch/arm/mach-omap2/clockdomains44xx_data.c | 3 +-
13080 arch/arm/mach-omap2/cm-regbits-33xx.h | 158 +++-
13081 arch/arm/mach-omap2/cm-regbits-34xx.h | 2 +
13082 arch/arm/mach-omap2/cm-regbits-44xx.h | 411 +++++++++--
13083 arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 +-
13084 arch/arm/mach-omap2/cm2xxx_3xxx.h | 1 +
13085 arch/arm/mach-omap2/control.h | 1 +
13086 arch/arm/mach-omap2/devices.c | 39 +-
13087 arch/arm/mach-omap2/display.c | 4 +-
13088 arch/arm/mach-omap2/dpll3xxx.c | 48 +-
13089 arch/arm/mach-omap2/gpmc.c | 194 +++--
13090 arch/arm/mach-omap2/omap_hwmod.c | 138 +++-
13091 arch/arm/mach-omap2/omap_hwmod_2420_data.c | 19 +
13092 arch/arm/mach-omap2/omap_hwmod_2430_data.c | 19 +
13093 .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 17 +
13094 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 110 ++-
13095 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 280 +++++++-
13096 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 243 ++++++-
13097 arch/arm/mach-omap2/omap_hwmod_common_data.h | 6 +-
13098 arch/arm/mach-omap2/pm.c | 5 +-
13099 arch/arm/mach-omap2/pmu.c | 95 +++
13100 arch/arm/mach-omap2/powerdomain44xx.c | 61 +-
13101 arch/arm/mach-omap2/prcm-common.h | 2 +
13102 arch/arm/mach-orion5x/addr-map.c | 3 +-
13103 arch/arm/mach-orion5x/common.c | 4 +-
13104 arch/arm/mach-orion5x/dns323-setup.c | 2 +-
13105 arch/arm/mach-orion5x/include/mach/bridge-regs.h | 20 +-
13106 arch/arm/mach-orion5x/include/mach/orion5x.h | 56 +-
13107 arch/arm/mach-orion5x/irq.c | 5 +-
13108 arch/arm/mach-orion5x/pci.c | 6 +-
13109 arch/arm/plat-omap/clock.c | 27 -
13110 arch/arm/plat-omap/include/plat/clock.h | 5 +
13111 arch/arm/plat-omap/include/plat/dmtimer.h | 1 +
13112 arch/arm/plat-omap/include/plat/iommu.h | 15 +
13113 arch/arm/plat-omap/include/plat/omap_device.h | 4 +
13114 arch/arm/plat-omap/include/plat/omap_hwmod.h | 26 +-
13115 arch/arm/plat-omap/omap_device.c | 59 +-
13116 arch/arm/plat-orion/Makefile | 10 +-
13117 arch/arm/plat-orion/addr-map.c | 11 +-
13118 arch/arm/plat-orion/common.c | 12 +-
13119 arch/arm/plat-orion/include/plat/addr-map.h | 4 +-
13120 arch/arm/plat-orion/include/plat/common.h | 8 +-
13121 arch/arm/plat-orion/include/plat/mpp.h | 2 +-
13122 arch/arm/plat-orion/include/plat/time.h | 4 +-
13123 arch/arm/plat-orion/mpp.c | 6 +-
13124 arch/arm/plat-orion/time.c | 8 +-
13125 drivers/char/hw_random/omap-rng.c | 121 ++--
13126 drivers/crypto/mv_cesa.c | 17 +-
13127 drivers/gpio/Kconfig | 6 +
13128 drivers/gpio/Makefile | 1 +
13129 drivers/gpio/gpio-mvebu.c | 679 ++++++++++++++++++
13130 drivers/hwmon/gpio-fan.c | 120 ++++
13131 drivers/mmc/host/sdhci-tegra.c | 1 -
13132 drivers/pinctrl/Kconfig | 22 +
13133 drivers/pinctrl/Makefile | 5 +
13134 drivers/pinctrl/pinctrl-armada-370.c | 421 +++++++++++
13135 drivers/pinctrl/pinctrl-armada-xp.c | 468 ++++++++++++
13136 drivers/pinctrl/pinctrl-dove.c | 620 ++++++++++++++++
13137 drivers/pinctrl/pinctrl-kirkwood.c | 472 ++++++++++++
13138 drivers/pinctrl/pinctrl-mvebu.c | 754 ++++++++++++++++++++
13139 drivers/pinctrl/pinctrl-mvebu.h | 192 +++++
13140 drivers/spi/spi-omap-100k.c | 2 -
13141 drivers/spi/spi-omap2-mcspi.c | 1 -
13142 158 files changed, 8706 insertions(+), 906 deletions(-)
13143 create mode 100644 Documentation/devicetree/bindings/crypto/mv_cesa.txt
13144 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-fan.txt
13145 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
13146 create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
13147 create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
13148 create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt
13149 create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt
13150 create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt
13151 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
13152 create mode 100644 arch/arm/boot/dts/armada-xp-mv78230.dtsi
13153 create mode 100644 arch/arm/boot/dts/armada-xp-mv78260.dtsi
13154 create mode 100644 arch/arm/boot/dts/armada-xp-mv78460.dtsi
13155 create mode 100644 arch/arm/boot/dts/dove-cm-a510.dts
13156 create mode 100644 arch/arm/boot/dts/dove-cubox.dts
13157 create mode 100644 arch/arm/boot/dts/dove-dove-db.dts
13158 create mode 100644 arch/arm/boot/dts/dove.dtsi
13159 create mode 100644 arch/arm/boot/dts/kirkwood-dockstar.dts
13160 create mode 100644 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
13161 create mode 100644 arch/arm/boot/dts/kirkwood-km_kirkwood.dts
13162 create mode 100644 arch/arm/mach-kirkwood/board-dockstar.c
13163 create mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c
13164 create mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c
13165 create mode 100644 arch/arm/mach-mvebu/addr-map.c
13166 create mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h
13167 create mode 100644 arch/arm/mach-omap2/pmu.c
13168 create mode 100644 drivers/gpio/gpio-mvebu.c
13169 create mode 100644 drivers/pinctrl/pinctrl-armada-370.c
13170 create mode 100644 drivers/pinctrl/pinctrl-armada-xp.c
13171 create mode 100644 drivers/pinctrl/pinctrl-dove.c
13172 create mode 100644 drivers/pinctrl/pinctrl-kirkwood.c
13173 create mode 100644 drivers/pinctrl/pinctrl-mvebu.c
13174 create mode 100644 drivers/pinctrl/pinctrl-mvebu.h
13175 Merging ep93xx/ep93xx-for-next (70f0f7c Merge branch 'ep93xx-fixes' into ep93xx-for-next)
13176 $ git merge ep93xx/ep93xx-for-next
13177 Already up-to-date!
13178 Merge made by the 'recursive' strategy.
13179 Merging ixp4xx/next (2346020 IXP4xx: map CPU config registers within VMALLOC region.)
13180 $ git merge ixp4xx/next
13181 Resolved 'arch/arm/mach-ixp4xx/common.c' using previous resolution.
13182 Resolved 'arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h' using previous resolution.
13183 Auto-merging drivers/crypto/Kconfig
13184 Auto-merging drivers/char/hw_random/Kconfig
13185 Auto-merging arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
13186 CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
13187 Auto-merging arch/arm/mach-ixp4xx/common.c
13188 CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/common.c
13189 Automatic merge failed; fix conflicts and then commit the result.
13191 [master e572b2f] Merge remote-tracking branch 'ixp4xx/next'
13192 $ git diff -M --stat --summary HEAD^..
13193 arch/arm/common/dmabounce.c | 4 +-
13194 arch/arm/mach-ixp4xx/common-pci.c | 1 +
13195 arch/arm/mach-ixp4xx/common.c | 13 +++----
13196 arch/arm/mach-ixp4xx/goramo_mlr.c | 3 +-
13197 arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 +-
13198 arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 ++++++++++-------------
13199 arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 +++---
13200 arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++-
13201 arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 14 +------
13202 drivers/char/hw_random/Kconfig | 6 +--
13203 drivers/char/hw_random/ixp4xx-rng.c | 5 ++-
13204 drivers/crypto/Kconfig | 2 +-
13205 drivers/crypto/ixp4xx_crypto.c | 12 +++---
13206 drivers/net/wan/ixp4xx_hss.c | 2 +-
13207 14 files changed, 62 insertions(+), 71 deletions(-)
13208 Merging msm/for-next (a0d271c Linux 3.6)
13209 $ git merge msm/for-next
13210 Already up-to-date.
13211 Merging renesas/next (b681273 Merge branch 'heads/boards' into next)
13212 $ git merge renesas/next
13213 Resolved 'arch/arm/Kconfig' using previous resolution.
13214 Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
13215 Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c
13216 Auto-merging arch/arm/mach-shmobile/include/mach/sh7372.h
13217 Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
13218 Auto-merging arch/arm/configs/kzm9g_defconfig
13219 Auto-merging arch/arm/Kconfig
13220 CONFLICT (content): Merge conflict in arch/arm/Kconfig
13221 Automatic merge failed; fix conflicts and then commit the result.
13223 [master eb38c7a] Merge remote-tracking branch 'renesas/next'
13224 $ git diff -M --stat --summary HEAD^..
13225 arch/arm/Kconfig | 9 +++++++++
13226 arch/arm/configs/armadillo800eva_defconfig | 1 +
13227 arch/arm/configs/kzm9g_defconfig | 4 ++++
13228 arch/arm/configs/mackerel_defconfig | 18 ++++++++++++++++--
13229 arch/arm/mach-shmobile/board-kzm9g.c | 14 +++++++++++++-
13230 arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++++
13231 arch/arm/mach-shmobile/setup-r8a7740.c | 16 ++++++++++++++++
13232 arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++++++++++++++++
13233 arch/arm/mm/proc-v7-2level.S | 8 ++++++++
13234 9 files changed, 91 insertions(+), 3 deletions(-)
13235 Merging samsung/for-next (59e65fd Merge branch 'next/dt-samsung-new' into for-next)
13236 $ git merge samsung/for-next
13237 Resolved 'arch/arm/mach-exynos/clock-exynos5.c' using previous resolution.
13238 Auto-merging arch/arm/mach-exynos/clock-exynos5.c
13239 CONFLICT (content): Merge conflict in arch/arm/mach-exynos/clock-exynos5.c
13240 Automatic merge failed; fix conflicts and then commit the result.
13242 [master 86712a7] Merge remote-tracking branch 'samsung/for-next'
13243 $ git diff -M --stat --summary HEAD^..
13244 Merging tegra/for-next (979570e Linux 3.6-rc7)
13245 $ git merge tegra/for-next
13246 Already up-to-date.
13247 Merging kvmtool/master (5a337ac kvm tools: don't exit on debug ioport write)
13248 $ git merge kvmtool/master
13249 Already up-to-date.
13250 Merging dma-mapping/dma-mapping-next (461b6f0 Merge branch 'next-cleanup' into for-v3.7)
13251 $ git merge dma-mapping/dma-mapping-next
13252 Resolved 'Documentation/devicetree/bindings/ata/ahci-platform.txt' using previous resolution.
13253 Resolved 'arch/arm/boot/dts/highbank.dts' using previous resolution.
13254 Auto-merging arch/arm/mm/mmu.c
13255 Auto-merging arch/arm/mach-highbank/highbank.c
13256 Auto-merging arch/arm/boot/dts/highbank.dts
13257 CONFLICT (content): Merge conflict in arch/arm/boot/dts/highbank.dts
13258 Auto-merging Documentation/devicetree/bindings/ata/ahci-platform.txt
13259 CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ata/ahci-platform.txt
13260 Automatic merge failed; fix conflicts and then commit the result.
13262 [master 8f554a9] Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
13263 $ git diff -M --stat --summary HEAD^..
13264 .../devicetree/bindings/ata/ahci-platform.txt | 1 +
13265 .../devicetree/bindings/dma/arm-pl330.txt | 3 +
13266 .../devicetree/bindings/net/calxeda-xgmac.txt | 3 +
13267 arch/arm/boot/dts/highbank.dts | 1 +
13268 arch/arm/include/asm/barrier.h | 7 +-
13269 arch/arm/include/asm/dma-mapping.h | 1 +
13270 arch/arm/include/asm/memory.h | 8 -
13271 arch/arm/mach-highbank/highbank.c | 52 ++++
13272 arch/arm/mm/dma-mapping.c | 264 +++++++++++++++-----
13273 arch/arm/mm/mmu.c | 11 -
13274 drivers/base/dma-contiguous.c | 18 +-
13275 11 files changed, 278 insertions(+), 91 deletions(-)
13276 Merging pwm/for-next (72004bd pwm: Add Ingenic JZ4740 support)
13277 $ git merge pwm/for-next
13278 Auto-merging drivers/pwm/pwm-ab8500.c
13279 Auto-merging drivers/pwm/Makefile
13280 Auto-merging drivers/pwm/Kconfig
13281 Auto-merging drivers/misc/Kconfig
13282 Removing arch/unicore32/kernel/pwm.c
13283 Auto-merging arch/unicore32/Kconfig
13284 Removing arch/mips/jz4740/timer.h
13285 Removing arch/mips/jz4740/pwm.c
13286 Merge made by the 'recursive' strategy.
13287 Documentation/devicetree/bindings/pwm/imx-pwm.txt | 17 ++
13288 Documentation/driver-model/devres.txt | 4 +
13289 Documentation/pwm.txt | 3 +-
13290 arch/mips/include/asm/mach-jz4740/platform.h | 1 +
13291 arch/mips/include/asm/mach-jz4740/timer.h | 113 +++++++++
13292 arch/mips/jz4740/Kconfig | 3 -
13293 arch/mips/jz4740/Makefile | 2 +-
13294 arch/mips/jz4740/board-qi_lb60.c | 1 +
13295 arch/mips/jz4740/platform.c | 6 +
13296 arch/mips/jz4740/pwm.c | 177 -------------
13297 arch/mips/jz4740/time.c | 2 +-
13298 arch/mips/jz4740/timer.c | 4 +-
13299 arch/mips/jz4740/timer.h | 136 ----------
13300 arch/unicore32/Kconfig | 12 +-
13301 arch/unicore32/include/mach/regs-ost.h | 18 +-
13302 arch/unicore32/kernel/Makefile | 1 -
13303 arch/unicore32/kernel/pwm.c | 263 -------------------
13304 drivers/misc/Kconfig | 10 -
13305 drivers/misc/Makefile | 1 -
13306 drivers/pwm/Kconfig | 29 ++-
13307 drivers/pwm/Makefile | 3 +
13308 drivers/pwm/core.c | 80 ++++++
13309 drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} | 116 ++++-----
13310 drivers/pwm/pwm-imx.c | 278 ++++++++++++++-------
13311 drivers/pwm/pwm-jz4740.c | 221 ++++++++++++++++
13312 drivers/pwm/pwm-puv3.c | 161 ++++++++++++
13313 drivers/pwm/pwm-tiecap.c | 22 ++
13314 drivers/pwm/pwm-tiehrpwm.c | 73 ++++--
13315 drivers/video/backlight/pwm_bl.c | 7 +-
13316 include/linux/pwm.h | 108 +++++++-
13317 30 files changed, 1064 insertions(+), 808 deletions(-)
13318 create mode 100644 Documentation/devicetree/bindings/pwm/imx-pwm.txt
13319 delete mode 100644 arch/mips/jz4740/pwm.c
13320 delete mode 100644 arch/mips/jz4740/timer.h
13321 delete mode 100644 arch/unicore32/kernel/pwm.c
13322 rename drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} (52%)
13323 create mode 100644 drivers/pwm/pwm-jz4740.c
13324 create mode 100644 drivers/pwm/pwm-puv3.c
13325 Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
13326 $ git merge dma-buf/for-next
13327 Auto-merging drivers/base/dma-buf.c
13328 Merge made by the 'recursive' strategy.
13329 drivers/base/dma-buf.c | 2 ++
13330 1 file changed, 2 insertions(+)
13331 Merging userns/for-next (72235465 userns: Convert the ufs filesystem to use kuid/kgid where appropriate)
13332 $ git merge userns/for-next
13333 Already up-to-date.
13334 Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
13335 $ git merge ktest/for-next
13336 Already up-to-date.
13337 Merging signal/for-next (12f79be alpha: don't open-code trace_report_syscall_{enter,exit})
13338 $ git merge signal/for-next
13339 Auto-merging kernel/sched/core.c
13340 Auto-merging kernel/fork.c
13341 Auto-merging include/linux/sched.h
13342 Auto-merging include/linux/ptrace.h
13343 Auto-merging include/linux/compat.h
13344 Auto-merging fs/exec.c
13345 CONFLICT (content): Merge conflict in fs/exec.c
13346 Auto-merging fs/binfmt_elf.c
13347 Removing arch/xtensa/include/asm/exec.h
13348 Auto-merging arch/x86/um/sys_call_table_32.c
13349 Auto-merging arch/x86/um/Kconfig
13350 Removing arch/x86/kernel/sys_i386_32.c
13351 Auto-merging arch/x86/kernel/signal.c
13352 CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c
13353 Auto-merging arch/x86/kernel/process_64.c
13354 Auto-merging arch/x86/kernel/process_32.c
13355 CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
13356 Auto-merging arch/x86/kernel/process.c
13357 Auto-merging arch/x86/kernel/entry_64.S
13358 Auto-merging arch/x86/kernel/entry_32.S
13359 Auto-merging arch/x86/kernel/Makefile
13360 Auto-merging arch/x86/include/asm/thread_info.h
13361 Auto-merging arch/x86/include/asm/sys_ia32.h
13362 Auto-merging arch/x86/include/asm/processor.h
13363 Auto-merging arch/x86/ia32/sys_ia32.c
13364 Auto-merging arch/x86/ia32/ia32entry.S
13365 Auto-merging arch/x86/Kconfig
13366 CONFLICT (content): Merge conflict in arch/x86/Kconfig
13367 Removing arch/unicore32/include/asm/exec.h
13368 Auto-merging arch/um/kernel/syscall.c
13369 Auto-merging arch/um/kernel/process.c
13370 Removing arch/um/kernel/internal.h
13371 Auto-merging arch/um/kernel/exec.c
13372 CONFLICT (content): Merge conflict in arch/um/kernel/exec.c
13373 Auto-merging arch/um/include/asm/processor-generic.h
13374 Removing arch/tile/include/asm/exec.h
13375 Removing arch/sparc/include/asm/exec.h
13376 Auto-merging arch/sparc/include/asm/Kbuild
13377 Removing arch/sh/include/asm/exec.h
13378 Auto-merging arch/s390/kernel/process.c
13379 Auto-merging arch/s390/kernel/entry64.S
13380 Auto-merging arch/s390/kernel/compat_wrapper.S
13381 Auto-merging arch/s390/kernel/compat_linux.c
13382 Auto-merging arch/s390/include/asm/unistd.h
13383 Auto-merging arch/s390/include/asm/processor.h
13384 Auto-merging arch/s390/Kconfig
13385 CONFLICT (content): Merge conflict in arch/s390/Kconfig
13386 Auto-merging arch/powerpc/kernel/sys_ppc32.c
13387 Auto-merging arch/powerpc/kernel/process.c
13388 Auto-merging arch/powerpc/kernel/ppc_ksyms.c
13389 Auto-merging arch/powerpc/kernel/entry_64.S
13390 Auto-merging arch/powerpc/kernel/entry_32.S
13391 Auto-merging arch/powerpc/include/asm/unistd.h
13392 Auto-merging arch/powerpc/include/asm/thread_info.h
13393 Auto-merging arch/powerpc/include/asm/processor.h
13394 Auto-merging arch/powerpc/Kconfig
13395 CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
13396 Removing arch/parisc/include/asm/exec.h
13397 Auto-merging arch/mn10300/kernel/process.c
13398 Removing arch/mn10300/kernel/kthread.S
13399 Removing arch/mn10300/kernel/kernel_execve.S
13400 Removing arch/mn10300/include/asm/exec.h
13401 Auto-merging arch/mn10300/Kconfig
13402 CONFLICT (content): Merge conflict in arch/mn10300/Kconfig
13403 Auto-merging arch/mips/include/asm/thread_info.h
13404 Removing arch/microblaze/include/asm/exec.h
13405 Auto-merging arch/m68k/kernel/process.c
13406 Removing arch/m68k/include/asm/exec.h
13407 Auto-merging arch/m68k/Kconfig
13408 CONFLICT (content): Merge conflict in arch/m68k/Kconfig
13409 Removing arch/m32r/include/asm/exec.h
13410 Auto-merging arch/m32r/include/asm/Kbuild
13411 CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
13412 Auto-merging arch/ia64/kernel/signal.c
13413 Removing arch/ia64/include/asm/exec.h
13414 Removing arch/h8300/include/asm/exec.h
13415 Auto-merging arch/h8300/include/asm/Kbuild
13416 CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
13417 Auto-merging arch/frv/kernel/process.c
13418 Removing arch/frv/kernel/kernel_thread.S
13419 Removing arch/frv/kernel/kernel_execve.S
13420 Removing arch/frv/include/asm/exec.h
13421 Removing arch/cris/include/asm/exec.h
13422 Auto-merging arch/cris/include/asm/Kbuild
13423 CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
13424 Removing arch/c6x/include/asm/exec.h
13425 Auto-merging arch/c6x/include/asm/Kbuild
13426 Auto-merging arch/c6x/Kconfig
13427 CONFLICT (content): Merge conflict in arch/c6x/Kconfig
13428 Removing arch/avr32/include/asm/exec.h
13429 Auto-merging arch/arm/kernel/process.c
13430 Auto-merging arch/arm/kernel/entry-common.S
13431 Auto-merging arch/arm/kernel/calls.S
13432 Auto-merging arch/arm/include/asm/unistd.h
13433 Auto-merging arch/arm/include/asm/thread_info.h
13434 Resolved 'arch/alpha/Kconfig' using previous resolution.
13435 Resolved 'arch/arm/Kconfig' using previous resolution.
13436 Resolved 'arch/arm/include/asm/thread_info.h' using previous resolution.
13437 Resolved 'arch/c6x/Kconfig' using previous resolution.
13438 Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
13439 Resolved 'arch/h8300/include/asm/Kbuild' using previous resolution.
13440 Resolved 'arch/m32r/include/asm/Kbuild' using previous resolution.
13441 Resolved 'arch/m68k/Kconfig' using previous resolution.
13442 Resolved 'arch/mn10300/Kconfig' using previous resolution.
13443 Resolved 'arch/um/kernel/exec.c' using previous resolution.
13444 Resolved 'arch/x86/Kconfig' using previous resolution.
13445 Resolved 'arch/x86/kernel/process_32.c' using previous resolution.
13446 Resolved 'arch/x86/kernel/signal.c' using previous resolution.
13447 Resolved 'fs/exec.c' using previous resolution.
13448 CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
13449 Auto-merging arch/arm/include/asm/ptrace.h
13450 Auto-merging arch/arm/Kconfig
13451 CONFLICT (content): Merge conflict in arch/arm/Kconfig
13452 Auto-merging arch/alpha/kernel/process.c
13453 Removing arch/alpha/include/asm/exec.h
13454 Auto-merging arch/alpha/Kconfig
13455 CONFLICT (content): Merge conflict in arch/alpha/Kconfig
13456 Auto-merging arch/Kconfig
13457 Automatic merge failed; fix conflicts and then commit the result.
13459 Recorded resolution for 'arch/powerpc/Kconfig'.
13460 Recorded resolution for 'arch/s390/Kconfig'.
13461 [master b5394e7] Merge remote-tracking branch 'signal/for-next'
13462 $ git diff -M --stat --summary HEAD^..
13464 arch/alpha/Kconfig | 1 +
13465 arch/alpha/include/asm/Kbuild | 1 +
13466 arch/alpha/include/asm/exec.h | 6 --
13467 arch/alpha/include/asm/processor.h | 3 -
13468 arch/alpha/include/asm/thread_info.h | 3 +-
13469 arch/alpha/include/asm/unistd.h | 2 +
13470 arch/alpha/kernel/alpha_ksyms.c | 3 -
13471 arch/alpha/kernel/entry.S | 82 +++++++---------------
13472 arch/alpha/kernel/process.c | 79 ++++++---------------
13473 arch/alpha/kernel/ptrace.c | 32 ++++-----
13474 arch/arm/Kconfig | 1 +
13475 arch/arm/include/asm/processor.h | 5 --
13476 arch/arm/include/asm/ptrace.h | 5 ++
13477 arch/arm/include/asm/system.h | 1 -
13478 arch/arm/include/asm/thread_info.h | 2 -
13479 arch/arm/include/asm/unistd.h | 2 +
13480 arch/arm/kernel/calls.S | 2 +-
13481 arch/arm/kernel/entry-common.S | 29 ++++++--
13482 arch/arm/kernel/process.c | 75 ++++----------------
13483 arch/arm/kernel/signal.c | 1 -
13484 arch/arm/kernel/sys_arm.c | 63 -----------------
13485 arch/avr32/include/asm/Kbuild | 1 +
13486 arch/avr32/include/asm/exec.h | 13 ----
13487 arch/avr32/include/asm/thread_info.h | 18 ++---
13488 arch/avr32/kernel/signal.c | 1 -
13489 arch/blackfin/include/asm/thread_info.h | 4 --
13490 arch/blackfin/kernel/signal.c | 1 -
13491 arch/c6x/Kconfig | 1 +
13492 arch/c6x/include/asm/Kbuild | 1 +
13493 arch/c6x/include/asm/exec.h | 6 --
13494 arch/c6x/include/asm/processor.h | 2 -
13495 arch/c6x/include/asm/syscalls.h | 5 --
13496 arch/c6x/include/asm/thread_info.h | 1 -
13497 arch/c6x/include/asm/unistd.h | 3 +
13498 arch/c6x/kernel/asm-offsets.c | 1 -
13499 arch/c6x/kernel/entry.S | 56 +++++++--------
13500 arch/c6x/kernel/process.c | 72 +++----------------
13501 arch/cris/include/asm/Kbuild | 1 +
13502 arch/cris/include/asm/exec.h | 6 --
13503 arch/cris/include/asm/thread_info.h | 3 -
13504 arch/frv/Kconfig | 1 +
13505 arch/frv/include/asm/Kbuild | 1 +
13506 arch/frv/include/asm/exec.h | 17 -----
13507 arch/frv/include/asm/processor.h | 9 +--
13508 arch/frv/include/asm/ptrace.h | 1 +
13509 arch/frv/include/asm/thread_info.h | 3 -
13510 arch/frv/include/asm/unistd.h | 2 +
13511 arch/frv/kernel/Makefile | 4 +-
13512 arch/frv/kernel/entry.S | 13 ++++
13513 arch/frv/kernel/frv_ksyms.c | 1 -
13514 arch/frv/kernel/kernel_execve.S | 33 ---------
13515 arch/frv/kernel/kernel_thread.S | 77 ---------------------
13516 arch/frv/kernel/process.c | 66 +++++++-----------
13517 arch/frv/kernel/signal.c | 9 ---
13518 arch/h8300/include/asm/Kbuild | 1 +
13519 arch/h8300/include/asm/exec.h | 6 --
13520 arch/h8300/include/asm/thread_info.h | 7 +-
13521 arch/h8300/kernel/signal.c | 1 -
13522 arch/hexagon/include/asm/thread_info.h | 5 --
13523 arch/hexagon/kernel/signal.c | 1 -
13524 arch/hexagon/kernel/syscall.c | 1 -
13525 arch/ia64/include/asm/Kbuild | 1 +
13526 arch/ia64/include/asm/exec.h | 14 ----
13527 arch/ia64/include/asm/thread_info.h | 2 -
13528 arch/ia64/kernel/signal.c | 8 ---
13529 arch/m32r/include/asm/Kbuild | 1 +
13530 arch/m32r/include/asm/exec.h | 14 ----
13531 arch/m32r/include/asm/thread_info.h | 9 +--
13532 arch/m32r/kernel/signal.c | 3 -
13533 arch/m68k/Kconfig | 1 +
13534 arch/m68k/include/asm/Kbuild | 1 +
13535 arch/m68k/include/asm/exec.h | 6 --
13536 arch/m68k/include/asm/processor.h | 25 ++++---
13537 arch/m68k/include/asm/ptrace.h | 2 +
13538 arch/m68k/include/asm/unistd.h | 2 +
13539 arch/m68k/kernel/entry.S | 16 +++++
13540 arch/m68k/kernel/process.c | 104 +++++++---------------------
13541 arch/m68k/kernel/sys_m68k.c | 17 -----
13542 arch/microblaze/include/asm/Kbuild | 1 +
13543 arch/microblaze/include/asm/exec.h | 14 ----
13544 arch/microblaze/include/asm/thread_info.h | 3 +-
13545 arch/microblaze/kernel/signal.c | 7 +-
13546 arch/mips/include/asm/thread_info.h | 3 -
13547 arch/mn10300/Kconfig | 1 +
13548 arch/mn10300/include/asm/Kbuild | 2 +
13549 arch/mn10300/include/asm/exec.h | 16 -----
13550 arch/mn10300/include/asm/frame.inc | 2 +-
13551 arch/mn10300/include/asm/processor.h | 18 +----
13552 arch/mn10300/include/asm/ptrace.h | 1 +
13553 arch/mn10300/include/asm/thread_info.h | 3 +-
13554 arch/mn10300/include/asm/unistd.h | 2 +
13555 arch/mn10300/kernel/Makefile | 4 +-
13556 arch/mn10300/kernel/entry.S | 18 +++++
13557 arch/mn10300/kernel/internal.h | 6 +-
13558 arch/mn10300/kernel/kernel_execve.S | 37 ----------
13559 arch/mn10300/kernel/kthread.S | 31 ---------
13560 arch/mn10300/kernel/process.c | 91 +++++++-----------------
13561 arch/mn10300/kernel/signal.c | 13 ----
13562 arch/openrisc/include/asm/thread_info.h | 3 +-
13563 arch/parisc/hpux/gate.S | 2 +-
13564 arch/parisc/include/asm/Kbuild | 1 +
13565 arch/parisc/include/asm/exec.h | 6 --
13566 arch/parisc/include/asm/thread_info.h | 5 +-
13567 arch/parisc/kernel/signal.c | 45 ++++--------
13568 arch/parisc/kernel/syscall.S | 9 +--
13569 arch/powerpc/Kconfig | 1 +
13570 arch/powerpc/include/asm/processor.h | 3 -
13571 arch/powerpc/include/asm/ptrace.h | 2 +
13572 arch/powerpc/include/asm/syscalls.h | 3 -
13573 arch/powerpc/include/asm/thread_info.h | 2 +
13574 arch/powerpc/include/asm/unistd.h | 2 +
13575 arch/powerpc/kernel/entry_32.S | 16 +++++
13576 arch/powerpc/kernel/entry_64.S | 16 +++++
13577 arch/powerpc/kernel/misc.S | 7 --
13578 arch/powerpc/kernel/misc_32.S | 33 ---------
13579 arch/powerpc/kernel/misc_64.S | 34 ---------
13580 arch/powerpc/kernel/ppc_ksyms.c | 1 -
13581 arch/powerpc/kernel/process.c | 59 ++++++++--------
13582 arch/powerpc/kernel/signal_32.c | 1 -
13583 arch/powerpc/kernel/sys_ppc32.c | 22 ------
13584 arch/s390/Kconfig | 1 +
13585 arch/s390/include/asm/processor.h | 4 +-
13586 arch/s390/include/asm/thread_info.h | 4 --
13587 arch/s390/include/asm/unistd.h | 2 +
13588 arch/s390/kernel/compat_linux.c | 26 -------
13589 arch/s390/kernel/compat_linux.h | 2 -
13590 arch/s390/kernel/compat_wrapper.S | 2 +-
13591 arch/s390/kernel/entry.S | 51 ++++++--------
13592 arch/s390/kernel/entry.h | 3 -
13593 arch/s390/kernel/entry64.S | 50 ++++++--------
13594 arch/s390/kernel/process.c | 107 +++++++++--------------------
13595 arch/score/include/asm/thread_info.h | 4 --
13596 arch/score/kernel/signal.c | 1 +
13597 arch/sh/include/asm/Kbuild | 1 +
13598 arch/sh/include/asm/exec.h | 10 ---
13599 arch/sh/include/asm/thread_info.h | 3 +
13600 arch/sh/kernel/signal_32.c | 1 -
13601 arch/sh/kernel/signal_64.c | 1 -
13602 arch/sparc/include/asm/Kbuild | 1 +
13603 arch/sparc/include/asm/exec.h | 6 --
13604 arch/sparc/include/asm/thread_info_32.h | 3 +-
13605 arch/sparc/include/asm/thread_info_64.h | 3 +
13606 arch/tile/include/asm/Kbuild | 1 +
13607 arch/tile/include/asm/exec.h | 20 ------
13608 arch/tile/kernel/compat_signal.c | 9 ---
13609 arch/tile/kernel/signal.c | 12 +---
13610 arch/um/include/asm/processor-generic.h | 2 -
13611 arch/um/include/asm/thread_info.h | 3 -
13612 arch/um/kernel/exec.c | 25 +------
13613 arch/um/kernel/internal.h | 1 -
13614 arch/um/kernel/process.c | 17 +----
13615 arch/um/kernel/syscall.c | 17 -----
13616 arch/unicore32/include/asm/Kbuild | 1 +
13617 arch/unicore32/include/asm/exec.h | 15 ----
13618 arch/unicore32/include/asm/thread_info.h | 4 +-
13619 arch/unicore32/kernel/entry.S | 2 -
13620 arch/unicore32/kernel/signal.c | 1 -
13621 arch/unicore32/kernel/sys.c | 1 -
13622 arch/x86/Kconfig | 1 +
13623 arch/x86/ia32/ia32entry.S | 2 +-
13624 arch/x86/ia32/sys_ia32.c | 15 ----
13625 arch/x86/include/asm/processor.h | 5 --
13626 arch/x86/include/asm/sys_ia32.h | 2 -
13627 arch/x86/include/asm/syscalls.h | 2 +-
13628 arch/x86/include/asm/thread_info.h | 2 -
13629 arch/x86/include/asm/unistd.h | 2 +
13630 arch/x86/kernel/Makefile | 2 +-
13631 arch/x86/kernel/asm-offsets.c | 3 +
13632 arch/x86/kernel/entry_32.S | 43 +++++++-----
13633 arch/x86/kernel/entry_64.S | 74 +++++++-------------
13634 arch/x86/kernel/process.c | 65 ------------------
13635 arch/x86/kernel/process_32.c | 37 ++++++++--
13636 arch/x86/kernel/process_64.c | 35 ++++++----
13637 arch/x86/kernel/signal.c | 4 --
13638 arch/x86/kernel/sys_i386_32.c | 40 -----------
13639 arch/x86/kernel/vm86_32.c | 6 +-
13640 arch/x86/syscalls/syscall_32.tbl | 2 +-
13641 arch/x86/um/Kconfig | 1 +
13642 arch/x86/um/sys_call_table_32.c | 1 -
13643 arch/xtensa/include/asm/Kbuild | 2 +
13644 arch/xtensa/include/asm/exec.h | 14 ----
13645 arch/xtensa/include/asm/thread_info.h | 5 --
13646 arch/xtensa/kernel/signal.c | 4 --
13647 fs/binfmt_elf.c | 1 -
13648 fs/binfmt_elf_fdpic.c | 1 -
13649 fs/exec.c | 61 ++++++++++++++--
13650 include/linux/binfmts.h | 6 ++
13651 include/linux/compat.h | 8 ++-
13652 include/linux/ptrace.h | 4 ++
13653 include/linux/sched.h | 3 +
13654 kernel/fork.c | 13 +++-
13655 kernel/sched/core.c | 2 +-
13656 193 files changed, 734 insertions(+), 1779 deletions(-)
13657 delete mode 100644 arch/alpha/include/asm/exec.h
13658 delete mode 100644 arch/avr32/include/asm/exec.h
13659 delete mode 100644 arch/c6x/include/asm/exec.h
13660 delete mode 100644 arch/cris/include/asm/exec.h
13661 delete mode 100644 arch/frv/include/asm/exec.h
13662 delete mode 100644 arch/frv/kernel/kernel_execve.S
13663 delete mode 100644 arch/frv/kernel/kernel_thread.S
13664 delete mode 100644 arch/h8300/include/asm/exec.h
13665 delete mode 100644 arch/ia64/include/asm/exec.h
13666 delete mode 100644 arch/m32r/include/asm/exec.h
13667 delete mode 100644 arch/m68k/include/asm/exec.h
13668 delete mode 100644 arch/microblaze/include/asm/exec.h
13669 delete mode 100644 arch/mn10300/include/asm/exec.h
13670 delete mode 100644 arch/mn10300/kernel/kernel_execve.S
13671 delete mode 100644 arch/mn10300/kernel/kthread.S
13672 delete mode 100644 arch/parisc/include/asm/exec.h
13673 delete mode 100644 arch/sh/include/asm/exec.h
13674 delete mode 100644 arch/sparc/include/asm/exec.h
13675 delete mode 100644 arch/tile/include/asm/exec.h
13676 delete mode 100644 arch/um/kernel/internal.h
13677 delete mode 100644 arch/unicore32/include/asm/exec.h
13678 delete mode 100644 arch/x86/kernel/sys_i386_32.c
13679 delete mode 100644 arch/xtensa/include/asm/exec.h
13680 Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
13681 $ git merge clk/clk-next
13682 Already up-to-date.
13683 Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
13684 $ git merge random/dev
13685 Already up-to-date.
13686 Merging scsi-post-merge/merge-base:master ()
13687 $ git clone -s -l -n -q . ../rebase-tmp
13689 $ git fetch --no-tags ../next refs/heads/akpm/master:akpm
13691 * [new branch] akpm/master -> akpm
13692 $ git fetch --no-tags ../next refs/heads/akpm/base:akpm-base
13694 * [new branch] akpm/base -> akpm-base
13695 $ git checkout akpm
13696 Switched to branch 'akpm'
13697 $ git rebase --onto master akpm-base
13698 First, rewinding head to replay your work on top of it...
13699 Applying: CRIS: Fix I/O macros
13700 Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
13701 Applying: vfs: d_obtain_alias() needs to use "/" as default name.
13702 Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
13703 Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
13704 Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
13705 Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
13706 Applying: acpi_memhotplug.c: remove memory info from list before freeing it
13707 Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
13708 Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
13709 Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
13710 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
13711 Applying: x86 numa: don't check if node is NUMA_NO_NODE
13712 Applying: arch/x86/tools/insn_sanity.c: identify source of messages
13713 Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
13714 Applying: audit.h: replace defines with C stubs
13715 Applying: audith-replace-defines-with-c-stubs-fix
13716 Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
13717 Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
13718 Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
13719 Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
13720 Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
13721 Applying: timeconst.pl: remove deprecated defined(@array)
13722 Applying: time: don't inline EXPORT_SYMBOL functions
13723 Applying: kbuild: make: fix if_changed when command contains backslashes
13724 Applying: compiler-gcc4.h: correct verion check for __compiletime_error
13725 Applying: h8300: select generic atomic64_t support
13726 Applying: unicore32: select generic atomic64_t support
13727 Applying: rapidio/rionet: fix multicast packet transmit logic
13728 Applying: readahead: fault retry breaks mmap file read random detection
13729 Applying: drivers/scsi/atp870u.c: fix bad use of udelay
13730 Applying: cciss: cleanup bitops usage
13731 Applying: cciss: use check_signature()
13732 Applying: block: store partition_meta_info.uuid as a string
13733 Applying: init: reduce PARTUUID min length to 1 from 36
13734 Applying: block: partition: msdos: provide UUIDs for partitions
13735 Applying: drbd: use copy_highpage
13736 Applying: vfs: increment iversion when a file is truncated
13737 Applying: fs: change return values from -EACCES to -EPERM
13738 Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
13739 Applying: mm/page_alloc.c: remove duplicate check
13740 Applying: mm: remove __GFP_NO_KSWAPD
13741 Applying: x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines
13742 Applying: x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn
13743 Applying: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix
13744 Applying: mm, x86, pat: rework linear pfn-mmap tracking
13745 Applying: mm: introduce arch-specific vma flag VM_ARCH_1
13746 Applying: mm: kill vma flag VM_INSERTPAGE
13747 Applying: mm: kill vma flag VM_CAN_NONLINEAR
13748 Applying: mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
13749 Applying: mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas
13750 Applying: mm: prepare VM_DONTDUMP for using in drivers
13751 Applying: mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
13752 Applying: mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix
13753 Applying: mm: fix nonuniform page status when writing new file with small buffer
13754 Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix
13755 Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix-fix
13756 Applying: mm/mmap.c: replace find_vma_prepare() with clearer find_vma_links()
13757 Applying: mm-mmapc-replace-find_vma_prepare-with-clearer-find_vma_links fix
13758 Applying: mm: compaction: update comment in try_to_compact_pages
13759 Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures
13760 Applying: mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures-fix
13761 Applying: mm: compaction: capture a suitable high-order page immediately when it is made available
13762 Applying: Revert "mm: mempolicy: Let vma_merge and vma_split handle vma->vm_policy linkages"
13763 Applying: mempolicy: remove mempolicy sharing
13764 Applying: mempolicy: fix a race in shared_policy_replace()
13765 Applying: mempolicy: fix refcount leak in mpol_set_shared_policy()
13766 Applying: mempolicy: fix a memory corruption by refcount imbalance in alloc_pages_vma()
13767 Applying: mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma-v2
13768 Applying: mm: mmu_notifier: fix inconsistent memory between secondary MMU and host
13769 Applying: mm-mmu_notifier-fix-inconsistent-memory-between-secondary-mmu-and-host-fix
13770 Applying: mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule
13771 Applying: mm/mmu_notifier: init notifier if necessary
13772 Applying: mm/mmu_notifier: init notifier if necessary
13773 Applying: mm/vmscan: fix error number for failed kthread
13774 Applying: mm: hugetlb: add arch hook for clearing page flags before entering pool
13775 Applying: mm: adjust final #endif position in mm/internal.h
13776 Applying: thp: fix the count of THP_COLLAPSE_ALLOC
13777 Applying: thp: remove unnecessary check in start_khugepaged
13778 Applying: thp: move khugepaged_mutex out of khugepaged
13779 Applying: thp: remove unnecessary khugepaged_thread check
13780 Applying: thp: remove wake_up_interruptible in the exit path
13781 Applying: thp: remove some code depend on CONFIG_NUMA
13782 Applying: thp: merge page pre-alloc in khugepaged_loop into khugepaged_do_scan
13783 Applying: thp: release page in page pre-alloc path
13784 Applying: thp: introduce khugepaged_prealloc_page and khugepaged_alloc_page
13785 Applying: thp: remove khugepaged_loop
13786 Applying: thp: use khugepaged_enabled to remove duplicate code
13787 Applying: thp: remove unnecessary set_recommended_min_free_kbytes
13788 Applying: mm: fix potential anon_vma locking issue in mprotect()
13789 Applying: thp, x86: introduce HAVE_ARCH_TRANSPARENT_HUGEPAGE
13790 Applying: thp: remove assumptions on pgtable_t type
13791 Applying: thp: introduce pmdp_invalidate()
13792 Applying: thp: make MADV_HUGEPAGE check for mm->def_flags
13793 Applying: thp, s390: thp splitting backend for s390
13794 Applying: thp, s390: thp pagetable pre-allocation for s390
13795 Applying: thp, s390: disable thp for kvm host on s390
13796 Applying: thp, s390: architecture backend for thp on s390
13797 Using index info to reconstruct a base tree...
13798 M arch/s390/include/asm/pgtable.h
13799 M arch/s390/include/asm/setup.h
13800 M arch/s390/kernel/early.c
13801 Falling back to patching base and 3-way merge...
13802 Auto-merging arch/s390/kernel/early.c
13803 Auto-merging arch/s390/include/asm/setup.h
13804 Auto-merging arch/s390/include/asm/pgtable.h
13805 Applying: thp, s390: add missing earlyclobber to inline assembly
13806 Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
13807 Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
13808 Applying: rbtree: empty nodes have no color
13809 Applying: rbtree-empty-nodes-have-no-color-fix
13810 Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c
13811 Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
13812 Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
13813 Applying: rbtree: performance and correctness test
13814 Using index info to reconstruct a base tree...
13816 Falling back to patching base and 3-way merge...
13817 Auto-merging lib/Makefile
13818 CONFLICT (content): Merge conflict in lib/Makefile
13819 Failed to merge in the changes.
13820 Patch failed at 0107 rbtree: performance and correctness test
13822 When you have resolved this problem run "git rebase --continue".
13823 If you would prefer to skip this patch, instead run "git rebase --skip".
13824 To check out the original branch and stop rebasing run "git rebase --abort".
13826 $ git rebase --continue
13827 Applying: rbtree-performance-and-correctness-test-fix
13828 Applying: rbtree: break out of rb_insert_color loop after tree rotation
13829 Applying: rbtree: adjust root color in rb_insert_color() only when necessary
13830 Applying: rbtree: low level optimizations in rb_insert_color()
13831 Applying: rbtree: adjust node color in __rb_erase_color() only when necessary
13832 Applying: perf tools: fix build for another rbtree.c change
13833 Applying: rbtree: optimize case selection logic in __rb_erase_color()
13834 Applying: rbtree: low level optimizations in __rb_erase_color()
13835 Applying: rbtree: coding style adjustments
13836 Applying: rbtree: optimize fetching of sibling node
13837 Applying: rbtree test: fix sparse warning about 64-bit constant
13838 Applying: rbtree: add __rb_change_child() helper function
13839 Applying: rbtree: place easiest case first in rb_erase()
13840 Applying: rbtree: handle 1-child recoloring in rb_erase() instead of rb_erase_color()
13841 Applying: rbtree: low level optimizations in rb_erase()
13842 Applying: rbtree: augmented rbtree test
13843 Applying: rbtree: faster augmented rbtree manipulation
13844 Applying: rbtree: remove prior augmented rbtree implementation
13845 Applying: rbtree: add RB_DECLARE_CALLBACKS() macro
13846 Applying: rbtree: add prio tree and interval tree tests
13847 Using index info to reconstruct a base tree...
13849 Falling back to patching base and 3-way merge...
13850 Auto-merging lib/Makefile
13851 Applying: mm: replace vma prio_tree with an interval tree
13852 Applying: kmemleak: use rbtree instead of prio tree
13853 Applying: prio_tree: remove
13854 Using index info to reconstruct a base tree...
13856 Falling back to patching base and 3-way merge...
13857 Removing lib/prio_tree_test.c
13858 Removing lib/prio_tree.c
13859 Auto-merging lib/Makefile
13860 Removing include/linux/prio_tree.h
13861 Removing Documentation/prio_tree.txt
13862 Applying: rbtree: move augmented rbtree functionality to rbtree_augmented.h
13863 Applying: mm: interval tree updates
13864 Applying: mm anon rmap: remove anon_vma_moveto_tail
13865 Applying: mm anon rmap: replace same_anon_vma linked list with an interval tree.
13866 Applying: mm rmap: remove vma_address check for address inside vma
13867 Applying: mm: add CONFIG_DEBUG_VM_RB build option
13868 Applying: mm anon rmap: in mremap, set the new vma's position before anon_vma_clone()
13869 Applying: mm: avoid taking rmap locks in move_ptes()
13870 Applying: memory-hotplug: build zonelists when offlining pages
13871 Applying: mm: mmu_notifier: make the mmu_notifier srcu static
13872 Applying: mm: cma: discard clean pages during contiguous allocation instead of migration
13873 Applying: mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix
13874 Applying: mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix-fix
13875 Applying: mm: fix tracing in free_pcppages_bulk()
13876 Applying: mm-fix-tracing-in-free_pcppages_bulk-fix
13877 Applying: cma: fix counting of isolated pages
13878 Applying: cma: count free CMA pages
13879 Applying: cma-count-free-cma-pages-fix
13880 Applying: cma: fix watermark checking
13881 Applying: cma: fix watermark checking cleanup
13882 Applying: mm: page_alloc: use get_freepage_migratetype() instead of page_private()
13883 Applying: mm: remain migratetype in freed page
13884 Applying: memory-hotplug: bug fix race between isolation and allocation
13885 Applying: memory-hotplug: fix pages missed by race rather than failing
13886 Applying: memory-hotplug-fix-pages-missed-by-race-rather-than-failng-fix
13887 Applying: atomic: implement generic atomic_dec_if_positive()
13888 Applying: atomic-implement-generic-atomic_dec_if_positive-fix
13889 Applying: swap: add a simple detector for inappropriate swapin readahead
13890 Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
13891 Applying: mm/memblock: reduce overhead in binary search
13892 Applying: mm/memblock: use existing interface to set nid
13893 Applying: mm/memblock: cleanup early_node_map[] related comments
13894 Applying: mm: compaction: abort compaction loop if lock is contended or run too long
13895 Applying: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix
13896 Applying: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix-2
13897 Applying: mm: compaction: move fatal signal check out of compact_checklock_irqsave
13898 Applying: mm: compaction: Update try_to_compact_pages()kerneldoc comment
13899 Applying: mm: compaction: acquire the zone->lru_lock as late as possible
13900 Applying: mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix
13901 Applying: mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix-fix
13902 Applying: mm: compaction: acquire the zone->lock as late as possible
13903 Applying: mm: compaction: iron out isolate_freepages_block() and isolate_freepages_range()
13904 Applying: Revert "mm: have order > 0 compaction start off where it left"
13905 Applying: mm: compaction: cache if a pageblock was scanned and no pages were isolated
13906 Applying: mm-compaction-cache-if-a-pageblock-was-scanned-and-no-pages-were-isolated-fix
13907 Applying: mm: compaction: cache if a pageblock was scanned and no pages were isolated -fix2
13908 Applying: mm: compaction: Restart compaction from near where it left off
13909 Applying: mm: compaction: Restart compaction from near where it left off -fix
13910 Applying: mm: compaction: clear PG_migrate_skip based on compaction and reclaim activity
13911 Applying: mm/hugetlb.c: remove duplicate inclusion of header file
13912 Applying: mm/page_alloc: refactor out __alloc_contig_migrate_alloc()
13913 Applying: mm-page_alloc-refactor-out-__alloc_contig_migrate_alloc-checkpatch-fixes
13914 Applying: memory-hotplug: don't replace lowmem pages with highmem
13915 Applying: thp: khugepaged_prealloc_page() forgot to reset the page alloc indicator
13916 Applying: mm: thp: fix the pmd_clear() arguments in pmdp_get_and_clear()
13917 Applying: mm: thp: fix the update_mmu_cache() last argument passing in mm/huge_memory.c
13918 Applying: mm: enable CONFIG_COMPACTION by default
13919 Applying: mm: fix-up zone present pages
13920 Applying: memcg: trivial fixes for Documentation/cgroups/memory.txt
13921 Applying: memcg: cleanup kmem tcp ifdefs
13922 Applying: memcg: move mem_cgroup_is_root upwards
13923 Applying: mm: fix invalidate_complete_page2() lock ordering
13924 Applying: mm: remove vma arg from page_evictable
13925 Applying: mm: use clear_page_mlock() in page_remove_rmap()
13926 Applying: mm: remove free_page_mlock
13927 Applying: mm, numa: reclaim from all nodes within reclaim distance
13928 Applying: mm-numa-reclaim-from-all-nodes-within-reclaim-distance-fix
13929 Applying: mm, numa: reclaim from all nodes within reclaim distance fix fix
13930 Applying: memory.txt: remove stray information
13931 Applying: mm: thp: fix pmd_present for split_huge_page and PROT_NONE with THP
13932 Applying: hugetlb: do not use vma_hugecache_offset() for vma_prio_tree_foreach
13933 Applying: mm: move all mmu notifier invocations to be done outside the PT lock
13934 Applying: mm: wrap calls to set_pte_at_notify with invalidate_range_start and invalidate_range_end
13935 Applying: mm: call invalidate_range_end in do_wp_page even for zero pages
13936 Applying: Revert 0def08e3 because check_range can't fail in migrate_to_node with
13937 Applying: mm: enhance comment and bug check
13938 Applying: memory-hotplug: fix zone stat mismatch
13939 Applying: mm: remove unevictable_pgs_mlockfreed
13940 Applying: KSM: numa awareness sysfs knob
13941 Applying: mm/memory.c: fix typo in comment
13942 Applying: fs/fs-writeback.c: remove unneccesary parameter of __writeback_single_inode()
13943 Applying: kpageflags: fix wrong KPF_THP on non-huge compound pages
13944 Applying: CMA: migrate mlocked pages
13945 Applying: cma: decrease cc.nr_migratepages after reclaiming pagelist
13946 Applying: sections: disable const sections for PA-RISC v2
13947 Using index info to reconstruct a base tree...
13949 Falling back to patching base and 3-way merge...
13950 Auto-merging init/Kconfig
13951 CONFLICT (content): Merge conflict in init/Kconfig
13952 Failed to merge in the changes.
13953 Patch failed at 0215 sections: disable const sections for PA-RISC v2
13955 When you have resolved this problem run "git rebase --continue".
13956 If you would prefer to skip this patch, instead run "git rebase --skip".
13957 To check out the original branch and stop rebasing run "git rebase --abort".
13959 $ git rebase --continue
13960 Applying: sections: fix section conflicts in arch/arm/
13961 Applying: sections: fix section conflicts in arch/frv
13962 Applying: sections: fix section conflicts in arch/h8300
13963 Applying: sections-fix-section-conflicts-in-arch-h8300-checkpatch-fixes
13964 Applying: sections: fix section conflicts in arch/ia64
13965 Applying: sections: fix section conflicts in arch/mips
13966 Applying: sections: fix section conflicts in arch/powerpc
13967 Applying: sections: fix section conflicts in arch/score
13968 Applying: sections: fix section conflicts in arch/sh
13969 Applying: sections-fix-section-conflicts-in-arch-sh-fix
13970 Applying: sections: fix section conflicts in arch/x86
13971 Applying: sections: fix section conflicts in drivers/atm
13972 Applying: sections: fix section conflicts in drivers/char
13973 Applying: sections: fix section conflicts in drivers/ide
13974 Applying: sections: fix section conflicts in drivers/macintosh
13975 Applying: sections-fix-section-conflicts-in-drivers-macintosh-checkpatch-fixes
13976 Applying: sections: fix section conflicts in drivers/mfd
13977 Applying: sections: fix section conflicts in drivers/mmc
13978 Applying: sections: fix section conflicts in drivers/net
13979 Applying: sections: fix section conflicts in drivers/net/hamradio
13980 Applying: sections: fix section conflicts in drivers/net/wan
13981 Applying: sections: fix section conflicts in drivers/platform/x86
13982 Applying: sections: fix section conflicts in drivers/scsi
13983 Applying: sections: fix section conflicts in drivers/video
13984 Applying: sections: fix section conflicts in mm/percpu.c
13985 Applying: sections: fix section conflicts in net/can
13986 Applying: sections: fix section conflicts in net
13987 Applying: sections: fix section conflicts in sound
13988 Applying: sections: fix const sections for crc32 table
13989 Applying: sectons-fix-const-sections-for-crc32-table-checkpatch-fixes
13990 Applying: frv: kill used but uninitialized variable
13991 Applying: score: select generic atomic64_t support
13992 Applying: cross-arch: don't corrupt personality flags upon exec()
13993 Applying: tile: fix personality bits handling upon exec()
13994 Applying: kernel/sys.c: call disable_nonboot_cpus() in kernel_restart()
13995 Applying: poweroff: fix bug in orderly_poweroff()
13996 Applying: lib: vsprintf: optimize division by 10 for small integers
13997 Applying: lib: vsprintf: optimize division by 10000
13998 Applying: lib: vsprintf: optimize put_dec_trunc8()
13999 Applying: lib-vsprintf-optimize-put_dec_trunc8-fix
14000 Applying: lib: vsprintf: fix broken comments
14001 Applying: lib/vsprintf: update documentation to cover all of %p[Mm][FR]
14002 Applying: MAINTAINERS: update gpio subsystem file list
14003 Applying: MAINTAINERS: add defconfig file to IMX section
14004 Applying: MAINTAINERS: Update gianfar_ptp after renaming
14005 Applying: MAINTAINERS: fix indentation for Viresh Kumar
14006 Applying: drivers/video/backlight/da9052_bl.c: use usleep_range() instead of msleep() for small sleeps
14007 Applying: drivers/video/backlight/ltv350qv.c: use usleep_range() instead of msleep() for small sleeps
14008 Applying: drivers/video/backlight/kb3886_bl.c: use usleep_range() instead of msleep() for small sleeps
14009 Applying: backlight: lp855x: add FAST bit description for LP8556
14010 Applying: backlight: add Backlight driver for lm3630 chip
14011 Applying: backlight-add-backlight-driver-for-lm3630-chip-fix
14012 Applying: backlight: add new lm3639 backlight driver
14013 Applying: backlight-add-new-lm3639-backlight-driver-fix
14014 Applying: backlight-add-new-lm3639-backlight-driver-fix-2
14015 Applying: backlight: remove ProGear driver
14016 Applying: drivers/video/backlight/da9052_bl.c: drop devm_kfree of devm_kzalloc'd data
14017 Applying: drivers/video/backlight/platform_lcd.c: add support for device tree based probe
14018 Applying: backlight-platform-lcd-add-support-for-device-tree-based-probe-fix
14019 Applying: pwm_backlight: add device tree support for Low Threshold Brightness
14020 Applying: pwm_backlight-add-device-tree-support-for-low-threshold-brightness-fix
14021 Applying: drivers/net/ethernet/sfc: use standard __{clear,set}_bit_le() functions
14022 Applying: drivers/net/ethernet/dec/tulip: Use standard __set_bit_le() function
14023 Applying: bitops: introduce generic {clear,set}_bit_le()
14024 Applying: powerpc: bitops: introduce {clear,set}_bit_le()
14025 Applying: kvm: replace test_and_set_bit_le() in mark_page_dirty_in_slot() with set_bit_le()
14026 Applying: idr: rename MAX_LEVEL to MAX_IDR_LEVEL
14027 Applying: idr-rename-max_level-to-max_idr_level-fix
14028 Applying: idr-rename-max_level-to-max_idr_level-fix-fix-2
14029 Applying: idr-rename-max_level-to-max_idr_level-fix-fix-2-fix
14030 Applying: idr-rename-max_level-to-max_idr_level-fix-3
14031 Applying: lib/parser.c: avoid overflow in match_number()
14032 Applying: lib-parserc-avoid-overflow-in-match_number-fix
14033 Applying: lib/Kconfig.debug: adjust hard-lockup related Kconfig options
14034 Applying: lib/gcd.c: prevent possible div by 0
14035 Applying: genalloc: make it possible to use a custom allocation algorithm
14036 Applying: lib/spinlock_debug: avoid livelock in do_raw_spin_lock()
14037 Applying: lib-spinlock_debug-avoid-livelock-in-do_raw_spin_lock-fix
14038 Applying: lib/vsprintf.c: improve standard conformance of sscanf()
14039 Applying: lib/plist.c: make plist test announcements KERN_DEBUG
14040 Applying: scatterlist: atomic sg_mapping_iter() no longer needs disabled IRQs
14041 Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
14042 Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
14043 Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
14044 Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
14045 Applying: checkpatch: check utf-8 content from a commit log when it's missing from charset
14046 Applying: checkpatch: update suggested printk conversions
14047 Applying: checkpatch: check networking specific block comment style
14048 Applying: CodingStyle: add networking specific block comment style
14049 Applying: epoll: support for disabling items, and a self-test app
14050 Applying: binfmt_elf: Uninitialized variable
14051 Applying: drivers/rtc/rtc-isl1208.c: add support for the ISL1218
14052 Applying: rtc-proc: permit the /proc/driver/rtc device to use other devices
14053 Applying: rtc: add Dallas DS2404 driver
14054 Applying: rtc-add-dallas-ds2404-driver-fix
14055 Applying: rtc: snvs: add Freescale rtc-snvs driver
14056 Applying: rtc: snvs: change timeout to use a fixed number of loop
14057 Applying: rtc: recycle id when unloading a rtc driver
14058 Applying: drivers/rtc/rtc-at91sam9.c: use module_platform_driver() macro
14059 Applying: rtc: tps65910: add RTC driver for TPS65910 PMIC RTC
14060 Applying: rtc: tps65910: change RTC driver name as per mfd
14061 Applying: rtc: add MAX8907 RTC driver
14062 Applying: rtc: kconfig: remove unnecessary dependencies.
14063 Applying: drivers/rtc/rtc-jz4740.c: fix IRQ error check
14064 Applying: drivers/rtc/rtc-spear.c: fix several error checks
14065 Applying: rtc: rc5t583: add ricoh rc5t583 RTC driver
14066 Applying: drivers/rtc/rtc-coh901331.c: use clk_prepare_enable() and clk_disable_unprepare()
14067 Applying: rtc: rtc-mxc: adapt to the new i.mx clock framework
14068 Applying: rtc: rtc-mxc: convert to module_platform_driver
14069 Applying: rtc_sysfs_show_hctosys(): display 0 if resume failed
14070 Applying: rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix
14071 Applying: rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix-fix
14072 Applying: drivers/rtc/rtc-s3c.c: fix return value in s3c_rtc_probe()
14073 Applying: drivers/rtc/rtc-ds1672.c: convert struct i2c_msg initialization to C99 format
14074 Applying: drivers/rtc/rtc-x1205.c: convert struct i2c_msg initialization to C99 format
14075 Applying: drivers/rtc/rtc-s35390a.c: convert struct i2c_msg initialization to C99 format
14076 Applying: drivers/rtc/rtc-rs5c372.c: convert struct i2c_msg initialization to C99 format
14077 Applying: drivers/rtc/rtc-pcf8563.c: convert struct i2c_msg initialization to C99 format
14078 Applying: drivers/rtc/rtc-isl1208.c: convert struct i2c_msg initialization to C99 format
14079 Applying: drivers/rtc/rtc-em3027.c: convert struct i2c_msg initialization to C99 format
14080 Applying: rtc: kconfig: fix up dependency for ab8500
14081 Applying: drivers/rtc/rtc-tps65910.c: use platform_get_irq() to get RTC irq details
14082 Applying: drivers/rtc/rtc-m41t80.c: remove disabled alarm functionality
14083 Applying: drivers/rtc/rtc-s35390a.c: add wakealarm support for rtc-s35390A rtc chip
14084 Applying: hfsplus: add on-disk layout declarations related to attributes tree
14085 Applying: hfsplus: add functionality of manipulating by records in attributes tree
14086 Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
14087 Applying: hfsplus: add support of manipulation by attributes file
14088 Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
14089 Applying: hfsplus: code style fixes - reworked support of extended attributes
14090 Applying: fat: use accessor function for msdos_dir_entry 'start'
14091 Applying: fat (exportfs): move NFS support code
14092 Applying: fat (exportfs): fix dentry reconnection
14093 Applying: fs/fat: fix a checkpatch issue in namei_msdos.c
14094 Applying: fs/fat: fix some checkpatch issues in fat.h
14095 Applying: fs/fat: chang indentation of some comments in fat.h
14096 Applying: fs/fat: fix two checkpatch issues in cache.c
14097 Applying: fs/fat: fix some small checkpatch issues in dir.c
14098 Applying: fs/fat: fix all other checkpatch issues in dir.c
14099 Applying: fs-fat-fix-all-other-checkpatch-issues-in-dirc-fix
14100 Applying: fs/fat: fix checkpatch issues in fatent.c
14101 Applying: fat: no need to reset EOF in ent_put for FAT32
14102 Applying: fat: simplify writeback_inode()
14103 Applying: fat-simplify-writeback_inode-checkpatch-fixes
14104 Applying: fat-simplify-writeback_inode-checkpatch-fixes-fix
14105 Applying: device_cgroup: add "deny_all" in dev_cgroup structure
14106 Applying: device_cgroup: introduce dev_whitelist_clean()
14107 Applying: device_cgroup: convert device_cgroup internally to policy + exceptions
14108 Applying: device_cgroup: rename whitelist to exception list
14109 Applying: coredump: make core dump functionality optional
14110 Applying: fs: amended coredump-related sysctl functions
14111 Applying: coredump-make-core-dump-functionality-optional-fix-fix
14112 Applying: coredump: update coredump-related headers
14113 Applying: coredump: add support for %d=__get_dumpable() in core name
14114 Applying: coredump-add-support-for-%d=__get_dumpable-in-core-name-fix
14115 Applying: coredump: use SUID_DUMPABLE_ENABLED rather than hardcoded 1
14116 Applying: coredump-use-suid_dumpable_enabled-rather-than-hardcoded-1-checkpatch-fixes
14117 Applying: coredump: pass siginfo_t* to do_coredump() and below, not merely signr
14118 Applying: compat: move compat_siginfo_t definition to asm/compat.h
14119 Applying: coredump: add a new elf note with siginfo of the signal
14120 Applying: coredump: extend core dump note section to contain file names of mapped files
14121 Applying: proc: return -ENOMEM when inode allocation failed
14122 Applying: proc: no need to initialize proc_inode->fd in proc_get_inode()
14123 Applying: proc: use kzalloc instead of kmalloc and memset
14124 Applying: proc-use-kzalloc-instead-of-kmalloc-and-memset-fix
14125 Applying: proc_sysctl.c: use BUG_ON instead of BUG
14126 Applying: fs/proc/root.c: use NULL instead of 0 for pointer
14127 Applying: kdump: remove unneeded include
14128 Applying: ipc/sem.c: alternatives to preempt_disable()
14129 Applying: rapidio/tsi721: modify mport name assignment
14130 Applying: rapidio: fix kerneldoc warnings after DMA support was added
14131 Applying: drivers/rapidio/devices/tsi721.c: fix error return code
14132 Applying: rapidio: add inbound memory mapping interface
14133 Applying: rapidio/tsi721: add inbound memory mapping callbacks
14134 Applying: rapidio: apply RX/TX enable to active switch ports only
14135 Applying: nbd: add set flags ioctl
14136 Applying: nbd: handle discard requests
14137 Applying: aoe: for performance support larger packet payloads
14138 Applying: aoe: kernel thread handles I/O completions for simple locking
14139 Applying: aoe: cleanup an allocation a bit
14140 Applying: aoe: become I/O request queue handler for increased user control
14141 Applying: aoe: use a kernel thread for transmissions
14142 Applying: aoe: use packets that work with the smallest-MTU local interface
14143 Applying: aoe: failover remote interface based on aoe_deadsecs parameter
14144 Applying: aoe: do revalidation steps in order
14145 Applying: aoe: disallow unsupported AoE minor addresses
14146 Applying: aoe: associate frames with the AoE storage target
14147 Applying: aoe: increase net_device reference count while using it
14148 Applying: aoe: remove unused code and add cosmetic improvements
14149 Applying: aoe: update internal version number to 49
14150 Applying: aoe: update copyright year in touched files
14151 Applying: aoe: update documentation with new URL and VM settings reference
14152 Applying: taskstats: cgroupstats_user_cmd() may leak on error
14153 Applying: kernel/resource.c: fix stack overflow in __reserve_region_with_split()
14154 Applying: lib/decompress.c add __init to decompress_method and data
14155 Applying: prio_tree: fix fs/block_dev.c for removal of prio_tree
14156 Applying: fs/block_dev.c:set_blocksize(): use mapping_mapped()
14158 $ git fetch -f ../rebase-tmp akpm:akpm/master
14160 + 275c16c...467509e akpm -> akpm/master (forced update)
14161 $ rm -rf ../rebase-tmp
14162 Merging akpm/master (467509e fs/block_dev.c:set_blocksize(): use mapping_mapped())
14163 $ git merge --no-ff akpm/master
14164 Removing mm/prio_tree.c
14165 Removing lib/prio_tree.c
14166 Removing include/linux/prio_tree.h
14167 Removing drivers/video/backlight/progear_bl.c
14168 Removing Documentation/prio_tree.txt
14169 Removing Documentation/memory.txt
14170 Merge made by the 'recursive' strategy.
14171 Documentation/00-INDEX | 2 -
14172 Documentation/CodingStyle | 10 +
14173 Documentation/aoe/aoe.txt | 9 +-
14174 Documentation/cgroups/memory.txt | 90 +-
14175 .../devicetree/bindings/crypto/fsl-sec4.txt | 51 +
14176 Documentation/devicetree/bindings/rtc/snvs-rtc.txt | 1 +
14177 .../bindings/video/backlight/pwm-backlight.txt | 10 +
14178 Documentation/memory.txt | 33 -
14179 Documentation/printk-formats.txt | 1 +
14180 Documentation/prio_tree.txt | 107 --
14181 Documentation/rbtree.txt | 209 +++-
14182 Documentation/rtc.txt | 5 +-
14183 Documentation/sysctl/kernel.txt | 2 +
14184 Documentation/vm/ksm.txt | 7 +
14185 Documentation/vm/unevictable-lru.txt | 14 +-
14186 MAINTAINERS | 22 +-
14188 arch/alpha/kernel/pci-sysfs.c | 2 +-
14189 arch/arm/mach-at91/clock.c | 2 +-
14190 arch/arm/mach-davinci/board-tnetv107x-evm.c | 6 +-
14191 arch/arm/mach-davinci/da830.c | 48 +-
14192 arch/arm/mach-davinci/da850.c | 6 +-
14193 arch/arm/mach-msm/board-qsd8x50.c | 4 +-
14194 arch/arm/mach-omap2/display.c | 6 +-
14195 arch/arm/mm/fault-armv.c | 3 +-
14196 arch/arm/mm/fault.c | 1 +
14197 arch/arm/mm/flush.c | 3 +-
14198 arch/arm64/include/asm/compat.h | 60 +-
14199 arch/arm64/kernel/signal32.c | 53 -
14200 arch/avr32/include/asm/elf.h | 3 +-
14201 arch/avr32/mm/fault.c | 1 +
14202 arch/blackfin/include/asm/elf.h | 3 +-
14203 arch/c6x/include/asm/elf.h | 3 +-
14204 arch/cris/include/asm/elf.h | 3 +-
14205 arch/cris/include/asm/io.h | 39 +-
14206 arch/cris/mm/fault.c | 1 +
14207 arch/frv/include/asm/elf.h | 3 +-
14208 arch/frv/kernel/pm.c | 19 +-
14209 arch/frv/kernel/setup.c | 2 +-
14210 arch/frv/mb93090-mb00/pci-irq.c | 2 +-
14211 arch/h8300/Kconfig | 1 +
14212 arch/h8300/include/asm/elf.h | 3 +-
14213 arch/h8300/kernel/sys_h8300.c | 1 +
14214 arch/h8300/kernel/timer/itu.c | 2 +-
14215 arch/h8300/kernel/timer/timer16.c | 2 +-
14216 arch/h8300/kernel/timer/timer8.c | 2 +-
14217 arch/h8300/kernel/timer/tpu.c | 2 +-
14218 arch/h8300/platform/h8300h/irq.c | 4 +-
14219 arch/h8300/platform/h8s/irq.c | 4 +-
14220 arch/hexagon/include/asm/elf.h | 3 +-
14221 arch/hexagon/mm/vm_fault.c | 1 +
14222 arch/ia64/include/asm/hugetlb.h | 4 +
14223 arch/ia64/kernel/perfmon.c | 2 +-
14224 arch/ia64/mm/fault.c | 1 +
14225 arch/ia64/mm/init.c | 4 +-
14226 arch/ia64/xen/irq_xen.c | 2 +-
14227 arch/ia64/xen/irq_xen.h | 2 +-
14228 arch/m32r/include/asm/elf.h | 3 +-
14229 arch/m68k/include/asm/elf.h | 3 +-
14230 arch/m68k/mm/fault.c | 1 +
14231 arch/microblaze/include/asm/atomic.h | 1 +
14232 arch/microblaze/include/asm/elf.h | 3 +-
14233 arch/microblaze/mm/fault.c | 1 +
14234 arch/mips/bcm63xx/boards/board_bcm963xx.c | 2 +-
14235 arch/mips/include/asm/compat-signal.h | 62 -
14236 arch/mips/include/asm/compat.h | 69 +-
14237 arch/mips/include/asm/hugetlb.h | 4 +
14238 arch/mips/mm/fault.c | 1 +
14239 arch/mips/pci/pci-octeon.c | 2 +-
14240 arch/mn10300/Makefile | 2 +-
14241 arch/mn10300/include/asm/elf.h | 3 +-
14242 arch/openrisc/include/asm/elf.h | 3 +-
14243 arch/openrisc/mm/fault.c | 1 +
14244 arch/parisc/Kconfig | 1 +
14245 arch/parisc/include/asm/compat.h | 59 +-
14246 arch/parisc/kernel/cache.c | 3 +-
14247 arch/parisc/kernel/signal32.h | 52 -
14248 arch/powerpc/include/asm/atomic.h | 1 +
14249 arch/powerpc/include/asm/bitops.h | 10 +
14250 arch/powerpc/include/asm/compat.h | 60 +-
14251 arch/powerpc/include/asm/hugetlb.h | 4 +
14252 arch/powerpc/include/asm/siginfo.h | 1 -
14253 arch/powerpc/kernel/ppc32.h | 51 -
14254 arch/powerpc/kvm/book3s_hv.c | 2 +-
14255 arch/powerpc/mm/fault.c | 1 +
14256 arch/powerpc/oprofile/cell/spu_task_sync.c | 15 +-
14257 arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +-
14258 arch/powerpc/platforms/512x/mpc5121_generic.c | 2 +-
14259 arch/powerpc/platforms/52xx/lite5200.c | 2 +-
14260 arch/powerpc/platforms/52xx/media5200.c | 2 +-
14261 arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 +-
14262 arch/powerpc/platforms/85xx/tqm85xx.c | 2 +-
14263 arch/s390/include/asm/compat.h | 75 +-
14264 arch/s390/include/asm/hugetlb.h | 19 +-
14265 arch/s390/include/asm/pgtable.h | 209 ++++
14266 arch/s390/include/asm/setup.h | 5 +-
14267 arch/s390/include/asm/tlb.h | 1 +
14268 arch/s390/kernel/compat_linux.h | 68 --
14269 arch/s390/kernel/early.c | 2 +
14270 arch/s390/mm/fault.c | 1 +
14271 arch/s390/mm/gup.c | 11 +-
14272 arch/s390/mm/pgtable.c | 108 ++
14273 arch/score/Kconfig | 3 +-
14274 arch/score/include/asm/elf.h | 2 +-
14275 arch/score/kernel/sys_score.c | 1 +
14276 arch/sh/include/asm/elf.h | 3 +-
14277 arch/sh/include/asm/hugetlb.h | 6 +
14278 arch/sh/include/asm/io.h | 2 +-
14279 arch/sh/kernel/ioport.c | 2 +-
14280 arch/sh/mm/fault.c | 1 +
14281 arch/sparc/include/asm/compat.h | 61 +-
14282 arch/sparc/include/asm/elf_32.h | 3 +-
14283 arch/sparc/include/asm/hugetlb.h | 4 +
14284 arch/sparc/include/asm/siginfo.h | 1 -
14285 arch/sparc/kernel/pci.c | 2 +-
14286 arch/sparc/kernel/signal32.c | 52 -
14287 arch/sparc/mm/fault_32.c | 1 +
14288 arch/sparc/mm/fault_64.c | 1 +
14289 arch/tile/include/asm/compat.h | 62 +
14290 arch/tile/include/asm/elf.h | 4 +-
14291 arch/tile/include/asm/hugetlb.h | 4 +
14292 arch/tile/kernel/compat_signal.c | 57 -
14293 arch/tile/mm/elf.c | 19 +-
14294 arch/tile/mm/fault.c | 1 +
14295 arch/um/kernel/trap.c | 1 +
14296 arch/unicore32/Kconfig | 1 +
14297 arch/unicore32/kernel/process.c | 2 +-
14298 arch/x86/Kconfig | 1 +
14299 arch/x86/include/asm/apic.h | 2 +-
14300 arch/x86/include/asm/atomic.h | 24 -
14301 arch/x86/include/asm/compat.h | 74 +-
14302 arch/x86/include/asm/hugetlb.h | 4 +
14303 arch/x86/include/asm/ia32.h | 67 --
14304 arch/x86/include/asm/pgtable.h | 11 +-
14305 arch/x86/include/asm/uv/uv.h | 2 +-
14306 arch/x86/kernel/acpi/boot.c | 7 +-
14307 arch/x86/kernel/apic/apic_numachip.c | 4 +-
14308 arch/x86/kernel/rtc.c | 2 +-
14309 arch/x86/mm/fault.c | 1 +
14310 arch/x86/mm/hugetlbpage.c | 3 +-
14311 arch/x86/mm/numa.c | 3 +-
14312 arch/x86/mm/pat.c | 87 +-
14313 arch/x86/mm/pat_rbtree.c | 34 +-
14314 arch/x86/platform/iris/iris.c | 67 +-
14315 arch/x86/platform/uv/tlb_uv.c | 10 +-
14316 arch/x86/tools/insn_sanity.c | 10 +-
14317 arch/x86/xen/mmu.c | 3 +-
14318 arch/xtensa/include/asm/elf.h | 3 +-
14319 arch/xtensa/mm/fault.c | 1 +
14320 block/genhd.c | 8 +-
14321 block/partitions/efi.c | 7 +-
14322 block/partitions/msdos.c | 21 +-
14323 drivers/acpi/acpi_memhotplug.c | 123 +-
14324 drivers/atm/eni.c | 2 +-
14325 drivers/block/aoe/aoe.h | 85 +-
14326 drivers/block/aoe/aoeblk.c | 89 +-
14327 drivers/block/aoe/aoechr.c | 11 +-
14328 drivers/block/aoe/aoecmd.c | 1222 +++++++++++++-------
14329 drivers/block/aoe/aoedev.c | 161 ++-
14330 drivers/block/aoe/aoemain.c | 10 +-
14331 drivers/block/aoe/aoenet.c | 61 +-
14332 drivers/block/cciss.c | 21 +-
14333 drivers/block/drbd/drbd_bitmap.c | 7 +-
14334 drivers/block/nbd.c | 23 +-
14335 drivers/char/mbcs.c | 4 +-
14336 drivers/char/mem.c | 2 +-
14337 drivers/char/mspec.c | 2 +-
14338 drivers/dma/dmaengine.c | 2 +-
14339 drivers/firmware/dmi_scan.c | 78 +-
14340 drivers/gpu/drm/drm_gem.c | 2 +-
14341 drivers/gpu/drm/drm_vm.c | 10 +-
14342 drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +-
14343 drivers/gpu/drm/gma500/framebuffer.c | 3 +-
14344 drivers/gpu/drm/i915/intel_pm.c | 3 +-
14345 drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +-
14346 drivers/gpu/drm/udl/udl_fb.c | 2 +-
14347 drivers/i2c/i2c-core.c | 2 +-
14348 drivers/ide/aec62xx.c | 2 +-
14349 drivers/ide/ali14xx.c | 4 +-
14350 drivers/ide/alim15x3.c | 2 +-
14351 drivers/ide/amd74xx.c | 2 +-
14352 drivers/ide/atiixp.c | 2 +-
14353 drivers/ide/cmd640.c | 2 +-
14354 drivers/ide/cmd64x.c | 2 +-
14355 drivers/ide/cs5520.c | 2 +-
14356 drivers/ide/cs5530.c | 2 +-
14357 drivers/ide/cs5535.c | 2 +-
14358 drivers/ide/cy82c693.c | 2 +-
14359 drivers/ide/dtc2278.c | 2 +-
14360 drivers/ide/hpt366.c | 24 +-
14361 drivers/ide/ht6560b.c | 2 +-
14362 drivers/ide/icside.c | 2 +-
14363 drivers/ide/ide-pci-generic.c | 2 +-
14364 drivers/ide/it8172.c | 2 +-
14365 drivers/ide/it8213.c | 2 +-
14366 drivers/ide/it821x.c | 2 +-
14367 drivers/ide/jmicron.c | 2 +-
14368 drivers/ide/ns87415.c | 2 +-
14369 drivers/ide/opti621.c | 2 +-
14370 drivers/ide/pdc202xx_new.c | 2 +-
14371 drivers/ide/pdc202xx_old.c | 2 +-
14372 drivers/ide/piix.c | 2 +-
14373 drivers/ide/qd65xx.c | 2 +-
14374 drivers/ide/rz1000.c | 2 +-
14375 drivers/ide/sc1200.c | 2 +-
14376 drivers/ide/scc_pata.c | 2 +-
14377 drivers/ide/serverworks.c | 2 +-
14378 drivers/ide/siimage.c | 2 +-
14379 drivers/ide/sis5513.c | 2 +-
14380 drivers/ide/sl82c105.c | 2 +-
14381 drivers/ide/slc90e66.c | 2 +-
14382 drivers/ide/tc86c001.c | 2 +-
14383 drivers/ide/triflex.c | 2 +-
14384 drivers/ide/trm290.c | 2 +-
14385 drivers/ide/tx4938ide.c | 2 +-
14386 drivers/ide/tx4939ide.c | 2 +-
14387 drivers/ide/umc8672.c | 2 +-
14388 drivers/ide/via82cxxx.c | 2 +-
14389 drivers/infiniband/core/cm.c | 2 +-
14390 drivers/infiniband/hw/ehca/ehca_uverbs.c | 4 +-
14391 drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +-
14392 drivers/infiniband/hw/mlx4/cm.c | 2 +-
14393 drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
14394 drivers/macintosh/macio_asic.c | 2 +-
14395 drivers/media/pci/meye/meye.c | 2 +-
14396 drivers/media/platform/omap/omap_vout.c | 2 +-
14397 drivers/media/platform/vino.c | 2 +-
14398 drivers/media/usb/sn9c102/sn9c102_core.c | 3 +-
14399 drivers/media/usb/usbvision/usbvision-video.c | 3 +-
14400 drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +-
14401 drivers/media/v4l2-core/videobuf-vmalloc.c | 2 +-
14402 drivers/media/v4l2-core/videobuf2-memops.c | 2 +-
14403 drivers/mfd/wm8994-core.c | 6 +-
14404 drivers/misc/carma/carma-fpga.c | 2 -
14405 drivers/misc/sgi-gru/grufile.c | 5 +-
14406 drivers/mmc/host/sdhci-pci.c | 2 +-
14407 drivers/mtd/mtdchar.c | 2 +-
14408 drivers/mtd/mtdcore.c | 6 +-
14409 drivers/net/can/slcan.c | 2 +-
14410 drivers/net/can/vcan.c | 2 +-
14411 drivers/net/ethernet/8390/ne3210.c | 2 +-
14412 drivers/net/ethernet/adaptec/starfire.c | 2 +-
14413 drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +-
14414 drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
14415 drivers/net/ethernet/dec/tulip/de2104x.c | 7 +-
14416 drivers/net/ethernet/dec/tulip/eeprom.c | 2 +-
14417 drivers/net/ethernet/dec/tulip/tulip_core.c | 7 +-
14418 drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +-
14419 drivers/net/ethernet/dlink/sundance.c | 2 +-
14420 drivers/net/ethernet/fealnx.c | 2 +-
14421 drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +-
14422 drivers/net/ethernet/realtek/8139too.c | 2 +-
14423 drivers/net/ethernet/sfc/efx.c | 4 +-
14424 drivers/net/ethernet/sfc/net_driver.h | 12 -
14425 drivers/net/ethernet/sfc/nic.c | 4 +-
14426 drivers/net/ethernet/sis/sis190.c | 2 +-
14427 drivers/net/hamradio/6pack.c | 6 +-
14428 drivers/net/hamradio/bpqether.c | 2 +-
14429 drivers/net/hamradio/mkiss.c | 6 +-
14430 drivers/net/hamradio/scc.c | 2 +-
14431 drivers/net/hamradio/yam.c | 2 +-
14432 drivers/net/rionet.c | 20 +-
14433 drivers/net/wan/z85230.c | 2 +-
14434 drivers/oprofile/buffer_sync.c | 17 +-
14435 drivers/pcmcia/cs.c | 37 +-
14436 drivers/platform/x86/amilo-rfkill.c | 2 +-
14437 drivers/platform/x86/fujitsu-tablet.c | 10 +-
14438 drivers/platform/x86/thinkpad_acpi.c | 2 +-
14439 drivers/pps/pps.c | 2 +-
14440 drivers/rapidio/devices/tsi721.c | 94 +-
14441 drivers/rapidio/devices/tsi721.h | 15 +-
14442 drivers/rapidio/rio-scan.c | 9 +-
14443 drivers/rapidio/rio.c | 44 +
14444 drivers/rtc/Kconfig | 87 +-
14445 drivers/rtc/Makefile | 5 +
14446 drivers/rtc/class.c | 9 +-
14447 drivers/rtc/hctosys.c | 4 +-
14448 drivers/rtc/rtc-at91sam9.c | 13 +-
14449 drivers/rtc/rtc-coh901331.c | 3 +-
14450 drivers/rtc/rtc-ds1672.c | 26 +-
14451 drivers/rtc/rtc-ds2404.c | 303 +++++
14452 drivers/rtc/rtc-em3027.c | 17 +-
14453 drivers/rtc/rtc-isl1208.c | 21 +-
14454 drivers/rtc/rtc-jz4740.c | 2 +-
14455 drivers/rtc/rtc-m41t80.c | 157 +--
14456 drivers/rtc/rtc-max8907.c | 245 ++++
14457 drivers/rtc/rtc-mxc.c | 30 +-
14458 drivers/rtc/rtc-pcf8563.c | 13 +-
14459 drivers/rtc/rtc-proc.c | 24 +-
14460 drivers/rtc/rtc-rc5t583.c | 331 ++++++
14461 drivers/rtc/rtc-rs5c372.c | 7 +-
14462 drivers/rtc/rtc-s35390a.c | 129 ++-
14463 drivers/rtc/rtc-s3c.c | 4 +-
14464 drivers/rtc/rtc-snvs.c | 350 ++++++
14465 drivers/rtc/rtc-spear.c | 12 +-
14466 drivers/rtc/rtc-sysfs.c | 6 +
14467 drivers/rtc/rtc-tps65910.c | 349 ++++++
14468 drivers/rtc/rtc-x1205.c | 92 +-
14469 drivers/scsi/aacraid/linit.c | 2 +-
14470 drivers/scsi/aic94xx/aic94xx_init.c | 2 +-
14471 drivers/scsi/atp870u.c | 11 +-
14472 drivers/scsi/sg.c | 2 +-
14473 drivers/staging/android/ashmem.c | 1 -
14474 drivers/staging/omapdrm/omap_gem_dmabuf.c | 2 +-
14475 drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 +-
14476 drivers/thermal/cpu_cooling.c | 2 +-
14477 drivers/thermal/thermal_sys.c | 2 +-
14478 drivers/uio/uio.c | 4 +-
14479 drivers/usb/mon/mon_bin.c | 2 +-
14480 drivers/vfio/pci/vfio_pci.c | 2 +-
14481 drivers/video/68328fb.c | 2 +-
14482 drivers/video/aty/aty128fb.c | 2 +-
14483 drivers/video/aty/atyfb_base.c | 3 +-
14484 drivers/video/backlight/Kconfig | 23 +-
14485 drivers/video/backlight/Makefile | 3 +-
14486 drivers/video/backlight/da9052_bl.c | 4 +-
14487 drivers/video/backlight/kb3886_bl.c | 4 +-
14488 drivers/video/backlight/lm3630_bl.c | 475 ++++++++
14489 drivers/video/backlight/lm3639_bl.c | 437 +++++++
14490 drivers/video/backlight/ltv350qv.c | 6 +-
14491 drivers/video/backlight/platform_lcd.c | 10 +
14492 drivers/video/backlight/progear_bl.c | 162 ---
14493 drivers/video/backlight/pwm_bl.c | 5 +
14494 drivers/video/fb-puv3.c | 3 +-
14495 drivers/video/fb_defio.c | 2 +-
14496 drivers/video/fbmem.c | 3 +-
14497 drivers/video/gbefb.c | 2 +-
14498 drivers/video/geode/gx1fb_core.c | 2 +-
14499 drivers/video/gxt4500.c | 4 +-
14500 drivers/video/i810/i810_main.c | 2 +-
14501 drivers/video/jz4740_fb.c | 2 +-
14502 drivers/video/omap2/omapfb/omapfb-main.c | 2 +-
14503 drivers/video/sbuslib.c | 5 +-
14504 drivers/video/smscufx.c | 1 -
14505 drivers/video/udlfb.c | 1 -
14506 drivers/video/vermilion/vermilion.c | 1 -
14507 drivers/video/vfb.c | 1 -
14508 drivers/xen/gntalloc.c | 2 +-
14509 drivers/xen/gntdev.c | 2 +-
14510 drivers/xen/privcmd.c | 3 +-
14511 fs/9p/vfs_file.c | 1 +
14512 fs/Kconfig.binfmt | 8 +
14515 fs/autofs4/root.c | 2 +-
14516 fs/binfmt_aout.c | 54 +-
14517 fs/binfmt_elf.c | 153 ++-
14518 fs/binfmt_elf_fdpic.c | 8 +-
14519 fs/binfmt_flat.c | 2 +-
14520 fs/block_dev.c | 11 +-
14521 fs/btrfs/file.c | 2 +-
14522 fs/ceph/addr.c | 2 +-
14523 fs/cifs/file.c | 1 +
14524 fs/compat_binfmt_elf.c | 7 +
14525 fs/coredump.c | 20 +-
14526 fs/coredump.h | 6 +
14528 fs/debugfs/inode.c | 1 -
14529 fs/dlm/config.c | 2 +-
14530 fs/eventpoll.c | 38 +-
14532 fs/ext4/file.c | 2 +-
14533 fs/fat/Makefile | 2 +-
14534 fs/fat/cache.c | 10 +-
14535 fs/fat/dir.c | 56 +-
14536 fs/fat/fat.h | 97 +-
14537 fs/fat/fatent.c | 13 +-
14538 fs/fat/inode.c | 187 +--
14539 fs/fat/namei_msdos.c | 7 +-
14540 fs/fat/namei_vfat.c | 5 +-
14541 fs/fat/nfs.c | 101 ++
14542 fs/fs-writeback.c | 7 +-
14543 fs/fuse/file.c | 1 +
14544 fs/gfs2/file.c | 2 +-
14545 fs/gfs2/sys.c | 18 +-
14546 fs/hfsplus/Makefile | 3 +-
14547 fs/hfsplus/attributes.c | 399 +++++++
14548 fs/hfsplus/bfind.c | 79 +-
14549 fs/hfsplus/bnode.c | 6 +-
14550 fs/hfsplus/brec.c | 23 +-
14551 fs/hfsplus/btree.c | 8 +
14552 fs/hfsplus/catalog.c | 36 +-
14553 fs/hfsplus/dir.c | 6 +-
14554 fs/hfsplus/extents.c | 4 +-
14555 fs/hfsplus/hfsplus_fs.h | 41 +-
14556 fs/hfsplus/hfsplus_raw.h | 68 +-
14557 fs/hfsplus/inode.c | 13 +
14558 fs/hfsplus/ioctl.c | 542 +++++++--
14559 fs/hfsplus/super.c | 33 +-
14560 fs/hfsplus/unicode.c | 7 +-
14561 fs/hugetlbfs/inode.c | 11 +-
14563 fs/jffs2/readinode.c | 13 +-
14564 fs/ncpfs/ioctl.c | 2 +-
14565 fs/nfs/file.c | 1 +
14566 fs/nilfs2/file.c | 2 +-
14567 fs/ocfs2/mmap.c | 2 +-
14568 fs/proc/base.c | 6 +-
14569 fs/proc/generic.c | 15 +-
14570 fs/proc/inode.c | 1 -
14571 fs/proc/internal.h | 2 +-
14572 fs/proc/page.c | 8 +-
14573 fs/proc/proc_sysctl.c | 8 +-
14574 fs/proc/root.c | 2 +-
14575 fs/proc/task_mmu.c | 2 +-
14577 fs/ubifs/file.c | 1 +
14578 fs/udf/file.c | 2 +-
14579 fs/xfs/xfs_file.c | 2 +-
14580 include/asm-generic/bitops/le.h | 10 +
14581 include/asm-generic/pgtable.h | 72 +-
14582 include/linux/atomic.h | 25 +
14583 include/linux/audit.h | 206 +++-
14584 include/linux/binfmts.h | 3 +-
14585 include/linux/compaction.h | 19 +-
14586 include/linux/compat.h | 5 -
14587 include/linux/compiler-gcc4.h | 2 +-
14588 include/linux/coredump.h | 5 +
14589 include/linux/elf.h | 6 +
14590 include/linux/eventpoll.h | 1 +
14591 include/linux/fs.h | 8 +-
14592 include/linux/genalloc.h | 27 +
14593 include/linux/genhd.h | 8 +-
14594 include/linux/gfp.h | 5 +-
14595 include/linux/huge_mm.h | 1 -
14596 include/linux/idr.h | 10 +-
14597 include/linux/init.h | 27 +-
14598 include/linux/interval_tree.h | 27 +
14599 include/linux/interval_tree_generic.h | 191 +++
14600 include/linux/memblock.h | 3 +-
14601 include/linux/mempolicy.h | 4 +-
14602 include/linux/mfd/rc5t583.h | 22 +
14603 include/linux/mfd/tps65910.h | 10 +
14604 include/linux/mm.h | 140 ++-
14605 include/linux/mm_types.h | 16 +-
14606 include/linux/mman.h | 1 -
14607 include/linux/mmu_notifier.h | 60 +-
14608 include/linux/mmzone.h | 10 +-
14609 include/linux/nbd.h | 15 +-
14610 include/linux/page-isolation.h | 7 +-
14611 include/linux/pageblock-flags.h | 19 +-
14612 include/linux/percpu.h | 2 +-
14613 include/linux/platform_data/lm3630_bl.h | 57 +
14614 include/linux/platform_data/lm3639_bl.h | 69 ++
14615 include/linux/platform_data/lp855x.h | 2 +
14616 include/linux/prio_tree.h | 120 --
14617 include/linux/rbtree.h | 119 +-
14618 include/linux/rbtree_augmented.h | 223 ++++
14619 include/linux/rio.h | 11 +-
14620 include/linux/rio_drv.h | 5 +
14621 include/linux/rmap.h | 39 +-
14622 include/linux/rtc-ds2404.h | 20 +
14623 include/linux/rtc.h | 2 +-
14624 include/linux/sched.h | 1 -
14625 include/linux/swap.h | 2 +-
14626 include/linux/timerqueue.h | 2 +-
14627 include/linux/vm_event_item.h | 1 -
14628 include/linux/vmstat.h | 12 +
14629 include/net/net_namespace.h | 2 +
14630 include/trace/events/gfpflags.h | 1 -
14632 init/do_mounts.c | 61 +-
14635 ipc/sem.c | 250 ++--
14636 kernel/auditsc.c | 13 +-
14637 kernel/events/core.c | 2 +-
14638 kernel/events/uprobes.c | 8 +-
14639 kernel/fork.c | 31 +-
14640 kernel/kexec.c | 1 -
14641 kernel/resource.c | 50 +-
14642 kernel/signal.c | 3 +-
14643 kernel/sys.c | 3 +-
14644 kernel/sysctl.c | 12 +-
14645 kernel/taskstats.c | 1 +
14646 kernel/time.c | 4 +-
14647 kernel/timeconst.pl | 2 +-
14648 lib/Kconfig.debug | 31 +-
14649 lib/Makefile | 7 +-
14651 lib/decompress.c | 9 +-
14653 lib/gen_crc32table.c | 6 +-
14654 lib/genalloc.c | 88 +-
14656 lib/interval_tree.c | 10 +
14657 lib/interval_tree_test_main.c | 105 ++
14658 lib/parser.c | 10 +-
14660 lib/prio_tree.c | 466 --------
14661 lib/rbtree.c | 656 ++++++-----
14662 lib/rbtree_test.c | 234 ++++
14663 lib/scatterlist.c | 16 +-
14664 lib/spinlock_debug.c | 32 +-
14665 lib/vsprintf.c | 139 ++-
14668 mm/bootmem.c | 10 +-
14669 mm/compaction.c | 559 ++++++---
14670 mm/filemap.c | 6 +-
14671 mm/filemap_xip.c | 10 +-
14672 mm/fremap.c | 16 +-
14673 mm/huge_memory.c | 423 ++++---
14674 mm/hugetlb.c | 29 +-
14675 mm/internal.h | 94 +-
14676 mm/interval_tree.c | 112 ++
14677 mm/kmemleak.c | 101 +-
14679 mm/madvise.c | 8 +-
14680 mm/memblock.c | 7 +-
14681 mm/memcontrol.c | 22 +-
14682 mm/memory-failure.c | 8 +-
14683 mm/memory.c | 116 +-
14684 mm/memory_hotplug.c | 29 +-
14685 mm/mempolicy.c | 148 ++-
14687 mm/mmap.c | 207 ++--
14688 mm/mmu_notifier.c | 103 +-
14689 mm/mremap.c | 73 +-
14690 mm/nobootmem.c | 5 +-
14692 mm/page_alloc.c | 285 +++--
14693 mm/page_isolation.c | 43 +-
14695 mm/pgtable-generic.c | 50 +
14696 mm/prio_tree.c | 208 ----
14697 mm/rmap.c | 162 +--
14700 mm/swap_state.c | 6 +
14701 mm/truncate.c | 3 -
14702 mm/vmalloc.c | 3 +-
14703 mm/vmscan.c | 111 +-
14704 mm/vmstat.c | 14 +-
14705 net/can/af_can.c | 2 +-
14706 net/can/bcm.c | 2 +-
14707 net/can/gw.c | 2 +-
14708 net/can/raw.c | 2 +-
14709 net/ceph/osd_client.c | 1 -
14710 net/decnet/dn_rules.c | 2 +-
14711 net/ipv4/fib_rules.c | 2 +-
14712 net/ipv4/ipmr.c | 2 +-
14713 net/ipv6/addrlabel.c | 2 +-
14714 net/ipv6/fib6_rules.c | 2 +-
14715 net/ipv6/ip6mr.c | 2 +-
14716 scripts/Kbuild.include | 2 +-
14717 scripts/checkpatch.pl | 35 +-
14718 security/device_cgroup.c | 373 +++---
14719 security/selinux/netnode.c | 3 +-
14720 security/selinux/selinuxfs.c | 2 +-
14721 security/tomoyo/util.c | 9 +-
14722 sound/core/pcm_native.c | 6 +-
14723 sound/soc/codecs/wm5100.c | 2 +-
14724 sound/usb/usx2y/us122l.c | 2 +-
14725 sound/usb/usx2y/usX2Yhwdep.c | 2 +-
14726 sound/usb/usx2y/usx2yhwdeppcm.c | 2 +-
14727 tools/perf/util/include/linux/rbtree.h | 1 +
14728 tools/testing/selftests/Makefile | 2 +-
14729 tools/testing/selftests/epoll/Makefile | 11 +
14730 tools/testing/selftests/epoll/test_epoll.c | 344 ++++++
14731 virt/kvm/kvm_main.c | 3 +-
14732 561 files changed, 12831 insertions(+), 5814 deletions(-)
14733 create mode 100644 Documentation/devicetree/bindings/rtc/snvs-rtc.txt
14734 delete mode 100644 Documentation/memory.txt
14735 delete mode 100644 Documentation/prio_tree.txt
14736 create mode 100644 drivers/rtc/rtc-ds2404.c
14737 create mode 100644 drivers/rtc/rtc-max8907.c
14738 create mode 100644 drivers/rtc/rtc-rc5t583.c
14739 create mode 100644 drivers/rtc/rtc-snvs.c
14740 create mode 100644 drivers/rtc/rtc-tps65910.c
14741 create mode 100644 drivers/video/backlight/lm3630_bl.c
14742 create mode 100644 drivers/video/backlight/lm3639_bl.c
14743 delete mode 100644 drivers/video/backlight/progear_bl.c
14744 create mode 100644 fs/coredump.h
14745 create mode 100644 fs/fat/nfs.c
14746 create mode 100644 fs/hfsplus/attributes.c
14747 create mode 100644 include/linux/interval_tree.h
14748 create mode 100644 include/linux/interval_tree_generic.h
14749 create mode 100644 include/linux/platform_data/lm3630_bl.h
14750 create mode 100644 include/linux/platform_data/lm3639_bl.h
14751 delete mode 100644 include/linux/prio_tree.h
14752 create mode 100644 include/linux/rbtree_augmented.h
14753 create mode 100644 include/linux/rtc-ds2404.h
14754 create mode 100644 lib/interval_tree.c
14755 create mode 100644 lib/interval_tree_test_main.c
14756 delete mode 100644 lib/prio_tree.c
14757 create mode 100644 lib/rbtree_test.c
14758 create mode 100644 mm/interval_tree.c
14759 delete mode 100644 mm/prio_tree.c
14760 create mode 100644 tools/testing/selftests/epoll/Makefile
14761 create mode 100644 tools/testing/selftests/epoll/test_epoll.c
projects / karo-tx-linux.git / blob