2 Tuesday 2 October 10:03:15 EST 2012
5 $ git reset --hard stable
6 HEAD is now at a0d271c Linux 3.6
7 Merging origin/master (797b9e5 Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6)
8 $ git merge origin/master
9 Updating a0d271c..797b9e5
11 Documentation/ABI/testing/sysfs-bus-usb | 7 +
12 Documentation/ABI/testing/sysfs-class-extcon | 22 +-
13 Documentation/ABI/testing/sysfs-class-regulator | 21 +
14 Documentation/ABI/testing/sysfs-driver-wacom | 13 +
15 Documentation/ABI/testing/sysfs-tty | 9 +
16 Documentation/RCU/checklist.txt | 6 +
17 Documentation/RCU/stallwarn.txt | 16 +-
18 Documentation/RCU/trace.txt | 43 +-
19 Documentation/RCU/whatisRCU.txt | 9 +-
20 Documentation/accounting/getdelays.c | 5 +-
21 Documentation/arm64/booting.txt | 152 +
22 Documentation/arm64/memory.txt | 73 +
23 Documentation/devicetree/bindings/misc/at25.txt | 34 +-
24 Documentation/devicetree/bindings/misc/lis302.txt | 112 +
25 .../devicetree/bindings/regulator/regulator.txt | 5 +-
26 .../devicetree/bindings/regulator/tps65217.txt | 31 +-
27 .../devicetree/bindings/regulator/tps6586x.txt | 73 +-
28 .../bindings/staging/iio/adc/mxs-lradc.txt | 15 +
29 .../bindings/staging/imx-drm/fsl-imx-drm.txt | 41 +
30 .../bindings/tty/serial/nxp-lpc32xx-hsuart.txt | 14 +
31 .../devicetree/bindings/tty/serial/of-serial.txt | 2 +
32 .../devicetree/bindings/usb/am33xx-usb.txt | 14 +
33 .../devicetree/bindings/usb/ci13xxx-imx.txt | 5 +
34 Documentation/devicetree/bindings/usb/omap-usb.txt | 33 +
35 .../devicetree/bindings/usb/platform-uhci.txt | 12 +
36 Documentation/devicetree/bindings/usb/pxa-usb.txt | 31 +
37 .../devicetree/bindings/usb/twlxxxx-usb.txt | 40 +
38 Documentation/devicetree/bindings/usb/usb-phy.txt | 17 +
39 .../devicetree/bindings/usb/usbmisc-imx.txt | 14 +
40 .../devicetree/bindings/usb/vt8500-ehci.txt | 12 +
41 Documentation/devicetree/bindings/w1/w1-gpio.txt | 22 +
42 Documentation/dontdiff | 1 -
43 Documentation/feature-removal-schedule.txt | 639 --
44 Documentation/filesystems/debugfs.txt | 4 +-
45 Documentation/hid/hid-sensor.txt | 140 +
46 Documentation/hwmon/adt7410 | 51 +
47 Documentation/hwmon/ina2xx | 18 +
48 Documentation/hwmon/lm70 | 12 +-
49 Documentation/hwmon/max197 | 60 +
50 Documentation/hwmon/mcp3021 | 23 +-
51 Documentation/ia64/aliasing-test.c | 1 +
52 Documentation/kernel-parameters.txt | 26 +-
53 Documentation/kobject.txt | 6 +-
54 Documentation/misc-devices/lis3lv02d | 3 +-
55 Documentation/power/swsusp.txt | 2 +-
56 Documentation/scheduler/sched-arch.txt | 10 -
57 Documentation/serial/00-INDEX | 2 -
58 Documentation/serial/computone.txt | 520 --
59 Documentation/trace/kprobetrace.txt | 2 +-
60 Documentation/usb/persist.txt | 3 +
61 Documentation/x86/x86_64/boot-options.txt | 7 +
62 Documentation/zh_CN/arm/Booting | 175 +
63 Documentation/zh_CN/basic_profiling.txt | 71 +
64 Documentation/zh_CN/filesystems/sysfs.txt | 372 +
65 Documentation/zh_CN/gpio.txt | 658 ++
66 Documentation/zh_CN/video4linux/omap3isp.txt | 277 +
67 Documentation/zh_CN/video4linux/v4l2-framework.txt | 983 +++
71 arch/alpha/kernel/pci.c | 6 -
72 arch/alpha/kernel/process.c | 6 +-
73 arch/alpha/kernel/smp.c | 1 +
74 arch/alpha/kernel/srmcons.c | 1 +
75 arch/arm/Kconfig | 9 +-
76 arch/arm/kernel/bios32.c | 9 -
77 arch/arm/mach-mmp/Kconfig | 3 +
78 arch/arm/mach-omap2/board-omap3evm.c | 1 +
79 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 +
80 arch/arm/mach-omap2/omap_phy_internal.c | 138 -
81 arch/arm/mach-omap2/serial.c | 18 +-
82 arch/arm/mach-omap2/twl-common.c | 5 -
83 arch/arm/mach-omap2/usb-musb.c | 3 -
84 arch/arm/mach-prima2/Makefile | 1 -
85 arch/arm/mach-prima2/clock.c | 510 --
86 arch/arm/mach-prima2/prima2.c | 1 -
87 arch/arm/mach-prima2/timer.c | 8 +-
88 arch/arm/mach-pxa/stargate2.c | 2 +-
89 arch/arm/mach-realview/core.c | 106 -
90 arch/arm/mach-realview/include/mach/clkdev.h | 16 -
91 arch/arm/mach-realview/realview_eb.c | 2 +
92 arch/arm/mach-realview/realview_pb1176.c | 2 +
93 arch/arm/mach-realview/realview_pb11mp.c | 2 +
94 arch/arm/mach-realview/realview_pba8.c | 2 +
95 arch/arm/mach-realview/realview_pbx.c | 2 +
96 arch/arm/mach-tegra/Makefile | 1 -
97 arch/arm/mach-tegra/board-harmony-power.c | 12 +-
98 arch/arm/mach-tegra/devices.c | 2 +-
99 arch/arm/mach-tegra/devices.h | 2 +-
100 arch/arm/mach-tegra/pcie.c | 12 +-
101 arch/arm/mach-ux500/Kconfig | 1 +
102 arch/arm/mach-ux500/Makefile | 2 +-
103 arch/arm/mach-ux500/board-mop500.c | 21 -
104 arch/arm/mach-ux500/clock.c | 715 --
105 arch/arm/mach-ux500/clock.h | 164 -
106 arch/arm/mach-ux500/cpu.c | 14 +-
107 arch/arm/mach-vt8500/bv07.c | 1 +
108 arch/arm/mach-vt8500/devices-vt8500.c | 5 +
109 arch/arm/mach-vt8500/devices-wm8505.c | 4 +
110 arch/arm/mach-vt8500/devices.c | 11 +
111 arch/arm/mach-vt8500/devices.h | 1 +
112 arch/arm/mach-vt8500/wm8505_7in.c | 1 +
113 arch/arm/plat-omap/include/plat/omap-serial.h | 50 +-
114 arch/arm64/Kconfig | 222 +
115 arch/arm64/Kconfig.debug | 27 +
116 arch/arm64/Makefile | 71 +
117 arch/arm64/boot/.gitignore | 2 +
118 arch/arm64/boot/Makefile | 36 +
119 arch/arm64/boot/install.sh | 46 +
120 arch/arm64/configs/defconfig | 85 +
121 arch/arm64/include/asm/Kbuild | 51 +
122 arch/arm64/include/asm/arm_generic.h | 100 +
123 arch/arm64/include/asm/asm-offsets.h | 1 +
124 arch/arm64/include/asm/assembler.h | 109 +
125 arch/arm64/include/asm/atomic.h | 305 +
126 arch/arm64/include/asm/auxvec.h | 22 +
127 arch/arm64/include/asm/barrier.h | 52 +
128 arch/arm64/include/asm/bitops.h | 53 +
129 arch/arm64/include/asm/bitsperlong.h | 23 +
130 arch/arm64/include/asm/byteorder.h | 21 +
131 arch/arm64/include/asm/cache.h | 32 +
132 arch/arm64/include/asm/cacheflush.h | 148 +
133 arch/arm64/include/asm/cachetype.h | 48 +
134 arch/arm64/include/asm/cmpxchg.h | 173 +
135 arch/arm64/include/asm/compat.h | 242 +
136 arch/arm64/include/asm/compiler.h | 30 +
137 arch/arm64/include/asm/cputable.h | 30 +
138 arch/arm64/include/asm/cputype.h | 49 +
139 arch/arm64/include/asm/debug-monitors.h | 88 +
140 arch/arm64/include/asm/device.h | 26 +
141 arch/arm64/include/asm/dma-mapping.h | 124 +
142 arch/arm64/include/asm/elf.h | 179 +
143 arch/arm64/include/asm/exception.h | 23 +
144 arch/arm64/include/asm/exec.h | 23 +
145 arch/arm64/include/asm/fb.h | 34 +
146 arch/arm64/include/asm/fcntl.h | 29 +
147 arch/arm64/include/asm/fpsimd.h | 64 +
148 arch/arm64/include/asm/futex.h | 136 +
149 arch/arm64/include/asm/hardirq.h | 52 +
150 arch/arm64/include/asm/hw_breakpoint.h | 137 +
151 arch/arm64/include/asm/hwcap.h | 53 +
152 arch/arm64/include/asm/io.h | 258 +
153 arch/arm64/include/asm/irq.h | 8 +
154 arch/arm64/include/asm/irqflags.h | 91 +
155 arch/arm64/include/asm/memblock.h | 21 +
156 arch/arm64/include/asm/memory.h | 144 +
157 arch/arm64/include/asm/mmu.h | 30 +
158 arch/arm64/include/asm/mmu_context.h | 152 +
159 arch/arm64/include/asm/module.h | 23 +
160 arch/arm64/include/asm/page.h | 67 +
161 arch/arm64/include/asm/param.h | 23 +
162 arch/arm64/include/asm/perf_event.h | 22 +
163 arch/arm64/include/asm/pgalloc.h | 113 +
164 arch/arm64/include/asm/pgtable-2level-hwdef.h | 43 +
165 arch/arm64/include/asm/pgtable-2level-types.h | 60 +
166 arch/arm64/include/asm/pgtable-3level-hwdef.h | 50 +
167 arch/arm64/include/asm/pgtable-3level-types.h | 66 +
168 arch/arm64/include/asm/pgtable-hwdef.h | 94 +
169 arch/arm64/include/asm/pgtable.h | 328 +
170 arch/arm64/include/asm/pmu.h | 82 +
171 arch/arm64/include/asm/proc-fns.h | 50 +
172 arch/arm64/include/asm/processor.h | 175 +
173 arch/arm64/include/asm/prom.h | 1 +
174 arch/arm64/include/asm/ptrace.h | 207 +
175 arch/arm64/include/asm/setup.h | 26 +
176 arch/arm64/include/asm/shmparam.h | 28 +
177 arch/arm64/include/asm/sigcontext.h | 69 +
178 arch/arm64/include/asm/siginfo.h | 23 +
179 arch/arm64/include/asm/signal.h | 24 +
180 arch/arm64/include/asm/signal32.h | 53 +
181 arch/arm64/include/asm/smp.h | 69 +
182 arch/arm64/include/asm/sparsemem.h | 24 +
183 arch/arm64/include/asm/spinlock.h | 202 +
184 arch/arm64/include/asm/spinlock_types.h | 38 +
185 arch/arm64/include/asm/stacktrace.h | 29 +
186 arch/arm64/include/asm/stat.h | 62 +
187 arch/arm64/include/asm/statfs.h | 23 +
188 arch/arm64/include/asm/syscall.h | 101 +
189 arch/arm64/include/asm/syscalls.h | 40 +
190 arch/arm64/include/asm/system_misc.h | 54 +
191 arch/arm64/include/asm/thread_info.h | 127 +
192 arch/arm64/include/asm/timex.h | 29 +
193 arch/arm64/include/asm/tlb.h | 190 +
194 arch/arm64/include/asm/tlbflush.h | 122 +
195 arch/arm64/include/asm/traps.h | 30 +
196 arch/arm64/include/asm/uaccess.h | 297 +
197 arch/arm64/include/asm/ucontext.h | 30 +
198 arch/arm64/include/asm/unistd.h | 27 +
199 arch/arm64/include/asm/unistd32.h | 758 ++
200 arch/arm64/include/asm/vdso.h | 41 +
201 arch/arm64/include/asm/vdso_datapage.h | 43 +
202 arch/arm64/kernel/.gitignore | 1 +
203 arch/arm64/kernel/Makefile | 27 +
204 arch/arm64/kernel/arm64ksyms.c | 46 +
205 arch/arm64/kernel/asm-offsets.c | 108 +
206 arch/arm64/kernel/cputable.c | 33 +
207 arch/arm64/kernel/debug-monitors.c | 288 +
208 arch/arm64/kernel/entry-fpsimd.S | 80 +
209 arch/arm64/kernel/entry.S | 695 ++
210 arch/arm64/kernel/fpsimd.c | 106 +
211 arch/arm64/kernel/head.S | 510 ++
212 arch/arm64/kernel/hw_breakpoint.c | 880 ++
213 arch/arm64/kernel/io.c | 64 +
214 arch/arm64/kernel/irq.c | 84 +
215 arch/arm64/kernel/kuser32.S | 77 +
216 arch/arm64/kernel/module.c | 456 +
217 arch/arm64/kernel/perf_event.c | 1368 +++
218 arch/arm64/kernel/process.c | 408 +
219 arch/arm64/kernel/ptrace.c | 1126 +++
220 arch/arm64/kernel/setup.c | 347 +
221 arch/arm64/kernel/signal.c | 437 +
222 arch/arm64/kernel/signal32.c | 876 ++
223 arch/arm64/kernel/smp.c | 469 +
224 arch/arm64/kernel/stacktrace.c | 127 +
225 arch/arm64/kernel/sys.c | 138 +
226 arch/arm64/kernel/sys32.S | 282 +
227 arch/arm64/kernel/sys_compat.c | 164 +
228 arch/arm64/kernel/time.c | 65 +
229 arch/arm64/kernel/traps.c | 348 +
230 arch/arm64/kernel/vdso.c | 261 +
231 arch/arm64/kernel/vdso/.gitignore | 2 +
232 arch/arm64/kernel/vdso/Makefile | 63 +
233 arch/arm64/kernel/vdso/gen_vdso_offsets.sh | 15 +
234 arch/arm64/kernel/vdso/gettimeofday.S | 242 +
235 arch/arm64/kernel/vdso/note.S | 28 +
236 arch/arm64/kernel/vdso/sigreturn.S | 37 +
237 arch/arm64/kernel/vdso/vdso.S | 33 +
238 arch/arm64/kernel/vdso/vdso.lds.S | 100 +
239 arch/arm64/kernel/vmlinux.lds.S | 126 +
240 arch/arm64/lib/Makefile | 4 +
241 arch/arm64/lib/bitops.c | 25 +
242 arch/arm64/lib/clear_page.S | 39 +
243 arch/arm64/lib/clear_user.S | 58 +
244 arch/arm64/lib/copy_from_user.S | 66 +
245 arch/arm64/lib/copy_in_user.S | 63 +
246 arch/arm64/lib/copy_page.S | 46 +
247 arch/arm64/lib/copy_to_user.S | 61 +
248 arch/arm64/lib/delay.c | 55 +
249 arch/arm64/lib/strncpy_from_user.S | 50 +
250 arch/arm64/lib/strnlen_user.S | 47 +
251 arch/arm64/mm/Makefile | 4 +
252 arch/arm64/mm/cache.S | 168 +
253 arch/arm64/mm/context.c | 159 +
254 arch/arm64/mm/copypage.c | 34 +
255 arch/arm64/mm/dma-mapping.c | 79 +
256 arch/arm64/mm/extable.c | 17 +
257 arch/arm64/mm/fault.c | 534 ++
258 arch/arm64/mm/flush.c | 135 +
259 arch/arm64/mm/init.c | 437 +
260 arch/arm64/mm/ioremap.c | 84 +
261 arch/arm64/mm/mm.h | 2 +
262 arch/arm64/mm/mmap.c | 144 +
263 arch/arm64/mm/mmu.c | 395 +
264 arch/arm64/mm/pgd.c | 54 +
265 arch/arm64/mm/proc-macros.S | 55 +
266 arch/arm64/mm/proc.S | 175 +
267 arch/arm64/mm/tlb.S | 71 +
268 arch/cris/kernel/process.c | 3 +
269 arch/frv/kernel/process.c | 3 +
270 arch/frv/mb93090-mb00/pci-vdk.c | 4 +-
271 arch/h8300/kernel/process.c | 3 +
272 arch/ia64/Kconfig | 12 +-
273 arch/ia64/hp/sim/simserial.c | 3 +-
274 arch/ia64/include/asm/numa.h | 2 +-
275 arch/ia64/include/asm/switch_to.h | 8 -
276 arch/ia64/kernel/machine_kexec.c | 3 +-
277 arch/ia64/kernel/process.c | 7 +-
278 arch/ia64/kernel/time.c | 66 +-
279 arch/ia64/pci/pci.c | 11 +-
280 arch/ia64/sn/kernel/io_common.c | 4 +-
281 arch/ia64/xen/xencomm.c | 3 +-
282 arch/m32r/kernel/process.c | 3 +
283 arch/m68k/amiga/platform.c | 5 +-
284 arch/m68k/emu/nfcon.c | 4 +
285 arch/m68k/include/asm/apollohw.h | 12 -
286 arch/m68k/kernel/pcibios.c | 5 -
287 arch/m68k/kernel/process.c | 3 +
288 arch/m68k/kernel/time.c | 5 +-
289 arch/m68k/q40/config.c | 5 +-
290 arch/mips/cavium-octeon/serial.c | 30 +-
291 arch/mips/pci/pci-octeon.c | 15 +-
292 arch/mips/pci/pci.c | 6 -
293 arch/mips/sni/a20r.c | 32 +
294 arch/mn10300/kernel/process.c | 3 +
295 arch/parisc/kernel/pdc_cons.c | 1 +
296 arch/parisc/kernel/process.c | 3 +
297 arch/powerpc/boot/.gitignore | 4 -
298 arch/powerpc/include/asm/machdep.h | 3 +
299 arch/powerpc/include/asm/time.h | 6 -
300 arch/powerpc/kernel/pci-common.c | 20 +
301 arch/powerpc/kernel/process.c | 3 -
302 arch/powerpc/kernel/time.c | 55 +-
303 arch/powerpc/platforms/Kconfig.cputype | 16 +-
304 arch/powerpc/platforms/powernv/pci-ioda.c | 41 +-
305 arch/s390/Kbuild | 1 +
306 arch/s390/Kconfig | 421 +-
307 arch/s390/boot/compressed/Makefile | 1 +
308 arch/s390/boot/compressed/misc.c | 45 +-
309 arch/s390/defconfig | 14 +-
310 arch/s390/include/asm/appldata.h | 2 +-
311 arch/s390/include/asm/chsc.h | 28 -
312 arch/s390/include/asm/cio.h | 28 +-
313 arch/s390/include/asm/cmpxchg.h | 61 +
314 arch/s390/include/asm/cpu_mf.h | 4 +
315 arch/s390/include/asm/cputime.h | 3 +
316 arch/s390/include/asm/css_chars.h | 39 +
317 arch/s390/include/asm/eadm.h | 124 +
318 arch/s390/include/asm/elf.h | 3 +
319 arch/s390/include/asm/etr.h | 8 +-
320 arch/s390/include/asm/irq.h | 2 +
321 arch/s390/include/asm/isc.h | 1 +
322 arch/s390/include/asm/lowcore.h | 6 +-
323 arch/s390/include/asm/mmu_context.h | 2 +-
324 arch/s390/include/asm/percpu.h | 50 +-
325 arch/s390/include/asm/processor.h | 59 +-
326 arch/s390/include/asm/ptrace.h | 12 +-
327 arch/s390/include/asm/runtime_instr.h | 98 +
328 arch/s390/include/asm/scsw.h | 38 +-
329 arch/s390/include/asm/setup.h | 5 +-
330 arch/s390/include/asm/smp.h | 4 +-
331 arch/s390/include/asm/string.h | 8 -
332 arch/s390/include/asm/switch_to.h | 6 +-
333 arch/s390/include/asm/sysinfo.h | 39 +-
334 arch/s390/include/asm/topology.h | 20 +-
335 arch/s390/include/asm/uaccess.h | 15 +-
336 arch/s390/include/asm/unistd.h | 4 +-
337 arch/s390/kernel/Makefile | 12 +-
338 arch/s390/kernel/asm-offsets.c | 2 +
339 arch/s390/kernel/cache.c | 385 +
340 arch/s390/kernel/compat_wrapper.S | 13 +
341 arch/s390/kernel/crash.c | 14 -
342 arch/s390/kernel/crash_dump.c | 3 +-
343 arch/s390/kernel/dis.c | 58 +-
344 arch/s390/kernel/early.c | 38 +-
345 arch/s390/kernel/entry64.S | 17 +-
346 arch/s390/kernel/irq.c | 56 +-
347 arch/s390/kernel/kprobes.c | 2 +-
348 arch/s390/kernel/lgr.c | 29 +-
349 arch/s390/kernel/machine_kexec.c | 9 +-
350 arch/s390/kernel/process.c | 8 +
351 arch/s390/kernel/processor.c | 7 +-
352 arch/s390/kernel/ptrace.c | 70 +
353 arch/s390/kernel/runtime_instr.c | 150 +
354 arch/s390/kernel/s390_ksyms.c | 2 +
355 arch/s390/kernel/setup.c | 54 +-
356 arch/s390/kernel/smp.c | 46 +-
357 arch/s390/kernel/syscalls.S | 2 +
358 arch/s390/kernel/sysinfo.c | 351 +-
359 arch/s390/kernel/time.c | 4 +-
360 arch/s390/kernel/topology.c | 27 +-
361 arch/s390/kernel/traps.c | 41 +-
362 arch/s390/kernel/vdso.c | 8 +-
363 arch/s390/kernel/vtime.c | 11 +-
364 arch/s390/kvm/Kconfig | 2 +-
365 arch/s390/kvm/priv.c | 4 +-
366 arch/s390/lib/Makefile | 3 +-
367 arch/s390/lib/mem32.S | 92 +
368 arch/s390/lib/mem64.S | 88 +
369 arch/s390/lib/string.c | 56 +-
370 arch/s390/mm/Makefile | 2 +-
371 arch/s390/mm/extable.c | 81 +
372 arch/s390/mm/fault.c | 7 +-
373 arch/s390/mm/gup.c | 37 +
374 arch/s390/mm/init.c | 4 +-
375 arch/s390/mm/pgtable.c | 6 +-
376 arch/s390/mm/vmem.c | 2 +-
377 arch/s390/net/Makefile | 4 +
378 arch/s390/net/bpf_jit.S | 130 +
379 arch/s390/net/bpf_jit_comp.c | 776 ++
380 arch/score/kernel/process.c | 4 +-
381 arch/sh/drivers/pci/pci.c | 5 -
382 arch/sparc/kernel/leon_pci.c | 9 -
383 arch/sparc/kernel/pci.c | 4 -
384 arch/tile/Kconfig | 8 -
385 arch/tile/include/asm/topology.h | 1 -
386 arch/tile/kernel/pci.c | 34 +-
387 arch/tile/kernel/pci_gx.c | 8 -
388 arch/um/drivers/line.c | 3 +-
389 arch/um/drivers/mconsole_kern.c | 1 +
390 arch/unicore32/kernel/pci.c | 8 -
391 arch/x86/Kconfig | 98 +-
392 arch/x86/Kconfig.cpu | 5 +-
393 arch/x86/boot/compressed/Makefile | 3 +
394 arch/x86/boot/compressed/eboot.c | 34 +-
395 arch/x86/boot/compressed/eboot.h | 4 +
396 arch/x86/boot/header.S | 4 -
397 arch/x86/configs/i386_defconfig | 23 +-
398 arch/x86/configs/x86_64_defconfig | 23 +-
399 arch/x86/ia32/ia32_signal.c | 31 +-
400 arch/x86/ia32/ia32entry.S | 6 +
401 arch/x86/ia32/sys_ia32.c | 2 +-
402 arch/x86/include/asm/alternative-asm.h | 9 +-
403 arch/x86/include/asm/alternative.h | 36 +-
404 arch/x86/include/asm/bitops.h | 14 +-
405 arch/x86/include/asm/calling.h | 48 +-
406 arch/x86/include/asm/cpufeature.h | 4 +
407 arch/x86/include/asm/fpu-internal.h | 422 +-
408 arch/x86/include/asm/ftrace.h | 56 +-
409 arch/x86/include/asm/futex.h | 19 +-
410 arch/x86/include/asm/hardirq.h | 4 +
411 arch/x86/include/asm/hpet.h | 2 -
412 arch/x86/include/asm/i387.h | 29 +-
413 arch/x86/include/asm/iommu_table.h | 6 +-
414 arch/x86/include/asm/kprobes.h | 1 +
415 arch/x86/include/asm/kvm.h | 16 +
416 arch/x86/include/asm/kvm_host.h | 16 -
417 arch/x86/include/asm/mce.h | 13 +-
418 arch/x86/include/asm/microcode.h | 10 +-
419 arch/x86/include/asm/perf_event.h | 2 +
420 arch/x86/include/asm/perf_regs.h | 33 +
421 arch/x86/include/asm/pgtable_types.h | 6 +-
422 arch/x86/include/asm/processor-flags.h | 1 +
423 arch/x86/include/asm/processor.h | 3 +-
424 arch/x86/include/asm/rcu.h | 32 +
425 arch/x86/include/asm/signal.h | 4 +
426 arch/x86/include/asm/smap.h | 91 +
427 arch/x86/include/asm/svm.h | 205 +-
428 arch/x86/include/asm/sys_ia32.h | 2 +-
429 arch/x86/include/asm/thread_info.h | 10 +-
430 arch/x86/include/asm/uaccess.h | 28 +-
431 arch/x86/include/asm/uaccess_32.h | 3 -
432 arch/x86/include/asm/uaccess_64.h | 3 -
433 arch/x86/include/asm/uprobes.h | 3 +-
434 arch/x86/include/asm/vdso.h | 3 +-
435 arch/x86/include/asm/vmx.h | 127 +-
436 arch/x86/include/asm/x86_init.h | 9 +-
437 arch/x86/include/asm/xor_32.h | 56 +-
438 arch/x86/include/asm/xor_64.h | 61 +-
439 arch/x86/include/asm/xor_avx.h | 54 +-
440 arch/x86/include/asm/xsave.h | 23 +-
441 arch/x86/kernel/Makefile | 2 +
442 arch/x86/kernel/acpi/boot.c | 2 +-
443 arch/x86/kernel/acpi/sleep.c | 15 +-
444 arch/x86/kernel/alternative.c | 111 +-
445 arch/x86/kernel/apic/apic.c | 2 +-
446 arch/x86/kernel/cpu/amd.c | 67 +
447 arch/x86/kernel/cpu/bugs.c | 7 +-
448 arch/x86/kernel/cpu/common.c | 63 +-
449 arch/x86/kernel/cpu/intel.c | 4 +
450 arch/x86/kernel/cpu/mcheck/mce-inject.c | 8 +
451 arch/x86/kernel/cpu/mcheck/mce-internal.h | 12 +
452 arch/x86/kernel/cpu/mcheck/mce.c | 94 +-
453 arch/x86/kernel/cpu/mcheck/mce_intel.c | 168 +-
454 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 30 +-
455 arch/x86/kernel/cpu/perf_event_intel_uncore.h | 6 +-
456 arch/x86/kernel/cpu/proc.c | 5 +-
457 arch/x86/kernel/cpuid.c | 5 +
458 arch/x86/kernel/devicetree.c | 51 +-
459 arch/x86/kernel/entry_32.S | 100 +-
460 arch/x86/kernel/entry_64.S | 172 +-
461 arch/x86/kernel/ftrace.c | 73 +-
462 arch/x86/kernel/head_32.S | 31 +-
463 arch/x86/kernel/i387.c | 292 +-
464 arch/x86/kernel/i8259.c | 2 +-
465 arch/x86/kernel/irq.c | 4 +-
466 arch/x86/kernel/kprobes.c | 67 +
467 arch/x86/kernel/microcode_amd.c | 357 +-
468 arch/x86/kernel/microcode_core.c | 67 +-
469 arch/x86/kernel/microcode_intel.c | 3 +-
470 arch/x86/kernel/msr.c | 5 +
471 arch/x86/kernel/perf_regs.c | 105 +
472 arch/x86/kernel/probe_roms.c | 2 +-
473 arch/x86/kernel/process.c | 22 +-
474 arch/x86/kernel/process_32.c | 4 -
475 arch/x86/kernel/process_64.c | 4 -
476 arch/x86/kernel/ptrace.c | 8 +-
477 arch/x86/kernel/setup.c | 4 +-
478 arch/x86/kernel/signal.c | 231 +-
479 arch/x86/kernel/smpboot.c | 20 +-
480 arch/x86/kernel/step.c | 53 +-
481 arch/x86/kernel/traps.c | 174 +-
482 arch/x86/kernel/uprobes.c | 52 +-
483 arch/x86/kernel/x8664_ksyms_64.c | 6 +-
484 arch/x86/kernel/x86_init.c | 4 +-
485 arch/x86/kernel/xsave.c | 517 +-
486 arch/x86/kvm/trace.h | 89 -
487 arch/x86/kvm/vmx.c | 12 +-
488 arch/x86/kvm/x86.c | 3 +-
489 arch/x86/lib/copy_user_64.S | 7 +
490 arch/x86/lib/copy_user_nocache_64.S | 3 +
491 arch/x86/lib/getuser.S | 10 +
492 arch/x86/lib/putuser.S | 8 +-
493 arch/x86/lib/usercopy_32.c | 13 +-
494 arch/x86/lib/usercopy_64.c | 3 +
495 arch/x86/mm/fault.c | 31 +-
496 arch/x86/mm/init_32.c | 13 +-
497 arch/x86/mm/tlb.c | 4 +-
498 arch/x86/pci/acpi.c | 3 +-
499 arch/x86/pci/mmconfig-shared.c | 2 +-
500 arch/x86/pci/visws.c | 5 -
501 arch/x86/platform/efi/Makefile | 1 +
502 arch/x86/platform/efi/efi-bgrt.c | 76 +
503 arch/x86/platform/efi/efi.c | 66 +-
504 arch/x86/realmode/rm/wakeup.h | 2 +
505 arch/x86/realmode/rm/wakeup_asm.S | 29 +-
506 arch/x86/xen/mmu.c | 18 +-
507 arch/x86/xen/smp.c | 6 +-
508 arch/xtensa/Kconfig | 18 -
509 arch/xtensa/kernel/pci.c | 8 -
510 arch/xtensa/kernel/process.c | 3 +
511 arch/xtensa/platforms/iss/console.c | 1 +
512 block/partitions/ibm.c | 455 +-
513 drivers/acpi/Kconfig | 4 +-
514 drivers/acpi/bgrt.c | 76 +-
515 drivers/acpi/pci_root.c | 101 +-
516 drivers/acpi/pci_slot.c | 44 +-
517 drivers/base/core.c | 105 +-
518 drivers/base/devres.c | 42 +
519 drivers/base/firmware_class.c | 838 +-
520 drivers/base/platform.c | 41 +-
521 drivers/base/power/main.c | 22 +
522 drivers/base/regmap/regmap-irq.c | 92 +-
523 drivers/base/regmap/regmap.c | 13 +-
524 drivers/block/Kconfig | 12 -
525 drivers/block/Makefile | 1 -
526 drivers/block/nvme.c | 2 +-
527 drivers/block/ub.c | 2474 ------
528 drivers/bluetooth/hci_ath.c | 2 +-
529 drivers/char/Kconfig | 6 +-
530 drivers/char/agp/sgi-agp.c | 5 +-
531 drivers/char/mmtimer.c | 3 +-
532 drivers/char/mwave/mwavedd.c | 16 +-
533 drivers/char/nwbutton.c | 4 +-
534 drivers/char/pcmcia/synclink_cs.c | 149 +-
535 drivers/char/ppdev.c | 3 +-
536 drivers/char/rtc.c | 2 +-
537 drivers/char/tlclk.c | 4 +-
538 drivers/char/ttyprintk.c | 33 +-
539 drivers/char/virtio_console.c | 12 +-
540 drivers/clk/Kconfig | 13 +
541 drivers/clk/Makefile | 9 +-
542 drivers/clk/clk-ls1x.c | 111 +
543 drivers/clk/clk-max77686.c | 244 +
544 drivers/clk/clk-prima2.c | 1171 +++
545 drivers/clk/clk.c | 57 +-
546 drivers/clk/mmp/Makefile | 9 +
547 drivers/clk/mmp/clk-apbc.c | 152 +
548 drivers/clk/mmp/clk-apmu.c | 97 +
549 drivers/clk/mmp/clk-frac.c | 153 +
550 drivers/clk/mmp/clk-mmp2.c | 449 +
551 drivers/clk/mmp/clk-pxa168.c | 346 +
552 drivers/clk/mmp/clk-pxa910.c | 320 +
553 drivers/clk/mmp/clk.h | 35 +
554 drivers/clk/ux500/Makefile | 12 +
555 drivers/clk/ux500/clk-prcc.c | 164 +
556 drivers/clk/ux500/clk-prcmu.c | 252 +
557 drivers/clk/ux500/clk.h | 48 +
558 drivers/clk/ux500/u8500_clk.c | 477 ++
559 drivers/clk/ux500/u8540_clk.c | 21 +
560 drivers/clk/ux500/u9540_clk.c | 21 +
561 drivers/clk/versatile/Makefile | 1 +
562 drivers/clk/versatile/clk-realview.c | 114 +
563 drivers/clocksource/Kconfig | 5 +
564 drivers/clocksource/Makefile | 1 +
565 drivers/clocksource/arm_generic.c | 232 +
566 drivers/dma/at_hdmac.c | 8 +-
567 drivers/dma/ep93xx_dma.c | 2 +-
568 drivers/dma/fsldma.c | 2 +-
569 drivers/dma/imx-dma.c | 4 +-
570 drivers/dma/intel_mid_dma.c | 2 +-
571 drivers/dma/intel_mid_dma_regs.h | 6 +-
572 drivers/dma/ioat/hw.h | 4 -
573 drivers/dma/pl330.c | 2 +-
574 drivers/dma/ppc4xx/adma.c | 2 +-
575 drivers/dma/ste_dma40_ll.h | 2 +-
576 drivers/extcon/Kconfig | 8 +-
577 drivers/extcon/Makefile | 5 +-
578 drivers/extcon/extcon-adc-jack.c | 198 +
579 drivers/extcon/extcon-arizona.c | 83 +-
580 drivers/extcon/{extcon_class.c => extcon-class.c} | 12 +-
581 drivers/extcon/{extcon_gpio.c => extcon-gpio.c} | 0
582 drivers/extcon/extcon-max77693.c | 8 +-
583 drivers/firmware/efivars.c | 17 +-
584 drivers/gpu/drm/radeon/evergreen.c | 10 +-
585 drivers/gpu/vga/vgaarb.c | 29 +-
586 drivers/hid/Kconfig | 36 +-
587 drivers/hid/Makefile | 22 +
588 drivers/hid/hid-a4tech.c | 1 -
589 drivers/hid/hid-apple.c | 1 -
590 drivers/hid/hid-aureal.c | 1 -
591 drivers/hid/hid-belkin.c | 1 -
592 drivers/hid/hid-cherry.c | 1 -
593 drivers/hid/hid-core.c | 43 +-
594 drivers/hid/hid-cypress.c | 1 -
595 drivers/hid/hid-debug.c | 12 +-
596 drivers/hid/hid-ezkey.c | 1 -
597 drivers/hid/hid-gyration.c | 1 -
598 drivers/hid/hid-holtekff.c | 3 +-
599 drivers/hid/hid-ids.h | 22 +-
600 drivers/hid/hid-input.c | 11 +-
601 drivers/hid/hid-lcpower.c | 2 +-
602 drivers/hid/hid-lenovo-tpkbd.c | 147 +-
603 drivers/hid/hid-lg.c | 20 +-
604 drivers/hid/hid-lg.h | 4 +
605 drivers/hid/hid-lg4ff.c | 198 +-
606 drivers/hid/hid-magicmouse.c | 2 +-
607 drivers/hid/hid-microsoft.c | 1 -
608 drivers/hid/hid-monterey.c | 1 -
609 drivers/hid/hid-multitouch.c | 252 +-
610 drivers/hid/hid-ntrig.c | 8 +-
611 drivers/hid/hid-petalynx.c | 1 -
612 drivers/hid/hid-picolcd.c | 2748 ------
613 drivers/hid/hid-picolcd.h | 309 +
614 drivers/hid/hid-picolcd_backlight.c | 122 +
615 drivers/hid/hid-picolcd_cir.c | 152 +
616 drivers/hid/hid-picolcd_core.c | 689 ++
617 drivers/hid/hid-picolcd_debugfs.c | 899 ++
618 drivers/hid/hid-picolcd_fb.c | 615 ++
619 drivers/hid/hid-picolcd_lcd.c | 107 +
620 drivers/hid/hid-picolcd_leds.c | 175 +
621 drivers/hid/hid-primax.c | 25 -
622 drivers/hid/hid-prodikeys.c | 18 +-
623 drivers/hid/hid-ps3remote.c | 215 +
624 drivers/hid/hid-samsung.c | 1 -
625 drivers/hid/hid-sensor-hub.c | 680 ++
626 drivers/hid/hid-sony.c | 1 -
627 drivers/hid/hid-sunplus.c | 1 -
628 drivers/hid/hid-uclogic.c | 98 +
629 drivers/hid/hid-wacom.c | 170 +-
630 drivers/hid/hid-waltop.c | 29 -
631 drivers/hid/hid-wiimote-ext.c | 97 +
632 drivers/hid/hidraw.c | 84 +-
633 drivers/hid/usbhid/hid-core.c | 6 +-
634 drivers/hid/usbhid/hid-quirks.c | 3 +-
635 drivers/hv/hv.c | 34 +-
636 drivers/hv/hv_kvp.c | 253 +-
637 drivers/hv/hv_util.c | 4 +-
638 drivers/hv/hyperv_vmbus.h | 47 +-
639 drivers/hv/vmbus_drv.c | 42 +-
640 drivers/hwmon/Kconfig | 126 +-
641 drivers/hwmon/Makefile | 2 +
642 drivers/hwmon/abituguru.c | 7 +-
643 drivers/hwmon/abituguru3.c | 6 +-
644 drivers/hwmon/ad7314.c | 16 +-
645 drivers/hwmon/ad7414.c | 21 +-
646 drivers/hwmon/ad7418.c | 21 +-
647 drivers/hwmon/adcxx.c | 9 +-
648 drivers/hwmon/adm1029.c | 21 +-
649 drivers/hwmon/adm9240.c | 26 -
650 drivers/hwmon/ads1015.c | 12 +-
651 drivers/hwmon/ads7828.c | 15 +-
652 drivers/hwmon/ads7871.c | 21 +-
653 drivers/hwmon/adt7410.c | 464 +
654 drivers/hwmon/adt7411.c | 9 +-
655 drivers/hwmon/adt7462.c | 15 +-
656 drivers/hwmon/adt7470.c | 15 +-
657 drivers/hwmon/amc6821.c | 16 +-
658 drivers/hwmon/asb100.c | 17 +-
659 drivers/hwmon/asus_atk0110.c | 1 -
660 drivers/hwmon/dme1737.c | 45 +-
661 drivers/hwmon/ds620.c | 16 +-
662 drivers/hwmon/emc1403.c | 18 +-
663 drivers/hwmon/emc2103.c | 10 +-
664 drivers/hwmon/f71882fg.c | 48 +-
665 drivers/hwmon/f75375s.c | 8 +-
666 drivers/hwmon/fam15h_power.c | 25 +-
667 drivers/hwmon/g760a.c | 10 +-
668 drivers/hwmon/ina2xx.c | 169 +-
669 drivers/hwmon/jz4740-hwmon.c | 53 +-
670 drivers/hwmon/lm70.c | 42 +-
671 drivers/hwmon/lm93.c | 2 +-
672 drivers/hwmon/lm95241.c | 15 +-
673 drivers/hwmon/lm95245.c | 15 +-
674 drivers/hwmon/ltc4151.c | 15 +-
675 drivers/hwmon/ltc4215.c | 15 +-
676 drivers/hwmon/ltc4245.c | 14 +-
677 drivers/hwmon/max1111.c | 74 +-
678 drivers/hwmon/max1668.c | 8 +-
679 drivers/hwmon/max197.c | 349 +
680 drivers/hwmon/mcp3021.c | 67 +-
681 drivers/hwmon/sch5627.c | 5 +-
682 drivers/hwmon/sch5636.c | 6 +-
683 drivers/hwmon/sch56xx-common.c | 28 +-
684 drivers/hwmon/sht15.c | 154 +-
685 drivers/hwmon/sht21.c | 13 +-
686 drivers/hwmon/via-cputemp.c | 23 +-
687 drivers/hwmon/vt8231.c | 24 +-
688 drivers/hwmon/w83791d.c | 7 +-
689 drivers/hwmon/w83792d.c | 58 +-
690 drivers/hwmon/w83793.c | 23 -
691 drivers/hwmon/w83l786ng.c | 13 +-
692 drivers/iio/Kconfig | 7 +-
693 drivers/iio/Makefile | 5 +
694 drivers/iio/accel/Kconfig | 16 +
695 drivers/iio/accel/Makefile | 5 +
696 drivers/iio/accel/hid-sensor-accel-3d.c | 418 +
697 drivers/iio/adc/Kconfig | 38 +
698 drivers/iio/adc/Makefile | 4 +
699 drivers/iio/adc/ad7266.c | 2 +-
700 .../iio/adc/ad7476_core.c => iio/adc/ad7476.c} | 210 +-
701 drivers/iio/adc/ad7791.c | 460 +
702 drivers/iio/adc/ad_sigma_delta.c | 558 ++
703 drivers/iio/adc/at91_adc.c | 77 +-
704 drivers/iio/adc/lp8788_adc.c | 264 +
705 drivers/iio/common/Kconfig | 5 +
706 drivers/iio/common/Makefile | 9 +
707 drivers/iio/common/hid-sensors/Kconfig | 26 +
708 drivers/iio/common/hid-sensors/Makefile | 6 +
709 .../iio/common/hid-sensors/hid-sensor-attributes.c | 250 +
710 .../iio/common/hid-sensors/hid-sensor-attributes.h | 57 +
711 .../iio/common/hid-sensors/hid-sensor-trigger.c | 103 +
712 .../iio/common/hid-sensors/hid-sensor-trigger.h | 26 +
713 drivers/iio/dac/Kconfig | 20 +-
714 drivers/iio/dac/Makefile | 1 +
715 drivers/iio/dac/ad5446.c | 450 +-
716 drivers/iio/dac/ad5446.h | 91 -
717 drivers/iio/dac/ad5755.c | 650 ++
718 drivers/iio/gyro/Kconfig | 16 +
719 drivers/iio/gyro/Makefile | 5 +
720 drivers/iio/gyro/hid-sensor-gyro-3d.c | 418 +
721 drivers/iio/industrialio-buffer.c | 15 +-
722 drivers/iio/industrialio-core.c | 13 +-
723 drivers/iio/inkern.c | 139 +-
724 drivers/iio/kfifo_buf.c | 31 +-
725 drivers/iio/light/Kconfig | 10 +
726 drivers/iio/light/Makefile | 1 +
727 drivers/iio/light/adjd_s311.c | 2 +-
728 drivers/iio/light/hid-sensor-als.c | 385 +
729 drivers/iio/magnetometer/Kconfig | 16 +
730 drivers/iio/magnetometer/Makefile | 5 +
731 drivers/iio/magnetometer/hid-sensor-magn-3d.c | 419 +
732 drivers/infiniband/hw/ehca/ehca_irq.c | 250 +-
733 drivers/infiniband/hw/ehca/ehca_irq.h | 6 +-
734 drivers/infiniband/hw/mthca/mthca_reset.c | 8 +-
735 drivers/infiniband/hw/qib/qib.h | 2 +-
736 drivers/infiniband/hw/qib/qib_pcie.c | 40 +-
737 drivers/input/evdev.c | 78 +-
738 drivers/input/input-mt.c | 305 +-
739 drivers/input/input.c | 254 +-
740 drivers/input/misc/uinput.c | 2 +-
741 drivers/input/mouse/alps.c | 2 +-
742 drivers/input/mouse/bcm5974.c | 348 +-
743 drivers/input/mouse/elantech.c | 4 +-
744 drivers/input/mouse/sentelic.c | 2 +-
745 drivers/input/mouse/synaptics.c | 4 +-
746 drivers/input/tablet/wacom_wac.c | 6 +-
747 drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
748 drivers/input/touchscreen/cyttsp_core.c | 2 +-
749 drivers/input/touchscreen/edt-ft5x06.c | 2 +-
750 drivers/input/touchscreen/egalax_ts.c | 2 +-
751 drivers/input/touchscreen/ili210x.c | 2 +-
752 drivers/input/touchscreen/mms114.c | 2 +-
753 drivers/input/touchscreen/penmount.c | 2 +-
754 drivers/input/touchscreen/wacom_w8001.c | 2 +-
755 drivers/iommu/intel-iommu.c | 6 +-
756 drivers/isdn/capi/capi.c | 3 +-
757 drivers/isdn/gigaset/interface.c | 7 +-
758 drivers/isdn/i4l/isdn_tty.c | 41 +-
759 drivers/lguest/x86/core.c | 10 +-
760 drivers/media/dvb/ngene/ngene-cards.c | 2 +-
761 drivers/memory/Makefile | 3 +
762 drivers/memory/emif.c | 205 +-
763 drivers/memory/of_memory.c | 153 +
764 drivers/memory/of_memory.h | 36 +
765 drivers/memory/tegra20-mc.c | 10 +-
766 drivers/memory/tegra30-mc.c | 22 +-
767 drivers/mfd/ab8500-gpadc.c | 2 +-
768 drivers/mfd/db8500-prcmu.c | 42 +
769 drivers/mfd/dbx500-prcmu-regs.h | 4 +-
770 drivers/mfd/rc5t583.c | 2 +-
771 drivers/mfd/rdc321x-southbridge.c | 2 +-
772 drivers/mfd/tps6586x.c | 13 +
773 drivers/mfd/tps65911-comparator.c | 2 +-
774 drivers/mfd/wm8994-irq.c | 1 +
775 drivers/misc/Kconfig | 14 +-
776 drivers/misc/bmp085-i2c.c | 7 -
777 drivers/misc/bmp085-spi.c | 13 +-
778 drivers/misc/c2port/Kconfig | 5 +-
779 drivers/misc/carma/carma-fpga-program.c | 1 -
780 drivers/misc/carma/carma-fpga.c | 2 +-
781 drivers/misc/eeprom/Kconfig | 2 +-
782 drivers/misc/eeprom/at25.c | 83 +-
783 drivers/misc/hpilo.c | 11 +-
784 drivers/misc/ibmasm/uart.c | 16 +-
785 drivers/misc/lis3lv02d/lis3lv02d.c | 192 +-
786 drivers/misc/lis3lv02d/lis3lv02d.h | 49 +-
787 drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 32 +-
788 drivers/misc/lis3lv02d/lis3lv02d_spi.c | 21 +
789 drivers/misc/mei/Kconfig | 2 +-
790 drivers/misc/mei/hw.h | 83 +-
791 drivers/misc/mei/init.c | 93 +-
792 drivers/misc/mei/interface.h | 10 +-
793 drivers/misc/mei/interrupt.c | 44 +-
794 drivers/misc/mei/iorw.c | 59 +-
795 drivers/misc/mei/main.c | 107 +-
796 drivers/misc/mei/mei_dev.h | 78 +-
797 drivers/misc/mei/wd.c | 91 +-
798 drivers/misc/pch_phub.c | 15 +-
799 drivers/misc/pti.c | 128 +-
800 drivers/misc/ti-st/st_core.c | 12 +-
801 drivers/misc/ti-st/st_kim.c | 109 +-
802 drivers/misc/tifm_7xx1.c | 14 +-
803 drivers/mmc/card/sdio_uart.c | 24 +-
804 drivers/mmc/core/sdio.c | 2 +-
805 drivers/mmc/host/at91_mci.c | 2 +-
806 drivers/mmc/host/atmel-mci.c | 2 +-
807 drivers/mmc/host/omap_hsmmc.c | 2 +-
808 drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
809 drivers/mmc/host/vub300.c | 2 +-
810 drivers/net/ethernet/3com/typhoon.c | 2 +-
811 drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 4 +-
812 drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +-
813 drivers/net/ethernet/broadcom/bnx2.c | 2 +-
814 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +-
815 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 20 +-
816 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 2 +-
817 drivers/net/ethernet/broadcom/tg3.c | 52 +-
818 drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +-
819 drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 22 +-
820 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 12 +-
821 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 6 +-
822 drivers/net/ethernet/emulex/benet/be_main.c | 2 +-
823 drivers/net/ethernet/intel/e100.c | 2 +-
824 drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
825 drivers/net/ethernet/intel/e1000e/netdev.c | 29 +-
826 drivers/net/ethernet/intel/igb/igb_main.c | 14 +-
827 drivers/net/ethernet/intel/igbvf/netdev.c | 2 +-
828 drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +-
829 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +-
830 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
831 drivers/net/ethernet/mellanox/mlx4/main.c | 2 +-
832 drivers/net/ethernet/mellanox/mlx4/reset.c | 8 +-
833 drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 31 +-
834 drivers/net/ethernet/neterion/s2io.c | 2 +-
835 drivers/net/ethernet/neterion/vxge/vxge-config.c | 4 +-
836 drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +-
837 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +-
838 .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +-
839 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +-
840 drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 +-
841 drivers/net/ethernet/realtek/r8169.c | 44 +-
842 drivers/net/ethernet/sgi/ioc3-eth.c | 22 +-
843 drivers/net/ethernet/sun/niu.c | 19 +-
844 drivers/net/irda/irtty-sir.c | 10 +-
845 drivers/net/usb/hso.c | 19 +-
846 drivers/net/wireless/ath/ath9k/pci.c | 21 +-
847 drivers/net/wireless/b43/Kconfig | 4 +-
848 drivers/net/wireless/iwlegacy/common.h | 4 +-
849 drivers/net/wireless/iwlwifi/pcie/trans.c | 7 +-
850 drivers/net/wireless/rtlwifi/pci.c | 8 +-
851 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 6 +-
852 drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 6 +-
853 drivers/oprofile/cpu_buffer.c | 11 +-
854 drivers/parisc/dino.c | 10 +-
855 drivers/parisc/lba_pci.c | 7 +-
856 drivers/parport/parport_gsc.c | 1 +
857 drivers/parport/parport_serial.c | 11 +-
858 drivers/pci/.gitignore | 4 -
859 drivers/pci/Kconfig | 1 -
860 drivers/pci/access.c | 202 +
861 drivers/pci/bus.c | 6 +-
862 drivers/pci/hotplug/Kconfig | 24 +-
863 drivers/pci/hotplug/Makefile | 3 -
864 drivers/pci/hotplug/acpiphp_glue.c | 99 +-
865 drivers/pci/hotplug/cpcihp_generic.c | 8 +-
866 drivers/pci/hotplug/cpqphp_ctrl.c | 21 +-
867 drivers/pci/hotplug/fakephp.c | 164 -
868 drivers/pci/hotplug/pciehp_acpi.c | 6 +-
869 drivers/pci/hotplug/pciehp_core.c | 28 +-
870 drivers/pci/hotplug/pciehp_hpc.c | 12 +-
871 drivers/pci/hotplug/pcihp_slot.c | 20 +-
872 drivers/pci/iov.c | 6 +-
873 drivers/pci/pci-driver.c | 57 +-
874 drivers/pci/pci.c | 358 +-
875 drivers/pci/pcie/aer/aer_inject.c | 2 +-
876 drivers/pci/pcie/aer/aerdrv.c | 26 +-
877 drivers/pci/pcie/aer/aerdrv_acpi.c | 2 +-
878 drivers/pci/pcie/aer/aerdrv_core.c | 67 +-
879 drivers/pci/pcie/aspm.c | 119 +-
880 drivers/pci/pcie/pme.c | 29 +-
881 drivers/pci/pcie/portdrv_bus.c | 2 +-
882 drivers/pci/pcie/portdrv_core.c | 34 +-
883 drivers/pci/pcie/portdrv_pci.c | 27 +-
884 drivers/pci/probe.c | 39 +-
885 drivers/pci/proc.c | 19 -
886 drivers/pci/quirks.c | 31 +-
887 drivers/pci/remove.c | 156 +-
888 drivers/pci/rom.c | 59 -
889 drivers/pci/search.c | 63 +-
890 drivers/pci/setup-bus.c | 81 +-
891 drivers/pci/setup-irq.c | 9 +-
892 drivers/pci/xen-pcifront.c | 10 +-
893 drivers/pcmcia/cardbus.c | 15 +-
894 drivers/power/Kconfig | 7 +
895 drivers/power/Makefile | 1 +
896 drivers/power/generic-adc-battery.c | 422 +
897 drivers/rapidio/devices/tsi721.c | 18 +-
898 drivers/regulator/Kconfig | 38 +-
899 drivers/regulator/Makefile | 2 +
900 drivers/regulator/aat2870-regulator.c | 2 +-
901 drivers/regulator/ab3100.c | 6 -
902 drivers/regulator/ab8500.c | 36 +-
903 drivers/regulator/arizona-ldo1.c | 6 +-
904 drivers/regulator/arizona-micsupp.c | 5 +
905 drivers/regulator/core.c | 153 +-
906 drivers/regulator/da9052-regulator.c | 4 +-
907 drivers/regulator/dummy.c | 2 +-
908 drivers/regulator/fan53555.c | 322 +
909 drivers/regulator/isl6271a-regulator.c | 6 -
910 drivers/regulator/lp872x.c | 88 +-
911 drivers/regulator/lp8788-buck.c | 80 +-
912 drivers/regulator/lp8788-ldo.c | 8 +
913 drivers/regulator/max77686.c | 30 +-
914 drivers/regulator/max8907-regulator.c | 408 +
915 drivers/regulator/mc13783-regulator.c | 89 +-
916 drivers/regulator/mc13892-regulator.c | 77 +-
917 drivers/regulator/mc13xxx-regulator-core.c | 17 +-
918 drivers/regulator/mc13xxx.h | 1 -
919 drivers/regulator/of_regulator.c | 25 +-
920 drivers/regulator/palmas-regulator.c | 45 +-
921 drivers/regulator/s2mps11.c | 27 +-
922 drivers/regulator/tps6524x-regulator.c | 10 +-
923 drivers/regulator/tps6586x-regulator.c | 96 +-
924 drivers/regulator/twl-regulator.c | 110 +-
925 drivers/regulator/wm831x-dcdc.c | 11 +-
926 drivers/regulator/wm831x-ldo.c | 12 +
927 drivers/regulator/wm8400-regulator.c | 7 +-
928 drivers/s390/block/Kconfig | 18 +
929 drivers/s390/block/Makefile | 6 +
930 drivers/s390/block/dasd_eckd.c | 21 +-
931 drivers/s390/block/dasd_ioctl.c | 4 +-
932 drivers/s390/block/scm_blk.c | 445 +
933 drivers/s390/block/scm_blk.h | 117 +
934 drivers/s390/block/scm_blk_cluster.c | 228 +
935 drivers/s390/block/scm_drv.c | 81 +
936 drivers/s390/char/con3215.c | 28 +-
937 drivers/s390/char/con3270.c | 1 -
938 drivers/s390/char/monreader.c | 5 +-
939 drivers/s390/char/sclp.c | 2 +-
940 drivers/s390/char/sclp_rw.c | 2 +-
941 drivers/s390/char/sclp_tty.c | 1 +
942 drivers/s390/char/sclp_vt220.c | 1 +
943 drivers/s390/char/tape.h | 1 -
944 drivers/s390/char/tape_std.h | 4 -
945 drivers/s390/char/tty3270.c | 34 +-
946 drivers/s390/char/vmlogrdr.c | 2 +-
947 drivers/s390/cio/Makefile | 2 +
948 drivers/s390/cio/chsc.c | 52 +
949 drivers/s390/cio/chsc.h | 43 +
950 drivers/s390/cio/cio.c | 2 +-
951 drivers/s390/cio/css.c | 1 +
952 drivers/s390/cio/eadm_sch.c | 401 +
953 drivers/s390/cio/eadm_sch.h | 20 +
954 drivers/s390/cio/orb.h | 24 +
955 drivers/s390/cio/qdio_debug.h | 38 +-
956 drivers/s390/cio/scm.c | 317 +
957 drivers/s390/crypto/Makefile | 3 +-
958 drivers/s390/crypto/ap_bus.c | 209 +-
959 drivers/s390/crypto/ap_bus.h | 35 +-
960 drivers/s390/crypto/zcrypt_api.c | 187 +-
961 drivers/s390/crypto/zcrypt_api.h | 19 +-
962 drivers/s390/crypto/zcrypt_cex2a.c | 371 +-
963 drivers/s390/crypto/zcrypt_cex4.c | 149 +
964 drivers/s390/crypto/zcrypt_cex4.h | 12 +
965 drivers/s390/crypto/zcrypt_debug.h | 59 +
966 drivers/s390/crypto/zcrypt_error.h | 13 +
967 drivers/s390/crypto/zcrypt_msgtype50.c | 531 ++
968 drivers/s390/crypto/zcrypt_msgtype50.h | 39 +
969 drivers/s390/crypto/zcrypt_msgtype6.c | 856 ++
970 drivers/s390/crypto/zcrypt_msgtype6.h | 169 +
971 drivers/s390/crypto/zcrypt_pcixcc.c | 781 +-
972 drivers/s390/crypto/zcrypt_pcixcc.h | 3 +-
973 drivers/s390/net/qeth_core_main.c | 15 +-
974 drivers/scsi/aic7xxx/aic79xx_core.c | 2 +-
975 drivers/scsi/bfa/bfa_ioc.c | 2 +-
976 drivers/scsi/bfa/bfa_ioc.h | 2 +-
977 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +-
978 drivers/scsi/gdth.h | 9 -
979 drivers/scsi/ipr.c | 68 +-
980 drivers/scsi/isci/host.c | 2 +-
981 drivers/scsi/isci/init.c | 2 +-
982 drivers/scsi/isci/port.c | 2 +-
983 drivers/scsi/isci/request.c | 2 +-
984 drivers/scsi/isci/task.c | 2 +-
985 drivers/scsi/lpfc/lpfc_init.c | 4 +-
986 drivers/scsi/lpfc/lpfc_sli.c | 4 +-
987 drivers/scsi/megaraid.c | 5 +-
988 drivers/scsi/megaraid.h | 35 -
989 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 2 +-
990 drivers/scsi/mvumi.c | 6 +-
991 drivers/scsi/qla2xxx/qla_nx.c | 8 +-
992 drivers/scsi/qla2xxx/qla_os.c | 2 +-
993 drivers/scsi/qla4xxx/ql4_nx.c | 4 +-
994 drivers/scsi/qla4xxx/ql4_os.c | 8 +-
995 drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +-
996 drivers/scsi/vmw_pvscsi.c | 4 +-
997 drivers/spi/spi-au1550.c | 2 +-
998 drivers/spi/spi-bfin-sport.c | 2 +-
999 drivers/spi/spi-oc-tiny.c | 2 +-
1000 drivers/spi/spi-ppc4xx.c | 4 +-
1001 drivers/spi/spi-topcliff-pch.c | 2 +-
1002 drivers/staging/Kconfig | 12 +-
1003 drivers/staging/Makefile | 6 +-
1004 drivers/staging/android/alarm-dev.c | 17 +-
1005 drivers/staging/android/ashmem.c | 32 +-
1006 drivers/staging/android/binder.c | 6 +-
1007 drivers/staging/android/logger.c | 40 +-
1008 drivers/staging/android/logger.h | 24 +-
1009 drivers/staging/android/timed_gpio.c | 13 +-
1010 drivers/staging/asus_oled/asus_oled.c | 56 +-
1011 drivers/staging/bcm/Bcmchar.c | 2 +
1012 drivers/staging/bcm/CmHost.c | 150 +-
1013 drivers/staging/bcm/CmHost.h | 54 +-
1014 drivers/staging/bcm/InterfaceInit.c | 17 +-
1015 drivers/staging/bcm/InterfaceInit.h | 33 +-
1016 drivers/staging/bcm/Kconfig | 2 +-
1017 drivers/staging/bcm/Misc.c | 5 +-
1018 drivers/staging/bcm/PHSModule.c | 4 +-
1019 drivers/staging/bcm/Prototypes.h | 2 +-
1020 drivers/staging/bcm/Transmit.c | 234 +-
1021 drivers/staging/bcm/cntrl_SignalingInterface.h | 704 +-
1022 drivers/staging/bcm/hostmibs.c | 2 +-
1023 drivers/staging/bcm/nvm.c | 4 +-
1024 drivers/staging/bcm/target_params.h | 2 +-
1025 drivers/staging/ccg/Kconfig | 7 +-
1026 drivers/staging/ccg/Makefile | 2 -
1027 drivers/staging/ccg/ccg.c | 43 +-
1028 drivers/staging/ccg/composite.c | 1688 ++++
1029 drivers/staging/ccg/composite.h | 395 +
1030 drivers/staging/ccg/config.c | 158 +
1031 drivers/staging/ccg/epautoconf.c | 393 +
1032 drivers/staging/ccg/f_acm.c | 814 ++
1033 drivers/staging/ccg/f_fs.c | 2455 ++++++
1034 drivers/staging/ccg/f_mass_storage.c | 3135 +++++++
1035 drivers/staging/ccg/f_rndis.c | 918 ++
1036 drivers/staging/ccg/gadget_chips.h | 150 +
1037 drivers/staging/ccg/ndis.h | 47 +
1038 drivers/staging/ccg/rndis.c | 1175 +++
1039 drivers/staging/ccg/rndis.h | 222 +
1040 drivers/staging/ccg/storage_common.c | 893 ++
1041 drivers/staging/ccg/u_ether.c | 986 +++
1042 drivers/staging/ccg/u_ether.h | 154 +
1043 drivers/staging/ccg/u_serial.c | 1341 +++
1044 drivers/staging/ccg/u_serial.h | 65 +
1045 drivers/staging/ccg/usbstring.c | 71 +
1046 drivers/staging/ced1401/Kconfig | 6 +
1047 drivers/staging/ced1401/Makefile | 3 +
1048 drivers/staging/ced1401/TODO | 10 +
1049 drivers/staging/ced1401/ced_ioc.c | 1515 ++++
1050 drivers/staging/ced1401/ced_ioctl.h | 345 +
1051 drivers/staging/ced1401/machine.h | 127 +
1052 drivers/staging/ced1401/usb1401.c | 1637 ++++
1053 drivers/staging/ced1401/usb1401.h | 249 +
1054 drivers/staging/ced1401/use1401.h | 287 +
1055 drivers/staging/ced1401/use14_ioc.h | 301 +
1056 drivers/staging/ced1401/userspace/use1401.c | 3035 +++++++
1057 drivers/staging/comedi/Kconfig | 66 +-
1058 drivers/staging/comedi/comedi.h | 1109 ++-
1059 drivers/staging/comedi/comedi_fops.c | 152 +-
1060 drivers/staging/comedi/comedidev.h | 2 +-
1061 drivers/staging/comedi/drivers.c | 82 +-
1062 drivers/staging/comedi/drivers/8253.h | 15 +-
1063 drivers/staging/comedi/drivers/8255.c | 41 +-
1064 drivers/staging/comedi/drivers/8255_pci.c | 353 +
1065 drivers/staging/comedi/drivers/Makefile | 6 +-
1066 drivers/staging/comedi/drivers/acl7225b.c | 6 +-
1067 .../comedi/drivers/addi-data/addi_amcc_S5920.c | 195 -
1068 .../comedi/drivers/addi-data/addi_amcc_S5920.h | 27 -
1069 .../staging/comedi/drivers/addi-data/addi_common.c | 14 +-
1070 .../comedi/drivers/addi-data/amcc_s5933_58.h | 453 -
1071 .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 18 +-
1072 .../comedi/drivers/addi-data/hwdrv_apci3120.c | 61 +-
1073 .../comedi/drivers/addi-data/hwdrv_apci3200.c | 81 +-
1074 drivers/staging/comedi/drivers/addi_apci_all.c | 18 -
1075 drivers/staging/comedi/drivers/adl_pci6208.c | 183 +-
1076 drivers/staging/comedi/drivers/adl_pci7230.c | 190 -
1077 drivers/staging/comedi/drivers/adl_pci7296.c | 183 -
1078 drivers/staging/comedi/drivers/adl_pci7432.c | 200 -
1079 drivers/staging/comedi/drivers/adl_pci7x3x.c | 332 +
1080 drivers/staging/comedi/drivers/adl_pci8164.c | 73 +-
1081 drivers/staging/comedi/drivers/adl_pci9111.c | 973 +--
1082 drivers/staging/comedi/drivers/adl_pci9118.c | 1059 +--
1083 drivers/staging/comedi/drivers/adq12b.c | 29 +-
1084 drivers/staging/comedi/drivers/adv_pci1710.c | 766 +-
1085 drivers/staging/comedi/drivers/adv_pci1723.c | 222 +-
1086 drivers/staging/comedi/drivers/adv_pci_dio.c | 473 +-
1087 drivers/staging/comedi/drivers/aio_aio12_8.c | 218 +-
1088 drivers/staging/comedi/drivers/aio_iiro_16.c | 4 +-
1089 drivers/staging/comedi/drivers/amplc_dio200.c | 114 +-
1090 drivers/staging/comedi/drivers/amplc_pc236.c | 108 +-
1091 drivers/staging/comedi/drivers/amplc_pc263.c | 54 +-
1092 drivers/staging/comedi/drivers/amplc_pci224.c | 64 +-
1093 drivers/staging/comedi/drivers/amplc_pci230.c | 154 +-
1094 drivers/staging/comedi/drivers/c6xdigio.c | 6 +-
1095 drivers/staging/comedi/drivers/cb_das16_cs.c | 56 +-
1096 drivers/staging/comedi/drivers/cb_pcidas.c | 202 +-
1097 drivers/staging/comedi/drivers/cb_pcidas64.c | 128 +-
1098 drivers/staging/comedi/drivers/cb_pcidda.c | 441 +-
1099 drivers/staging/comedi/drivers/cb_pcidio.c | 211 -
1100 drivers/staging/comedi/drivers/cb_pcimdas.c | 279 +-
1101 drivers/staging/comedi/drivers/cb_pcimdda.c | 393 +-
1102 drivers/staging/comedi/drivers/comedi_bond.c | 110 +-
1103 drivers/staging/comedi/drivers/comedi_fc.h | 32 +
1104 drivers/staging/comedi/drivers/comedi_parport.c | 86 +-
1105 drivers/staging/comedi/drivers/comedi_test.c | 108 +-
1106 drivers/staging/comedi/drivers/contec_pci_dio.c | 146 +-
1107 drivers/staging/comedi/drivers/daqboard2000.c | 466 +-
1108 drivers/staging/comedi/drivers/das08.c | 482 +-
1109 drivers/staging/comedi/drivers/das08.h | 15 +-
1110 drivers/staging/comedi/drivers/das08_cs.c | 26 +
1111 drivers/staging/comedi/drivers/das16.c | 82 +-
1112 drivers/staging/comedi/drivers/das16m1.c | 54 +-
1113 drivers/staging/comedi/drivers/das1800.c | 145 +-
1114 drivers/staging/comedi/drivers/das6402.c | 4 +-
1115 drivers/staging/comedi/drivers/das800.c | 52 +-
1116 drivers/staging/comedi/drivers/dmm32at.c | 57 +-
1117 drivers/staging/comedi/drivers/dt2801.c | 12 +-
1118 drivers/staging/comedi/drivers/dt2811.c | 8 +-
1119 drivers/staging/comedi/drivers/dt2814.c | 46 +-
1120 drivers/staging/comedi/drivers/dt2815.c | 2 +-
1121 drivers/staging/comedi/drivers/dt2817.c | 2 +-
1122 drivers/staging/comedi/drivers/dt282x.c | 103 +-
1123 drivers/staging/comedi/drivers/dt3000.c | 48 +-
1124 drivers/staging/comedi/drivers/dt9812.c | 8 +-
1125 drivers/staging/comedi/drivers/dyna_pci10xx.c | 161 +-
1126 drivers/staging/comedi/drivers/fl512.c | 4 +-
1127 drivers/staging/comedi/drivers/gsc_hpdi.c | 43 +-
1128 drivers/staging/comedi/drivers/icp_multi.c | 692 +-
1129 drivers/staging/comedi/drivers/icp_multi.h | 297 -
1130 drivers/staging/comedi/drivers/ii_pci20kc.c | 4 +-
1131 drivers/staging/comedi/drivers/jr3_pci.c | 9 +-
1132 drivers/staging/comedi/drivers/jr3_pci.h | 4 +-
1133 drivers/staging/comedi/drivers/ke_counter.c | 103 +-
1134 drivers/staging/comedi/drivers/me4000.c | 1636 ++--
1135 drivers/staging/comedi/drivers/me4000.h | 409 -
1136 drivers/staging/comedi/drivers/me_daq.c | 221 +-
1137 drivers/staging/comedi/drivers/mite.c | 285 +-
1138 drivers/staging/comedi/drivers/mite.h | 66 +-
1139 drivers/staging/comedi/drivers/mpc624.c | 2 +-
1140 drivers/staging/comedi/drivers/mpc8260cpm.c | 2 +-
1141 drivers/staging/comedi/drivers/multiq3.c | 14 +-
1142 drivers/staging/comedi/drivers/ni_6527.c | 171 +-
1143 drivers/staging/comedi/drivers/ni_65xx.c | 181 +-
1144 drivers/staging/comedi/drivers/ni_660x.c | 133 +-
1145 drivers/staging/comedi/drivers/ni_670x.c | 62 +-
1146 drivers/staging/comedi/drivers/ni_at_a2150.c | 46 +-
1147 drivers/staging/comedi/drivers/ni_at_ao.c | 8 +-
1148 drivers/staging/comedi/drivers/ni_atmio.c | 2 +-
1149 drivers/staging/comedi/drivers/ni_atmio16d.c | 67 +-
1150 drivers/staging/comedi/drivers/ni_daq_700.c | 212 +-
1151 drivers/staging/comedi/drivers/ni_daq_dio24.c | 12 +-
1152 drivers/staging/comedi/drivers/ni_labpc.c | 467 +-
1153 drivers/staging/comedi/drivers/ni_labpc_cs.c | 6 +-
1154 drivers/staging/comedi/drivers/ni_mio_common.c | 240 +-
1155 drivers/staging/comedi/drivers/ni_mio_cs.c | 4 +-
1156 drivers/staging/comedi/drivers/ni_pcidio.c | 472 +-
1157 drivers/staging/comedi/drivers/ni_pcimio.c | 70 +-
1158 drivers/staging/comedi/drivers/ni_tiocmd.c | 61 +-
1159 drivers/staging/comedi/drivers/pcl711.c | 53 +-
1160 drivers/staging/comedi/drivers/pcl724.c | 15 +-
1161 drivers/staging/comedi/drivers/pcl725.c | 4 +-
1162 drivers/staging/comedi/drivers/pcl726.c | 6 +-
1163 drivers/staging/comedi/drivers/pcl730.c | 8 +-
1164 drivers/staging/comedi/drivers/pcl812.c | 57 +-
1165 drivers/staging/comedi/drivers/pcl816.c | 52 +-
1166 drivers/staging/comedi/drivers/pcl818.c | 59 +-
1167 drivers/staging/comedi/drivers/pcm3724.c | 26 +-
1168 drivers/staging/comedi/drivers/pcm3730.c | 12 +-
1169 drivers/staging/comedi/drivers/pcm_common.c | 56 +-
1170 drivers/staging/comedi/drivers/pcmad.c | 2 +-
1171 drivers/staging/comedi/drivers/pcmda12.c | 2 +-
1172 drivers/staging/comedi/drivers/pcmmio.c | 32 +-
1173 drivers/staging/comedi/drivers/pcmuio.c | 14 +-
1174 drivers/staging/comedi/drivers/poc.c | 2 +-
1175 drivers/staging/comedi/drivers/quatech_daqp_cs.c | 63 +-
1176 drivers/staging/comedi/drivers/rtd520.c | 67 +-
1177 drivers/staging/comedi/drivers/rti800.c | 10 +-
1178 drivers/staging/comedi/drivers/rti802.c | 2 +-
1179 drivers/staging/comedi/drivers/s526.c | 602 +-
1180 drivers/staging/comedi/drivers/s626.c | 755 +-
1181 drivers/staging/comedi/drivers/s626.h | 1 -
1182 drivers/staging/comedi/drivers/serial2002.c | 14 +-
1183 drivers/staging/comedi/drivers/skel.c | 74 +-
1184 drivers/staging/comedi/drivers/ssv_dnp.c | 7 +-
1185 drivers/staging/comedi/drivers/usbdux.c | 201 +-
1186 drivers/staging/comedi/drivers/usbduxfast.c | 120 +-
1187 drivers/staging/comedi/drivers/usbduxsigma.c | 192 +-
1188 drivers/staging/comedi/drivers/vmk80xx.c | 14 +-
1189 .../staging/comedi/kcomedilib/kcomedilib_main.c | 23 +-
1190 drivers/staging/comedi/range.c | 18 +-
1191 drivers/staging/cptm1217/clearpad_tm1217.c | 13 +-
1192 drivers/staging/crystalhd/crystalhd_lnx.c | 6 +-
1193 drivers/staging/csr/Makefile | 1 -
1194 drivers/staging/csr/bh.c | 173 +-
1195 drivers/staging/csr/csr_formatted_io.c | 27 -
1196 drivers/staging/csr/csr_formatted_io.h | 25 -
1197 drivers/staging/csr/csr_framework_ext.c | 13 +-
1198 drivers/staging/csr/csr_panic.c | 1 -
1199 drivers/staging/csr/csr_time.c | 27 +-
1200 drivers/staging/csr/csr_wifi_hip_card_sdio.c | 8 +-
1201 drivers/staging/csr/csr_wifi_hip_download.c | 2 +
1202 drivers/staging/csr/csr_wifi_hip_send.c | 9 +-
1203 drivers/staging/csr/csr_wifi_hip_udi.c | 94 +-
1204 drivers/staging/csr/csr_wifi_hip_unifi.h | 1 -
1205 drivers/staging/csr/drv.c | 46 +-
1206 drivers/staging/csr/firmware.c | 6 +-
1207 drivers/staging/csr/io.c | 53 +-
1208 drivers/staging/csr/monitor.c | 7 +-
1209 drivers/staging/csr/netdev.c | 630 +-
1210 drivers/staging/csr/sdio_events.c | 4 +-
1211 drivers/staging/csr/sdio_mmc.c | 65 +-
1212 drivers/staging/csr/sme_blocking.c | 4 +-
1213 drivers/staging/csr/sme_native.c | 6 +-
1214 drivers/staging/csr/sme_sys.c | 22 +-
1215 drivers/staging/csr/sme_wext.c | 8 +-
1216 drivers/staging/csr/ul_int.c | 5 +-
1217 drivers/staging/csr/unifi_pdu_processing.c | 5 +-
1218 drivers/staging/csr/unifi_priv.h | 40 -
1219 drivers/staging/csr/unifi_wext.h | 27 +-
1220 drivers/staging/csr/wext_events.c | 8 +-
1221 drivers/staging/cxt1e1/linux.c | 12 +-
1222 drivers/staging/cxt1e1/musycc.c | 10 +-
1223 drivers/staging/dgrp/Kconfig | 9 +
1224 drivers/staging/dgrp/Makefile | 12 +
1225 drivers/staging/dgrp/README | 2 +
1226 drivers/staging/dgrp/TODO | 13 +
1227 drivers/staging/dgrp/dgrp_common.c | 200 +
1228 drivers/staging/dgrp/dgrp_common.h | 208 +
1229 drivers/staging/dgrp/dgrp_dpa_ops.c | 556 ++
1230 drivers/staging/dgrp/dgrp_driver.c | 110 +
1231 drivers/staging/dgrp/dgrp_mon_ops.c | 346 +
1232 drivers/staging/dgrp/dgrp_net_ops.c | 3737 ++++++++
1233 drivers/staging/dgrp/dgrp_ports_ops.c | 170 +
1234 drivers/staging/dgrp/dgrp_specproc.c | 822 ++
1235 drivers/staging/dgrp/dgrp_sysfs.c | 555 ++
1236 drivers/staging/dgrp/dgrp_tty.c | 3331 ++++++++
1237 drivers/staging/dgrp/digirp.h | 129 +
1238 drivers/staging/dgrp/drp.h | 693 ++
1239 drivers/staging/et131x/et131x.c | 26 +-
1240 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 34 +-
1241 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 14 +-
1242 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 2 -
1243 drivers/staging/gdm72xx/gdm_qos.c | 118 +-
1244 drivers/staging/gdm72xx/gdm_qos.h | 58 +-
1245 drivers/staging/gdm72xx/gdm_sdio.c | 37 +-
1246 drivers/staging/gdm72xx/gdm_usb.c | 62 +-
1247 drivers/staging/gdm72xx/gdm_usb.h | 16 +-
1248 drivers/staging/gdm72xx/gdm_wimax.c | 16 +-
1249 drivers/staging/gdm72xx/usb_boot.c | 220 +-
1250 drivers/staging/iio/Documentation/generic_buffer.c | 10 +
1251 drivers/staging/iio/Documentation/inkernel.txt | 6 +-
1252 drivers/staging/iio/Kconfig | 2 +-
1253 drivers/staging/iio/TODO | 2 +-
1254 drivers/staging/iio/accel/adis16201_core.c | 4 +-
1255 drivers/staging/iio/accel/adis16201_ring.c | 3 +-
1256 drivers/staging/iio/accel/adis16203_core.c | 4 +-
1257 drivers/staging/iio/accel/adis16203_ring.c | 5 +-
1258 drivers/staging/iio/accel/adis16204_core.c | 4 +-
1259 drivers/staging/iio/accel/adis16204_ring.c | 3 +-
1260 drivers/staging/iio/accel/adis16209_core.c | 4 +-
1261 drivers/staging/iio/accel/adis16209_ring.c | 3 +-
1262 drivers/staging/iio/accel/adis16220_core.c | 11 +-
1263 drivers/staging/iio/accel/adis16240_core.c | 4 +-
1264 drivers/staging/iio/accel/adis16240_ring.c | 3 +-
1265 drivers/staging/iio/accel/kxsd9.c | 6 +-
1266 drivers/staging/iio/accel/lis3l02dq.h | 14 +-
1267 drivers/staging/iio/accel/lis3l02dq_core.c | 26 +-
1268 drivers/staging/iio/accel/lis3l02dq_ring.c | 31 +-
1269 drivers/staging/iio/accel/sca3000.h | 2 +-
1270 drivers/staging/iio/accel/sca3000_core.c | 14 +-
1271 drivers/staging/iio/accel/sca3000_ring.c | 2 +-
1272 drivers/staging/iio/adc/Kconfig | 43 +-
1273 drivers/staging/iio/adc/Makefile | 5 +-
1274 drivers/staging/iio/adc/ad7192.c | 523 +-
1275 drivers/staging/iio/adc/ad7298_core.c | 2 +-
1276 drivers/staging/iio/adc/ad7298_ring.c | 3 +-
1277 drivers/staging/iio/adc/ad7476.h | 66 -
1278 drivers/staging/iio/adc/ad7476_ring.c | 64 -
1279 drivers/staging/iio/adc/ad7606.h | 2 +-
1280 drivers/staging/iio/adc/ad7606_core.c | 6 +-
1281 drivers/staging/iio/adc/ad7606_ring.c | 3 +-
1282 drivers/staging/iio/adc/ad7780.c | 237 +-
1283 drivers/staging/iio/adc/ad7793.c | 688 +-
1284 drivers/staging/iio/adc/ad7793.h | 10 +-
1285 drivers/staging/iio/adc/ad7887_core.c | 2 +-
1286 drivers/staging/iio/adc/ad7887_ring.c | 2 +-
1287 drivers/staging/iio/adc/ad799x_ring.c | 3 +-
1288 drivers/staging/iio/adc/lpc32xx_adc.c | 2 +-
1289 drivers/staging/iio/adc/max1363.h | 2 +-
1290 drivers/staging/iio/adc/max1363_core.c | 32 +-
1291 drivers/staging/iio/adc/max1363_ring.c | 2 +-
1292 drivers/staging/iio/adc/mxs-lradc.c | 590 ++
1293 drivers/staging/iio/adc/spear_adc.c | 27 +-
1294 drivers/staging/iio/gyro/adis16060_core.c | 4 +-
1295 drivers/staging/iio/gyro/adis16080_core.c | 2 +-
1296 drivers/staging/iio/gyro/adis16130_core.c | 2 +-
1297 drivers/staging/iio/gyro/adis16260_core.c | 12 +-
1298 drivers/staging/iio/gyro/adis16260_ring.c | 3 +-
1299 drivers/staging/iio/gyro/adxrs450_core.c | 2 +-
1300 drivers/staging/iio/iio_dummy_evgen.c | 2 +-
1301 drivers/staging/iio/iio_hwmon.c | 47 +-
1302 drivers/staging/iio/iio_simple_dummy.c | 24 +-
1303 drivers/staging/iio/iio_simple_dummy.h | 6 +-
1304 drivers/staging/iio/iio_simple_dummy_buffer.c | 13 +-
1305 drivers/staging/iio/impedance-analyzer/ad5933.c | 4 +-
1306 drivers/staging/iio/imu/adis16400.h | 2 +-
1307 drivers/staging/iio/imu/adis16400_core.c | 18 +-
1308 drivers/staging/iio/imu/adis16400_ring.c | 2 +-
1309 drivers/staging/iio/light/isl29018.c | 17 +-
1310 drivers/staging/iio/light/tsl2563.c | 2 +-
1311 drivers/staging/iio/magnetometer/hmc5843.c | 2 +-
1312 drivers/staging/iio/meter/ade7753.c | 13 +-
1313 drivers/staging/iio/meter/ade7754.c | 12 +-
1314 drivers/staging/iio/meter/ade7758.h | 2 +-
1315 drivers/staging/iio/meter/ade7758_core.c | 13 +-
1316 drivers/staging/iio/meter/ade7758_ring.c | 3 +-
1317 drivers/staging/iio/meter/ade7759.c | 11 +-
1318 drivers/staging/iio/meter/ade7854-spi.c | 2 +-
1319 drivers/staging/iio/resolver/ad2s1210.c | 2 +-
1320 drivers/staging/iio/ring_hw.h | 2 +-
1321 drivers/staging/iio/ring_sw.c | 7 +-
1322 drivers/staging/iio/trigger/Kconfig | 2 +
1323 drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 109 +-
1324 drivers/staging/iio/trigger/iio-trig-bfin-timer.h | 24 +
1325 drivers/staging/iio/trigger/iio-trig-gpio.c | 8 +-
1326 .../staging/iio/trigger/iio-trig-periodic-rtc.c | 8 +-
1327 drivers/staging/iio/trigger/iio-trig-sysfs.c | 17 +-
1328 drivers/staging/imx-drm/Kconfig | 35 +
1329 drivers/staging/imx-drm/Makefile | 9 +
1330 drivers/staging/imx-drm/TODO | 22 +
1331 drivers/staging/imx-drm/imx-drm-core.c | 884 ++
1332 drivers/staging/imx-drm/imx-drm.h | 58 +
1333 drivers/staging/imx-drm/imx-fb.c | 47 +
1334 drivers/staging/imx-drm/imx-fbdev.c | 74 +
1335 drivers/staging/imx-drm/ipu-v3/Makefile | 3 +
1336 drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h | 318 +
1337 drivers/staging/imx-drm/ipu-v3/ipu-common.c | 1143 +++
1338 drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 372 +
1339 drivers/staging/imx-drm/ipu-v3/ipu-di.c | 700 ++
1340 drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c | 408 +
1341 drivers/staging/imx-drm/ipu-v3/ipu-dp.c | 336 +
1342 drivers/staging/imx-drm/ipu-v3/ipu-prv.h | 206 +
1343 drivers/staging/imx-drm/ipuv3-crtc.c | 579 ++
1344 drivers/staging/imx-drm/parallel-display.c | 261 +
1345 drivers/staging/ipack/Kconfig | 1 +
1346 drivers/staging/ipack/TODO | 25 +-
1347 drivers/staging/ipack/bridges/tpci200.c | 735 +-
1348 drivers/staging/ipack/bridges/tpci200.h | 39 +-
1349 drivers/staging/ipack/devices/ipoctal.c | 750 +-
1350 drivers/staging/ipack/devices/scc2698.h | 117 +-
1351 drivers/staging/ipack/ipack.c | 372 +-
1352 drivers/staging/ipack/ipack.h | 88 +-
1353 drivers/staging/ipack/ipack_ids.h | 32 +
1354 drivers/staging/keucr/smcommon.h | 2 -
1355 drivers/staging/keucr/usb.c | 2 +-
1356 drivers/staging/line6/pcm.c | 8 +-
1357 drivers/staging/line6/variax.c | 8 +-
1358 drivers/staging/nvec/Kconfig | 2 +-
1359 drivers/staging/nvec/nvec.c | 25 +-
1360 drivers/staging/olpc_dcon/olpc_dcon.c | 53 +-
1361 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 15 +-
1362 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 6 +-
1363 drivers/staging/omap-thermal/omap-bandgap.c | 23 +-
1364 drivers/staging/omap-thermal/omap-thermal-common.c | 42 +-
1365 drivers/staging/omap-thermal/omap4-thermal.c | 54 +-
1366 drivers/staging/omap-thermal/omap5-thermal.c | 38 +-
1367 drivers/staging/omapdrm/omap_crtc.c | 33 +-
1368 drivers/staging/omapdrm/omap_dmm_tiler.c | 51 +-
1369 drivers/staging/omapdrm/omap_dmm_tiler.h | 17 +-
1370 drivers/staging/omapdrm/omap_drv.c | 21 +-
1371 drivers/staging/omapdrm/omap_drv.h | 33 +-
1372 drivers/staging/omapdrm/omap_fb.c | 99 +-
1373 drivers/staging/omapdrm/omap_gem.c | 60 +-
1374 drivers/staging/omapdrm/omap_plane.c | 111 +-
1375 drivers/staging/ozwpan/ozcdev.c | 14 +-
1376 drivers/staging/ozwpan/ozevent.c | 6 +-
1377 drivers/staging/ozwpan/ozhcd.c | 104 +-
1378 drivers/staging/ozwpan/ozmain.c | 2 +-
1379 drivers/staging/ozwpan/ozpd.c | 11 +-
1380 drivers/staging/ozwpan/ozpd.h | 1 +
1381 drivers/staging/ozwpan/ozproto.c | 13 +
1382 drivers/staging/ozwpan/ozproto.h | 8 +-
1383 drivers/staging/ozwpan/ozprotocol.h | 6 +-
1384 drivers/staging/panel/panel.c | 52 +-
1385 drivers/staging/ramster/Kconfig | 25 +-
1386 drivers/staging/ramster/Makefile | 7 +-
1387 drivers/staging/ramster/TODO | 13 -
1388 drivers/staging/ramster/cluster/Makefile | 3 -
1389 drivers/staging/ramster/ramster.h | 113 +-
1390 .../ramster/{cluster => ramster}/heartbeat.c | 6 +-
1391 .../ramster/{cluster => ramster}/heartbeat.h | 0
1392 .../staging/ramster/{cluster => ramster}/masklog.c | 0
1393 .../staging/ramster/{cluster => ramster}/masklog.h | 0
1394 .../ramster/{cluster => ramster}/nodemanager.c | 15 +-
1395 .../ramster/{cluster => ramster}/nodemanager.h | 0
1396 drivers/staging/ramster/{ => }/ramster/r2net.c | 79 +-
1397 drivers/staging/ramster/ramster/ramster.c | 985 +++
1398 drivers/staging/ramster/ramster/ramster.h | 161 +
1399 .../{cluster => ramster}/ramster_nodemanager.h | 0
1400 drivers/staging/ramster/{cluster => ramster}/tcp.c | 53 +-
1401 drivers/staging/ramster/{cluster => ramster}/tcp.h | 0
1402 .../ramster/{cluster => ramster}/tcp_internal.h | 0
1403 drivers/staging/ramster/tmem.c | 313 +-
1404 drivers/staging/ramster/tmem.h | 109 +-
1405 drivers/staging/ramster/xvmalloc.c | 509 --
1406 drivers/staging/ramster/xvmalloc.h | 30 -
1407 drivers/staging/ramster/xvmalloc_int.h | 95 -
1408 drivers/staging/ramster/zbud.c | 1060 +++
1409 drivers/staging/ramster/zbud.h | 33 +
1410 drivers/staging/ramster/zcache-main.c | 3566 +++-----
1411 drivers/staging/ramster/zcache.h | 55 +-
1412 drivers/staging/rtl8187se/ieee80211/ieee80211.h | 2 +-
1413 .../rtl8187se/ieee80211/ieee80211_softmac.c | 13 +-
1414 .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 5 +-
1415 drivers/staging/rtl8187se/r8180_core.c | 4 +-
1416 drivers/staging/rtl8187se/r8180_hw.h | 9 +-
1417 drivers/staging/rtl8187se/r8185b_init.c | 2 +-
1418 .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 9 +-
1419 .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 4 +
1420 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +-
1421 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +-
1422 drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 8 +-
1423 drivers/staging/rtl8192e/rtllib.h | 8 +-
1424 drivers/staging/rtl8192e/rtllib_softmac.c | 24 +-
1425 drivers/staging/rtl8192e/rtllib_softmac_wx.c | 7 +-
1426 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +-
1427 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 20 +-
1428 .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 5 +-
1429 .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 2 +-
1430 drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 4 +-
1431 .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 2 +-
1432 drivers/staging/rtl8192u/r8192U_core.c | 27 +-
1433 drivers/staging/rtl8192u/r819xU_HTType.h | 2 +-
1434 drivers/staging/rtl8192u/r819xU_phyreg.h | 2 +-
1435 drivers/staging/rtl8712/drv_types.h | 9 -
1436 drivers/staging/rtl8712/ethernet.h | 8 -
1437 drivers/staging/rtl8712/os_intfs.c | 2 +-
1438 drivers/staging/rtl8712/rtl8712_recv.c | 9 +-
1439 drivers/staging/rtl8712/rtl8712_recv.h | 2 +-
1440 drivers/staging/rtl8712/rtl8712_xmit.c | 2 +-
1441 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +-
1442 drivers/staging/rtl8712/rtl871x_ioctl_set.c | 5 +-
1443 drivers/staging/rtl8712/rtl871x_mlme.c | 5 +-
1444 drivers/staging/rtl8712/rtl871x_pwrctrl.h | 20 -
1445 drivers/staging/rtl8712/rtl871x_recv.c | 9 +-
1446 drivers/staging/rtl8712/rtl871x_security.c | 8 +-
1447 drivers/staging/rtl8712/usb_intf.c | 1 -
1448 drivers/staging/rtl8712/usb_osintf.h | 3 -
1449 drivers/staging/rtl8712/usb_vendor_req.h | 58 -
1450 drivers/staging/rts5139/rts51x_fop.c | 2 +-
1451 drivers/staging/rts5139/trace.h | 32 +-
1452 drivers/staging/rts_pstor/ms.c | 872 +-
1453 drivers/staging/rts_pstor/rtsx.c | 112 +-
1454 drivers/staging/rts_pstor/rtsx_card.c | 186 +-
1455 drivers/staging/rts_pstor/rtsx_chip.c | 563 +-
1456 drivers/staging/rts_pstor/rtsx_scsi.c | 405 +-
1457 drivers/staging/rts_pstor/rtsx_transport.c | 100 +-
1458 drivers/staging/rts_pstor/sd.c | 1055 +--
1459 drivers/staging/rts_pstor/trace.h | 30 +-
1460 drivers/staging/sbe-2t3e3/2t3e3.h | 1 -
1461 drivers/staging/sbe-2t3e3/dc.c | 10 +-
1462 drivers/staging/sbe-2t3e3/module.c | 15 +-
1463 drivers/staging/sbe-2t3e3/netdev.c | 8 +-
1464 drivers/staging/sep/sep_main.c | 2 +-
1465 drivers/staging/serqt_usb2/serqt_usb2.c | 181 +-
1466 drivers/staging/silicom/Kconfig | 46 +
1467 drivers/staging/silicom/Makefile | 9 +
1468 drivers/staging/silicom/README | 14 +
1469 drivers/staging/silicom/TODO | 8 +
1470 drivers/staging/silicom/bits.h | 56 +
1471 drivers/staging/silicom/bp_ioctl.h | 140 +
1472 drivers/staging/silicom/bp_mod.c | 8931 ++++++++++++++++++++
1473 drivers/staging/silicom/bp_mod.h | 704 ++
1474 drivers/staging/silicom/bp_proc.c | 1350 +++
1475 drivers/staging/silicom/bypass.h | 202 +
1476 drivers/staging/silicom/bypasslib/Makefile | 6 +
1477 drivers/staging/silicom/bypasslib/bp_ioctl.h | 198 +
1478 drivers/staging/silicom/bypasslib/bplibk.h | 47 +
1479 drivers/staging/silicom/bypasslib/bypass.c | 529 ++
1480 drivers/staging/silicom/bypasslib/libbp_sd.h | 509 ++
1481 drivers/staging/silicom/libbp_sd.h | 550 ++
1482 drivers/staging/slicoss/slicoss.c | 40 +-
1483 drivers/staging/sm7xxfb/sm7xx.h | 2 +-
1484 drivers/staging/sm7xxfb/sm7xxfb.c | 119 +-
1485 drivers/staging/speakup/i18n.c | 1 +
1486 drivers/staging/speakup/serialio.h | 3 +-
1487 drivers/staging/speakup/speakup_soft.c | 15 +-
1488 drivers/staging/telephony/ixj.c | 4 +-
1489 .../staging/tidspbridge/Documentation/error-codes | 2 +-
1490 drivers/staging/tidspbridge/core/_tiomap.h | 2 +-
1491 drivers/staging/tidspbridge/core/chnl_sm.c | 9 +-
1492 drivers/staging/tidspbridge/core/dsp-clock.c | 2 +
1493 drivers/staging/tidspbridge/core/io_sm.c | 10 +-
1494 drivers/staging/tidspbridge/core/sync.c | 2 +-
1495 drivers/staging/tidspbridge/core/tiomap3430.c | 8 +-
1496 drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 2 +-
1497 drivers/staging/tidspbridge/core/wdt.c | 7 +-
1498 drivers/staging/tidspbridge/dynload/tramp.c | 8 +-
1499 drivers/staging/tidspbridge/gen/uuidutil.c | 21 -
1500 drivers/staging/tidspbridge/hw/hw_mmu.c | 6 +-
1501 .../tidspbridge/include/dspbridge/dspioctl.h | 2 +-
1502 .../staging/tidspbridge/include/dspbridge/mbx_sh.h | 2 +-
1503 .../staging/tidspbridge/include/dspbridge/node.h | 2 +-
1504 .../staging/tidspbridge/include/dspbridge/ntfy.h | 2 +-
1505 .../staging/tidspbridge/include/dspbridge/proc.h | 2 +-
1506 .../staging/tidspbridge/include/dspbridge/strm.h | 2 +-
1507 .../staging/tidspbridge/include/dspbridge/sync.h | 4 +-
1508 .../tidspbridge/include/dspbridge/uuidutil.h | 20 -
1509 drivers/staging/tidspbridge/rmgr/dbdcd.c | 29 +-
1510 drivers/staging/tidspbridge/rmgr/drv_interface.c | 14 +-
1511 drivers/staging/tidspbridge/rmgr/dspdrv.c | 4 +-
1512 drivers/staging/tidspbridge/rmgr/mgr.c | 4 +-
1513 drivers/staging/tidspbridge/rmgr/nldr.c | 2 +-
1514 drivers/staging/tidspbridge/rmgr/node.c | 5 +-
1515 drivers/staging/tidspbridge/rmgr/proc.c | 2 +-
1516 drivers/staging/usbip/Kconfig | 4 +-
1517 drivers/staging/usbip/stub_dev.c | 8 +-
1518 drivers/staging/usbip/stub_rx.c | 2 +-
1519 drivers/staging/usbip/usbip_common.c | 7 +-
1520 drivers/staging/usbip/userspace/configure.ac | 12 +-
1521 drivers/staging/usbip/userspace/doc/usbip.8 | 66 +-
1522 .../usbip/userspace/doc/usbip_bind_driver.8 | 42 -
1523 drivers/staging/usbip/userspace/doc/usbipd.8 | 16 +-
1524 drivers/staging/usbip/vhci_hcd.c | 31 +-
1525 drivers/staging/vme/devices/vme_pio2_core.c | 10 +-
1526 drivers/staging/vme/devices/vme_user.c | 10 +-
1527 drivers/staging/vt6655/80211mgr.h | 2 +-
1528 drivers/staging/vt6655/baseband.c | 172 +-
1529 drivers/staging/vt6655/baseband.h | 10 +-
1530 drivers/staging/vt6655/bssdb.c | 4 +-
1531 drivers/staging/vt6655/card.c | 101 +-
1532 drivers/staging/vt6655/datarate.c | 2 +-
1533 drivers/staging/vt6655/device.h | 4 +-
1534 drivers/staging/vt6655/device_main.c | 104 +-
1535 drivers/staging/vt6655/dpc.c | 2 +-
1536 drivers/staging/vt6655/hostap.c | 8 +-
1537 drivers/staging/vt6655/ioctl.c | 9 +-
1538 drivers/staging/vt6655/iwctl.c | 6 +-
1539 drivers/staging/vt6655/key.c | 2 +-
1540 drivers/staging/vt6655/mac.c | 12 +-
1541 drivers/staging/vt6655/mac.h | 2 +-
1542 drivers/staging/vt6655/mib.c | 2 +-
1543 drivers/staging/vt6655/power.c | 2 +-
1544 drivers/staging/vt6655/rf.c | 82 +-
1545 drivers/staging/vt6655/rf.h | 2 +-
1546 drivers/staging/vt6655/rxtx.c | 42 +-
1547 drivers/staging/vt6655/tcrc.c | 2 +-
1548 drivers/staging/vt6655/tcrc.h | 2 +-
1549 drivers/staging/vt6655/tether.c | 4 +-
1550 drivers/staging/vt6655/tkip.c | 2 +-
1551 drivers/staging/vt6655/vntwifi.c | 2 +-
1552 drivers/staging/vt6655/wcmd.c | 6 +-
1553 drivers/staging/vt6655/wmgr.c | 56 +-
1554 drivers/staging/vt6655/wmgr.h | 4 +-
1555 drivers/staging/vt6655/wpa.c | 2 +-
1556 drivers/staging/vt6655/wpa2.c | 8 +-
1557 drivers/staging/vt6655/wpactl.c | 6 +-
1558 drivers/staging/vt6655/wroute.c | 2 +-
1559 drivers/staging/vt6656/80211mgr.h | 4 +-
1560 drivers/staging/vt6656/baseband.c | 6 +-
1561 drivers/staging/vt6656/baseband.h | 2 +-
1562 drivers/staging/vt6656/bssdb.c | 18 +-
1563 drivers/staging/vt6656/card.c | 38 +-
1564 drivers/staging/vt6656/device.h | 2 +-
1565 drivers/staging/vt6656/dpc.c | 2 +-
1566 drivers/staging/vt6656/hostap.c | 30 +-
1567 drivers/staging/vt6656/int.c | 2 +-
1568 drivers/staging/vt6656/ioctl.c | 11 +-
1569 drivers/staging/vt6656/iwctl.c | 2 +-
1570 drivers/staging/vt6656/key.c | 4 +-
1571 drivers/staging/vt6656/main_usb.c | 20 +-
1572 drivers/staging/vt6656/power.c | 2 +-
1573 drivers/staging/vt6656/rf.c | 58 +-
1574 drivers/staging/vt6656/rf.h | 2 +-
1575 drivers/staging/vt6656/rxtx.c | 52 +-
1576 drivers/staging/vt6656/tcrc.c | 2 +-
1577 drivers/staging/vt6656/tcrc.h | 2 +-
1578 drivers/staging/vt6656/tether.c | 4 +-
1579 drivers/staging/vt6656/tkip.c | 2 +-
1580 drivers/staging/vt6656/wcmd.c | 8 +-
1581 drivers/staging/vt6656/wctl.c | 2 +-
1582 drivers/staging/vt6656/wmgr.c | 26 +-
1583 drivers/staging/vt6656/wpa.c | 2 +-
1584 drivers/staging/vt6656/wpa2.c | 6 +-
1585 drivers/staging/vt6656/wpactl.c | 6 +-
1586 drivers/staging/winbond/Kconfig | 2 +-
1587 drivers/staging/winbond/localpara.h | 4 +-
1588 drivers/staging/winbond/mds.c | 2 +-
1589 drivers/staging/winbond/mto.c | 2 +-
1590 drivers/staging/winbond/phy_calibration.c | 14 +-
1591 drivers/staging/winbond/reg.c | 2 +-
1592 drivers/staging/winbond/sme_api.h | 11 +-
1593 drivers/staging/winbond/wb35reg.c | 4 +-
1594 drivers/staging/winbond/wb35tx.c | 154 +-
1595 drivers/staging/winbond/wb35tx_s.h | 46 +-
1596 drivers/staging/wlags49_h2/README.ubuntu | 12 +-
1597 drivers/staging/wlags49_h2/TODO | 10 +-
1598 drivers/staging/wlags49_h2/hcf.c | 20 +-
1599 drivers/staging/wlags49_h2/hcfcfg.h | 2 +-
1600 drivers/staging/wlags49_h2/hcfdef.h | 6 +-
1601 drivers/staging/wlags49_h2/mdd.h | 8 +-
1602 drivers/staging/wlags49_h2/sta_h2.c | 2 +-
1603 drivers/staging/wlags49_h2/sta_h25.c | 2 +-
1604 drivers/staging/wlags49_h2/wl_enc.h | 2 +-
1605 drivers/staging/wlags49_h2/wl_if.h | 2 +-
1606 drivers/staging/wlags49_h2/wl_internal.h | 4 +-
1607 drivers/staging/wlags49_h2/wl_main.c | 18 +-
1608 drivers/staging/wlags49_h2/wl_netdev.c | 59 +-
1609 drivers/staging/wlags49_h2/wl_pci.c | 8 +-
1610 drivers/staging/wlags49_h2/wl_priv.c | 2 +-
1611 drivers/staging/wlags49_h2/wl_profile.c | 2 +-
1612 drivers/staging/wlags49_h2/wl_version.h | 2 +-
1613 drivers/staging/wlags49_h2/wl_wext.c | 27 +-
1614 drivers/staging/wlags49_h25/Kconfig | 2 +-
1615 drivers/staging/wlags49_h25/TODO | 8 +-
1616 drivers/staging/wlan-ng/cfg80211.c | 11 +-
1617 drivers/staging/wlan-ng/hfa384x_usb.c | 37 +-
1618 drivers/staging/wlan-ng/p80211conv.c | 9 +-
1619 drivers/staging/wlan-ng/p80211netdev.c | 21 +-
1620 drivers/staging/wlan-ng/p80211netdev.h | 2 +-
1621 drivers/staging/wlan-ng/p80211req.c | 152 +-
1622 drivers/staging/wlan-ng/p80211types.h | 2 +-
1623 drivers/staging/wlan-ng/p80211wep.c | 18 +-
1624 drivers/staging/wlan-ng/prism2fw.c | 56 +-
1625 drivers/staging/wlan-ng/prism2sta.c | 53 +-
1626 drivers/staging/xgifb/XGI_main_26.c | 45 +-
1627 drivers/staging/xgifb/vb_def.h | 21 -
1628 drivers/staging/xgifb/vb_init.c | 5 +-
1629 drivers/staging/xgifb/vb_setmode.c | 601 +-
1630 drivers/staging/xgifb/vb_struct.h | 49 +-
1631 drivers/staging/xgifb/vb_table.h | 194 +-
1632 drivers/staging/zcache/tmem.c | 2 +-
1633 drivers/staging/zsmalloc/zsmalloc-main.c | 322 +-
1634 drivers/staging/zsmalloc/zsmalloc_int.h | 155 -
1635 drivers/target/iscsi/iscsi_target_parameters.c | 4 +-
1636 drivers/tty/Kconfig | 9 +-
1637 drivers/tty/amiserial.c | 45 +-
1638 drivers/tty/bfin_jtag_comm.c | 1 +
1639 drivers/tty/cyclades.c | 102 +-
1640 drivers/tty/ehv_bytechan.c | 9 +-
1641 drivers/tty/hvc/Kconfig | 2 +-
1642 drivers/tty/hvc/hvc_console.c | 33 +-
1643 drivers/tty/hvc/hvcs.c | 82 +-
1644 drivers/tty/hvc/hvsi.c | 2 +
1645 drivers/tty/hvc/hvsi_lib.c | 2 +-
1646 drivers/tty/ipwireless/network.c | 7 +-
1647 drivers/tty/ipwireless/tty.c | 2 +-
1648 drivers/tty/isicom.c | 13 +-
1649 drivers/tty/moxa.c | 39 +-
1650 drivers/tty/mxser.c | 63 +-
1651 drivers/tty/n_gsm.c | 144 +-
1652 drivers/tty/n_r3964.c | 10 +-
1653 drivers/tty/n_tty.c | 29 +-
1654 drivers/tty/nozomi.c | 4 +-
1655 drivers/tty/pty.c | 234 +-
1656 drivers/tty/rocket.c | 22 +-
1657 drivers/tty/serial/68328serial.c | 23 +-
1658 drivers/tty/serial/8250/8250.c | 156 +-
1659 drivers/tty/serial/8250/8250.h | 43 +-
1660 drivers/tty/serial/8250/8250_acorn.c | 22 +-
1661 drivers/tty/serial/8250/8250_dw.c | 38 +-
1662 drivers/tty/serial/8250/8250_gsc.c | 26 +-
1663 drivers/tty/serial/8250/8250_hp300.c | 26 +-
1664 drivers/tty/serial/8250/8250_pci.c | 216 +-
1665 drivers/tty/serial/8250/8250_pnp.c | 59 +-
1666 drivers/tty/serial/8250/Kconfig | 16 +-
1667 drivers/tty/serial/8250/Makefile | 5 +-
1668 drivers/tty/serial/8250/serial_cs.c | 30 +-
1669 drivers/tty/serial/Kconfig | 73 +-
1670 drivers/tty/serial/Makefile | 5 +-
1671 drivers/tty/serial/altera_uart.c | 6 +-
1672 drivers/tty/serial/amba-pl010.c | 15 +-
1673 drivers/tty/serial/amba-pl011.c | 177 +-
1674 drivers/tty/serial/bfin_uart.c | 2 +-
1675 drivers/tty/serial/cpm_uart/cpm_uart_core.c | 23 +-
1676 drivers/tty/serial/crisv10.c | 45 +-
1677 drivers/tty/serial/ifx6x60.c | 4 +-
1678 drivers/tty/serial/imx.c | 13 +-
1679 drivers/tty/serial/ioc3_serial.c | 3 +-
1680 drivers/tty/serial/ioc4_serial.c | 5 +-
1681 drivers/tty/serial/jsm/jsm_driver.c | 2 +-
1682 drivers/tty/serial/jsm/jsm_tty.c | 8 +-
1683 drivers/tty/serial/kgdb_nmi.c | 402 +
1684 drivers/tty/serial/kgdboc.c | 9 +
1685 drivers/tty/serial/lpc32xx_hs.c | 823 ++
1686 drivers/tty/serial/m32r_sio.c | 36 +-
1687 drivers/tty/serial/max3100.c | 26 +-
1688 drivers/tty/serial/max3107.c | 1215 ---
1689 drivers/tty/serial/max3107.h | 441 -
1690 drivers/tty/serial/max310x.c | 1260 +++
1691 drivers/tty/serial/mpc52xx_uart.c | 8 +-
1692 drivers/tty/serial/msm_serial.c | 2 +-
1693 drivers/tty/serial/msm_smd_tty.c | 8 +-
1694 drivers/tty/serial/mxs-auart.c | 8 +-
1695 drivers/tty/serial/of_serial.c | 13 +-
1696 drivers/tty/serial/omap-serial.c | 885 +-
1697 drivers/tty/serial/pch_uart.c | 4 +
1698 drivers/tty/serial/pxa.c | 14 +
1699 drivers/tty/serial/samsung.c | 95 +-
1700 drivers/tty/serial/sc26xx.c | 4 +
1701 drivers/tty/serial/sccnxp.c | 990 +++
1702 drivers/tty/serial/serial_core.c | 251 +-
1703 drivers/tty/serial/sirfsoc_uart.c | 8 +-
1704 drivers/tty/serial/sunsu.c | 8 +-
1705 drivers/tty/synclink.c | 86 +-
1706 drivers/tty/synclink_gt.c | 37 +-
1707 drivers/tty/synclinkmp.c | 58 +-
1708 drivers/tty/tty_io.c | 375 +-
1709 drivers/tty/tty_ioctl.c | 100 +-
1710 drivers/tty/tty_ldisc.c | 78 +-
1711 drivers/tty/tty_mutex.c | 71 +-
1712 drivers/tty/tty_port.c | 94 +-
1713 drivers/tty/vt/keyboard.c | 50 +-
1714 drivers/tty/vt/vt.c | 141 +-
1715 drivers/usb/Kconfig | 1 +
1716 drivers/usb/atm/ueagle-atm.c | 79 +-
1717 drivers/usb/atm/usbatm.c | 46 +-
1718 drivers/usb/chipidea/Kconfig | 1 -
1719 drivers/usb/chipidea/Makefile | 4 +-
1720 drivers/usb/chipidea/ci.h | 1 +
1721 drivers/usb/chipidea/ci13xxx_imx.c | 71 +
1722 drivers/usb/chipidea/ci13xxx_imx.h | 28 +
1723 drivers/usb/chipidea/core.c | 24 +-
1724 drivers/usb/chipidea/udc.c | 39 +-
1725 drivers/usb/chipidea/usbmisc_imx6q.c | 162 +
1726 drivers/usb/class/cdc-acm.c | 6 +-
1727 drivers/usb/core/Kconfig | 2 +-
1728 drivers/usb/core/config.c | 2 +
1729 drivers/usb/core/devices.c | 7 +-
1730 drivers/usb/core/devio.c | 35 +
1731 drivers/usb/core/driver.c | 11 +-
1732 drivers/usb/core/endpoint.c | 10 +-
1733 drivers/usb/core/hcd.c | 22 +-
1734 drivers/usb/core/hub.c | 214 +-
1735 drivers/usb/core/message.c | 2 -
1736 drivers/usb/core/quirks.c | 2 +-
1737 drivers/usb/core/sysfs.c | 12 +-
1738 drivers/usb/core/usb-acpi.c | 205 +-
1739 drivers/usb/core/usb.h | 13 +
1740 drivers/usb/dwc3/Kconfig | 2 -
1741 drivers/usb/dwc3/core.c | 18 +-
1742 drivers/usb/dwc3/core.h | 7 +-
1743 drivers/usb/dwc3/dwc3-exynos.c | 66 +
1744 drivers/usb/dwc3/dwc3-omap.c | 66 +
1745 drivers/usb/dwc3/dwc3-pci.c | 67 +
1746 drivers/usb/dwc3/ep0.c | 217 +-
1747 drivers/usb/dwc3/gadget.c | 101 +-
1748 drivers/usb/early/ehci-dbgp.c | 17 +-
1749 drivers/usb/gadget/Kconfig | 78 +-
1750 drivers/usb/gadget/Makefile | 4 +
1751 drivers/usb/gadget/acm_ms.c | 55 +-
1752 drivers/usb/gadget/amd5536udc.c | 6 +-
1753 drivers/usb/gadget/at91_udc.c | 5 +-
1754 drivers/usb/gadget/audio.c | 62 +-
1755 drivers/usb/gadget/bcm63xx_udc.c | 2464 ++++++
1756 drivers/usb/gadget/cdc2.c | 56 +-
1757 drivers/usb/gadget/composite.c | 290 +-
1758 drivers/usb/gadget/config.c | 6 +-
1759 drivers/usb/gadget/dbgp.c | 11 +-
1760 drivers/usb/gadget/dummy_hcd.c | 2 +
1761 drivers/usb/gadget/epautoconf.c | 33 +-
1762 drivers/usb/gadget/ether.c | 61 +-
1763 drivers/usb/gadget/f_ecm.c | 5 +-
1764 drivers/usb/gadget/f_hid.c | 2 +-
1765 drivers/usb/gadget/f_mass_storage.c | 16 +-
1766 drivers/usb/gadget/f_midi.c | 1 -
1767 drivers/usb/gadget/f_ncm.c | 5 +-
1768 drivers/usb/gadget/f_sourcesink.c | 2 +-
1769 drivers/usb/gadget/f_subset.c | 5 +-
1770 drivers/usb/gadget/f_uac2.c | 2 +-
1771 drivers/usb/gadget/file_storage.c | 38 +-
1772 drivers/usb/gadget/fsl_udc_core.c | 6 +-
1773 drivers/usb/gadget/fusb300_udc.c | 4 +-
1774 drivers/usb/gadget/g_ffs.c | 26 +-
1775 drivers/usb/gadget/gadget_chips.h | 96 +-
1776 drivers/usb/gadget/gmidi.c | 61 +-
1777 drivers/usb/gadget/goku_udc.c | 6 +-
1778 drivers/usb/gadget/hid.c | 52 +-
1779 drivers/usb/gadget/inode.c | 29 +-
1780 drivers/usb/gadget/lpc32xx_udc.c | 129 +-
1781 drivers/usb/gadget/m66592-udc.c | 4 +-
1782 drivers/usb/gadget/mass_storage.c | 39 +-
1783 drivers/usb/gadget/multi.c | 42 +-
1784 drivers/usb/gadget/mv_udc_core.c | 91 +-
1785 drivers/usb/gadget/ncm.c | 62 +-
1786 drivers/usb/gadget/nokia.c | 58 +-
1787 drivers/usb/gadget/omap_udc.c | 6 +-
1788 drivers/usb/gadget/pch_udc.c | 6 +-
1789 drivers/usb/gadget/printer.c | 173 +-
1790 drivers/usb/gadget/pxa25x_udc.c | 7 +-
1791 drivers/usb/gadget/pxa25x_udc.h | 2 +-
1792 drivers/usb/gadget/pxa27x_udc.c | 6 +-
1793 drivers/usb/gadget/rndis.c | 22 +-
1794 drivers/usb/gadget/s3c-hsotg.c | 8 +-
1795 drivers/usb/gadget/s3c-hsudc.c | 51 +-
1796 drivers/usb/gadget/s3c2410_udc.c | 148 +-
1797 drivers/usb/gadget/serial.c | 72 +-
1798 drivers/usb/gadget/tcm_usb_gadget.c | 49 +-
1799 drivers/usb/gadget/tcm_usb_gadget.h | 11 +-
1800 drivers/usb/gadget/u_ether.c | 8 +-
1801 drivers/usb/gadget/u_serial.c | 3 +-
1802 drivers/usb/gadget/udc-core.c | 13 +-
1803 drivers/usb/gadget/usbstring.c | 3 +-
1804 drivers/usb/gadget/webcam.c | 42 +-
1805 drivers/usb/gadget/zero.c | 73 +-
1806 drivers/usb/host/Kconfig | 40 +-
1807 drivers/usb/host/ehci-atmel.c | 30 +-
1808 drivers/usb/host/ehci-au1xxx.c | 20 +-
1809 drivers/usb/host/ehci-cns3xxx.c | 16 +-
1810 drivers/usb/host/ehci-dbg.c | 6 +-
1811 drivers/usb/host/ehci-fsl.c | 57 +-
1812 drivers/usb/host/ehci-fsl.h | 1 +
1813 drivers/usb/host/ehci-grlib.c | 18 +-
1814 drivers/usb/host/ehci-hcd.c | 4 +-
1815 drivers/usb/host/ehci-hub.c | 4 +-
1816 drivers/usb/host/ehci-ixp4xx.c | 19 +-
1817 drivers/usb/host/ehci-ls1x.c | 20 +-
1818 drivers/usb/host/ehci-msm.c | 13 +-
1819 drivers/usb/host/ehci-mv.c | 51 +-
1820 drivers/usb/host/ehci-mxc.c | 45 +-
1821 drivers/usb/host/ehci-platform.c | 50 +-
1822 drivers/usb/host/ehci-ppc-of.c | 28 +-
1823 drivers/usb/host/ehci-s5p.c | 7 +-
1824 drivers/usb/host/ehci-sead3.c | 15 +-
1825 drivers/usb/host/ehci-sh.c | 35 +-
1826 drivers/usb/host/ehci-tegra.c | 57 +-
1827 drivers/usb/host/ehci-timer.c | 6 +-
1828 drivers/usb/host/ehci-vt8500.c | 24 +-
1829 drivers/usb/host/ehci-xilinx-of.c | 20 +-
1830 drivers/usb/host/fhci-sched.c | 3 +-
1831 drivers/usb/host/fsl-mph-dr-of.c | 2 +
1832 drivers/usb/host/ohci-nxp.c | 2 +-
1833 drivers/usb/host/ohci-platform.c | 46 +-
1834 drivers/usb/host/ohci-pxa27x.c | 68 +
1835 drivers/usb/host/ohci-xls.c | 2 +-
1836 drivers/usb/host/r8a66597-hcd.c | 5 +-
1837 drivers/usb/host/sl811-hcd.c | 2 +-
1838 drivers/usb/host/uhci-hcd.c | 5 +
1839 drivers/usb/host/uhci-platform.c | 157 +
1840 drivers/usb/host/whci/hcd.c | 8 +-
1841 drivers/usb/host/whci/qset.c | 11 +-
1842 drivers/usb/host/xhci-hub.c | 20 +-
1843 drivers/usb/host/xhci-mem.c | 7 +
1844 drivers/usb/host/xhci-pci.c | 1 +
1845 drivers/usb/host/xhci-ring.c | 290 +-
1846 drivers/usb/host/xhci.c | 43 +-
1847 drivers/usb/host/xhci.h | 20 +
1848 drivers/usb/misc/Kconfig | 5 +
1849 drivers/usb/misc/Makefile | 1 +
1850 drivers/usb/misc/ezusb.c | 160 +
1851 drivers/usb/misc/legousbtower.c | 3 -
1852 drivers/usb/misc/rio500.c | 2 +-
1853 drivers/usb/musb/Kconfig | 3 +-
1854 drivers/usb/musb/am35x.c | 67 +-
1855 drivers/usb/musb/blackfin.c | 64 +-
1856 drivers/usb/musb/cppi_dma.c | 2 +-
1857 drivers/usb/musb/da8xx.c | 59 +-
1858 drivers/usb/musb/davinci.c | 67 +-
1859 drivers/usb/musb/musb_core.c | 331 +-
1860 drivers/usb/musb/musb_core.h | 17 +-
1861 drivers/usb/musb/musb_debugfs.c | 8 +-
1862 drivers/usb/musb/musb_dma.h | 2 +-
1863 drivers/usb/musb/musb_dsps.c | 194 +-
1864 drivers/usb/musb/musb_gadget.c | 172 +-
1865 drivers/usb/musb/musb_host.c | 264 +-
1866 drivers/usb/musb/musb_host.h | 3 +
1867 drivers/usb/musb/musb_virthub.c | 13 +-
1868 drivers/usb/musb/musbhsdma.c | 2 +-
1869 drivers/usb/musb/omap2430.c | 156 +-
1870 drivers/usb/musb/omap2430.h | 9 +
1871 drivers/usb/musb/tusb6010.c | 57 +-
1872 drivers/usb/musb/tusb6010_omap.c | 2 +-
1873 drivers/usb/musb/ux500.c | 33 +-
1874 drivers/usb/musb/ux500_dma.c | 2 +-
1875 drivers/usb/otg/Kconfig | 2 +-
1876 drivers/usb/otg/fsl_otg.c | 34 +-
1877 drivers/usb/otg/mxs-phy.c | 38 +-
1878 drivers/usb/otg/nop-usb-xceiv.c | 8 +-
1879 drivers/usb/otg/otg.c | 2 +-
1880 drivers/usb/otg/twl4030-usb.c | 26 +-
1881 drivers/usb/otg/twl6030-usb.c | 157 +-
1882 drivers/usb/phy/Kconfig | 17 +
1883 drivers/usb/phy/Makefile | 3 +
1884 drivers/usb/phy/isp1301.c | 6 -
1885 drivers/usb/phy/mv_u3d_phy.c | 345 +
1886 drivers/usb/phy/mv_u3d_phy.h | 105 +
1887 drivers/usb/phy/omap-usb2.c | 271 +
1888 .../usb_phy.c => drivers/usb/phy/tegra_usb_phy.c | 152 +-
1889 drivers/usb/renesas_usbhs/common.c | 15 +-
1890 drivers/usb/renesas_usbhs/mod.c | 25 +-
1891 drivers/usb/serial/Kconfig | 21 +-
1892 drivers/usb/serial/Makefile | 2 +-
1893 drivers/usb/serial/aircable.c | 5 -
1894 drivers/usb/serial/ark3116.c | 11 +-
1895 drivers/usb/serial/belkin_sa.c | 10 +-
1896 drivers/usb/serial/ch341.c | 49 +-
1897 drivers/usb/serial/console.c | 27 +-
1898 drivers/usb/serial/cp210x.c | 149 +-
1899 drivers/usb/serial/cyberjack.c | 77 +-
1900 drivers/usb/serial/cypress_m8.c | 197 +-
1901 drivers/usb/serial/digi_acceleport.c | 64 +-
1902 drivers/usb/serial/empeg.c | 7 +-
1903 drivers/usb/serial/ezusb.c | 59 -
1904 drivers/usb/serial/f81232.c | 11 +-
1905 drivers/usb/serial/ftdi_sio.c | 140 +-
1906 drivers/usb/serial/ftdi_sio_ids.h | 5 +
1907 drivers/usb/serial/funsoft.c | 5 -
1908 drivers/usb/serial/garmin_gps.c | 129 +-
1909 drivers/usb/serial/generic.c | 11 +-
1910 drivers/usb/serial/io_edgeport.c | 626 +-
1911 drivers/usb/serial/io_ti.c | 418 +-
1912 drivers/usb/serial/ipaq.c | 4 -
1913 drivers/usb/serial/ipw.c | 66 +-
1914 drivers/usb/serial/ir-usb.c | 18 +-
1915 drivers/usb/serial/iuu_phoenix.c | 162 +-
1916 drivers/usb/serial/keyspan.c | 344 +-
1917 drivers/usb/serial/keyspan.h | 17 +-
1918 drivers/usb/serial/keyspan_pda.c | 77 +-
1919 drivers/usb/serial/kl5kusb105.c | 59 +-
1920 drivers/usb/serial/kobil_sct.c | 112 +-
1921 drivers/usb/serial/mct_u232.c | 108 +-
1922 drivers/usb/serial/metro-usb.c | 13 -
1923 drivers/usb/serial/mos7720.c | 241 +-
1924 drivers/usb/serial/mos7840.c | 488 +-
1925 drivers/usb/serial/navman.c | 8 +-
1926 drivers/usb/serial/omninet.c | 43 +-
1927 drivers/usb/serial/opticon.c | 30 +-
1928 drivers/usb/serial/option.c | 23 +-
1929 drivers/usb/serial/oti6858.c | 87 +-
1930 drivers/usb/serial/pl2303.c | 14 +-
1931 drivers/usb/serial/qcaux.c | 10 +-
1932 drivers/usb/serial/qcserial.c | 5 -
1933 drivers/usb/serial/quatech2.c | 11 +-
1934 drivers/usb/serial/safe_serial.c | 12 +-
1935 drivers/usb/serial/sierra.c | 13 +-
1936 drivers/usb/serial/spcp8x5.c | 17 +-
1937 drivers/usb/serial/ssu100.c | 41 +-
1938 drivers/usb/serial/symbolserial.c | 8 +-
1939 drivers/usb/serial/ti_usb_3410_5052.c | 160 +-
1940 drivers/usb/serial/usb-serial.c | 183 +-
1941 drivers/usb/serial/usb_wwan.c | 58 +-
1942 drivers/usb/serial/visor.c | 13 +-
1943 drivers/usb/serial/whiteheat.c | 137 +-
1944 drivers/usb/serial/zte_ev.c | 307 +
1945 drivers/usb/storage/Kconfig | 14 -
1946 drivers/usb/storage/Makefile | 9 +-
1947 drivers/usb/storage/alauda.c | 2 +-
1948 drivers/usb/storage/cypress_atacb.c | 2 +-
1949 drivers/usb/storage/datafab.c | 2 +-
1950 drivers/usb/storage/ene_ub6250.c | 30 +-
1951 drivers/usb/storage/freecom.c | 2 +-
1952 drivers/usb/storage/isd200.c | 5 +-
1953 drivers/usb/storage/jumpshot.c | 2 +-
1954 drivers/usb/storage/karma.c | 2 +-
1955 drivers/usb/storage/libusual.c | 243 -
1956 drivers/usb/storage/onetouch.c | 2 +-
1957 drivers/usb/storage/realtek_cr.c | 2 +-
1958 drivers/usb/storage/sddr09.c | 2 +-
1959 drivers/usb/storage/sddr55.c | 2 +-
1960 drivers/usb/storage/shuttle_usbat.c | 2 +-
1961 drivers/usb/storage/sierra_ms.c | 3 +-
1962 drivers/usb/storage/transport.c | 2 +-
1963 drivers/usb/storage/uas.c | 107 +-
1964 drivers/usb/storage/unusual_devs.h | 36 +-
1965 drivers/usb/storage/usb.c | 17 +-
1966 drivers/usb/storage/usual-tables.c | 18 +-
1967 drivers/usb/wusbcore/Kconfig | 3 +-
1968 drivers/usb/wusbcore/security.c | 7 +-
1969 drivers/usb/wusbcore/wa-hc.c | 4 +-
1970 drivers/video/backlight/88pm860x_bl.c | 1 -
1971 drivers/video/efifb.c | 4 +-
1972 drivers/video/exynos/exynos_mipi_dsi.c | 2 +-
1973 drivers/video/tmiofb.c | 4 +
1974 drivers/vme/bridges/vme_ca91cx42.c | 20 +-
1975 drivers/vme/bridges/vme_tsi148.c | 10 +-
1976 drivers/w1/masters/Kconfig | 1 -
1977 drivers/w1/masters/ds1wm.c | 2 +-
1978 drivers/w1/masters/omap_hdq.c | 57 +-
1979 drivers/w1/masters/w1-gpio.c | 66 +-
1980 drivers/xen/Makefile | 2 +-
1981 drivers/xen/dbgp.c | 48 +
1982 drivers/xen/xen-pciback/pci_stub.c | 2 +-
1983 firmware/Makefile | 1 -
1984 firmware/intelliport2.bin.ihex | 2147 -----
1985 fs/btrfs/ctree.h | 2 +-
1986 fs/btrfs/delayed-ref.h | 2 +-
1987 fs/btrfs/inode.c | 4 +-
1988 fs/cifs/Kconfig | 38 +-
1989 fs/cifs/Makefile | 2 +-
1990 fs/cifs/cifsacl.c | 2 +-
1991 fs/cifs/cifsencrypt.c | 67 +-
1992 fs/cifs/cifsfs.c | 63 +-
1993 fs/cifs/cifsfs.h | 2 +-
1994 fs/cifs/cifsglob.h | 268 +-
1995 fs/cifs/cifspdu.h | 2 +-
1996 fs/cifs/cifsproto.h | 136 +-
1997 fs/cifs/cifssmb.c | 289 +-
1998 fs/cifs/connect.c | 198 +-
1999 fs/cifs/dir.c | 124 +-
2000 fs/cifs/file.c | 1055 ++-
2001 fs/cifs/inode.c | 441 +-
2002 fs/cifs/ioctl.c | 32 +-
2003 fs/cifs/link.c | 74 +-
2004 fs/cifs/misc.c | 32 +-
2005 fs/cifs/netmisc.c | 9 +-
2006 fs/cifs/readdir.c | 167 +-
2007 fs/cifs/sess.c | 3 +-
2008 fs/cifs/smb1ops.c | 328 +-
2009 fs/cifs/smb2file.c | 302 +
2010 fs/cifs/smb2glob.h | 14 +
2011 fs/cifs/smb2inode.c | 98 +-
2012 fs/cifs/smb2maperror.c | 6 +-
2013 fs/cifs/smb2misc.c | 240 +-
2014 fs/cifs/smb2ops.c | 346 +-
2015 fs/cifs/smb2pdu.c | 1235 ++-
2016 fs/cifs/smb2pdu.h | 284 +-
2017 fs/cifs/smb2proto.h | 87 +-
2018 fs/cifs/smb2transport.c | 204 +-
2019 fs/cifs/transport.c | 283 +-
2020 fs/compat_ioctl.c | 6 +
2021 fs/debugfs/inode.c | 8 +-
2023 fs/dlm/config.c | 79 +-
2024 fs/dlm/config.h | 2 -
2025 fs/dlm/dlm_internal.h | 46 +-
2026 fs/dlm/lockspace.c | 15 +-
2027 fs/dlm/lowcomms.c | 215 +-
2028 fs/dlm/lowcomms.h | 2 +
2030 fs/dlm/member.c | 17 +-
2031 fs/dlm/rcom.c | 2 +-
2032 fs/dlm/recoverd.c | 27 +-
2033 fs/dlm/recoverd.h | 1 -
2035 fs/ext2/balloc.c | 2 +-
2036 fs/ext3/balloc.c | 2 +-
2037 fs/ext3/inode.c | 2 +-
2038 fs/ext4/inode.c | 14 +-
2039 fs/ext4/mballoc.c | 2 +-
2040 fs/fs-writeback.c | 4 -
2041 fs/gfs2/aops.c | 11 +-
2042 fs/gfs2/bmap.c | 2 +-
2043 fs/gfs2/file.c | 4 +-
2044 fs/gfs2/glock.c | 60 +-
2045 fs/gfs2/glops.c | 1 +
2046 fs/gfs2/incore.h | 30 +-
2047 fs/gfs2/inode.c | 20 +-
2048 fs/gfs2/ops_fstype.c | 8 +
2049 fs/gfs2/quota.c | 11 +-
2050 fs/gfs2/rgrp.c | 1203 ++-
2051 fs/gfs2/rgrp.h | 28 +-
2052 fs/gfs2/super.c | 9 +-
2053 fs/gfs2/trace_gfs2.h | 20 +-
2054 fs/gfs2/trans.h | 7 +-
2055 fs/gfs2/xattr.c | 96 +-
2057 fs/nfs/super.c | 2 +-
2059 fs/sysfs/symlink.c | 2 +-
2060 include/asm-generic/bitops/builtin-__ffs.h | 15 +
2061 include/asm-generic/bitops/builtin-__fls.h | 15 +
2062 include/asm-generic/bitops/builtin-ffs.h | 17 +
2063 include/asm-generic/bitops/builtin-fls.h | 16 +
2064 include/clocksource/arm_generic.h | 21 +
2065 include/linux/Kbuild | 4 +-
2066 include/linux/acpi.h | 6 +-
2067 include/linux/amba/serial.h | 1 -
2068 include/linux/bcd.h | 17 +-
2069 include/linux/cd1400.h | 292 -
2070 include/linux/cdk.h | 486 --
2071 include/linux/clk-provider.h | 6 +
2072 include/linux/comstats.h | 119 -
2073 include/linux/device.h | 85 +-
2074 include/linux/efi-bgrt.h | 21 +
2075 include/linux/efi.h | 8 +
2076 include/linux/elf.h | 4 +
2077 include/linux/extcon.h | 18 +-
2078 include/linux/extcon/extcon-adc-jack.h | 71 +
2079 include/linux/firmware.h | 15 +
2080 include/linux/fsl_devices.h | 2 +
2081 include/linux/ftrace.h | 158 +-
2082 include/linux/generic_serial.h | 35 -
2083 include/linux/hardirq.h | 8 +-
2084 include/linux/hid-sensor-hub.h | 160 +
2085 include/linux/hid-sensor-ids.h | 112 +
2086 include/linux/hid.h | 5 +-
2087 include/linux/hyperv.h | 101 +-
2088 include/linux/iio/adc/ad_sigma_delta.h | 173 +
2089 include/linux/iio/buffer.h | 6 +-
2090 include/linux/iio/consumer.h | 44 +-
2091 include/linux/iio/iio.h | 65 +-
2092 include/linux/iio/kfifo_buf.h | 3 +
2093 include/linux/iio/machine.h | 5 +
2094 include/linux/iio/trigger.h | 13 +-
2095 include/linux/iio/trigger_consumer.h | 11 +
2096 include/linux/iio/types.h | 1 +
2097 include/linux/input.h | 35 +-
2098 include/linux/input/mt.h | 57 +-
2099 include/linux/interrupt.h | 2 +
2100 include/linux/irqdesc.h | 2 -
2101 include/linux/istallion.h | 123 -
2102 include/linux/kbd_kern.h | 13 -
2103 include/linux/kdb.h | 29 +-
2104 include/linux/kernel_stat.h | 8 +
2105 include/linux/kgdb.h | 13 +
2106 include/linux/kprobes.h | 27 +
2107 include/linux/kthread.h | 11 +-
2108 include/linux/kvm_host.h | 4 +-
2109 include/linux/mfd/dbx500-prcmu.h | 1 +
2110 include/linux/mfd/max77686.h | 1 +
2111 include/linux/mfd/max8998.h | 2 +-
2112 include/linux/mfd/tps6586x.h | 1 +
2113 include/linux/mod_devicetable.h | 8 +
2114 include/linux/netdevice.h | 3 -
2115 include/linux/pci-acpi.h | 17 +-
2116 include/linux/pci.h | 55 +-
2117 include/linux/pci_ids.h | 1 -
2118 include/linux/pci_regs.h | 7 +
2119 include/linux/pcieport_if.h | 2 +-
2120 include/linux/perf_event.h | 60 +-
2121 include/linux/perf_regs.h | 25 +
2122 include/linux/platform_data/ad5755.h | 103 +
2123 include/linux/platform_data/ad7791.h | 17 +
2124 include/linux/platform_data/clk-realview.h | 1 +
2125 include/linux/platform_data/clk-ux500.h | 17 +
2126 include/linux/platform_data/max197.h | 21 +
2127 include/linux/platform_data/max310x.h | 67 +
2128 include/linux/platform_data/sccnxp.h | 93 +
2129 include/linux/{ => platform_data}/sht15.h | 1 -
2130 include/linux/platform_device.h | 4 +
2131 include/linux/pm.h | 5 +
2132 include/linux/power/generic-adc-battery.h | 29 +
2133 include/linux/rcupdate.h | 21 +-
2134 include/linux/regmap.h | 3 +
2135 include/linux/regulator/consumer.h | 15 +
2136 include/linux/regulator/driver.h | 18 +-
2137 include/linux/regulator/fan53555.h | 60 +
2138 include/linux/regulator/machine.h | 2 +
2139 include/linux/sc26198.h | 533 --
2140 include/linux/sched.h | 21 +-
2141 include/linux/screen_info.h | 2 +
2142 include/linux/serial.h | 81 +-
2143 include/linux/serial167.h | 157 -
2144 include/linux/serial_8250.h | 33 +-
2145 include/linux/serial_core.h | 8 +-
2146 include/linux/serial_reg.h | 4 +
2147 include/linux/smpboot.h | 43 +
2148 include/linux/stallion.h | 147 -
2149 include/linux/task_work.h | 3 +-
2150 include/linux/ti_wilink_st.h | 3 +-
2151 include/linux/timer.h | 165 +-
2152 include/linux/topology.h | 2 -
2153 include/linux/tracepoint.h | 28 +-
2154 include/linux/tty.h | 92 +-
2155 include/linux/tty_driver.h | 47 +-
2156 include/linux/tty_flags.h | 78 +
2157 include/linux/uprobes.h | 15 +-
2158 include/linux/usb.h | 32 +-
2159 include/linux/usb/ch11.h | 4 +-
2160 include/linux/usb/composite.h | 97 +-
2161 include/linux/usb/ehci_def.h | 35 +-
2162 include/linux/usb/ehci_pdriver.h | 8 +
2163 include/linux/usb/ezusb.h | 16 +
2164 include/linux/usb/gadget.h | 33 +-
2165 include/linux/usb/hcd.h | 4 +-
2166 include/linux/usb/nop-usb-xceiv.h | 24 +
2167 include/linux/usb/ohci_pdriver.h | 8 +
2168 include/linux/usb/omap_usb.h | 46 +
2169 include/linux/usb/otg.h | 236 +-
2170 include/linux/usb/phy.h | 233 +
2171 include/linux/usb/phy_companion.h | 34 +
2172 include/linux/usb/quirks.h | 4 +-
2173 include/linux/usb/serial.h | 32 +-
2174 .../usb_phy.h => include/linux/usb/tegra_usb_phy.h | 16 +-
2175 include/linux/usb_usual.h | 24 -
2176 include/linux/usbdevice_fs.h | 14 +
2177 include/linux/w1-gpio.h | 1 +
2178 include/net/irda/ircomm_tty.h | 17 +-
2179 include/trace/define_trace.h | 2 +-
2180 include/xen/interface/physdev.h | 16 +
2181 init/Kconfig | 186 +-
2183 kernel/Kconfig.locks | 103 +-
2184 kernel/Makefile | 5 +-
2185 kernel/cpu.c | 21 +-
2186 kernel/debug/debug_core.c | 14 +-
2187 kernel/debug/kdb/kdb_main.c | 31 +
2188 kernel/events/callchain.c | 38 +-
2189 kernel/events/core.c | 214 +
2190 kernel/events/internal.h | 82 +-
2191 kernel/events/ring_buffer.c | 10 +-
2192 kernel/events/uprobes.c | 248 +-
2193 kernel/fork.c | 10 +-
2194 kernel/irq/chip.c | 1 +
2195 kernel/irq/dummychip.c | 2 +
2196 kernel/kprobes.c | 247 +-
2197 kernel/kthread.c | 185 +-
2198 kernel/lockdep.c | 39 +
2199 kernel/rcupdate.c | 4 +
2200 kernel/rcutiny.c | 33 +-
2201 kernel/rcutiny_plugin.h | 10 +-
2202 kernel/rcutorture.c | 159 +-
2203 kernel/rcutree.c | 916 +-
2204 kernel/rcutree.h | 50 +-
2205 kernel/rcutree_plugin.h | 597 +-
2206 kernel/rcutree_trace.c | 22 +-
2207 kernel/sched/Makefile | 2 +-
2208 kernel/sched/core.c | 694 +-
2209 kernel/sched/cputime.c | 530 ++
2210 kernel/sched/fair.c | 81 +-
2211 kernel/sched/features.h | 10 +-
2212 kernel/sched/rt.c | 5 -
2213 kernel/sched/sched.h | 69 +-
2214 kernel/signal.c | 18 +-
2215 kernel/smpboot.c | 233 +
2216 kernel/smpboot.h | 4 +
2217 kernel/softirq.c | 117 +-
2218 kernel/sysctl.c | 8 +-
2219 kernel/task_work.c | 111 +-
2220 kernel/time/tick-sched.c | 6 +-
2221 kernel/timer.c | 108 +-
2222 kernel/trace/Kconfig | 10 +
2223 kernel/trace/Makefile | 8 +-
2224 kernel/trace/ftrace.c | 322 +-
2225 kernel/trace/ring_buffer.c | 4 +-
2226 kernel/trace/trace.c | 12 +-
2227 kernel/trace/trace.h | 3 +-
2228 kernel/trace/trace_event_perf.c | 3 +-
2229 kernel/trace/trace_events.c | 116 +-
2230 kernel/trace/trace_events_filter.c | 2 +-
2231 kernel/trace/trace_functions.c | 14 +-
2232 kernel/trace/trace_functions_graph.c | 5 +-
2233 kernel/trace/trace_irqsoff.c | 5 +-
2234 kernel/trace/trace_sched_wakeup.c | 5 +-
2235 kernel/trace/trace_selftest.c | 304 +-
2236 kernel/trace/trace_stack.c | 4 +-
2237 kernel/trace/trace_syscalls.c | 2 +-
2238 kernel/watchdog.c | 263 +-
2239 lib/Kconfig.debug | 20 +-
2241 lib/dynamic_debug.c | 56 +-
2243 mm/kmemleak.c | 6 +-
2244 net/8021q/vlanproc.c | 2 +-
2245 net/bluetooth/rfcomm/tty.c | 10 +-
2246 net/core/dev.c | 20 +-
2247 net/irda/ircomm/ircomm_param.c | 5 -
2248 net/irda/ircomm/ircomm_tty.c | 320 +-
2249 net/irda/ircomm/ircomm_tty_attach.c | 40 +-
2250 net/irda/ircomm/ircomm_tty_ioctl.c | 33 +-
2251 scripts/coccinelle/api/memdup_user.cocci | 4 +-
2252 scripts/kconfig/streamline_config.pl | 50 +-
2253 scripts/mod/file2alias.c | 15 +
2254 scripts/recordmcount.h | 4 +-
2255 scripts/sortextable.c | 10 +-
2256 security/apparmor/.gitignore | 1 -
2257 security/keys/keyctl.c | 2 -
2258 sound/oss/.gitignore | 1 -
2259 tools/hv/hv_get_dhcp_info.sh | 28 +
2260 tools/hv/hv_get_dns_info.sh | 13 +
2261 tools/hv/hv_kvp_daemon.c | 1036 ++-
2262 tools/hv/hv_set_ifconfig.sh | 68 +
2263 tools/lib/traceevent/Makefile | 2 +-
2264 tools/lib/traceevent/event-parse.c | 754 +-
2265 tools/lib/traceevent/event-parse.h | 46 +-
2266 tools/lib/traceevent/event-utils.h | 6 +
2267 tools/perf/.gitignore | 2 +
2268 tools/perf/Documentation/Makefile | 6 +-
2269 tools/perf/Documentation/jit-interface.txt | 15 +
2270 tools/perf/Documentation/perf-annotate.txt | 3 +
2271 tools/perf/Documentation/perf-diff.txt | 3 +
2272 tools/perf/Documentation/perf-kvm.txt | 30 +-
2273 tools/perf/Documentation/perf-list.txt | 48 +-
2274 tools/perf/Documentation/perf-report.txt | 3 +
2275 tools/perf/Documentation/perf-script-perl.txt | 4 +-
2276 tools/perf/Documentation/perf-script-python.txt | 10 +-
2277 tools/perf/Documentation/perf-trace.txt | 53 +
2278 tools/perf/MANIFEST | 4 +
2279 tools/perf/Makefile | 173 +-
2280 tools/perf/arch/x86/Makefile | 3 +
2281 tools/perf/arch/x86/include/perf_regs.h | 80 +
2282 tools/perf/arch/x86/util/unwind.c | 111 +
2283 tools/perf/bash_completion | 26 +
2284 tools/perf/bench/bench.h | 3 +-
2285 tools/perf/bench/mem-memcpy.c | 2 +-
2286 tools/perf/bench/mem-memset.c | 2 +-
2287 tools/perf/bench/sched-messaging.c | 2 +-
2288 tools/perf/bench/sched-pipe.c | 10 +-
2289 tools/perf/builtin-annotate.c | 4 +-
2290 tools/perf/builtin-bench.c | 2 +-
2291 tools/perf/builtin-buildid-cache.c | 10 +-
2292 tools/perf/builtin-buildid-list.c | 7 +-
2293 tools/perf/builtin-diff.c | 96 +-
2294 tools/perf/builtin-evlist.c | 2 +-
2295 tools/perf/builtin-help.c | 50 +-
2296 tools/perf/builtin-inject.c | 29 +-
2297 tools/perf/builtin-kmem.c | 234 +-
2298 tools/perf/builtin-kvm.c | 838 +-
2299 tools/perf/builtin-list.c | 16 +-
2300 tools/perf/builtin-lock.c | 414 +-
2301 tools/perf/builtin-probe.c | 24 +-
2302 tools/perf/builtin-record.c | 305 +-
2303 tools/perf/builtin-report.c | 47 +-
2304 tools/perf/builtin-sched.c | 1522 ++--
2305 tools/perf/builtin-script.c | 229 +-
2306 tools/perf/builtin-stat.c | 136 +-
2307 tools/perf/builtin-test.c | 353 +-
2308 tools/perf/builtin-timechart.c | 70 +-
2309 tools/perf/builtin-top.c | 33 +-
2310 tools/perf/builtin-trace.c | 310 +
2311 tools/perf/builtin.h | 2 +
2312 tools/perf/command-list.txt | 3 +-
2313 tools/perf/config/feature-tests.mak | 50 +
2314 tools/perf/perf-archive.sh | 6 +-
2315 tools/perf/perf.c | 75 +-
2316 tools/perf/perf.h | 15 +-
2317 .../Perf-Trace-Util/lib/Perf/Trace/EventClass.py | 94 +
2318 .../python/bin/event_analyzing_sample-record | 8 +
2319 .../python/bin/event_analyzing_sample-report | 3 +
2320 .../perf/scripts/python/event_analyzing_sample.py | 189 +
2321 tools/perf/ui/browser.c | 7 +-
2322 tools/perf/ui/browsers/annotate.c | 6 +-
2323 tools/perf/ui/browsers/hists.c | 133 +-
2324 tools/perf/ui/gtk/browser.c | 111 +-
2325 tools/perf/ui/gtk/gtk.h | 3 +
2326 tools/perf/ui/gtk/helpline.c | 56 +
2327 tools/perf/ui/gtk/setup.c | 6 +-
2328 tools/perf/ui/gtk/util.c | 9 +-
2329 tools/perf/ui/helpline.c | 56 +-
2330 tools/perf/ui/helpline.h | 33 +-
2331 tools/perf/ui/hist.c | 390 +
2332 tools/perf/ui/setup.c | 10 +-
2333 tools/perf/ui/stdio/hist.c | 498 ++
2334 tools/perf/ui/tui/helpline.c | 57 +
2335 tools/perf/ui/tui/setup.c | 10 +-
2336 tools/perf/util/alias.c | 3 +-
2337 tools/perf/util/annotate.c | 19 +-
2338 tools/perf/util/annotate.h | 15 +-
2339 tools/perf/util/build-id.c | 11 +-
2340 tools/perf/util/cache.h | 6 +-
2341 tools/perf/util/callchain.c | 6 +-
2342 tools/perf/util/callchain.h | 2 +-
2343 tools/perf/util/cgroup.c | 4 +-
2344 tools/perf/util/config.c | 6 +-
2345 tools/perf/util/cpumap.c | 22 +-
2346 tools/perf/util/cpumap.h | 13 +-
2347 tools/perf/util/debug.c | 4 +-
2348 tools/perf/util/debug.h | 17 +-
2349 tools/perf/util/dso-test-data.c | 2 +-
2350 tools/perf/util/dwarf-aux.c | 2 +
2351 tools/perf/util/event.c | 71 +-
2352 tools/perf/util/event.h | 14 +-
2353 tools/perf/util/evlist.c | 143 +-
2354 tools/perf/util/evlist.h | 35 +-
2355 tools/perf/util/evsel.c | 276 +-
2356 tools/perf/util/evsel.h | 63 +-
2357 tools/perf/util/generate-cmdlist.sh | 15 +
2358 tools/perf/util/header.c | 1063 ++-
2359 tools/perf/util/header.h | 29 +-
2360 tools/perf/util/help.c | 4 +-
2361 tools/perf/util/hist.c | 721 +-
2362 tools/perf/util/hist.h | 75 +-
2363 tools/perf/util/include/linux/bitops.h | 4 +
2364 tools/perf/util/include/linux/compiler.h | 9 +-
2365 tools/perf/util/include/linux/kernel.h | 17 +-
2366 tools/perf/util/include/linux/magic.h | 12 +
2367 tools/perf/util/include/linux/rbtree.h | 1 +
2368 tools/perf/util/include/linux/string.h | 2 +
2369 tools/perf/util/include/linux/types.h | 8 +
2370 tools/perf/util/intlist.c | 8 +-
2371 tools/perf/util/map.c | 47 +-
2372 tools/perf/util/map.h | 9 +-
2373 tools/perf/util/parse-events-test.c | 426 +-
2374 tools/perf/util/parse-events.c | 254 +-
2375 tools/perf/util/parse-events.h | 18 +-
2376 tools/perf/util/parse-events.l | 56 +-
2377 tools/perf/util/parse-events.y | 125 +-
2378 tools/perf/util/parse-options.c | 3 +-
2379 tools/perf/util/perf_regs.h | 14 +
2380 tools/perf/util/pmu.c | 80 +-
2381 tools/perf/util/pmu.h | 3 +
2382 tools/perf/util/pmu.y | 6 +-
2383 tools/perf/util/probe-event.c | 69 +-
2384 tools/perf/util/probe-finder.c | 28 +-
2385 tools/perf/util/python-ext-sources | 2 +-
2386 tools/perf/util/python.c | 17 +-
2387 .../perf/util/scripting-engines/trace-event-perl.c | 50 +-
2388 .../util/scripting-engines/trace-event-python.c | 113 +-
2389 tools/perf/util/session.c | 198 +-
2390 tools/perf/util/session.h | 10 +-
2391 tools/perf/util/sort.c | 25 +-
2392 tools/perf/util/sort.h | 2 +-
2393 tools/perf/util/stat.c | 57 +
2394 tools/perf/util/stat.h | 16 +
2395 tools/perf/util/string.c | 18 +-
2396 tools/perf/util/strlist.c | 2 +-
2397 tools/perf/util/symbol-elf.c | 841 ++
2398 tools/perf/util/symbol-minimal.c | 307 +
2399 tools/perf/util/symbol.c | 942 +--
2400 tools/perf/util/symbol.h | 67 +-
2401 tools/perf/util/target.c | 4 +-
2402 tools/perf/util/thread.h | 2 +
2403 tools/perf/util/top.c | 3 +-
2404 tools/perf/util/top.h | 1 +
2405 tools/perf/util/trace-event-parse.c | 54 +-
2406 tools/perf/util/trace-event-scripting.c | 34 +-
2407 tools/perf/util/trace-event.h | 12 +-
2408 tools/perf/util/unwind.c | 571 ++
2409 tools/perf/util/unwind.h | 35 +
2410 tools/perf/util/util.c | 25 +
2411 tools/perf/util/util.h | 9 +-
2412 tools/perf/util/vdso.c | 111 +
2413 tools/perf/util/vdso.h | 18 +
2414 tools/perf/util/wrapper.c | 3 +-
2415 tools/scripts/Makefile.include | 6 +-
2416 tools/testing/ktest/examples/include/defaults.conf | 2 +-
2417 tools/testing/ktest/examples/include/tests.conf | 2 +-
2418 tools/testing/ktest/ktest.pl | 4 +-
2419 tools/testing/selftests/vm/run_vmtests | 6 +-
2420 tools/usb/testusb.c | 25 +-
2421 2410 files changed, 169283 insertions(+), 69043 deletions(-)
2422 create mode 100644 Documentation/arm64/booting.txt
2423 create mode 100644 Documentation/arm64/memory.txt
2424 create mode 100644 Documentation/devicetree/bindings/misc/lis302.txt
2425 create mode 100644 Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
2426 create mode 100644 Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt
2427 create mode 100644 Documentation/devicetree/bindings/tty/serial/nxp-lpc32xx-hsuart.txt
2428 create mode 100644 Documentation/devicetree/bindings/usb/am33xx-usb.txt
2429 create mode 100644 Documentation/devicetree/bindings/usb/omap-usb.txt
2430 create mode 100644 Documentation/devicetree/bindings/usb/platform-uhci.txt
2431 create mode 100644 Documentation/devicetree/bindings/usb/pxa-usb.txt
2432 create mode 100644 Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
2433 create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
2434 create mode 100644 Documentation/devicetree/bindings/usb/usbmisc-imx.txt
2435 create mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt
2436 create mode 100644 Documentation/devicetree/bindings/w1/w1-gpio.txt
2437 delete mode 100644 Documentation/feature-removal-schedule.txt
2438 create mode 100755 Documentation/hid/hid-sensor.txt
2439 create mode 100644 Documentation/hwmon/adt7410
2440 create mode 100644 Documentation/hwmon/max197
2441 delete mode 100644 Documentation/serial/computone.txt
2442 create mode 100644 Documentation/zh_CN/arm/Booting
2443 create mode 100644 Documentation/zh_CN/basic_profiling.txt
2444 create mode 100644 Documentation/zh_CN/filesystems/sysfs.txt
2445 create mode 100644 Documentation/zh_CN/gpio.txt
2446 create mode 100644 Documentation/zh_CN/video4linux/omap3isp.txt
2447 create mode 100644 Documentation/zh_CN/video4linux/v4l2-framework.txt
2448 delete mode 100644 arch/arm/mach-prima2/clock.c
2449 delete mode 100644 arch/arm/mach-realview/include/mach/clkdev.h
2450 delete mode 100644 arch/arm/mach-ux500/clock.c
2451 delete mode 100644 arch/arm/mach-ux500/clock.h
2452 create mode 100644 arch/arm64/Kconfig
2453 create mode 100644 arch/arm64/Kconfig.debug
2454 create mode 100644 arch/arm64/Makefile
2455 create mode 100644 arch/arm64/boot/.gitignore
2456 create mode 100644 arch/arm64/boot/Makefile
2457 create mode 100644 arch/arm64/boot/install.sh
2458 create mode 100644 arch/arm64/configs/defconfig
2459 create mode 100644 arch/arm64/include/asm/Kbuild
2460 create mode 100644 arch/arm64/include/asm/arm_generic.h
2461 create mode 100644 arch/arm64/include/asm/asm-offsets.h
2462 create mode 100644 arch/arm64/include/asm/assembler.h
2463 create mode 100644 arch/arm64/include/asm/atomic.h
2464 create mode 100644 arch/arm64/include/asm/auxvec.h
2465 create mode 100644 arch/arm64/include/asm/barrier.h
2466 create mode 100644 arch/arm64/include/asm/bitops.h
2467 create mode 100644 arch/arm64/include/asm/bitsperlong.h
2468 create mode 100644 arch/arm64/include/asm/byteorder.h
2469 create mode 100644 arch/arm64/include/asm/cache.h
2470 create mode 100644 arch/arm64/include/asm/cacheflush.h
2471 create mode 100644 arch/arm64/include/asm/cachetype.h
2472 create mode 100644 arch/arm64/include/asm/cmpxchg.h
2473 create mode 100644 arch/arm64/include/asm/compat.h
2474 create mode 100644 arch/arm64/include/asm/compiler.h
2475 create mode 100644 arch/arm64/include/asm/cputable.h
2476 create mode 100644 arch/arm64/include/asm/cputype.h
2477 create mode 100644 arch/arm64/include/asm/debug-monitors.h
2478 create mode 100644 arch/arm64/include/asm/device.h
2479 create mode 100644 arch/arm64/include/asm/dma-mapping.h
2480 create mode 100644 arch/arm64/include/asm/elf.h
2481 create mode 100644 arch/arm64/include/asm/exception.h
2482 create mode 100644 arch/arm64/include/asm/exec.h
2483 create mode 100644 arch/arm64/include/asm/fb.h
2484 create mode 100644 arch/arm64/include/asm/fcntl.h
2485 create mode 100644 arch/arm64/include/asm/fpsimd.h
2486 create mode 100644 arch/arm64/include/asm/futex.h
2487 create mode 100644 arch/arm64/include/asm/hardirq.h
2488 create mode 100644 arch/arm64/include/asm/hw_breakpoint.h
2489 create mode 100644 arch/arm64/include/asm/hwcap.h
2490 create mode 100644 arch/arm64/include/asm/io.h
2491 create mode 100644 arch/arm64/include/asm/irq.h
2492 create mode 100644 arch/arm64/include/asm/irqflags.h
2493 create mode 100644 arch/arm64/include/asm/memblock.h
2494 create mode 100644 arch/arm64/include/asm/memory.h
2495 create mode 100644 arch/arm64/include/asm/mmu.h
2496 create mode 100644 arch/arm64/include/asm/mmu_context.h
2497 create mode 100644 arch/arm64/include/asm/module.h
2498 create mode 100644 arch/arm64/include/asm/page.h
2499 create mode 100644 arch/arm64/include/asm/param.h
2500 create mode 100644 arch/arm64/include/asm/perf_event.h
2501 create mode 100644 arch/arm64/include/asm/pgalloc.h
2502 create mode 100644 arch/arm64/include/asm/pgtable-2level-hwdef.h
2503 create mode 100644 arch/arm64/include/asm/pgtable-2level-types.h
2504 create mode 100644 arch/arm64/include/asm/pgtable-3level-hwdef.h
2505 create mode 100644 arch/arm64/include/asm/pgtable-3level-types.h
2506 create mode 100644 arch/arm64/include/asm/pgtable-hwdef.h
2507 create mode 100644 arch/arm64/include/asm/pgtable.h
2508 create mode 100644 arch/arm64/include/asm/pmu.h
2509 create mode 100644 arch/arm64/include/asm/proc-fns.h
2510 create mode 100644 arch/arm64/include/asm/processor.h
2511 create mode 100644 arch/arm64/include/asm/prom.h
2512 create mode 100644 arch/arm64/include/asm/ptrace.h
2513 create mode 100644 arch/arm64/include/asm/setup.h
2514 create mode 100644 arch/arm64/include/asm/shmparam.h
2515 create mode 100644 arch/arm64/include/asm/sigcontext.h
2516 create mode 100644 arch/arm64/include/asm/siginfo.h
2517 create mode 100644 arch/arm64/include/asm/signal.h
2518 create mode 100644 arch/arm64/include/asm/signal32.h
2519 create mode 100644 arch/arm64/include/asm/smp.h
2520 create mode 100644 arch/arm64/include/asm/sparsemem.h
2521 create mode 100644 arch/arm64/include/asm/spinlock.h
2522 create mode 100644 arch/arm64/include/asm/spinlock_types.h
2523 create mode 100644 arch/arm64/include/asm/stacktrace.h
2524 create mode 100644 arch/arm64/include/asm/stat.h
2525 create mode 100644 arch/arm64/include/asm/statfs.h
2526 create mode 100644 arch/arm64/include/asm/syscall.h
2527 create mode 100644 arch/arm64/include/asm/syscalls.h
2528 create mode 100644 arch/arm64/include/asm/system_misc.h
2529 create mode 100644 arch/arm64/include/asm/thread_info.h
2530 create mode 100644 arch/arm64/include/asm/timex.h
2531 create mode 100644 arch/arm64/include/asm/tlb.h
2532 create mode 100644 arch/arm64/include/asm/tlbflush.h
2533 create mode 100644 arch/arm64/include/asm/traps.h
2534 create mode 100644 arch/arm64/include/asm/uaccess.h
2535 create mode 100644 arch/arm64/include/asm/ucontext.h
2536 create mode 100644 arch/arm64/include/asm/unistd.h
2537 create mode 100644 arch/arm64/include/asm/unistd32.h
2538 create mode 100644 arch/arm64/include/asm/vdso.h
2539 create mode 100644 arch/arm64/include/asm/vdso_datapage.h
2540 create mode 100644 arch/arm64/kernel/.gitignore
2541 create mode 100644 arch/arm64/kernel/Makefile
2542 create mode 100644 arch/arm64/kernel/arm64ksyms.c
2543 create mode 100644 arch/arm64/kernel/asm-offsets.c
2544 create mode 100644 arch/arm64/kernel/cputable.c
2545 create mode 100644 arch/arm64/kernel/debug-monitors.c
2546 create mode 100644 arch/arm64/kernel/entry-fpsimd.S
2547 create mode 100644 arch/arm64/kernel/entry.S
2548 create mode 100644 arch/arm64/kernel/fpsimd.c
2549 create mode 100644 arch/arm64/kernel/head.S
2550 create mode 100644 arch/arm64/kernel/hw_breakpoint.c
2551 create mode 100644 arch/arm64/kernel/io.c
2552 create mode 100644 arch/arm64/kernel/irq.c
2553 create mode 100644 arch/arm64/kernel/kuser32.S
2554 create mode 100644 arch/arm64/kernel/module.c
2555 create mode 100644 arch/arm64/kernel/perf_event.c
2556 create mode 100644 arch/arm64/kernel/process.c
2557 create mode 100644 arch/arm64/kernel/ptrace.c
2558 create mode 100644 arch/arm64/kernel/setup.c
2559 create mode 100644 arch/arm64/kernel/signal.c
2560 create mode 100644 arch/arm64/kernel/signal32.c
2561 create mode 100644 arch/arm64/kernel/smp.c
2562 create mode 100644 arch/arm64/kernel/stacktrace.c
2563 create mode 100644 arch/arm64/kernel/sys.c
2564 create mode 100644 arch/arm64/kernel/sys32.S
2565 create mode 100644 arch/arm64/kernel/sys_compat.c
2566 create mode 100644 arch/arm64/kernel/time.c
2567 create mode 100644 arch/arm64/kernel/traps.c
2568 create mode 100644 arch/arm64/kernel/vdso.c
2569 create mode 100644 arch/arm64/kernel/vdso/.gitignore
2570 create mode 100644 arch/arm64/kernel/vdso/Makefile
2571 create mode 100755 arch/arm64/kernel/vdso/gen_vdso_offsets.sh
2572 create mode 100644 arch/arm64/kernel/vdso/gettimeofday.S
2573 create mode 100644 arch/arm64/kernel/vdso/note.S
2574 create mode 100644 arch/arm64/kernel/vdso/sigreturn.S
2575 create mode 100644 arch/arm64/kernel/vdso/vdso.S
2576 create mode 100644 arch/arm64/kernel/vdso/vdso.lds.S
2577 create mode 100644 arch/arm64/kernel/vmlinux.lds.S
2578 create mode 100644 arch/arm64/lib/Makefile
2579 create mode 100644 arch/arm64/lib/bitops.c
2580 create mode 100644 arch/arm64/lib/clear_page.S
2581 create mode 100644 arch/arm64/lib/clear_user.S
2582 create mode 100644 arch/arm64/lib/copy_from_user.S
2583 create mode 100644 arch/arm64/lib/copy_in_user.S
2584 create mode 100644 arch/arm64/lib/copy_page.S
2585 create mode 100644 arch/arm64/lib/copy_to_user.S
2586 create mode 100644 arch/arm64/lib/delay.c
2587 create mode 100644 arch/arm64/lib/strncpy_from_user.S
2588 create mode 100644 arch/arm64/lib/strnlen_user.S
2589 create mode 100644 arch/arm64/mm/Makefile
2590 create mode 100644 arch/arm64/mm/cache.S
2591 create mode 100644 arch/arm64/mm/context.c
2592 create mode 100644 arch/arm64/mm/copypage.c
2593 create mode 100644 arch/arm64/mm/dma-mapping.c
2594 create mode 100644 arch/arm64/mm/extable.c
2595 create mode 100644 arch/arm64/mm/fault.c
2596 create mode 100644 arch/arm64/mm/flush.c
2597 create mode 100644 arch/arm64/mm/init.c
2598 create mode 100644 arch/arm64/mm/ioremap.c
2599 create mode 100644 arch/arm64/mm/mm.h
2600 create mode 100644 arch/arm64/mm/mmap.c
2601 create mode 100644 arch/arm64/mm/mmu.c
2602 create mode 100644 arch/arm64/mm/pgd.c
2603 create mode 100644 arch/arm64/mm/proc-macros.S
2604 create mode 100644 arch/arm64/mm/proc.S
2605 create mode 100644 arch/arm64/mm/tlb.S
2606 create mode 100644 arch/s390/include/asm/css_chars.h
2607 create mode 100644 arch/s390/include/asm/eadm.h
2608 create mode 100644 arch/s390/include/asm/runtime_instr.h
2609 create mode 100644 arch/s390/kernel/cache.c
2610 delete mode 100644 arch/s390/kernel/crash.c
2611 create mode 100644 arch/s390/kernel/runtime_instr.c
2612 create mode 100644 arch/s390/lib/mem32.S
2613 create mode 100644 arch/s390/lib/mem64.S
2614 create mode 100644 arch/s390/mm/extable.c
2615 create mode 100644 arch/s390/net/Makefile
2616 create mode 100644 arch/s390/net/bpf_jit.S
2617 create mode 100644 arch/s390/net/bpf_jit_comp.c
2618 create mode 100644 arch/x86/include/asm/perf_regs.h
2619 create mode 100644 arch/x86/include/asm/rcu.h
2620 create mode 100644 arch/x86/include/asm/smap.h
2621 create mode 100644 arch/x86/kernel/perf_regs.c
2622 create mode 100644 arch/x86/platform/efi/efi-bgrt.c
2623 delete mode 100644 drivers/block/ub.c
2624 create mode 100644 drivers/clk/clk-ls1x.c
2625 create mode 100644 drivers/clk/clk-max77686.c
2626 create mode 100644 drivers/clk/clk-prima2.c
2627 create mode 100644 drivers/clk/mmp/Makefile
2628 create mode 100644 drivers/clk/mmp/clk-apbc.c
2629 create mode 100644 drivers/clk/mmp/clk-apmu.c
2630 create mode 100644 drivers/clk/mmp/clk-frac.c
2631 create mode 100644 drivers/clk/mmp/clk-mmp2.c
2632 create mode 100644 drivers/clk/mmp/clk-pxa168.c
2633 create mode 100644 drivers/clk/mmp/clk-pxa910.c
2634 create mode 100644 drivers/clk/mmp/clk.h
2635 create mode 100644 drivers/clk/ux500/Makefile
2636 create mode 100644 drivers/clk/ux500/clk-prcc.c
2637 create mode 100644 drivers/clk/ux500/clk-prcmu.c
2638 create mode 100644 drivers/clk/ux500/clk.h
2639 create mode 100644 drivers/clk/ux500/u8500_clk.c
2640 create mode 100644 drivers/clk/ux500/u8540_clk.c
2641 create mode 100644 drivers/clk/ux500/u9540_clk.c
2642 create mode 100644 drivers/clk/versatile/clk-realview.c
2643 create mode 100644 drivers/clocksource/arm_generic.c
2644 create mode 100644 drivers/extcon/extcon-adc-jack.c
2645 rename drivers/extcon/{extcon_class.c => extcon-class.c} (98%)
2646 rename drivers/extcon/{extcon_gpio.c => extcon-gpio.c} (100%)
2647 delete mode 100644 drivers/hid/hid-picolcd.c
2648 create mode 100644 drivers/hid/hid-picolcd.h
2649 create mode 100644 drivers/hid/hid-picolcd_backlight.c
2650 create mode 100644 drivers/hid/hid-picolcd_cir.c
2651 create mode 100644 drivers/hid/hid-picolcd_core.c
2652 create mode 100644 drivers/hid/hid-picolcd_debugfs.c
2653 create mode 100644 drivers/hid/hid-picolcd_fb.c
2654 create mode 100644 drivers/hid/hid-picolcd_lcd.c
2655 create mode 100644 drivers/hid/hid-picolcd_leds.c
2656 create mode 100644 drivers/hid/hid-ps3remote.c
2657 create mode 100644 drivers/hid/hid-sensor-hub.c
2658 create mode 100644 drivers/hwmon/adt7410.c
2659 create mode 100644 drivers/hwmon/max197.c
2660 create mode 100644 drivers/iio/accel/Kconfig
2661 create mode 100644 drivers/iio/accel/Makefile
2662 create mode 100644 drivers/iio/accel/hid-sensor-accel-3d.c
2663 rename drivers/{staging/iio/adc/ad7476_core.c => iio/adc/ad7476.c} (52%)
2664 create mode 100644 drivers/iio/adc/ad7791.c
2665 create mode 100644 drivers/iio/adc/ad_sigma_delta.c
2666 create mode 100644 drivers/iio/adc/lp8788_adc.c
2667 create mode 100644 drivers/iio/common/Kconfig
2668 create mode 100644 drivers/iio/common/Makefile
2669 create mode 100644 drivers/iio/common/hid-sensors/Kconfig
2670 create mode 100644 drivers/iio/common/hid-sensors/Makefile
2671 create mode 100644 drivers/iio/common/hid-sensors/hid-sensor-attributes.c
2672 create mode 100644 drivers/iio/common/hid-sensors/hid-sensor-attributes.h
2673 create mode 100644 drivers/iio/common/hid-sensors/hid-sensor-trigger.c
2674 create mode 100644 drivers/iio/common/hid-sensors/hid-sensor-trigger.h
2675 delete mode 100644 drivers/iio/dac/ad5446.h
2676 create mode 100644 drivers/iio/dac/ad5755.c
2677 create mode 100644 drivers/iio/gyro/Kconfig
2678 create mode 100644 drivers/iio/gyro/Makefile
2679 create mode 100644 drivers/iio/gyro/hid-sensor-gyro-3d.c
2680 create mode 100644 drivers/iio/light/hid-sensor-als.c
2681 create mode 100644 drivers/iio/magnetometer/Kconfig
2682 create mode 100644 drivers/iio/magnetometer/Makefile
2683 create mode 100644 drivers/iio/magnetometer/hid-sensor-magn-3d.c
2684 create mode 100644 drivers/memory/of_memory.c
2685 create mode 100644 drivers/memory/of_memory.h
2686 delete mode 100644 drivers/pci/.gitignore
2687 delete mode 100644 drivers/pci/hotplug/fakephp.c
2688 create mode 100644 drivers/power/generic-adc-battery.c
2689 create mode 100644 drivers/regulator/fan53555.c
2690 create mode 100644 drivers/regulator/max8907-regulator.c
2691 create mode 100644 drivers/s390/block/scm_blk.c
2692 create mode 100644 drivers/s390/block/scm_blk.h
2693 create mode 100644 drivers/s390/block/scm_blk_cluster.c
2694 create mode 100644 drivers/s390/block/scm_drv.c
2695 create mode 100644 drivers/s390/cio/eadm_sch.c
2696 create mode 100644 drivers/s390/cio/eadm_sch.h
2697 create mode 100644 drivers/s390/cio/scm.c
2698 create mode 100644 drivers/s390/crypto/zcrypt_cex4.c
2699 create mode 100644 drivers/s390/crypto/zcrypt_cex4.h
2700 create mode 100644 drivers/s390/crypto/zcrypt_debug.h
2701 create mode 100644 drivers/s390/crypto/zcrypt_msgtype50.c
2702 create mode 100644 drivers/s390/crypto/zcrypt_msgtype50.h
2703 create mode 100644 drivers/s390/crypto/zcrypt_msgtype6.c
2704 create mode 100644 drivers/s390/crypto/zcrypt_msgtype6.h
2705 create mode 100644 drivers/staging/ccg/composite.c
2706 create mode 100644 drivers/staging/ccg/composite.h
2707 create mode 100644 drivers/staging/ccg/config.c
2708 create mode 100644 drivers/staging/ccg/epautoconf.c
2709 create mode 100644 drivers/staging/ccg/f_acm.c
2710 create mode 100644 drivers/staging/ccg/f_fs.c
2711 create mode 100644 drivers/staging/ccg/f_mass_storage.c
2712 create mode 100644 drivers/staging/ccg/f_rndis.c
2713 create mode 100644 drivers/staging/ccg/gadget_chips.h
2714 create mode 100644 drivers/staging/ccg/ndis.h
2715 create mode 100644 drivers/staging/ccg/rndis.c
2716 create mode 100644 drivers/staging/ccg/rndis.h
2717 create mode 100644 drivers/staging/ccg/storage_common.c
2718 create mode 100644 drivers/staging/ccg/u_ether.c
2719 create mode 100644 drivers/staging/ccg/u_ether.h
2720 create mode 100644 drivers/staging/ccg/u_serial.c
2721 create mode 100644 drivers/staging/ccg/u_serial.h
2722 create mode 100644 drivers/staging/ccg/usbstring.c
2723 create mode 100644 drivers/staging/ced1401/Kconfig
2724 create mode 100644 drivers/staging/ced1401/Makefile
2725 create mode 100644 drivers/staging/ced1401/TODO
2726 create mode 100644 drivers/staging/ced1401/ced_ioc.c
2727 create mode 100644 drivers/staging/ced1401/ced_ioctl.h
2728 create mode 100644 drivers/staging/ced1401/machine.h
2729 create mode 100644 drivers/staging/ced1401/usb1401.c
2730 create mode 100644 drivers/staging/ced1401/usb1401.h
2731 create mode 100644 drivers/staging/ced1401/use1401.h
2732 create mode 100644 drivers/staging/ced1401/use14_ioc.h
2733 create mode 100644 drivers/staging/ced1401/userspace/use1401.c
2734 create mode 100644 drivers/staging/comedi/drivers/8255_pci.c
2735 delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
2736 delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h
2737 delete mode 100644 drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h
2738 delete mode 100644 drivers/staging/comedi/drivers/addi_apci_all.c
2739 delete mode 100644 drivers/staging/comedi/drivers/adl_pci7230.c
2740 delete mode 100644 drivers/staging/comedi/drivers/adl_pci7296.c
2741 delete mode 100644 drivers/staging/comedi/drivers/adl_pci7432.c
2742 create mode 100644 drivers/staging/comedi/drivers/adl_pci7x3x.c
2743 delete mode 100644 drivers/staging/comedi/drivers/cb_pcidio.c
2744 delete mode 100644 drivers/staging/comedi/drivers/icp_multi.h
2745 delete mode 100644 drivers/staging/comedi/drivers/me4000.h
2746 delete mode 100644 drivers/staging/csr/csr_formatted_io.c
2747 delete mode 100644 drivers/staging/csr/csr_formatted_io.h
2748 create mode 100644 drivers/staging/dgrp/Kconfig
2749 create mode 100644 drivers/staging/dgrp/Makefile
2750 create mode 100644 drivers/staging/dgrp/README
2751 create mode 100644 drivers/staging/dgrp/TODO
2752 create mode 100644 drivers/staging/dgrp/dgrp_common.c
2753 create mode 100644 drivers/staging/dgrp/dgrp_common.h
2754 create mode 100644 drivers/staging/dgrp/dgrp_dpa_ops.c
2755 create mode 100644 drivers/staging/dgrp/dgrp_driver.c
2756 create mode 100644 drivers/staging/dgrp/dgrp_mon_ops.c
2757 create mode 100644 drivers/staging/dgrp/dgrp_net_ops.c
2758 create mode 100644 drivers/staging/dgrp/dgrp_ports_ops.c
2759 create mode 100644 drivers/staging/dgrp/dgrp_specproc.c
2760 create mode 100644 drivers/staging/dgrp/dgrp_sysfs.c
2761 create mode 100644 drivers/staging/dgrp/dgrp_tty.c
2762 create mode 100644 drivers/staging/dgrp/digirp.h
2763 create mode 100644 drivers/staging/dgrp/drp.h
2764 delete mode 100644 drivers/staging/iio/adc/ad7476.h
2765 delete mode 100644 drivers/staging/iio/adc/ad7476_ring.c
2766 create mode 100644 drivers/staging/iio/adc/mxs-lradc.c
2767 create mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.h
2768 create mode 100644 drivers/staging/imx-drm/Kconfig
2769 create mode 100644 drivers/staging/imx-drm/Makefile
2770 create mode 100644 drivers/staging/imx-drm/TODO
2771 create mode 100644 drivers/staging/imx-drm/imx-drm-core.c
2772 create mode 100644 drivers/staging/imx-drm/imx-drm.h
2773 create mode 100644 drivers/staging/imx-drm/imx-fb.c
2774 create mode 100644 drivers/staging/imx-drm/imx-fbdev.c
2775 create mode 100644 drivers/staging/imx-drm/ipu-v3/Makefile
2776 create mode 100644 drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h
2777 create mode 100644 drivers/staging/imx-drm/ipu-v3/ipu-common.c
2778 create mode 100644 drivers/staging/imx-drm/ipu-v3/ipu-dc.c
2779 create mode 100644 drivers/staging/imx-drm/ipu-v3/ipu-di.c
2780 create mode 100644 drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c
2781 create mode 100644 drivers/staging/imx-drm/ipu-v3/ipu-dp.c
2782 create mode 100644 drivers/staging/imx-drm/ipu-v3/ipu-prv.h
2783 create mode 100644 drivers/staging/imx-drm/ipuv3-crtc.c
2784 create mode 100644 drivers/staging/imx-drm/parallel-display.c
2785 create mode 100644 drivers/staging/ipack/ipack_ids.h
2786 delete mode 100644 drivers/staging/ramster/TODO
2787 delete mode 100644 drivers/staging/ramster/cluster/Makefile
2788 rename drivers/staging/ramster/{cluster => ramster}/heartbeat.c (98%)
2789 rename drivers/staging/ramster/{cluster => ramster}/heartbeat.h (100%)
2790 rename drivers/staging/ramster/{cluster => ramster}/masklog.c (100%)
2791 rename drivers/staging/ramster/{cluster => ramster}/masklog.h (100%)
2792 rename drivers/staging/ramster/{cluster => ramster}/nodemanager.c (98%)
2793 rename drivers/staging/ramster/{cluster => ramster}/nodemanager.h (100%)
2794 rename drivers/staging/ramster/{ => }/ramster/r2net.c (86%)
2795 create mode 100644 drivers/staging/ramster/ramster/ramster.c
2796 create mode 100644 drivers/staging/ramster/ramster/ramster.h
2797 rename drivers/staging/ramster/{cluster => ramster}/ramster_nodemanager.h (100%)
2798 rename drivers/staging/ramster/{cluster => ramster}/tcp.c (97%)
2799 rename drivers/staging/ramster/{cluster => ramster}/tcp.h (100%)
2800 rename drivers/staging/ramster/{cluster => ramster}/tcp_internal.h (100%)
2801 delete mode 100644 drivers/staging/ramster/xvmalloc.c
2802 delete mode 100644 drivers/staging/ramster/xvmalloc.h
2803 delete mode 100644 drivers/staging/ramster/xvmalloc_int.h
2804 create mode 100644 drivers/staging/ramster/zbud.c
2805 create mode 100644 drivers/staging/ramster/zbud.h
2806 delete mode 100644 drivers/staging/rtl8712/usb_vendor_req.h
2807 create mode 100644 drivers/staging/silicom/Kconfig
2808 create mode 100644 drivers/staging/silicom/Makefile
2809 create mode 100644 drivers/staging/silicom/README
2810 create mode 100644 drivers/staging/silicom/TODO
2811 create mode 100644 drivers/staging/silicom/bits.h
2812 create mode 100644 drivers/staging/silicom/bp_ioctl.h
2813 create mode 100644 drivers/staging/silicom/bp_mod.c
2814 create mode 100644 drivers/staging/silicom/bp_mod.h
2815 create mode 100644 drivers/staging/silicom/bp_proc.c
2816 create mode 100644 drivers/staging/silicom/bypass.h
2817 create mode 100644 drivers/staging/silicom/bypasslib/Makefile
2818 create mode 100644 drivers/staging/silicom/bypasslib/bp_ioctl.h
2819 create mode 100644 drivers/staging/silicom/bypasslib/bplibk.h
2820 create mode 100644 drivers/staging/silicom/bypasslib/bypass.c
2821 create mode 100644 drivers/staging/silicom/bypasslib/libbp_sd.h
2822 create mode 100644 drivers/staging/silicom/libbp_sd.h
2823 delete mode 100644 drivers/staging/usbip/userspace/doc/usbip_bind_driver.8
2824 delete mode 100644 drivers/staging/zsmalloc/zsmalloc_int.h
2825 create mode 100644 drivers/tty/serial/kgdb_nmi.c
2826 create mode 100644 drivers/tty/serial/lpc32xx_hs.c
2827 delete mode 100644 drivers/tty/serial/max3107.c
2828 delete mode 100644 drivers/tty/serial/max3107.h
2829 create mode 100644 drivers/tty/serial/max310x.c
2830 create mode 100644 drivers/tty/serial/sccnxp.c
2831 create mode 100644 drivers/usb/chipidea/ci13xxx_imx.h
2832 create mode 100644 drivers/usb/chipidea/usbmisc_imx6q.c
2833 create mode 100644 drivers/usb/gadget/bcm63xx_udc.c
2834 create mode 100644 drivers/usb/host/uhci-platform.c
2835 create mode 100644 drivers/usb/misc/ezusb.c
2836 create mode 100644 drivers/usb/phy/mv_u3d_phy.c
2837 create mode 100644 drivers/usb/phy/mv_u3d_phy.h
2838 create mode 100644 drivers/usb/phy/omap-usb2.c
2839 rename arch/arm/mach-tegra/usb_phy.c => drivers/usb/phy/tegra_usb_phy.c (94%)
2840 delete mode 100644 drivers/usb/serial/ezusb.c
2841 create mode 100644 drivers/usb/serial/zte_ev.c
2842 delete mode 100644 drivers/usb/storage/libusual.c
2843 create mode 100644 drivers/xen/dbgp.c
2844 delete mode 100644 firmware/intelliport2.bin.ihex
2845 create mode 100644 fs/cifs/smb2file.c
2846 create mode 100644 include/asm-generic/bitops/builtin-__ffs.h
2847 create mode 100644 include/asm-generic/bitops/builtin-__fls.h
2848 create mode 100644 include/asm-generic/bitops/builtin-ffs.h
2849 create mode 100644 include/asm-generic/bitops/builtin-fls.h
2850 create mode 100644 include/clocksource/arm_generic.h
2851 delete mode 100644 include/linux/cd1400.h
2852 delete mode 100644 include/linux/cdk.h
2853 delete mode 100644 include/linux/comstats.h
2854 create mode 100644 include/linux/efi-bgrt.h
2855 create mode 100644 include/linux/extcon/extcon-adc-jack.h
2856 delete mode 100644 include/linux/generic_serial.h
2857 create mode 100644 include/linux/hid-sensor-hub.h
2858 create mode 100644 include/linux/hid-sensor-ids.h
2859 create mode 100644 include/linux/iio/adc/ad_sigma_delta.h
2860 delete mode 100644 include/linux/istallion.h
2861 create mode 100644 include/linux/perf_regs.h
2862 create mode 100644 include/linux/platform_data/ad5755.h
2863 create mode 100644 include/linux/platform_data/ad7791.h
2864 create mode 100644 include/linux/platform_data/clk-realview.h
2865 create mode 100644 include/linux/platform_data/clk-ux500.h
2866 create mode 100644 include/linux/platform_data/max197.h
2867 create mode 100644 include/linux/platform_data/max310x.h
2868 create mode 100644 include/linux/platform_data/sccnxp.h
2869 rename include/linux/{ => platform_data}/sht15.h (99%)
2870 create mode 100644 include/linux/power/generic-adc-battery.h
2871 create mode 100644 include/linux/regulator/fan53555.h
2872 delete mode 100644 include/linux/sc26198.h
2873 delete mode 100644 include/linux/serial167.h
2874 create mode 100644 include/linux/smpboot.h
2875 delete mode 100644 include/linux/stallion.h
2876 create mode 100644 include/linux/tty_flags.h
2877 create mode 100644 include/linux/usb/ezusb.h
2878 create mode 100644 include/linux/usb/nop-usb-xceiv.h
2879 create mode 100644 include/linux/usb/omap_usb.h
2880 create mode 100644 include/linux/usb/phy.h
2881 create mode 100644 include/linux/usb/phy_companion.h
2882 rename arch/arm/mach-tegra/include/mach/usb_phy.h => include/linux/usb/tegra_usb_phy.h (86%)
2883 create mode 100644 kernel/sched/cputime.c
2884 create mode 100755 tools/hv/hv_get_dhcp_info.sh
2885 create mode 100755 tools/hv/hv_get_dns_info.sh
2886 create mode 100755 tools/hv/hv_set_ifconfig.sh
2887 create mode 100644 tools/perf/Documentation/jit-interface.txt
2888 create mode 100644 tools/perf/Documentation/perf-trace.txt
2889 create mode 100644 tools/perf/arch/x86/include/perf_regs.h
2890 create mode 100644 tools/perf/arch/x86/util/unwind.c
2891 create mode 100644 tools/perf/bash_completion
2892 create mode 100644 tools/perf/builtin-trace.c
2893 create mode 100755 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
2894 create mode 100644 tools/perf/scripts/python/bin/event_analyzing_sample-record
2895 create mode 100644 tools/perf/scripts/python/bin/event_analyzing_sample-report
2896 create mode 100644 tools/perf/scripts/python/event_analyzing_sample.py
2897 create mode 100644 tools/perf/ui/gtk/helpline.c
2898 create mode 100644 tools/perf/ui/hist.c
2899 create mode 100644 tools/perf/ui/stdio/hist.c
2900 create mode 100644 tools/perf/ui/tui/helpline.c
2901 create mode 100644 tools/perf/util/include/linux/magic.h
2902 create mode 100644 tools/perf/util/perf_regs.h
2903 create mode 100644 tools/perf/util/stat.c
2904 create mode 100644 tools/perf/util/stat.h
2905 create mode 100644 tools/perf/util/symbol-elf.c
2906 create mode 100644 tools/perf/util/symbol-minimal.c
2907 create mode 100644 tools/perf/util/unwind.c
2908 create mode 100644 tools/perf/util/unwind.h
2909 create mode 100644 tools/perf/util/vdso.c
2910 create mode 100644 tools/perf/util/vdso.h
2911 Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
2912 $ git merge fixes/master
2914 Merging kbuild-current/rc-fixes (fe04ddf kbuild: Do not package /boot and /lib in make tar-pkg)
2915 $ git merge kbuild-current/rc-fixes
2916 Auto-merging arch/x86/Makefile
2917 Merge made by the 'recursive' strategy.
2918 arch/x86/Makefile | 2 +-
2919 scripts/Makefile.fwinst | 4 ++--
2920 scripts/package/buildtar | 2 +-
2921 3 files changed, 4 insertions(+), 4 deletions(-)
2922 Merging arm-current/fixes (7253b85 ARM: 7541/1: Add ARM ERRATA 775420 workaround)
2923 $ git merge arm-current/fixes
2924 Auto-merging arch/arm/Kconfig
2925 Merge made by the 'recursive' strategy.
2926 arch/arm/Kconfig | 10 ++++++++++
2927 arch/arm/mm/cache-v7.S | 3 +++
2928 2 files changed, 13 insertions(+)
2929 Merging m68k-current/for-linus (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
2930 $ git merge m68k-current/for-linus
2932 Merging powerpc-merge/merge (636802e powerpc: Don't use __put_user() in patch_instruction)
2933 $ git merge powerpc-merge/merge
2935 Merging sparc/master (1b62ca7 sparc64: Fix return value of Niagara-2 memcpy.)
2936 $ git merge sparc/master
2937 Merge made by the 'recursive' strategy.
2938 arch/sparc/lib/NG2memcpy.S | 46 ++++++++++++++++++++++----------------------
2939 1 file changed, 23 insertions(+), 23 deletions(-)
2940 Merging net/master (a0d271c Linux 3.6)
2941 $ git merge net/master
2943 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)
2944 $ git merge sound-current/for-linus
2946 Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
2947 $ git merge pci-current/for-linus
2949 Merging wireless/master (a7be50b iwlwifi: don't double free the interrupt in failure path)
2950 $ git merge wireless/master
2952 Merging driver-core.current/driver-core-linus (5698bd7 Linux 3.6-rc6)
2953 $ git merge driver-core.current/driver-core-linus
2955 Merging tty.current/tty-linus (5698bd7 Linux 3.6-rc6)
2956 $ git merge tty.current/tty-linus
2958 Merging usb.current/usb-linus (0d00dc2 USB: Fix race condition when removing host controllers)
2959 $ git merge usb.current/usb-linus
2961 Merging staging.current/staging-linus (5698bd7 Linux 3.6-rc6)
2962 $ git merge staging.current/staging-linus
2964 Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3)
2965 $ git merge char-misc.current/char-misc-linus
2967 Merging input-current/for-linus (dde3ada Merge branch 'next' into for-linus)
2968 $ git merge input-current/for-linus
2969 Auto-merging fs/compat_ioctl.c
2970 Auto-merging drivers/input/tablet/wacom_wac.c
2971 Auto-merging drivers/input/mouse/synaptics.c
2972 Auto-merging drivers/input/misc/uinput.c
2973 Auto-merging drivers/input/input.c
2974 Merge made by the 'recursive' strategy.
2975 .../devicetree/bindings/input/gpio-keys-polled.txt | 38 ++++
2976 .../devicetree/bindings/input/rotary-encoder.txt | 36 ++++
2977 drivers/input/apm-power.c | 2 +-
2978 drivers/input/ff-core.c | 4 +-
2979 drivers/input/ff-memless.c | 14 +-
2980 drivers/input/input.c | 43 +++--
2981 drivers/input/joydev.c | 2 +-
2982 drivers/input/keyboard/gpio_keys.c | 169 +++++++++--------
2983 drivers/input/keyboard/gpio_keys_polled.c | 147 +++++++++++++--
2984 drivers/input/keyboard/omap-keypad.c | 8 +-
2985 drivers/input/keyboard/samsung-keypad.c | 10 +-
2986 drivers/input/keyboard/tegra-kbc.c | 2 +-
2987 drivers/input/misc/rotary_encoder.c | 140 +++++++++-----
2988 drivers/input/misc/twl4030-pwrbutton.c | 1 +
2989 drivers/input/misc/uinput.c | 197 ++++++++++++--------
2990 drivers/input/mouse/hgpk.c | 9 +-
2991 drivers/input/mouse/synaptics.c | 31 ++-
2992 drivers/input/mousedev.c | 9 +-
2993 drivers/input/sparse-keymap.c | 4 +-
2994 drivers/input/tablet/wacom_wac.c | 2 +-
2995 drivers/input/touchscreen/s3c2410_ts.c | 2 +-
2996 fs/compat_ioctl.c | 2 +
2997 .../mach/kbc.h => include/linux/input/tegra_kbc.h | 0
2998 include/linux/uinput.h | 27 +--
2999 24 files changed, 611 insertions(+), 288 deletions(-)
3000 create mode 100644 Documentation/devicetree/bindings/input/gpio-keys-polled.txt
3001 create mode 100644 Documentation/devicetree/bindings/input/rotary-encoder.txt
3002 rename arch/arm/mach-tegra/include/mach/kbc.h => include/linux/input/tegra_kbc.h (100%)
3003 Merging md-current/for-linus (80b4812 md/raid10: fix "enough" function for detecting if array is failed.)
3004 $ git merge md-current/for-linus
3006 Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
3007 $ git merge audit-current/for-linus
3009 Merging crypto-current/master (298b973 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
3010 $ git merge crypto-current/master
3011 Merge made by the 'recursive' strategy.
3012 arch/x86/crypto/glue_helper.c | 2 +-
3013 1 file changed, 1 insertion(+), 1 deletion(-)
3014 Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
3015 $ git merge ide/master
3017 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
3018 $ git merge dwmw2/master
3020 Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
3021 $ git merge sh-current/sh-fixes-for-linus
3023 Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
3024 $ git merge irqdomain-current/irqdomain/merge
3026 Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
3027 $ git merge devicetree-current/devicetree/merge
3028 Auto-merging drivers/of/base.c
3029 Merge made by the 'recursive' strategy.
3030 drivers/of/base.c | 2 ++
3031 1 file changed, 2 insertions(+)
3032 Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
3033 $ git merge spi-current/spi/merge
3034 Auto-merging drivers/spi/spi.c
3035 Auto-merging drivers/spi/spi-s3c64xx.c
3036 Auto-merging drivers/spi/spi-bcm63xx.c
3037 Merge made by the 'recursive' strategy.
3038 drivers/spi/spi-bcm63xx.c | 16 ++++++----------
3039 drivers/spi/spi-s3c64xx.c | 10 ++++------
3040 drivers/spi/spi.c | 5 ++++-
3041 3 files changed, 14 insertions(+), 17 deletions(-)
3042 Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
3043 $ git merge gpio-current/gpio/merge
3045 Merging arm/for-next (f537d06 Merge branch 'devel-stable' into for-next)
3046 $ git merge arm/for-next
3047 Removing arch/arm/mach-sa1100/include/mach/lart.h
3048 Removing arch/arm/mach-sa1100/include/mach/SA-1111.h
3049 Removing arch/arm/kernel/compat.h
3050 Auto-merging arch/arm/kernel/atags_compat.c
3051 Removing arch/arm/include/asm/unaligned.h
3052 Removing arch/arm/include/asm/types.h
3053 Removing arch/arm/include/asm/termios.h
3054 Removing arch/arm/include/asm/termbits.h
3055 Removing arch/arm/include/asm/sockios.h
3056 Removing arch/arm/include/asm/socket.h
3057 Removing arch/arm/include/asm/shmbuf.h
3058 Removing arch/arm/include/asm/serial.h
3059 Removing arch/arm/include/asm/sembuf.h
3060 Removing arch/arm/include/asm/segment.h
3061 Removing arch/arm/include/asm/parport.h
3062 Removing arch/arm/include/asm/param.h
3063 Removing arch/arm/include/asm/msgbuf.h
3064 Removing arch/arm/include/asm/ipcbuf.h
3065 Removing arch/arm/include/asm/hardware/linkup-l1110.h
3066 Removing arch/arm/include/asm/exec.h
3067 Removing arch/arm/include/asm/current.h
3068 Auto-merging arch/arm/Kconfig
3069 Merge made by the 'recursive' strategy.
3070 Documentation/arm/Booting | 22 +-
3071 Documentation/devicetree/bindings/arm/arm-boards | 12 +
3072 .../devicetree/bindings/arm/versatile-fpga-irq.txt | 31 ++
3073 arch/arm/Kconfig | 31 +-
3074 arch/arm/Makefile | 9 +-
3075 arch/arm/boot/compressed/.gitignore | 1 +
3076 arch/arm/boot/compressed/Makefile | 9 +-
3077 arch/arm/boot/compressed/decompress.c | 3 +
3078 arch/arm/boot/compressed/head.S | 71 +++-
3079 arch/arm/boot/dts/integrator.dtsi | 76 ++++
3080 arch/arm/boot/dts/integratorap.dts | 68 ++++
3081 arch/arm/boot/dts/integratorcp.dts | 110 ++++++
3082 arch/arm/include/asm/Kbuild | 17 +
3083 arch/arm/include/asm/arch_timer.h | 8 +-
3084 arch/arm/include/asm/assembler.h | 28 ++
3085 arch/arm/include/asm/cacheflush.h | 15 +
3086 arch/arm/include/asm/current.h | 15 -
3087 arch/arm/include/asm/delay.h | 9 +
3088 arch/arm/include/asm/exec.h | 6 -
3089 arch/arm/include/asm/glue-cache.h | 17 +-
3090 arch/arm/include/asm/hardirq.h | 2 +-
3091 arch/arm/include/asm/hardware/linkup-l1110.h | 48 ---
3092 arch/arm/include/asm/io.h | 67 +++-
3093 arch/arm/include/asm/ipcbuf.h | 1 -
3094 arch/arm/include/asm/msgbuf.h | 31 --
3095 arch/arm/include/asm/mutex.h | 9 +-
3096 arch/arm/include/asm/opcodes-virt.h | 39 ++
3097 arch/arm/include/asm/opcodes.h | 181 ++++++++-
3098 arch/arm/include/asm/param.h | 31 --
3099 arch/arm/include/asm/parport.h | 18 -
3100 arch/arm/include/asm/ptrace.h | 1 +
3101 arch/arm/include/asm/segment.h | 11 -
3102 arch/arm/include/asm/sembuf.h | 25 --
3103 arch/arm/include/asm/serial.h | 19 -
3104 arch/arm/include/asm/shmbuf.h | 42 ---
3105 arch/arm/include/asm/socket.h | 72 ----
3106 arch/arm/include/asm/sockios.h | 13 -
3107 arch/arm/include/asm/syscall.h | 4 +
3108 arch/arm/include/asm/termbits.h | 198 ----------
3109 arch/arm/include/asm/termios.h | 92 -----
3110 arch/arm/include/asm/thread_info.h | 6 +-
3111 arch/arm/include/asm/timex.h | 6 -
3112 arch/arm/include/asm/types.h | 16 -
3113 arch/arm/include/asm/unaligned.h | 19 -
3114 arch/arm/include/asm/unistd.h | 8 +
3115 arch/arm/include/asm/virt.h | 69 ++++
3116 arch/arm/kernel/Makefile | 7 +-
3117 arch/arm/kernel/arch_timer.c | 383 ++++++++++++++------
3118 arch/arm/kernel/asm-offsets.c | 2 +
3119 arch/arm/kernel/atags.h | 14 +
3120 arch/arm/kernel/{compat.c => atags_compat.c} | 4 +-
3121 arch/arm/kernel/atags_parse.c | 238 ++++++++++++
3122 arch/arm/kernel/{atags.c => atags_proc.c} | 0
3123 arch/arm/kernel/compat.h | 11 -
3124 arch/arm/kernel/entry-common.S | 9 +
3125 arch/arm/kernel/head.S | 14 +-
3126 arch/arm/kernel/hyp-stub.S | 223 ++++++++++++
3127 arch/arm/kernel/machine_kexec.c | 29 +-
3128 arch/arm/kernel/ptrace.c | 19 +-
3129 arch/arm/kernel/sched_clock.c | 8 +
3130 arch/arm/kernel/setup.c | 256 ++-----------
3131 arch/arm/kernel/smp.c | 21 +-
3132 arch/arm/kernel/suspend.c | 17 +-
3133 arch/arm/lib/delay.c | 35 +-
3134 arch/arm/mach-exynos/platsmp.c | 2 +-
3135 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 +-
3136 arch/arm/mach-integrator/common.h | 3 +
3137 arch/arm/mach-integrator/core.c | 17 +-
3138 arch/arm/mach-integrator/integrator_ap.c | 276 ++++++++++----
3139 arch/arm/mach-integrator/integrator_cp.c | 325 +++++++++++------
3140 arch/arm/mach-sa1100/include/mach/SA-1111.h | 5 -
3141 arch/arm/mach-sa1100/include/mach/lart.h | 13 -
3142 arch/arm/mach-shmobile/smp-emev2.c | 2 +-
3143 arch/arm/mm/Kconfig | 17 +
3144 arch/arm/mm/alignment.c | 6 +-
3145 arch/arm/mm/cache-fa.S | 3 +
3146 arch/arm/mm/cache-l2x0.c | 8 +-
3147 arch/arm/mm/cache-v3.S | 3 +
3148 arch/arm/mm/cache-v4.S | 3 +
3149 arch/arm/mm/cache-v4wb.S | 3 +
3150 arch/arm/mm/cache-v4wt.S | 3 +
3151 arch/arm/mm/cache-v6.S | 3 +
3152 arch/arm/mm/cache-v7.S | 48 ++-
3153 arch/arm/mm/init.c | 2 +-
3154 arch/arm/mm/ioremap.c | 1 +
3155 arch/arm/mm/proc-arm1020.S | 3 +
3156 arch/arm/mm/proc-arm1020e.S | 3 +
3157 arch/arm/mm/proc-arm1022.S | 3 +
3158 arch/arm/mm/proc-arm1026.S | 3 +
3159 arch/arm/mm/proc-arm920.S | 3 +
3160 arch/arm/mm/proc-arm922.S | 3 +
3161 arch/arm/mm/proc-arm925.S | 3 +
3162 arch/arm/mm/proc-arm926.S | 3 +
3163 arch/arm/mm/proc-arm940.S | 3 +
3164 arch/arm/mm/proc-arm946.S | 3 +
3165 arch/arm/mm/proc-feroceon.S | 4 +
3166 arch/arm/mm/proc-macros.S | 1 +
3167 arch/arm/mm/proc-mohawk.S | 3 +
3168 arch/arm/mm/proc-v7.S | 2 +-
3169 arch/arm/mm/proc-xsc3.S | 3 +
3170 arch/arm/mm/proc-xscale.S | 4 +
3171 arch/arm/plat-versatile/fpga-irq.c | 72 +++-
3172 arch/arm/plat-versatile/include/plat/fpga-irq.h | 2 +
3173 103 files changed, 2417 insertions(+), 1329 deletions(-)
3174 create mode 100644 Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt
3175 create mode 100644 arch/arm/boot/dts/integrator.dtsi
3176 create mode 100644 arch/arm/boot/dts/integratorap.dts
3177 create mode 100644 arch/arm/boot/dts/integratorcp.dts
3178 delete mode 100644 arch/arm/include/asm/current.h
3179 delete mode 100644 arch/arm/include/asm/exec.h
3180 delete mode 100644 arch/arm/include/asm/hardware/linkup-l1110.h
3181 delete mode 100644 arch/arm/include/asm/ipcbuf.h
3182 delete mode 100644 arch/arm/include/asm/msgbuf.h
3183 create mode 100644 arch/arm/include/asm/opcodes-virt.h
3184 delete mode 100644 arch/arm/include/asm/param.h
3185 delete mode 100644 arch/arm/include/asm/parport.h
3186 delete mode 100644 arch/arm/include/asm/segment.h
3187 delete mode 100644 arch/arm/include/asm/sembuf.h
3188 delete mode 100644 arch/arm/include/asm/serial.h
3189 delete mode 100644 arch/arm/include/asm/shmbuf.h
3190 delete mode 100644 arch/arm/include/asm/socket.h
3191 delete mode 100644 arch/arm/include/asm/sockios.h
3192 delete mode 100644 arch/arm/include/asm/termbits.h
3193 delete mode 100644 arch/arm/include/asm/termios.h
3194 delete mode 100644 arch/arm/include/asm/types.h
3195 delete mode 100644 arch/arm/include/asm/unaligned.h
3196 create mode 100644 arch/arm/include/asm/virt.h
3197 rename arch/arm/kernel/{compat.c => atags_compat.c} (99%)
3198 create mode 100644 arch/arm/kernel/atags_parse.c
3199 rename arch/arm/kernel/{atags.c => atags_proc.c} (100%)
3200 delete mode 100644 arch/arm/kernel/compat.h
3201 create mode 100644 arch/arm/kernel/hyp-stub.S
3202 delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1111.h
3203 delete mode 100644 arch/arm/mach-sa1100/include/mach/lart.h
3204 Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf)
3205 $ git merge arm-perf/for-next/perf
3206 Resolved 'arch/arm/kernel/hw_breakpoint.c' using previous resolution.
3207 Auto-merging arch/arm/plat-samsung/devs.c
3208 Auto-merging arch/arm/mach-tegra/devices.c
3209 Auto-merging arch/arm/mach-realview/realview_pbx.c
3210 Auto-merging arch/arm/mach-realview/realview_pba8.c
3211 Auto-merging arch/arm/mach-realview/realview_pb11mp.c
3212 Auto-merging arch/arm/mach-realview/realview_pb1176.c
3213 Auto-merging arch/arm/mach-realview/realview_eb.c
3214 Removing arch/arm/kernel/pmu.c
3215 Auto-merging arch/arm/kernel/hw_breakpoint.c
3216 CONFLICT (content): Merge conflict in arch/arm/kernel/hw_breakpoint.c
3217 Auto-merging arch/arm/kernel/Makefile
3218 Auto-merging arch/arm/Kconfig
3219 Auto-merging MAINTAINERS
3220 Automatic merge failed; fix conflicts and then commit the result.
3222 [master 2201f58] Merge remote-tracking branch 'arm-perf/for-next/perf'
3223 $ git diff -M --stat --summary HEAD^..
3224 Documentation/devicetree/bindings/arm/pmu.txt | 4 +
3226 arch/arm/Kconfig | 8 +-
3227 arch/arm/include/asm/perf_event.h | 9 +-
3228 arch/arm/include/asm/pmu.h | 77 ++----
3229 arch/arm/kernel/Makefile | 3 +-
3230 arch/arm/kernel/perf_event.c | 347 ++++---------------------
3231 arch/arm/kernel/perf_event_cpu.c | 295 +++++++++++++++++++++
3232 arch/arm/kernel/perf_event_v6.c | 12 +-
3233 arch/arm/kernel/perf_event_v7.c | 32 +--
3234 arch/arm/kernel/perf_event_xscale.c | 10 +-
3235 arch/arm/kernel/pmu.c | 36 ---
3236 arch/arm/mach-bcmring/arch.c | 3 +-
3237 arch/arm/mach-omap2/devices.c | 3 +-
3238 arch/arm/mach-pxa/devices.c | 3 +-
3239 arch/arm/mach-realview/realview_eb.c | 3 +-
3240 arch/arm/mach-realview/realview_pb1176.c | 3 +-
3241 arch/arm/mach-realview/realview_pb11mp.c | 3 +-
3242 arch/arm/mach-realview/realview_pba8.c | 3 +-
3243 arch/arm/mach-realview/realview_pbx.c | 3 +-
3244 arch/arm/mach-tegra/devices.c | 3 +-
3245 arch/arm/mach-ux500/cpu-db8500.c | 3 +-
3246 arch/arm/mach-vexpress/ct-ca9x4.c | 3 +-
3247 arch/arm/plat-iop/pmu.c | 3 +-
3248 arch/arm/plat-samsung/devs.c | 3 +-
3249 25 files changed, 424 insertions(+), 449 deletions(-)
3250 create mode 100644 arch/arm/kernel/perf_event_cpu.c
3251 delete mode 100644 arch/arm/kernel/pmu.c
3252 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
3253 $ git merge davinci/davinci-next
3255 Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
3256 $ git merge xilinx/arm-next
3258 Merging arm64/upstream (27aa55c arm64: ptrace: remove obsolete ptrace request numbers from user headers)
3259 $ git merge arm64/upstream
3261 Merging blackfin/for-linus (6895f97 kbuild: add symbol prefix arg to kallsyms)
3262 $ git merge blackfin/for-linus
3264 Merging c6x/for-linux-next (a0d271c Linux 3.6)
3265 $ git merge c6x/for-linux-next
3267 Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code)
3268 $ git merge cris/for-next
3269 Removing arch/cris/arch-v32/mach-fs/vcs_hook.h
3270 Removing arch/cris/arch-v32/mach-fs/vcs_hook.c
3271 Removing arch/cris/arch-v32/mach-a3/vcs_hook.h
3272 Removing arch/cris/arch-v32/mach-a3/vcs_hook.c
3273 Auto-merging arch/cris/arch-v32/drivers/pci/bios.c
3274 Auto-merging arch/cris/Kconfig
3275 Merge made by the 'recursive' strategy.
3276 arch/cris/Kconfig | 5 -
3277 arch/cris/arch-v32/drivers/axisflashmap.c | 29 ------
3278 arch/cris/arch-v32/drivers/pci/bios.c | 25 -----
3279 arch/cris/arch-v32/kernel/head.S | 58 +----------
3280 arch/cris/arch-v32/kernel/kgdb.c | 14 ---
3281 arch/cris/arch-v32/mach-a3/Makefile | 2 -
3282 arch/cris/arch-v32/mach-a3/vcs_hook.c | 103 --------------------
3283 arch/cris/arch-v32/mach-a3/vcs_hook.h | 58 -----------
3284 arch/cris/arch-v32/mach-fs/Makefile | 2 -
3285 arch/cris/arch-v32/mach-fs/vcs_hook.c | 100 -------------------
3286 arch/cris/arch-v32/mach-fs/vcs_hook.h | 42 --------
3287 arch/cris/arch-v32/mm/init.c | 8 --
3288 arch/cris/include/arch-v32/arch/page.h | 5 -
3289 arch/cris/include/arch-v32/arch/processor.h | 6 +-
3290 .../cris/include/arch-v32/mach-fs/mach/startup.inc | 6 --
3291 arch/cris/include/asm/pci.h | 1 -
3292 16 files changed, 3 insertions(+), 461 deletions(-)
3293 delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.c
3294 delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.h
3295 delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.c
3296 delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.h
3297 Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
3298 $ git merge hexagon/linux-next
3300 Merging ia64/next (39c9a4a [IA64] xen: Fix return value check in xencomm_vtop())
3301 $ git merge ia64/next
3303 Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
3304 $ git merge m68k/for-next
3306 Merging m68knommu/for-next (a255172 m68knommu: fix inconsistent formating in ColdFire 5407 definitions)
3307 $ git merge m68knommu/for-next
3308 Merge made by the 'recursive' strategy.
3309 arch/m68k/include/asm/cacheflush_no.h | 19 +-
3310 arch/m68k/include/asm/m5206sim.h | 98 +--
3311 arch/m68k/include/asm/m523xsim.h | 24 +-
3312 arch/m68k/include/asm/m5249sim.h | 98 +--
3313 arch/m68k/include/asm/m525xsim.h | 70 +-
3314 arch/m68k/include/asm/m5272sim.h | 99 +--
3315 arch/m68k/include/asm/m527xsim.h | 84 ++-
3316 arch/m68k/include/asm/m528xsim.h | 51 +-
3317 arch/m68k/include/asm/m5307sim.h | 136 ++--
3318 arch/m68k/include/asm/m532xsim.h | 1189 ++-----------------------------
3319 arch/m68k/include/asm/m5407sim.h | 110 +--
3320 arch/m68k/include/asm/m54xxgpt.h | 40 +-
3321 arch/m68k/include/asm/m54xxsim.h | 27 +-
3322 arch/m68k/include/asm/mcfslt.h | 7 -
3323 arch/m68k/include/asm/nettel.h | 9 +-
3324 arch/m68k/platform/68VZ328/Makefile | 8 +-
3325 arch/m68k/platform/coldfire/device.c | 4 +-
3326 arch/m68k/platform/coldfire/head.S | 2 +-
3327 arch/m68k/platform/coldfire/intc-5249.c | 10 +-
3328 arch/m68k/platform/coldfire/intc-5272.c | 20 +-
3329 arch/m68k/platform/coldfire/intc.c | 28 +-
3330 arch/m68k/platform/coldfire/m523x.c | 8 +-
3331 arch/m68k/platform/coldfire/m5249.c | 10 +-
3332 arch/m68k/platform/coldfire/m525x.c | 4 +-
3333 arch/m68k/platform/coldfire/m5272.c | 19 +-
3334 arch/m68k/platform/coldfire/m527x.c | 24 +-
3335 arch/m68k/platform/coldfire/m528x.c | 6 +-
3336 arch/m68k/platform/coldfire/m532x.c | 221 +++---
3337 arch/m68k/platform/coldfire/m54xx.c | 16 +-
3338 arch/m68k/platform/coldfire/nettel.c | 4 +-
3339 arch/m68k/platform/coldfire/pci.c | 4 +-
3340 arch/m68k/platform/coldfire/reset.c | 2 +-
3341 arch/m68k/platform/coldfire/sltimers.c | 4 +-
3342 arch/m68k/platform/coldfire/timers.c | 4 +-
3343 drivers/watchdog/m54xx_wdt.c | 21 +-
3344 35 files changed, 702 insertions(+), 1778 deletions(-)
3345 Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
3346 $ git merge microblaze/next
3348 Merging mips/mips-for-linux-next (97541cc MIPS: ath79: Fix CPU/DDR frequency calculation for SRIF PLLs)
3349 $ git merge mips/mips-for-linux-next
3350 Resolved 'drivers/net/ethernet/octeon/octeon_mgmt.c' using previous resolution.
3351 Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
3352 CONFLICT (content): Merge conflict in drivers/net/ethernet/octeon/octeon_mgmt.c
3353 Removing arch/mips/mipssim/sim_time.c
3354 Removing arch/mips/mipssim/sim_smtc.c
3355 Removing arch/mips/mipssim/sim_setup.c
3356 Removing arch/mips/mipssim/sim_platform.c
3357 Removing arch/mips/mipssim/sim_mem.c
3358 Removing arch/mips/mipssim/sim_int.c
3359 Removing arch/mips/mipssim/sim_console.c
3360 Removing arch/mips/mipssim/Platform
3361 Removing arch/mips/mipssim/Makefile
3362 Removing arch/mips/lantiq/xway/gpio.c
3363 Removing arch/mips/include/asm/mips-boards/simint.h
3364 Auto-merging arch/mips/include/asm/mach-sead3/war.h
3365 Auto-merging arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h
3366 Removing arch/mips/configs/mipssim_defconfig
3367 Automatic merge failed; fix conflicts and then commit the result.
3369 [master 54a77c2] Merge remote-tracking branch 'mips/mips-for-linux-next'
3370 $ git diff -M --stat --summary HEAD^..
3371 .../bindings/pinctrl/lantiq,falcon-pinumx.txt | 83 +
3372 .../bindings/pinctrl/lantiq,xway-pinumx.txt | 97 +
3373 arch/mips/Kbuild.platforms | 2 +-
3374 arch/mips/Kconfig | 33 +-
3375 arch/mips/ath79/clock.c | 109 +-
3376 arch/mips/ath79/dev-usb.c | 92 +-
3377 arch/mips/ath79/mach-db120.c | 2 +
3378 arch/mips/bcm63xx/Makefile | 2 +-
3379 arch/mips/bcm63xx/boards/board_bcm963xx.c | 26 +-
3380 arch/mips/bcm63xx/clk.c | 21 +-
3381 arch/mips/bcm63xx/dev-usb-usbd.c | 65 +
3382 arch/mips/cavium-octeon/csrc-octeon.c | 93 +-
3383 .../cavium-octeon/executive/cvmx-interrupt-rsl.c | 2 +-
3384 arch/mips/cavium-octeon/octeon-irq.c | 842 +-
3385 arch/mips/cavium-octeon/setup.c | 3 +-
3386 ...um-octeon_defconfig => cavium_octeon_defconfig} | 0
3387 arch/mips/configs/mipssim_defconfig | 64 -
3388 ...5-stb225_defconfig => pnx8335_stb225_defconfig} | 0
3389 ...pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} | 0
3390 ...0-stb810_defconfig => pnx8550_stb810_defconfig} | 0
3391 ...1250-swarm_defconfig => sb1250_swarm_defconfig} | 0
3392 arch/mips/configs/sead3_defconfig | 124 +
3393 arch/mips/include/asm/cpu-features.h | 4 +-
3394 arch/mips/include/asm/cpu.h | 2 +
3395 arch/mips/include/asm/gic.h | 49 +-
3396 arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 30 +
3397 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 85 +-
3398 .../asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h | 17 +
3399 arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h | 38 +
3400 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 167 +-
3401 .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 5 +
3402 .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 2 +-
3403 arch/mips/include/asm/mach-cavium-octeon/irq.h | 7 +-
3404 .../include/asm/mach-lantiq/falcon/falcon_irq.h | 2 +
3405 .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 4 +
3406 arch/mips/include/asm/mach-lantiq/gpio.h | 5 +-
3407 .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 2 +
3408 .../cpu-feature-overrides.h | 15 +-
3409 arch/mips/include/asm/mach-sead3/irq.h | 9 +
3410 .../include/asm/mach-sead3/kernel-entry-init.h | 52 +
3411 .../include/asm/{mach-mipssim => mach-sead3}/war.h | 12 +-
3412 arch/mips/include/asm/mips-boards/maltaint.h | 55 +-
3413 arch/mips/include/asm/mips-boards/sead3int.h | 19 +
3414 arch/mips/include/asm/mips-boards/simint.h | 31 -
3415 arch/mips/include/asm/mipsregs.h | 3 +
3416 arch/mips/include/asm/octeon/cvmx-agl-defs.h | 1014 +-
3417 arch/mips/include/asm/octeon/cvmx-asxx-defs.h | 300 +-
3418 arch/mips/include/asm/octeon/cvmx-ciu-defs.h |11333 ++++++++++++++++----
3419 arch/mips/include/asm/octeon/cvmx-ciu2-defs.h | 7108 ++++++++++++
3420 arch/mips/include/asm/octeon/cvmx-dbg-defs.h | 39 +-
3421 arch/mips/include/asm/octeon/cvmx-dpi-defs.h | 411 +-
3422 arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1321 ++-
3423 arch/mips/include/asm/octeon/cvmx-gmxx-defs.h | 4966 ++++++++-
3424 arch/mips/include/asm/octeon/cvmx-gpio-defs.h | 282 +-
3425 arch/mips/include/asm/octeon/cvmx-iob-defs.h | 722 +-
3426 arch/mips/include/asm/octeon/cvmx-ipd-defs.h | 1111 +-
3427 arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 1726 ++-
3428 arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 171 +-
3429 arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 105 +-
3430 arch/mips/include/asm/octeon/cvmx-led-defs.h | 67 +-
3431 arch/mips/include/asm/octeon/cvmx-mio-defs.h | 1909 +++-
3432 arch/mips/include/asm/octeon/cvmx-mixx-defs.h | 234 +-
3433 arch/mips/include/asm/octeon/cvmx-npei-defs.h | 1743 ++-
3434 arch/mips/include/asm/octeon/cvmx-npi-defs.h | 1260 ++-
3435 arch/mips/include/asm/octeon/cvmx-pci-defs.h | 909 +-
3436 arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 1292 ++-
3437 arch/mips/include/asm/octeon/cvmx-pcsx-defs.h | 729 +-
3438 arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h | 574 +-
3439 arch/mips/include/asm/octeon/cvmx-pemx-defs.h | 288 +-
3440 arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 246 +-
3441 arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 2 +-
3442 arch/mips/include/asm/octeon/cvmx-pip-defs.h | 2431 ++++-
3443 arch/mips/include/asm/octeon/cvmx-pko-defs.h | 1993 +++-
3444 arch/mips/include/asm/octeon/cvmx-pow-defs.h | 530 +-
3445 arch/mips/include/asm/octeon/cvmx-rnm-defs.h | 107 +-
3446 arch/mips/include/asm/octeon/cvmx-sli-defs.h | 1351 ++-
3447 arch/mips/include/asm/octeon/cvmx-smix-defs.h | 202 +-
3448 arch/mips/include/asm/octeon/cvmx-spxx-defs.h | 225 +-
3449 arch/mips/include/asm/octeon/cvmx-sriox-defs.h | 703 +-
3450 arch/mips/include/asm/octeon/cvmx-srxx-defs.h | 62 +-
3451 arch/mips/include/asm/octeon/cvmx-stxx-defs.h | 166 +-
3452 arch/mips/include/asm/octeon/cvmx-uctlx-defs.h | 268 +-
3453 arch/mips/include/asm/octeon/octeon-model.h | 18 +
3454 arch/mips/include/asm/octeon/octeon.h | 4 +
3455 arch/mips/include/asm/pgtable-bits.h | 18 +-
3456 arch/mips/include/asm/pgtable.h | 12 +-
3457 arch/mips/include/asm/thread_info.h | 6 +-
3458 arch/mips/include/asm/uasm.h | 2 +
3459 arch/mips/include/asm/unistd.h | 15 +-
3460 arch/mips/kernel/cevt-r4k.c | 5 +
3461 arch/mips/kernel/cpu-probe.c | 10 +-
3462 arch/mips/kernel/entry.S | 15 +-
3463 arch/mips/kernel/irq-gic.c | 162 +-
3464 arch/mips/kernel/scall32-o32.S | 14 +-
3465 arch/mips/kernel/scall64-64.S | 14 +-
3466 arch/mips/kernel/scall64-n32.S | 14 +-
3467 arch/mips/kernel/scall64-o32.S | 14 +-
3468 arch/mips/kernel/signal.c | 8 -
3469 arch/mips/lantiq/Kconfig | 2 +
3470 arch/mips/lantiq/falcon/prom.c | 5 +
3471 arch/mips/lantiq/falcon/sysctrl.c | 1 +
3472 arch/mips/lantiq/irq.c | 82 +-
3473 arch/mips/lantiq/xway/Makefile | 2 +-
3474 arch/mips/lantiq/xway/gpio.c | 183 -
3475 arch/mips/lantiq/xway/gptu.c | 214 +
3476 arch/mips/lantiq/xway/sysctrl.c | 3 +-
3477 arch/mips/mipssim/Makefile | 23 -
3478 arch/mips/mipssim/Platform | 6 -
3479 arch/mips/mipssim/sim_console.c | 40 -
3480 arch/mips/mipssim/sim_int.c | 87 -
3481 arch/mips/mipssim/sim_mem.c | 115 -
3482 arch/mips/mipssim/sim_platform.c | 35 -
3483 arch/mips/mipssim/sim_setup.c | 99 -
3484 arch/mips/mipssim/sim_smtc.c | 116 -
3485 arch/mips/mipssim/sim_time.c | 117 -
3486 arch/mips/mm/c-r4k.c | 21 +
3487 arch/mips/mm/cache.c | 2 +-
3488 arch/mips/mm/fault.c | 2 +-
3489 arch/mips/mm/tlb-r4k.c | 2 +-
3490 arch/mips/mm/tlbex.c | 44 +-
3491 arch/mips/mm/uasm.c | 23 +-
3492 arch/mips/mti-malta/malta-int.c | 34 +
3493 arch/mips/mti-sead3/Makefile | 19 +
3494 arch/mips/mti-sead3/Platform | 7 +
3495 arch/mips/mti-sead3/leds-sead3.c | 128 +
3496 arch/mips/mti-sead3/sead3-cmdline.c | 46 +
3497 arch/mips/mti-sead3/sead3-console.c | 46 +
3498 arch/mips/mti-sead3/sead3-display.c | 78 +
3499 arch/mips/mti-sead3/sead3-ehci.c | 47 +
3500 arch/mips/mti-sead3/sead3-i2c-dev.c | 33 +
3501 arch/mips/mti-sead3/sead3-i2c-drv.c | 405 +
3502 arch/mips/mti-sead3/sead3-i2c.c | 37 +
3503 arch/mips/mti-sead3/sead3-init.c | 91 +
3504 arch/mips/mti-sead3/sead3-int.c | 158 +
3505 arch/mips/mti-sead3/sead3-lcd.c | 43 +
3506 arch/mips/mti-sead3/sead3-leds.c | 83 +
3507 arch/mips/mti-sead3/sead3-memory.c | 138 +
3508 arch/mips/mti-sead3/sead3-mtd.c | 54 +
3509 arch/mips/mti-sead3/sead3-net.c | 51 +
3510 arch/mips/mti-sead3/sead3-pic32-bus.c | 103 +
3511 arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 435 +
3512 arch/mips/mti-sead3/sead3-platform.c | 45 +
3513 arch/mips/mti-sead3/sead3-reset.c | 39 +
3514 arch/mips/mti-sead3/sead3-serial.c | 45 +
3515 arch/mips/mti-sead3/sead3-setup.c | 20 +
3516 arch/mips/mti-sead3/sead3-time.c | 117 +
3517 drivers/gpio/gpio-stp-xway.c | 2 +-
3518 drivers/net/ethernet/broadcom/bcm63xx_enet.h | 30 +-
3519 drivers/net/ethernet/octeon/octeon_mgmt.c | 550 +-
3520 drivers/pinctrl/Kconfig | 16 +
3521 drivers/pinctrl/Makefile | 3 +
3522 drivers/pinctrl/pinctrl-falcon.c | 468 +
3523 drivers/pinctrl/pinctrl-lantiq.c | 342 +
3524 drivers/pinctrl/pinctrl-lantiq.h | 194 +
3525 drivers/pinctrl/pinctrl-xway.c | 781 ++
3526 155 files changed, 51777 insertions(+), 4641 deletions(-)
3527 create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt
3528 create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt
3529 create mode 100644 arch/mips/bcm63xx/dev-usb-usbd.c
3530 rename arch/mips/configs/{cavium-octeon_defconfig => cavium_octeon_defconfig} (100%)
3531 delete mode 100644 arch/mips/configs/mipssim_defconfig
3532 rename arch/mips/configs/{pnx8335-stb225_defconfig => pnx8335_stb225_defconfig} (100%)
3533 rename arch/mips/configs/{pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} (100%)
3534 rename arch/mips/configs/{pnx8550-stb810_defconfig => pnx8550_stb810_defconfig} (100%)
3535 rename arch/mips/configs/{sb1250-swarm_defconfig => sb1250_swarm_defconfig} (100%)
3536 create mode 100644 arch/mips/configs/sead3_defconfig
3537 create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
3538 create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h
3539 rename arch/mips/include/asm/{mach-mipssim => mach-sead3}/cpu-feature-overrides.h (83%)
3540 create mode 100644 arch/mips/include/asm/mach-sead3/irq.h
3541 create mode 100644 arch/mips/include/asm/mach-sead3/kernel-entry-init.h
3542 rename arch/mips/include/asm/{mach-mipssim => mach-sead3}/war.h (72%)
3543 create mode 100644 arch/mips/include/asm/mips-boards/sead3int.h
3544 delete mode 100644 arch/mips/include/asm/mips-boards/simint.h
3545 create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu2-defs.h
3546 delete mode 100644 arch/mips/lantiq/xway/gpio.c
3547 create mode 100644 arch/mips/lantiq/xway/gptu.c
3548 delete mode 100644 arch/mips/mipssim/Makefile
3549 delete mode 100644 arch/mips/mipssim/Platform
3550 delete mode 100644 arch/mips/mipssim/sim_console.c
3551 delete mode 100644 arch/mips/mipssim/sim_int.c
3552 delete mode 100644 arch/mips/mipssim/sim_mem.c
3553 delete mode 100644 arch/mips/mipssim/sim_platform.c
3554 delete mode 100644 arch/mips/mipssim/sim_setup.c
3555 delete mode 100644 arch/mips/mipssim/sim_smtc.c
3556 delete mode 100644 arch/mips/mipssim/sim_time.c
3557 create mode 100644 arch/mips/mti-sead3/Makefile
3558 create mode 100644 arch/mips/mti-sead3/Platform
3559 create mode 100644 arch/mips/mti-sead3/leds-sead3.c
3560 create mode 100644 arch/mips/mti-sead3/sead3-cmdline.c
3561 create mode 100644 arch/mips/mti-sead3/sead3-console.c
3562 create mode 100644 arch/mips/mti-sead3/sead3-display.c
3563 create mode 100644 arch/mips/mti-sead3/sead3-ehci.c
3564 create mode 100644 arch/mips/mti-sead3/sead3-i2c-dev.c
3565 create mode 100644 arch/mips/mti-sead3/sead3-i2c-drv.c
3566 create mode 100644 arch/mips/mti-sead3/sead3-i2c.c
3567 create mode 100644 arch/mips/mti-sead3/sead3-init.c
3568 create mode 100644 arch/mips/mti-sead3/sead3-int.c
3569 create mode 100644 arch/mips/mti-sead3/sead3-lcd.c
3570 create mode 100644 arch/mips/mti-sead3/sead3-leds.c
3571 create mode 100644 arch/mips/mti-sead3/sead3-memory.c
3572 create mode 100644 arch/mips/mti-sead3/sead3-mtd.c
3573 create mode 100644 arch/mips/mti-sead3/sead3-net.c
3574 create mode 100644 arch/mips/mti-sead3/sead3-pic32-bus.c
3575 create mode 100644 arch/mips/mti-sead3/sead3-pic32-i2c-drv.c
3576 create mode 100644 arch/mips/mti-sead3/sead3-platform.c
3577 create mode 100644 arch/mips/mti-sead3/sead3-reset.c
3578 create mode 100644 arch/mips/mti-sead3/sead3-serial.c
3579 create mode 100644 arch/mips/mti-sead3/sead3-setup.c
3580 create mode 100644 arch/mips/mti-sead3/sead3-time.c
3581 create mode 100644 drivers/pinctrl/pinctrl-falcon.c
3582 create mode 100644 drivers/pinctrl/pinctrl-lantiq.c
3583 create mode 100644 drivers/pinctrl/pinctrl-lantiq.h
3584 create mode 100644 drivers/pinctrl/pinctrl-xway.c
3585 Merging openrisc/for-upstream (4c8faa4 openrisc: mask interrupts in irq_mask_ack function)
3586 $ git merge openrisc/for-upstream
3587 Merge made by the 'recursive' strategy.
3588 arch/openrisc/include/asm/processor.h | 2 +-
3589 arch/openrisc/kernel/irq.c | 20 +++++++++++---------
3590 arch/openrisc/kernel/ptrace.c | 2 +-
3591 arch/openrisc/lib/delay.c | 6 +++---
3592 include/linux/audit.h | 1 +
3593 5 files changed, 17 insertions(+), 14 deletions(-)
3594 Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
3595 $ git merge parisc/for-next
3597 Merging s390/features (c397031 s390: update defconfig)
3598 $ git merge s390/features
3600 Merging sh/sh-latest (16d74eb sh: pfc: Fix up GPIO mux type reconfig case.)
3601 $ git merge sh/sh-latest
3603 Merging sparc-next/master (42a4172 sparc64: Fix trailing whitespace in NG4 memcpy.)
3604 $ git merge sparc-next/master
3605 Merge made by the 'recursive' strategy.
3606 arch/sparc/Kbuild | 1 +
3607 arch/sparc/crypto/Makefile | 25 +
3608 arch/sparc/crypto/aes_asm.S | 1535 +++++++++++++++++++++++++++++++++++
3609 arch/sparc/crypto/aes_glue.c | 477 +++++++++++
3610 arch/sparc/crypto/camellia_asm.S | 563 +++++++++++++
3611 arch/sparc/crypto/camellia_glue.c | 322 ++++++++
3612 arch/sparc/crypto/crc32c_asm.S | 20 +
3613 arch/sparc/crypto/crc32c_glue.c | 179 ++++
3614 arch/sparc/crypto/crop_devid.c | 14 +
3615 arch/sparc/crypto/des_asm.S | 418 ++++++++++
3616 arch/sparc/crypto/des_glue.c | 529 ++++++++++++
3617 arch/sparc/crypto/md5_asm.S | 70 ++
3618 arch/sparc/crypto/md5_glue.c | 188 +++++
3619 arch/sparc/crypto/opcodes.h | 99 +++
3620 arch/sparc/crypto/sha1_asm.S | 72 ++
3621 arch/sparc/crypto/sha1_glue.c | 183 +++++
3622 arch/sparc/crypto/sha256_asm.S | 78 ++
3623 arch/sparc/crypto/sha256_glue.c | 241 ++++++
3624 arch/sparc/crypto/sha512_asm.S | 102 +++
3625 arch/sparc/crypto/sha512_glue.c | 226 ++++++
3626 arch/sparc/include/asm/asi.h | 4 +-
3627 arch/sparc/include/asm/elf_64.h | 9 +
3628 arch/sparc/include/asm/hypervisor.h | 11 +
3629 arch/sparc/include/asm/mdesc.h | 1 +
3630 arch/sparc/include/asm/pcr.h | 36 +-
3631 arch/sparc/include/asm/perfctr.h | 30 -
3632 arch/sparc/include/asm/pstate.h | 14 +
3633 arch/sparc/kernel/head_64.S | 14 +-
3634 arch/sparc/kernel/hvapi.c | 1 +
3635 arch/sparc/kernel/hvcalls.S | 16 +
3636 arch/sparc/kernel/ktlb.S | 25 +-
3637 arch/sparc/kernel/mdesc.c | 24 +
3638 arch/sparc/kernel/nmi.c | 21 +-
3639 arch/sparc/kernel/pci_sun4v.c | 2 +-
3640 arch/sparc/kernel/pcr.c | 172 +++-
3641 arch/sparc/kernel/perf_event.c | 516 +++++++++---
3642 arch/sparc/kernel/setup_64.c | 67 +-
3643 arch/sparc/lib/Makefile | 3 +
3644 arch/sparc/lib/NG4copy_from_user.S | 30 +
3645 arch/sparc/lib/NG4copy_page.S | 57 ++
3646 arch/sparc/lib/NG4copy_to_user.S | 39 +
3647 arch/sparc/lib/NG4memcpy.S | 360 ++++++++
3648 arch/sparc/lib/NG4patch.S | 43 +
3649 arch/sparc/lib/NGpage.S | 2 +
3650 arch/sparc/lib/ksyms.c | 4 +
3651 arch/sparc/mm/init_64.c | 230 +++++-
3652 arch/sparc/mm/init_64.h | 4 +-
3653 crypto/Kconfig | 97 +++
3654 drivers/crypto/n2_core.c | 2 +-
3655 drivers/sbus/char/display7seg.c | 2 +-
3656 drivers/sbus/char/envctrl.c | 8 +-
3657 drivers/sbus/char/openprom.c | 4 +-
3658 52 files changed, 6919 insertions(+), 271 deletions(-)
3659 create mode 100644 arch/sparc/crypto/Makefile
3660 create mode 100644 arch/sparc/crypto/aes_asm.S
3661 create mode 100644 arch/sparc/crypto/aes_glue.c
3662 create mode 100644 arch/sparc/crypto/camellia_asm.S
3663 create mode 100644 arch/sparc/crypto/camellia_glue.c
3664 create mode 100644 arch/sparc/crypto/crc32c_asm.S
3665 create mode 100644 arch/sparc/crypto/crc32c_glue.c
3666 create mode 100644 arch/sparc/crypto/crop_devid.c
3667 create mode 100644 arch/sparc/crypto/des_asm.S
3668 create mode 100644 arch/sparc/crypto/des_glue.c
3669 create mode 100644 arch/sparc/crypto/md5_asm.S
3670 create mode 100644 arch/sparc/crypto/md5_glue.c
3671 create mode 100644 arch/sparc/crypto/opcodes.h
3672 create mode 100644 arch/sparc/crypto/sha1_asm.S
3673 create mode 100644 arch/sparc/crypto/sha1_glue.c
3674 create mode 100644 arch/sparc/crypto/sha256_asm.S
3675 create mode 100644 arch/sparc/crypto/sha256_glue.c
3676 create mode 100644 arch/sparc/crypto/sha512_asm.S
3677 create mode 100644 arch/sparc/crypto/sha512_glue.c
3678 create mode 100644 arch/sparc/lib/NG4copy_from_user.S
3679 create mode 100644 arch/sparc/lib/NG4copy_page.S
3680 create mode 100644 arch/sparc/lib/NG4copy_to_user.S
3681 create mode 100644 arch/sparc/lib/NG4memcpy.S
3682 create mode 100644 arch/sparc/lib/NG4patch.S
3683 Merging tile/master (e70cf54 tile: gxio iorpc numbering change for TRIO interface)
3684 $ git merge tile/master
3686 Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
3687 $ git merge unicore32/unicore32
3688 Auto-merging arch/unicore32/Kconfig
3689 Merge made by the 'recursive' strategy.
3690 arch/unicore32/Kconfig | 3 +++
3691 arch/unicore32/include/asm/bug.h | 5 -----
3692 arch/unicore32/include/asm/cmpxchg.h | 2 +-
3693 arch/unicore32/kernel/setup.h | 6 ++++++
3694 arch/unicore32/mm/fault.c | 37 +++++++++++++++++++++++++---------
3695 5 files changed, 37 insertions(+), 16 deletions(-)
3696 Merging xtensa/for_next (ded389d xtensa: Add missing RCU idle APIs on idle loop)
3697 $ git merge xtensa/for_next
3698 Removing arch/xtensa/platforms/iss/io.c
3699 Auto-merging arch/xtensa/platforms/iss/console.c
3700 Auto-merging arch/xtensa/kernel/pci.c
3701 Removing arch/xtensa/kernel/io.c
3702 Auto-merging arch/xtensa/Kconfig
3703 Merge made by the 'recursive' strategy.
3704 arch/xtensa/Kconfig | 6 +-
3705 arch/xtensa/Makefile | 2 +-
3706 arch/xtensa/boot/boot-elf/Makefile | 9 +-
3707 arch/xtensa/boot/boot-redboot/Makefile | 12 +-
3708 arch/xtensa/include/asm/io.h | 172 +++-----------------
3709 arch/xtensa/include/asm/ioctls.h | 4 +-
3710 arch/xtensa/include/asm/regs.h | 2 +-
3711 arch/xtensa/kernel/Makefile | 3 +-
3712 arch/xtensa/kernel/io.c | 75 ---------
3713 arch/xtensa/kernel/irq.c | 4 +-
3714 arch/xtensa/kernel/pci-dma.c | 4 +
3715 arch/xtensa/kernel/pci.c | 2 +-
3716 arch/xtensa/kernel/platform.c | 4 +-
3717 arch/xtensa/kernel/xtensa_ksyms.c | 25 +++
3718 arch/xtensa/platforms/iss/Makefile | 4 +-
3719 arch/xtensa/platforms/iss/console.c | 15 +-
3720 .../platforms/iss/include/platform/simcall.h | 53 ++++++
3721 arch/xtensa/platforms/iss/io.c | 32 ----
3722 arch/xtensa/platforms/iss/network.c | 49 ------
3723 arch/xtensa/platforms/iss/setup.c | 14 +-
3724 drivers/isdn/hisax/Kconfig | 10 +-
3725 drivers/parport/Kconfig | 2 +-
3726 drivers/usb/musb/musb_io.h | 3 +-
3727 scripts/mod/modpost.c | 2 +
3728 24 files changed, 154 insertions(+), 354 deletions(-)
3729 delete mode 100644 arch/xtensa/kernel/io.c
3730 create mode 100644 arch/xtensa/platforms/iss/include/platform/serial.h
3731 delete mode 100644 arch/xtensa/platforms/iss/io.c
3732 Merging btrfs/next (b456b5a btrfs: move inline function code to header file)
3733 $ git merge btrfs/next
3734 Auto-merging fs/btrfs/inode.c
3735 Auto-merging fs/btrfs/ctree.h
3736 Merge made by the 'recursive' strategy.
3737 fs/btrfs/backref.c | 299 ++++++++++---
3738 fs/btrfs/backref.h | 10 +-
3739 fs/btrfs/btrfs_inode.h | 15 +-
3740 fs/btrfs/ctree.c | 175 ++------
3741 fs/btrfs/ctree.h | 105 ++++-
3742 fs/btrfs/delayed-inode.c | 6 +-
3743 fs/btrfs/disk-io.c | 117 ++---
3744 fs/btrfs/extent-tree.c | 395 ++++++++---------
3745 fs/btrfs/extent_io.c | 111 +++--
3746 fs/btrfs/extent_io.h | 23 +-
3747 fs/btrfs/extent_map.c | 55 ++-
3748 fs/btrfs/extent_map.h | 8 +-
3749 fs/btrfs/file-item.c | 5 +-
3750 fs/btrfs/file.c | 447 +++++++++++++++++--
3751 fs/btrfs/free-space-cache.c | 10 +-
3752 fs/btrfs/hash.h | 10 +
3753 fs/btrfs/inode-item.c | 285 +++++++++++-
3754 fs/btrfs/inode.c | 1002 +++++++++++++++++++++++++++++++++++++-----
3755 fs/btrfs/ioctl.c | 92 ++--
3756 fs/btrfs/math.h | 44 ++
3757 fs/btrfs/ordered-data.c | 97 ++--
3758 fs/btrfs/ordered-data.h | 12 +-
3759 fs/btrfs/qgroup.c | 40 +-
3760 fs/btrfs/relocation.c | 11 +-
3761 fs/btrfs/root-tree.c | 29 +-
3762 fs/btrfs/scrub.c | 30 +-
3763 fs/btrfs/send.c | 915 +++++++++++++++++++++-----------------
3764 fs/btrfs/send.h | 1 +
3765 fs/btrfs/super.c | 52 ++-
3766 fs/btrfs/transaction.c | 283 ++++++++----
3767 fs/btrfs/transaction.h | 20 +-
3768 fs/btrfs/tree-log.c | 798 +++++++++++++++++++++++++++------
3769 fs/btrfs/ulist.c | 7 +-
3770 fs/btrfs/ulist.h | 9 +-
3771 fs/btrfs/volumes.c | 60 +--
3772 include/trace/events/btrfs.h | 14 +-
3773 36 files changed, 4000 insertions(+), 1592 deletions(-)
3774 create mode 100644 fs/btrfs/math.h
3775 Merging ceph/master (5ce765a libceph: only kunmap kmapped pages)
3776 $ git merge ceph/master
3778 Merging cifs/for-next (1d4ab90 [CIFS] Fix indentation of fs/cifs/Kconfig entries)
3779 $ git merge cifs/for-next
3781 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
3782 $ git merge configfs/linux-next
3784 Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
3785 $ git merge ecryptfs/next
3787 Merging ext3/for_next (09e05d4 jbd: Fix assertion failure in commit code due to lacking transaction credits)
3788 $ git merge ext3/for_next
3789 Merge made by the 'recursive' strategy.
3790 fs/ext3/super.c | 8 ++++---
3791 fs/jbd/commit.c | 45 ++++++++++++++++++++++++++---------
3792 fs/jbd/transaction.c | 64 ++++++++++++++++++++++++++++++++++----------------
3793 fs/reiserfs/xattr.c | 2 +-
3794 fs/udf/file.c | 9 +++++++
3795 fs/udf/inode.c | 59 +++++++++++++++++++++++++++++++++-------------
3796 6 files changed, 136 insertions(+), 51 deletions(-)
3797 Merging ext4/dev (390f867 ext4: fix mtime update in nodelalloc mode)
3798 $ git merge ext4/dev
3799 Auto-merging fs/jbd2/journal.c
3800 Auto-merging fs/fs-writeback.c
3801 Auto-merging fs/ext4/super.c
3802 Auto-merging fs/ext4/mballoc.c
3803 Auto-merging fs/ext4/inode.c
3804 Auto-merging fs/buffer.c
3805 Merge made by the 'recursive' strategy.
3806 Documentation/ABI/testing/sysfs-fs-ext4 | 13 +
3807 Documentation/filesystems/ext4.txt | 10 +
3809 fs/ext4/ext4.h | 46 ++-
3810 fs/ext4/extents.c | 256 ++++++++-------
3811 fs/ext4/file.c | 6 +-
3812 fs/ext4/fsync.c | 90 +-----
3813 fs/ext4/ialloc.c | 9 +
3814 fs/ext4/indirect.c | 18 +-
3815 fs/ext4/inode.c | 83 ++---
3816 fs/ext4/ioctl.c | 25 +-
3817 fs/ext4/mballoc.c | 129 ++++----
3818 fs/ext4/mballoc.h | 5 -
3819 fs/ext4/move_extent.c | 520 +++++++++++++++++++------------
3820 fs/ext4/namei.c | 105 +++++--
3821 fs/ext4/page-io.c | 173 ++++++----
3822 fs/ext4/resize.c | 432 +++++++++++++++++++------
3823 fs/ext4/super.c | 92 ++++--
3824 fs/fs-writeback.c | 1 +
3825 fs/jbd2/commit.c | 40 ++-
3826 fs/jbd2/journal.c | 5 +
3827 fs/jbd2/recovery.c | 7 +-
3828 fs/jbd2/transaction.c | 65 ++--
3829 fs/nilfs2/file.c | 1 +
3830 include/linux/falloc.h | 1 +
3831 include/trace/events/ext4.h | 242 +++++++-------
3832 26 files changed, 1492 insertions(+), 895 deletions(-)
3833 Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
3834 $ git merge fuse/for-next
3835 Auto-merging fs/fuse/inode.c
3836 Auto-merging fs/fuse/dev.c
3837 Merge made by the 'recursive' strategy.
3838 fs/Kconfig | 10 ----
3839 fs/fuse/Kconfig | 16 ++++-
3840 fs/fuse/dev.c | 19 ++++++
3841 fs/fuse/dir.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++--
3842 fs/fuse/fuse_i.h | 6 ++
3843 fs/fuse/inode.c | 5 +-
3844 include/linux/fuse.h | 12 ++++
3845 7 files changed, 211 insertions(+), 17 deletions(-)
3846 Merging gfs2/master (2216db7 GFS2: Write out dirty inode metadata in delayed deletes)
3847 $ git merge gfs2/master
3849 Merging jfs/jfs-next (84f4141 jfs: Fix do_div precision in commit b40c2e66)
3850 $ git merge jfs/jfs-next
3851 Merge made by the 'recursive' strategy.
3852 Documentation/filesystems/jfs.txt | 19 ++++--
3853 fs/jfs/Makefile | 2 +-
3854 fs/jfs/ioctl.c | 43 ++++++++++++-
3855 fs/jfs/jfs_discard.c | 117 ++++++++++++++++++++++++++++++++++
3856 fs/jfs/jfs_discard.h | 26 ++++++++
3857 fs/jfs/jfs_dmap.c | 126 +++++++++++++++++++++++++++++++++++--
3858 fs/jfs/jfs_dmap.h | 2 +
3859 fs/jfs/jfs_filsys.h | 3 +
3860 fs/jfs/jfs_incore.h | 1 +
3861 fs/jfs/jfs_txnmgr.c | 9 +--
3862 fs/jfs/super.c | 71 ++++++++++++++++-----
3863 11 files changed, 388 insertions(+), 31 deletions(-)
3864 create mode 100644 fs/jfs/jfs_discard.c
3865 create mode 100644 fs/jfs/jfs_discard.h
3866 Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
3867 $ git merge logfs/master
3868 Merge made by the 'recursive' strategy.
3869 fs/logfs/dev_mtd.c | 2 +-
3870 1 file changed, 1 insertion(+), 1 deletion(-)
3871 Merging nfs/linux-next (2c78126 NFSv4: nfs4_match_clientids is only used by NFSv4.1)
3872 $ git merge nfs/linux-next
3873 Auto-merging fs/nfs/super.c
3874 Auto-merging Documentation/kernel-parameters.txt
3875 Merge made by the 'recursive' strategy.
3876 Documentation/filesystems/nfs/nfs.txt | 44 ++++-
3877 Documentation/kernel-parameters.txt | 5 +
3878 fs/lockd/mon.c | 86 +++++++--
3879 fs/lockd/netns.h | 4 +
3880 fs/lockd/svc.c | 1 +
3881 fs/nfs/blocklayout/blocklayout.c | 272 +++++++++++++++++++++++----
3882 fs/nfs/blocklayout/blocklayout.h | 1 +
3883 fs/nfs/blocklayout/extents.c | 3 +-
3884 fs/nfs/callback.c | 320 +++++++++++++++++++++-----------
3885 fs/nfs/callback.h | 4 +-
3886 fs/nfs/callback_proc.c | 31 +++-
3887 fs/nfs/client.c | 23 +--
3888 fs/nfs/dir.c | 16 +-
3889 fs/nfs/direct.c | 20 +-
3890 fs/nfs/file.c | 41 ++--
3891 fs/nfs/idmap.c | 113 +++++++----
3892 fs/nfs/inode.c | 10 +-
3893 fs/nfs/internal.h | 14 +-
3894 fs/nfs/netns.h | 3 +
3895 fs/nfs/nfs4_fs.h | 19 +-
3896 fs/nfs/nfs4client.c | 255 ++++++++++++++++++++++++-
3897 fs/nfs/nfs4file.c | 29 ++-
3898 fs/nfs/nfs4filelayout.c | 41 ++--
3899 fs/nfs/nfs4filelayout.h | 16 +-
3900 fs/nfs/nfs4filelayoutdev.c | 17 +-
3901 fs/nfs/nfs4namespace.c | 16 +-
3902 fs/nfs/nfs4proc.c | 184 +++++++++++++-----
3903 fs/nfs/nfs4state.c | 219 ++++++++++++++++++++--
3904 fs/nfs/nfs4xdr.c | 25 ++-
3905 fs/nfs/pagelist.c | 12 +-
3906 fs/nfs/pnfs.c | 330 +++++++++++++++++++--------------
3907 fs/nfs/pnfs.h | 54 ++----
3908 fs/nfs/pnfs_dev.c | 27 +++
3909 fs/nfs/super.c | 29 ++-
3910 fs/nfs/write.c | 11 +-
3911 include/linux/nfs_fs.h | 11 +-
3912 include/linux/nfs_fs_sb.h | 3 +
3913 include/linux/nfs_xdr.h | 4 +-
3914 include/linux/sunrpc/clnt.h | 2 +
3915 include/linux/sunrpc/xprt.h | 3 +-
3916 net/sunrpc/auth_gss/auth_gss.c | 58 +++---
3917 net/sunrpc/clnt.c | 105 +++++++----
3918 net/sunrpc/rpc_pipe.c | 8 +-
3919 net/sunrpc/sched.c | 2 +-
3920 net/sunrpc/xdr.c | 21 ++-
3921 net/sunrpc/xprt.c | 8 +-
3922 net/sunrpc/xprtrdma/transport.c | 22 +--
3923 net/sunrpc/xprtsock.c | 40 ++--
3924 48 files changed, 1864 insertions(+), 718 deletions(-)
3925 $ git reset --hard HEAD^
3926 HEAD is now at 43b840c Merge remote-tracking branch 'logfs/master'
3927 Merging refs/next/20121001/nfs
3928 $ git merge refs/next/20121001/nfs
3929 Merge made by the 'recursive' strategy.
3930 fs/nfs/blocklayout/blocklayout.c | 2 +-
3931 fs/nfs/callback_proc.c | 31 +++-
3932 fs/nfs/direct.c | 16 +-
3933 fs/nfs/file.c | 41 +++--
3934 fs/nfs/inode.c | 10 +-
3935 fs/nfs/nfs4_fs.h | 8 +-
3936 fs/nfs/nfs4file.c | 29 ++--
3937 fs/nfs/nfs4filelayout.c | 41 +++--
3938 fs/nfs/nfs4filelayout.h | 16 +-
3939 fs/nfs/nfs4filelayoutdev.c | 17 +-
3940 fs/nfs/nfs4namespace.c | 4 +-
3941 fs/nfs/nfs4proc.c | 62 +++----
3942 fs/nfs/nfs4state.c | 29 ++--
3943 fs/nfs/nfs4xdr.c | 9 +-
3944 fs/nfs/pagelist.c | 12 +-
3945 fs/nfs/pnfs.c | 330 ++++++++++++++++++++++----------------
3946 fs/nfs/pnfs.h | 54 ++-----
3947 fs/nfs/pnfs_dev.c | 27 ++++
3948 fs/nfs/write.c | 11 +-
3949 include/linux/nfs_fs.h | 9 +-
3950 include/linux/nfs_xdr.h | 1 -
3951 include/linux/sunrpc/xprt.h | 3 +-
3952 net/sunrpc/xdr.c | 23 ++-
3953 net/sunrpc/xprt.c | 8 +-
3954 net/sunrpc/xprtrdma/transport.c | 22 +--
3955 net/sunrpc/xprtsock.c | 40 ++---
3956 26 files changed, 489 insertions(+), 366 deletions(-)
3957 Merging nfsd/nfsd-next (6e67b5d nfsd4: fix bind_conn_to_session xdr comment)
3958 $ git merge nfsd/nfsd-next
3959 Merge made by the 'recursive' strategy.
3960 .../filesystems/nfs/nfsd-admin-interfaces.txt | 41 ++++
3961 fs/lockd/svc.c | 17 +-
3963 fs/nfs/callback.c | 16 +-
3964 fs/nfsd/nfs2acl.c | 3 +-
3965 fs/nfsd/nfs3proc.c | 2 +-
3966 fs/nfsd/nfs4callback.c | 1 -
3967 fs/nfsd/nfs4idmap.c | 4 +-
3968 fs/nfsd/nfs4proc.c | 4 +-
3969 fs/nfsd/nfs4state.c | 134 ++++++-----
3970 fs/nfsd/nfs4xdr.c | 2 +-
3971 fs/nfsd/nfsctl.c | 84 +------
3972 fs/nfsd/nfsd.h | 4 +-
3973 fs/nfsd/nfssvc.c | 26 +--
3974 fs/nfsd/state.h | 6 +-
3975 fs/nfsd/vfs.c | 2 +-
3976 include/linux/sunrpc/svc_xprt.h | 5 +-
3977 include/linux/sunrpc/svcsock.h | 3 -
3978 net/sunrpc/svc_xprt.c | 233 ++++++++++++--------
3979 net/sunrpc/svcsock.c | 157 +++++--------
3980 net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 -
3981 21 files changed, 341 insertions(+), 413 deletions(-)
3982 create mode 100644 Documentation/filesystems/nfs/nfsd-admin-interfaces.txt
3983 Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
3984 $ git merge ocfs2/linux-next
3985 Merge made by the 'recursive' strategy.
3986 fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
3987 fs/ocfs2/cluster/masklog.h | 3 ++-
3988 fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
3989 fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
3990 fs/ocfs2/symlink.c | 2 +-
3991 5 files changed, 27 insertions(+), 35 deletions(-)
3992 Merging omfs/for-next (976d167 Linux 3.1-rc9)
3993 $ git merge omfs/for-next
3995 Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
3996 $ git merge squashfs/master
3998 Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
3999 $ git merge v9fs/for-next
4000 Merge made by the 'recursive' strategy.
4001 fs/9p/v9fs.c | 30 +++++++++++++++++++-----------
4002 fs/9p/vfs_inode.c | 8 ++++----
4003 net/9p/client.c | 18 ++++++++++++++++--
4004 net/9p/trans_fd.c | 38 ++++++++++++++++++++------------------
4005 4 files changed, 59 insertions(+), 35 deletions(-)
4006 Merging ubifs/linux-next (3668b70 UBIFS: print less)
4007 $ git merge ubifs/linux-next
4008 Merge made by the 'recursive' strategy.
4009 fs/ubifs/budget.c | 5 +-
4010 fs/ubifs/commit.c | 8 +-
4011 fs/ubifs/compress.c | 7 +-
4012 fs/ubifs/debug.c | 633 +++++++++++++++++++++----------------------------
4013 fs/ubifs/debug.h | 15 +-
4014 fs/ubifs/dir.c | 4 +-
4015 fs/ubifs/file.c | 4 +-
4016 fs/ubifs/gc.c | 6 +-
4017 fs/ubifs/log.c | 14 +-
4018 fs/ubifs/lprops.c | 66 +++---
4019 fs/ubifs/lpt.c | 5 +-
4020 fs/ubifs/lpt_commit.c | 58 ++---
4021 fs/ubifs/orphan.c | 7 +-
4022 fs/ubifs/recovery.c | 11 +-
4023 fs/ubifs/replay.c | 16 +-
4024 fs/ubifs/sb.c | 19 +-
4025 fs/ubifs/scan.c | 15 +-
4026 fs/ubifs/super.c | 119 +++++-----
4027 fs/ubifs/tnc_misc.c | 4 +-
4028 fs/ubifs/ubifs.h | 13 +-
4029 20 files changed, 451 insertions(+), 578 deletions(-)
4030 Merging xfs/for-next (2ea0392 xfs: Make inode32 a remountable option)
4031 $ git merge xfs/for-next
4032 Auto-merging fs/xfs/xfs_super.c
4033 Auto-merging fs/xfs/xfs_ialloc.c
4034 Merge made by the 'recursive' strategy.
4035 fs/xfs/xfs_file.c | 379 ++++++++++++++++++++++++++++++++++++++++++++++-----
4036 fs/xfs/xfs_ialloc.c | 2 +-
4037 fs/xfs/xfs_mount.c | 43 +-----
4038 fs/xfs/xfs_mount.h | 5 -
4039 fs/xfs/xfs_super.c | 95 ++++++++++++-
4040 fs/xfs/xfs_super.h | 2 +
4041 fs/xfs/xfs_trace.h | 1 +
4042 7 files changed, 447 insertions(+), 80 deletions(-)
4043 Merging vfs/for-next (49de614 MAX_LFS_FILESIZE should be a loff_t)
4044 $ git merge vfs/for-next
4045 Resolved 'drivers/staging/android/binder.c' using previous resolution.
4046 Auto-merging net/9p/trans_fd.c
4047 Auto-merging kernel/events/core.c
4048 Auto-merging include/linux/sched.h
4049 Auto-merging fs/xfs/xfs_super.c
4050 Auto-merging fs/ubifs/super.c
4051 Auto-merging fs/stat.c
4052 Auto-merging fs/ocfs2/cluster/heartbeat.c
4053 Auto-merging fs/nfsd/nfs4state.c
4054 Auto-merging fs/nfs/inode.c
4055 Auto-merging fs/locks.c
4056 Auto-merging fs/jfs/super.c
4057 Auto-merging fs/fuse/inode.c
4058 Auto-merging fs/fuse/dev.c
4059 Auto-merging fs/ext4/super.c
4060 Auto-merging fs/ext4/ioctl.c
4061 Auto-merging fs/ext3/super.c
4062 Auto-merging fs/dcache.c
4063 Auto-merging fs/compat_ioctl.c
4064 Auto-merging fs/cifs/cifsfs.c
4065 Auto-merging fs/btrfs/ioctl.c
4066 Auto-merging fs/btrfs/inode.c
4067 Auto-merging fs/btrfs/extent_io.c
4068 Auto-merging fs/9p/v9fs.c
4069 Auto-merging drivers/tty/tty_io.c
4070 Auto-merging drivers/staging/omapdrm/omap_gem.c
4071 Auto-merging drivers/staging/android/binder.c
4072 CONFLICT (content): Merge conflict in drivers/staging/android/binder.c
4073 Auto-merging arch/um/drivers/mconsole_kern.c
4074 Automatic merge failed; fix conflicts and then commit the result.
4076 [master a17c0f9] Merge remote-tracking branch 'vfs/for-next'
4077 $ git diff -M --stat --summary HEAD^..
4078 arch/alpha/kernel/osf_sys.c | 13 +-
4079 arch/ia64/kernel/perfmon.c | 18 +-
4080 arch/parisc/hpux/fs.c | 17 +-
4081 arch/powerpc/include/asm/systbl.h | 4 +-
4082 arch/powerpc/include/asm/unistd.h | 1 +
4083 arch/powerpc/kernel/sys_ppc32.c | 45 +-
4084 arch/powerpc/platforms/cell/spu_syscalls.c | 21 +-
4085 arch/powerpc/platforms/cell/spufs/coredump.c | 40 +-
4086 arch/s390/hypfs/inode.c | 2 -
4087 arch/sparc/include/asm/unistd.h | 1 +
4088 arch/sparc/kernel/sys32.S | 2 +-
4089 arch/sparc/kernel/sys_sparc32.c | 46 --
4090 arch/um/drivers/mconsole_kern.c | 99 +---
4091 drivers/base/dma-buf.c | 3 +-
4092 drivers/infiniband/core/ucma.c | 10 +-
4093 drivers/infiniband/core/uverbs_cmd.c | 21 +-
4094 drivers/infiniband/core/uverbs_main.c | 11 +-
4095 drivers/staging/android/binder.c | 111 +----
4096 drivers/staging/omapdrm/omap_gem.c | 3 +-
4097 drivers/tty/tty_io.c | 45 +-
4098 drivers/usb/gadget/f_fs.c | 4 +-
4099 drivers/vfio/vfio.c | 15 +-
4100 drivers/vhost/vhost.c | 8 +-
4101 drivers/video/msm/mdp.c | 12 +-
4104 fs/adfs/super.c | 5 +
4105 fs/affs/super.c | 5 +
4106 fs/afs/super.c | 5 +
4107 fs/autofs4/dev-ioctl.c | 18 +-
4108 fs/autofs4/waitq.c | 3 +-
4109 fs/befs/linuxvfs.c | 5 +
4110 fs/bfs/inode.c | 5 +
4111 fs/binfmt_elf.c | 19 +-
4112 fs/btrfs/extent_io.c | 6 +
4113 fs/btrfs/inode.c | 5 +
4114 fs/btrfs/ioctl.c | 32 +-
4115 fs/btrfs/reada.c | 18 +-
4116 fs/ceph/inode.c | 4 +-
4117 fs/ceph/super.c | 5 +
4118 fs/cifs/cifsfs.c | 5 +
4119 fs/coda/inode.c | 37 +-
4120 fs/compat.c | 112 +++--
4121 fs/compat_ioctl.c | 27 +-
4122 fs/coredump.c | 686 +++++++++++++++++++++++++
4124 fs/ecryptfs/main.c | 6 +
4125 fs/efs/super.c | 5 +
4126 fs/eventpoll.c | 23 +-
4127 fs/exec.c | 688 +-------------------------
4128 fs/exofs/super.c | 5 +
4129 fs/ext2/super.c | 5 +
4130 fs/ext3/super.c | 5 +
4131 fs/ext4/ioctl.c | 12 +-
4132 fs/ext4/super.c | 5 +
4133 fs/fat/inode.c | 5 +
4134 fs/fcntl.c | 166 +------
4135 fs/fhandle.c | 17 +-
4136 fs/file.c | 573 ++++++++++++++++++++-
4137 fs/file_table.c | 106 ----
4138 fs/freevxfs/vxfs_super.c | 5 +
4139 fs/fuse/dev.c | 3 +-
4140 fs/fuse/inode.c | 6 +
4141 fs/hfs/super.c | 6 +
4142 fs/hfsplus/super.c | 6 +
4143 fs/hpfs/super.c | 5 +
4144 fs/hugetlbfs/inode.c | 5 +
4146 fs/isofs/inode.c | 5 +
4147 fs/jffs2/super.c | 6 +
4148 fs/jfs/super.c | 6 +
4150 fs/logfs/inode.c | 5 +
4151 fs/minix/inode.c | 5 +
4153 fs/ncpfs/inode.c | 5 +
4154 fs/nfs/inode.c | 5 +
4155 fs/nfsd/nfs4state.c | 3 +-
4156 fs/nilfs2/super.c | 6 +
4157 fs/notify/fanotify/fanotify_user.c | 87 ++--
4158 fs/notify/inotify/inotify_user.c | 28 +-
4159 fs/ntfs/super.c | 6 +
4160 fs/ocfs2/cluster/heartbeat.c | 38 +-
4161 fs/ocfs2/dlmfs/dlmfs.c | 5 +
4162 fs/ocfs2/super.c | 5 +
4163 fs/open.c | 130 ++---
4164 fs/openpromfs/inode.c | 5 +
4166 fs/proc/Makefile | 2 +-
4167 fs/proc/base.c | 417 +---------------
4168 fs/proc/fd.c | 367 ++++++++++++++
4170 fs/proc/internal.h | 48 ++
4171 fs/qnx4/inode.c | 5 +
4172 fs/qnx6/inode.c | 5 +
4173 fs/read_write.c | 180 +++----
4174 fs/read_write.h | 2 +
4175 fs/readdir.c | 36 +-
4176 fs/reiserfs/super.c | 5 +
4177 fs/romfs/super.c | 5 +
4179 fs/signalfd.c | 13 +-
4180 fs/splice.c | 69 ++-
4181 fs/squashfs/super.c | 5 +
4186 fs/sysv/inode.c | 5 +
4187 fs/timerfd.c | 45 +-
4188 fs/ubifs/super.c | 6 +
4189 fs/udf/super.c | 5 +
4190 fs/ufs/super.c | 5 +
4193 fs/xfs/xfs_dfrag.c | 34 +-
4194 fs/xfs/xfs_ioctl.c | 10 +-
4195 fs/xfs/xfs_super.c | 5 +
4196 include/linux/compat.h | 3 +
4197 include/linux/fdtable.h | 39 +-
4198 include/linux/file.h | 35 +-
4199 include/linux/fs.h | 10 +-
4200 include/linux/net.h | 3 +-
4201 include/linux/sched.h | 1 +
4202 ipc/mqueue.c | 78 +--
4203 kernel/events/core.c | 72 ++-
4204 kernel/exit.c | 97 +---
4205 kernel/sys.c | 14 +-
4206 kernel/taskstats.c | 11 +-
4207 mm/fadvise.c | 34 +-
4211 mm/readahead.c | 14 +-
4212 net/9p/trans_fd.c | 16 +-
4214 net/core/netprio_cgroup.c | 38 +-
4215 net/core/scm.c | 3 +-
4216 net/sctp/socket.c | 25 +-
4217 net/socket.c | 66 ++-
4218 security/selinux/hooks.c | 73 +--
4219 sound/core/pcm_native.c | 13 +-
4220 142 files changed, 2913 insertions(+), 2874 deletions(-)
4221 create mode 100644 fs/coredump.c
4222 create mode 100644 fs/proc/fd.c
4223 create mode 100644 fs/proc/fd.h
4224 Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next)
4225 $ git merge pci/next
4227 Merging powerpc/next (7844663 powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get)
4228 $ git merge powerpc/next
4229 Resolved 'drivers/scsi/ipr.c' using previous resolution.
4230 Auto-merging drivers/tty/hvc/hvc_console.c
4231 Auto-merging drivers/scsi/ipr.c
4232 CONFLICT (content): Merge conflict in drivers/scsi/ipr.c
4233 Auto-merging arch/powerpc/kernel/time.c
4234 Auto-merging arch/powerpc/kernel/process.c
4235 Removing arch/powerpc/include/asm/abs_addr.h
4236 Removing arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
4237 Removing arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
4238 Removing arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
4239 Removing arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
4240 Automatic merge failed; fix conflicts and then commit the result.
4242 [master 03ac780] Merge remote-tracking branch 'powerpc/next'
4243 $ git diff -M --stat --summary HEAD^..
4244 Documentation/devicetree/bindings/misc/ifm-csi.txt | 41 ++
4245 .../devicetree/bindings/powerpc/fsl/ifc.txt | 9 +-
4246 arch/powerpc/Kconfig | 17 +-
4247 arch/powerpc/boot/Makefile | 1 +
4248 arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi | 58 ++
4249 arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi | 52 ++
4250 arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi | 59 ++
4251 arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi | 3 +
4252 arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi | 3 +
4253 arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi | 3 +
4254 arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi | 3 +
4255 arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi | 3 +
4256 arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi | 3 +
4257 arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi | 3 +
4258 arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi | 3 +
4259 arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi | 3 +
4260 arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi | 3 +
4261 arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi | 3 +
4262 arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi | 3 +
4263 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi | 3 +
4264 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi | 3 +
4265 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | 3 +
4266 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 3 +
4267 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 320 +++++++++
4268 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi | 114 ++++
4269 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi | 118 ++++
4270 arch/powerpc/boot/dts/mpc8536ds.dtsi | 4 +
4271 arch/powerpc/boot/dts/mpc8540ads.dts | 2 +
4272 arch/powerpc/boot/dts/mpc8541cds.dts | 2 +
4273 arch/powerpc/boot/dts/mpc8544ds.dts | 4 +-
4274 arch/powerpc/boot/dts/mpc8544ds.dtsi | 39 ++
4275 arch/powerpc/boot/dts/mpc8555cds.dts | 2 +
4276 arch/powerpc/boot/dts/mpc8560ads.dts | 2 +
4277 arch/powerpc/boot/dts/o2d.dts | 47 ++
4278 arch/powerpc/boot/dts/o2d.dtsi | 139 ++++
4279 arch/powerpc/boot/dts/o2d300.dts | 52 ++
4280 arch/powerpc/boot/dts/o2dnt2.dts | 48 ++
4281 arch/powerpc/boot/dts/o2i.dts | 33 +
4282 arch/powerpc/boot/dts/o2mnt.dts | 33 +
4283 arch/powerpc/boot/dts/o3dnt.dts | 48 ++
4284 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts | 63 --
4285 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | 141 ----
4286 arch/powerpc/boot/dts/p1022ds.dtsi | 4 +
4287 arch/powerpc/boot/dts/p1022rdk.dts | 188 ++++++
4288 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 67 --
4289 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 125 ----
4290 arch/powerpc/boot/dts/p2041rdb.dts | 4 +
4291 arch/powerpc/boot/dts/p3041ds.dts | 4 +
4292 arch/powerpc/boot/dts/p4080ds.dts | 4 +
4293 arch/powerpc/boot/dts/p5020ds.dts | 4 +
4294 arch/powerpc/boot/dts/p5040ds.dts | 207 ++++++
4295 arch/powerpc/configs/85xx/p1023rds_defconfig | 6 +
4296 arch/powerpc/configs/corenet32_smp_defconfig | 1 +
4297 arch/powerpc/configs/corenet64_smp_defconfig | 1 +
4298 arch/powerpc/configs/mpc85xx_defconfig | 1 +
4299 arch/powerpc/configs/mpc85xx_smp_defconfig | 1 +
4300 arch/powerpc/configs/ppc64_defconfig | 1 +
4301 arch/powerpc/configs/pseries_defconfig | 1 +
4302 arch/powerpc/include/asm/abs_addr.h | 56 --
4303 arch/powerpc/include/asm/cacheflush.h | 2 +
4304 arch/powerpc/include/asm/debug.h | 2 +-
4305 arch/powerpc/include/asm/eeh.h | 141 ++--
4306 arch/powerpc/include/asm/eeh_event.h | 6 +-
4307 arch/powerpc/include/asm/exception-64e.h | 6 +-
4308 arch/powerpc/include/asm/fsl_guts.h | 2 +
4309 arch/powerpc/include/asm/fsl_ifc.h | 14 +-
4310 arch/powerpc/include/asm/hvcall.h | 5 -
4311 arch/powerpc/include/asm/hw_breakpoint.h | 9 +-
4312 arch/powerpc/include/asm/kprobes.h | 15 +-
4313 arch/powerpc/include/asm/kvm_book3s.h | 2 +-
4314 arch/powerpc/include/asm/kvm_book3s_asm.h | 1 -
4315 arch/powerpc/include/asm/machdep.h | 9 +-
4316 arch/powerpc/include/asm/mmu-hash64.h | 169 +++--
4317 arch/powerpc/include/asm/mmu.h | 9 +
4318 arch/powerpc/include/asm/mpc52xx.h | 2 +
4319 arch/powerpc/include/asm/mpic.h | 19 +
4320 arch/powerpc/include/asm/paca.h | 3 +-
4321 arch/powerpc/include/asm/page_64.h | 10 +-
4322 arch/powerpc/include/asm/pci-bridge.h | 11 +
4323 arch/powerpc/include/asm/perf_event_server.h | 1 +
4324 arch/powerpc/include/asm/pgtable-ppc64-4k.h | 4 +-
4325 arch/powerpc/include/asm/pgtable-ppc64-64k.h | 2 +-
4326 arch/powerpc/include/asm/pgtable-ppc64.h | 19 +-
4327 arch/powerpc/include/asm/pgtable.h | 10 +-
4328 arch/powerpc/include/asm/ppc-opcode.h | 3 +
4329 arch/powerpc/include/asm/ppc-pci.h | 20 +-
4330 arch/powerpc/include/asm/probes.h | 42 ++
4331 arch/powerpc/include/asm/processor.h | 6 +-
4332 arch/powerpc/include/asm/pte-hash64-64k.h | 18 +-
4333 arch/powerpc/include/asm/reg.h | 54 +-
4334 arch/powerpc/include/asm/setup.h | 2 +-
4335 arch/powerpc/include/asm/smp.h | 2 +
4336 arch/powerpc/include/asm/sparsemem.h | 4 +-
4337 arch/powerpc/include/asm/swiotlb.h | 6 +
4338 arch/powerpc/include/asm/thread_info.h | 7 +-
4339 arch/powerpc/include/asm/tlbflush.h | 7 +-
4340 arch/powerpc/include/asm/uaccess.h | 11 -
4341 arch/powerpc/include/asm/uprobes.h | 54 ++
4342 arch/powerpc/kernel/Makefile | 1 +
4343 arch/powerpc/kernel/asm-offsets.c | 2 +-
4344 arch/powerpc/kernel/cpu_setup_fsl_booke.S | 74 ++-
4345 arch/powerpc/kernel/cputable.c | 4 +
4346 arch/powerpc/kernel/dma-swiotlb.c | 22 +-
4347 arch/powerpc/kernel/dma.c | 3 +-
4348 arch/powerpc/kernel/entry_32.S | 47 +-
4349 arch/powerpc/kernel/entry_64.S | 35 +
4350 arch/powerpc/kernel/exceptions-64e.S | 212 +++---
4351 arch/powerpc/kernel/exceptions-64s.S | 127 +++-
4352 arch/powerpc/kernel/fadump.c | 3 +-
4353 arch/powerpc/kernel/head_fsl_booke.S | 46 +-
4354 arch/powerpc/kernel/hw_breakpoint.c | 25 +-
4355 arch/powerpc/kernel/ibmebus.c | 1 -
4356 arch/powerpc/kernel/irq.c | 8 +-
4357 arch/powerpc/kernel/machine_kexec.c | 14 +-
4358 arch/powerpc/kernel/paca.c | 1 +
4359 arch/powerpc/kernel/pci-common.c | 16 +-
4360 arch/powerpc/kernel/process.c | 16 +-
4361 arch/powerpc/kernel/prom.c | 4 +-
4362 arch/powerpc/kernel/prom_init.c | 2 +-
4363 arch/powerpc/kernel/ptrace.c | 3 +
4364 arch/powerpc/kernel/rtas_flash.c | 7 +-
4365 arch/powerpc/kernel/rtas_pci.c | 5 +-
4366 arch/powerpc/kernel/setup_64.c | 2 +
4367 arch/powerpc/kernel/signal.c | 8 +-
4368 arch/powerpc/kernel/smp.c | 14 +-
4369 arch/powerpc/kernel/time.c | 8 +-
4370 arch/powerpc/kernel/traps.c | 1 +
4371 arch/powerpc/kernel/uprobes.c | 184 ++++++
4372 arch/powerpc/kernel/vdso.c | 4 +-
4373 arch/powerpc/kernel/vio.c | 1 -
4374 arch/powerpc/kvm/book3s_32_mmu_host.c | 8 +-
4375 arch/powerpc/kvm/book3s_64_mmu_host.c | 17 +-
4376 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +-
4377 arch/powerpc/kvm/trace.h | 14 +-
4378 arch/powerpc/lib/sstep.c | 36 +-
4379 arch/powerpc/mm/fault.c | 1 +
4380 arch/powerpc/mm/hash_low_64.S | 97 +--
4381 arch/powerpc/mm/hash_native_64.c | 192 +++---
4382 arch/powerpc/mm/hash_utils_64.c | 48 +-
4383 arch/powerpc/mm/hugetlbpage-hash64.c | 15 +-
4384 arch/powerpc/mm/init_64.c | 1 -
4385 arch/powerpc/mm/mem.c | 5 +-
4386 arch/powerpc/mm/mmu_context_hash64.c | 10 +-
4387 arch/powerpc/mm/pgtable_64.c | 13 +-
4388 arch/powerpc/mm/slb_low.S | 62 +-
4389 arch/powerpc/mm/slice.c | 112 ++--
4390 arch/powerpc/mm/stab.c | 3 +-
4391 arch/powerpc/mm/subpage-prot.c | 6 +-
4392 arch/powerpc/mm/tlb_hash64.c | 11 +-
4393 arch/powerpc/mm/tlb_low_64e.S | 18 +-
4394 arch/powerpc/oprofile/op_model_power4.c | 116 +++-
4395 arch/powerpc/perf/core-book3s.c | 46 +-
4396 arch/powerpc/perf/power7-pmu.c | 3 +
4397 arch/powerpc/platforms/44x/currituck.c | 10 +-
4398 arch/powerpc/platforms/512x/Kconfig | 1 +
4399 arch/powerpc/platforms/512x/clock.c | 6 +-
4400 arch/powerpc/platforms/512x/mpc512x_shared.c | 6 -
4401 arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
4402 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 35 +-
4403 arch/powerpc/platforms/85xx/Kconfig | 21 +
4404 arch/powerpc/platforms/85xx/Makefile | 2 +
4405 arch/powerpc/platforms/85xx/common.c | 10 +
4406 arch/powerpc/platforms/85xx/corenet_ds.c | 38 +-
4407 arch/powerpc/platforms/85xx/ge_imp3a.c | 62 +-
4408 arch/powerpc/platforms/85xx/mpc8536_ds.c | 36 +-
4409 arch/powerpc/platforms/85xx/mpc85xx_ads.c | 11 +-
4410 arch/powerpc/platforms/85xx/mpc85xx_cds.c | 44 +-
4411 arch/powerpc/platforms/85xx/mpc85xx_ds.c | 15 +-
4412 arch/powerpc/platforms/85xx/mpc85xx_mds.c | 40 +-
4413 arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 30 +-
4414 arch/powerpc/platforms/85xx/p1010rdb.c | 14 +-
4415 arch/powerpc/platforms/85xx/p1022_ds.c | 36 +-
4416 arch/powerpc/platforms/85xx/p1022_rdk.c | 167 +++++
4417 arch/powerpc/platforms/85xx/p1023_rds.c | 9 +-
4418 arch/powerpc/platforms/85xx/p2041_rdb.c | 2 +-
4419 arch/powerpc/platforms/85xx/p3041_ds.c | 2 +-
4420 arch/powerpc/platforms/85xx/p4080_ds.c | 2 +-
4421 arch/powerpc/platforms/85xx/p5020_ds.c | 2 +-
4422 arch/powerpc/platforms/85xx/p5040_ds.c | 89 +++
4423 arch/powerpc/platforms/85xx/qemu_e500.c | 5 +-
4424 arch/powerpc/platforms/85xx/sbc8548.c | 21 +-
4425 arch/powerpc/platforms/85xx/smp.c | 220 +++++--
4426 arch/powerpc/platforms/85xx/socrates.c | 11 +-
4427 arch/powerpc/platforms/85xx/stx_gp3.c | 13 +-
4428 arch/powerpc/platforms/85xx/tqm85xx.c | 21 +-
4429 arch/powerpc/platforms/85xx/xes_mpc85xx.c | 56 +-
4430 arch/powerpc/platforms/86xx/gef_ppc9a.c | 12 +-
4431 arch/powerpc/platforms/86xx/gef_sbc310.c | 13 +-
4432 arch/powerpc/platforms/86xx/gef_sbc610.c | 12 +-
4433 arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 21 +-
4434 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 42 +-
4435 arch/powerpc/platforms/86xx/sbc8641d.c | 14 +-
4436 arch/powerpc/platforms/cell/beat.c | 4 +-
4437 arch/powerpc/platforms/cell/beat.h | 2 +-
4438 arch/powerpc/platforms/cell/beat_htab.c | 45 +-
4439 arch/powerpc/platforms/pasemi/iommu.c | 6 +-
4440 arch/powerpc/platforms/powernv/pci-ioda.c | 695 +++++---------------
4441 arch/powerpc/platforms/powernv/pci-p5ioc2.c | 1 -
4442 arch/powerpc/platforms/powernv/pci.c | 7 +-
4443 arch/powerpc/platforms/powernv/pci.h | 21 +-
4444 arch/powerpc/platforms/ps3/htab.c | 22 +-
4445 arch/powerpc/platforms/ps3/setup.c | 10 +-
4446 arch/powerpc/platforms/pseries/Makefile | 5 +-
4447 arch/powerpc/platforms/pseries/eeh.c | 543 ++++-----------
4448 arch/powerpc/platforms/pseries/eeh_cache.c | 59 +-
4449 arch/powerpc/platforms/pseries/eeh_dev.c | 14 +-
4450 arch/powerpc/platforms/pseries/eeh_driver.c | 310 ++++-----
4451 arch/powerpc/platforms/pseries/eeh_event.c | 54 +-
4452 arch/powerpc/platforms/pseries/eeh_pe.c | 652 ++++++++++++++++++
4453 arch/powerpc/platforms/pseries/eeh_pseries.c | 247 ++++---
4454 arch/powerpc/platforms/pseries/eeh_sysfs.c | 9 -
4455 arch/powerpc/platforms/pseries/iommu.c | 12 +-
4456 arch/powerpc/platforms/pseries/lpar.c | 77 +--
4457 arch/powerpc/platforms/pseries/msi.c | 26 +-
4458 arch/powerpc/platforms/pseries/pci.c | 2 +-
4459 arch/powerpc/platforms/pseries/pci_dlpar.c | 32 +-
4460 arch/powerpc/platforms/pseries/setup.c | 22 +-
4461 arch/powerpc/sysdev/Makefile | 2 +-
4462 arch/powerpc/sysdev/dart_iommu.c | 7 +-
4463 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 10 +
4464 arch/powerpc/sysdev/fsl_ifc.c | 20 +-
4465 arch/powerpc/sysdev/fsl_mpic_err.c | 149 +++++
4466 arch/powerpc/sysdev/fsl_pci.c | 120 ++--
4467 arch/powerpc/sysdev/fsl_pci.h | 20 +-
4468 arch/powerpc/sysdev/mpic.c | 102 ++-
4469 arch/powerpc/sysdev/mpic.h | 22 +
4470 arch/powerpc/xmon/xmon.c | 111 +++-
4471 drivers/crypto/nx/nx.c | 17 +-
4472 drivers/edac/mpc85xx_edac.c | 43 +-
4473 drivers/infiniband/hw/ehca/ehca_cq.c | 2 +-
4474 drivers/infiniband/hw/ehca/ehca_eq.c | 2 +-
4475 drivers/infiniband/hw/ehca/ehca_mrmw.c | 45 +-
4476 drivers/infiniband/hw/ehca/ehca_qp.c | 6 +-
4477 drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +-
4478 drivers/infiniband/hw/ehca/ehca_tools.h | 1 -
4479 drivers/infiniband/hw/ehca/hcp_if.c | 12 +-
4480 drivers/infiniband/hw/ehca/ipz_pt_fn.c | 2 +-
4481 drivers/macintosh/smu.c | 3 +-
4482 drivers/net/ethernet/ibm/ehea/ehea.h | 1 -
4483 drivers/net/ethernet/ibm/ehea/ehea_phyp.c | 12 +-
4484 drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 14 +-
4485 drivers/pci/hotplug/rpadlpar_core.c | 2 +-
4486 drivers/scsi/ipr.c | 18 +-
4487 drivers/tty/hvc/hvc_console.c | 33 +-
4488 drivers/tty/hvc/hvc_vio.c | 123 ++--
4489 drivers/video/ps3fb.c | 3 +-
4490 246 files changed, 6326 insertions(+), 3223 deletions(-)
4491 create mode 100644 Documentation/devicetree/bindings/misc/ifm-csi.txt
4492 create mode 100644 arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi
4493 create mode 100644 arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi
4494 create mode 100644 arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi
4495 create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
4496 create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
4497 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi
4498 create mode 100644 arch/powerpc/boot/dts/o2d.dts
4499 create mode 100644 arch/powerpc/boot/dts/o2d.dtsi
4500 create mode 100644 arch/powerpc/boot/dts/o2d300.dts
4501 create mode 100644 arch/powerpc/boot/dts/o2dnt2.dts
4502 create mode 100644 arch/powerpc/boot/dts/o2i.dts
4503 create mode 100644 arch/powerpc/boot/dts/o2mnt.dts
4504 create mode 100644 arch/powerpc/boot/dts/o3dnt.dts
4505 delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
4506 delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
4507 create mode 100644 arch/powerpc/boot/dts/p1022rdk.dts
4508 delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
4509 delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
4510 create mode 100644 arch/powerpc/boot/dts/p5040ds.dts
4511 delete mode 100644 arch/powerpc/include/asm/abs_addr.h
4512 create mode 100644 arch/powerpc/include/asm/probes.h
4513 create mode 100644 arch/powerpc/include/asm/uprobes.h
4514 create mode 100644 arch/powerpc/kernel/uprobes.c
4515 create mode 100644 arch/powerpc/platforms/85xx/p1022_rdk.c
4516 create mode 100644 arch/powerpc/platforms/85xx/p5040_ds.c
4517 create mode 100644 arch/powerpc/platforms/pseries/eeh_pe.c
4518 create mode 100644 arch/powerpc/sysdev/fsl_mpic_err.c
4519 Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
4520 $ git merge 4xx/next
4522 Merging mpc5xxx/next (9d9fd88 powerpc/mpc52xx_lpbfifo: optionally defer fifo transfer start)
4523 $ git merge mpc5xxx/next
4525 Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
4526 $ git merge galak/next
4527 Merge made by the 'recursive' strategy.
4528 arch/powerpc/sysdev/fsl_pci.c | 37 +++++++++++++++++---------
4529 drivers/mtd/nand/fsl_ifc_nand.c | 56 ++++++++++++++++++++++++++++++++++++++-
4530 2 files changed, 79 insertions(+), 14 deletions(-)
4531 Merging hid/for-next (0b82411 Merge branch 'hidraw' into for-next)
4532 $ git merge hid/for-next
4533 Recorded preimage for 'drivers/hid/hid-multitouch.c'
4534 Auto-merging drivers/hid/hid-multitouch.c
4535 CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c
4536 Automatic merge failed; fix conflicts and then commit the result.
4538 Recorded resolution for 'drivers/hid/hid-multitouch.c'.
4539 [master 46d4e43] Merge remote-tracking branch 'hid/for-next'
4540 $ git diff -M --stat --summary HEAD^..
4541 Merging quilt/i2c (cf53e33 i2c-viapro: Add VIA VX900 device ID)
4542 $ git merge quilt/i2c
4543 Auto-merging include/linux/pci_ids.h
4544 Merge made by the 'recursive' strategy.
4545 Documentation/i2c/busses/i2c-viapro | 6 +-
4546 drivers/i2c/Kconfig | 17 ++-
4547 drivers/i2c/busses/Kconfig | 18 +--
4548 drivers/i2c/busses/i2c-designware-core.c | 2 +-
4549 drivers/i2c/busses/i2c-i801.c | 214 +++++++++++++++++++++++++++++-
4550 drivers/i2c/busses/i2c-parport.c | 2 +-
4551 drivers/i2c/busses/i2c-viapro.c | 3 +
4552 drivers/i2c/busses/scx200_acb.c | 24 ++--
4553 drivers/i2c/busses/scx200_i2c.c | 15 +--
4554 drivers/i2c/i2c-core.c | 16 ++-
4555 drivers/i2c/i2c-mux.c | 22 +++
4556 drivers/i2c/i2c-smbus.c | 11 +-
4557 drivers/i2c/muxes/i2c-mux-gpio.c | 4 +-
4558 drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +-
4559 drivers/i2c/muxes/i2c-mux-pca954x.c | 10 +-
4560 drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
4561 include/linux/i2c-mux-gpio.h | 2 +
4562 include/linux/i2c-mux.h | 1 +
4563 include/linux/i2c/pca954x.h | 1 +
4564 include/linux/pci_ids.h | 1 +
4565 20 files changed, 316 insertions(+), 57 deletions(-)
4566 Merging i2c-embedded/i2c-embedded/for-next (2bdbfa9 i2c: davinci: preparation for switch to common clock framework)
4567 $ git merge i2c-embedded/i2c-embedded/for-next
4568 Auto-merging drivers/i2c/busses/Kconfig
4569 Removing arch/arm/mach-at91/include/mach/at91_twi.h
4570 Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
4571 Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi
4572 Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi
4573 Auto-merging arch/arm/boot/dts/at91sam9263.dtsi
4574 Auto-merging arch/arm/boot/dts/at91sam9260.dtsi
4575 Merge made by the 'recursive' strategy.
4576 .../devicetree/bindings/i2c/atmel-i2c.txt | 30 +
4577 Documentation/devicetree/bindings/i2c/davinci.txt | 28 +
4578 arch/arm/boot/dts/at91sam9260.dtsi | 10 +
4579 arch/arm/boot/dts/at91sam9263.dtsi | 10 +
4580 arch/arm/boot/dts/at91sam9g20.dtsi | 4 +
4581 arch/arm/boot/dts/at91sam9g25ek.dts | 12 +
4582 arch/arm/boot/dts/at91sam9g45.dtsi | 20 +
4583 arch/arm/boot/dts/at91sam9m10g45ek.dts | 8 +
4584 arch/arm/boot/dts/at91sam9n12.dtsi | 20 +
4585 arch/arm/boot/dts/at91sam9n12ek.dts | 8 +
4586 arch/arm/boot/dts/at91sam9x5.dtsi | 30 +
4587 arch/arm/mach-at91/at91rm9200.c | 1 +
4588 arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
4589 arch/arm/mach-at91/at91sam9260.c | 3 +
4590 arch/arm/mach-at91/at91sam9260_devices.c | 8 +-
4591 arch/arm/mach-at91/at91sam9261.c | 2 +
4592 arch/arm/mach-at91/at91sam9261_devices.c | 14 +-
4593 arch/arm/mach-at91/at91sam9263.c | 2 +
4594 arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
4595 arch/arm/mach-at91/at91sam9g45.c | 4 +
4596 arch/arm/mach-at91/at91sam9g45_devices.c | 10 +-
4597 arch/arm/mach-at91/at91sam9n12.c | 2 +
4598 arch/arm/mach-at91/at91sam9rl.c | 2 +
4599 arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
4600 arch/arm/mach-at91/at91sam9x5.c | 3 +
4601 arch/arm/mach-at91/include/mach/at91_twi.h | 68 --
4602 drivers/i2c/busses/Kconfig | 17 +-
4603 drivers/i2c/busses/i2c-at91.c | 667 +++++++++++++-------
4604 drivers/i2c/busses/i2c-davinci.c | 58 +-
4605 drivers/i2c/busses/i2c-imx.c | 6 +-
4606 drivers/i2c/busses/i2c-nomadik.c | 17 -
4607 drivers/i2c/busses/i2c-omap.c | 448 ++++++++-----
4608 32 files changed, 1003 insertions(+), 515 deletions(-)
4609 create mode 100644 Documentation/devicetree/bindings/i2c/atmel-i2c.txt
4610 create mode 100644 Documentation/devicetree/bindings/i2c/davinci.txt
4611 delete mode 100644 arch/arm/mach-at91/include/mach/at91_twi.h
4612 Merging quilt/jdelvare-hwmon (37e5dd8 hwmon: Update Alexey Fisher's name)
4613 $ git merge quilt/jdelvare-hwmon
4614 Merge made by the 'recursive' strategy.
4615 Documentation/hwmon/max1619 | 2 +-
4616 drivers/hwmon/max1619.c | 4 ++--
4617 drivers/hwmon/max6642.c | 2 +-
4618 3 files changed, 4 insertions(+), 4 deletions(-)
4619 Merging hwmon-staging/hwmon-next (592758b hwmon: (mcp3021) Add MCP3221 support)
4620 $ git merge hwmon-staging/hwmon-next
4622 Merging v4l-dvb/master (0421fb6 Merge /home/v4l/v4l/patchwork)
4623 $ git merge v4l-dvb/master
4624 Removing drivers/staging/media/lirc/lirc_ttusbir.c
4625 Removing drivers/staging/media/lirc/lirc_ene0100.h
4626 Removing drivers/staging/media/easycap/easycap_testcard.c
4627 Removing drivers/staging/media/easycap/easycap_sound.c
4628 Removing drivers/staging/media/easycap/easycap_settings.c
4629 Removing drivers/staging/media/easycap/easycap_main.c
4630 Removing drivers/staging/media/easycap/easycap_low.c
4631 Removing drivers/staging/media/easycap/easycap_ioctl.c
4632 Removing drivers/staging/media/easycap/easycap.h
4633 Removing drivers/staging/media/easycap/README
4634 Removing drivers/staging/media/easycap/Makefile
4635 Removing drivers/staging/media/easycap/Kconfig
4636 Removing drivers/media/video/tlg2300/Makefile
4637 Removing drivers/media/video/cx23885/Kconfig
4638 Removing drivers/media/video/bt8xx/Makefile
4639 Removing drivers/media/video/bt8xx/Kconfig
4640 Removing drivers/media/video/Makefile
4641 Removing drivers/media/video/Kconfig
4642 Auto-merging drivers/media/v4l2-core/videobuf2-vmalloc.c
4643 Auto-merging drivers/media/v4l2-core/videobuf2-core.c
4644 Auto-merging drivers/media/v4l2-core/videobuf-dvb.c
4645 Auto-merging drivers/media/v4l2-core/v4l2-subdev.c
4646 Auto-merging drivers/media/v4l2-core/v4l2-mem2mem.c
4647 Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c
4648 Auto-merging drivers/media/v4l2-core/v4l2-dev.c
4649 Auto-merging drivers/media/v4l2-core/v4l2-ctrls.c
4650 Auto-merging drivers/media/v4l2-core/v4l2-compat-ioctl32.c
4651 Auto-merging drivers/media/v4l2-core/v4l2-common.c
4652 Auto-merging drivers/media/usb/uvc/uvcvideo.h
4653 Auto-merging drivers/media/usb/uvc/uvc_video.c
4654 Auto-merging drivers/media/usb/uvc/uvc_driver.c
4655 Auto-merging drivers/media/usb/usbvision/usbvision-video.c
4656 Auto-merging drivers/media/usb/usbvision/Makefile
4657 Auto-merging drivers/media/usb/usbvision/Kconfig
4658 Auto-merging drivers/media/usb/ttusb-dec/Makefile
4659 Auto-merging drivers/media/usb/ttusb-budget/Kconfig
4660 Auto-merging drivers/media/usb/tm6000/tm6000-video.c
4661 Auto-merging drivers/media/usb/tm6000/tm6000-input.c
4662 Auto-merging drivers/media/usb/tm6000/tm6000-alsa.c
4663 Auto-merging drivers/media/usb/tm6000/Makefile
4664 Auto-merging drivers/media/usb/tlg2300/pd-alsa.c
4665 Auto-merging drivers/media/usb/s2255/s2255drv.c
4666 Auto-merging drivers/media/usb/pwc/pwc-if.c
4667 Auto-merging drivers/media/usb/pwc/Makefile
4668 Auto-merging drivers/media/usb/pvrusb2/pvrusb2-devattr.c
4669 Auto-merging drivers/media/usb/pvrusb2/Makefile
4670 Auto-merging drivers/media/usb/pvrusb2/Kconfig
4671 Auto-merging drivers/media/usb/hdpvr/Makefile
4672 Auto-merging drivers/media/usb/gspca/zc3xx.c
4673 Auto-merging drivers/media/usb/gspca/xirlink_cit.c
4674 Auto-merging drivers/media/usb/gspca/vicam.c
4675 Auto-merging drivers/media/usb/gspca/vc032x.c
4676 Auto-merging drivers/media/usb/gspca/stv06xx/Makefile
4677 Auto-merging drivers/media/usb/gspca/sq930x.c
4678 Auto-merging drivers/media/usb/gspca/sq905c.c
4679 Auto-merging drivers/media/usb/gspca/sq905.c
4680 Auto-merging drivers/media/usb/gspca/sonixj.c
4681 Auto-merging drivers/media/usb/gspca/sn9c20x.c
4682 Auto-merging drivers/media/usb/gspca/pac7302.c
4683 Auto-merging drivers/media/usb/gspca/ov519.c
4684 Auto-merging drivers/media/usb/gspca/m5602/Makefile
4685 Auto-merging drivers/media/usb/gspca/jl2005bcd.c
4686 Auto-merging drivers/media/usb/gspca/gspca.c
4687 Auto-merging drivers/media/usb/gspca/gl860/Makefile
4688 Auto-merging drivers/media/usb/gspca/finepix.c
4689 Auto-merging drivers/media/usb/gspca/cpia1.c
4690 Auto-merging drivers/media/usb/gspca/Kconfig
4691 Auto-merging drivers/media/usb/em28xx/em28xx-video.c
4692 Auto-merging drivers/media/usb/em28xx/em28xx-core.c
4693 Auto-merging drivers/media/usb/em28xx/em28xx-audio.c
4694 Auto-merging drivers/media/usb/em28xx/Makefile
4695 Auto-merging drivers/media/usb/em28xx/Kconfig
4696 Auto-merging drivers/media/usb/dvb-usb/ttusb2.c
4697 Auto-merging drivers/media/usb/dvb-usb/pctv452e.c
4698 Auto-merging drivers/media/usb/dvb-usb/dvb-usb.h
4699 Auto-merging drivers/media/usb/dvb-usb/dvb-usb-dvb.c
4700 Auto-merging drivers/media/usb/dvb-usb/dib0700_core.c
4701 Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.h
4702 Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.c
4703 Auto-merging drivers/media/usb/dvb-usb-v2/mxl111sf.h
4704 Auto-merging drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
4705 Auto-merging drivers/media/usb/dvb-usb-v2/lmedm04.c
4706 Auto-merging drivers/media/usb/dvb-usb-v2/gl861.h
4707 Auto-merging drivers/media/usb/dvb-usb-v2/gl861.c
4708 Auto-merging drivers/media/usb/dvb-usb-v2/ec168.h
4709 Auto-merging drivers/media/usb/dvb-usb-v2/ec168.c
4710 Auto-merging drivers/media/usb/dvb-usb-v2/ce6230.h
4711 Auto-merging drivers/media/usb/dvb-usb-v2/ce6230.c
4712 Auto-merging drivers/media/usb/dvb-usb-v2/az6007.c
4713 Auto-merging drivers/media/usb/dvb-usb-v2/au6610.h
4714 Auto-merging drivers/media/usb/dvb-usb-v2/au6610.c
4715 Auto-merging drivers/media/usb/dvb-usb-v2/anysee.h
4716 Auto-merging drivers/media/usb/dvb-usb-v2/anysee.c
4717 Auto-merging drivers/media/usb/dvb-usb-v2/af9035.h
4718 Auto-merging drivers/media/usb/dvb-usb-v2/af9035.c
4719 Auto-merging drivers/media/usb/dvb-usb-v2/af9015.h
4720 Auto-merging drivers/media/usb/cx231xx/cx231xx-video.c
4721 Auto-merging drivers/media/usb/cx231xx/cx231xx-417.c
4722 Auto-merging drivers/media/usb/cx231xx/Makefile
4723 Auto-merging drivers/media/usb/cx231xx/Kconfig
4724 Auto-merging drivers/media/usb/cpia2/cpia2_v4l.c
4725 Auto-merging drivers/media/usb/cpia2/cpia2_core.c
4726 Auto-merging drivers/media/usb/b2c2/flexcop-usb.c
4727 Auto-merging drivers/media/usb/au0828/au0828.h
4728 Auto-merging drivers/media/usb/au0828/au0828-video.c
4729 Auto-merging drivers/media/usb/au0828/au0828-reg.h
4730 Auto-merging drivers/media/usb/au0828/au0828-i2c.c
4731 Auto-merging drivers/media/usb/au0828/au0828-dvb.c
4732 Auto-merging drivers/media/usb/au0828/au0828-core.c
4733 Auto-merging drivers/media/usb/au0828/au0828-cards.c
4734 Auto-merging drivers/media/usb/au0828/Makefile
4735 Auto-merging drivers/media/usb/au0828/Kconfig
4736 Auto-merging drivers/media/tuners/xc5000.c
4737 Auto-merging drivers/media/tuners/xc4000.c
4738 Auto-merging drivers/media/tuners/tuner-xc2028.c
4739 Auto-merging drivers/media/tuners/tua9001.h
4740 Auto-merging drivers/media/tuners/tua9001.c
4741 Auto-merging drivers/media/tuners/tda18271-common.c
4742 Auto-merging drivers/media/tuners/tda18218_priv.h
4743 Auto-merging drivers/media/tuners/tda18218.c
4744 Auto-merging drivers/media/tuners/tda18212.c
4745 Auto-merging drivers/media/tuners/qt1010.c
4746 Auto-merging drivers/media/tuners/mxl5005s.c
4747 Auto-merging drivers/media/tuners/mc44s803.c
4748 Auto-merging drivers/media/tuners/Makefile
4749 Auto-merging drivers/media/tuners/Kconfig
4750 Auto-merging drivers/media/platform/vivi.c
4751 Auto-merging drivers/media/platform/soc_camera/soc_camera_platform.c
4752 Auto-merging drivers/media/platform/soc_camera/soc_camera.c
4753 Auto-merging drivers/media/platform/soc_camera/omap1_camera.c
4754 Auto-merging drivers/media/platform/soc_camera/mx3_camera.c
4755 Auto-merging drivers/media/platform/soc_camera/mx2_camera.c
4756 Auto-merging drivers/media/platform/sh_vou.c
4757 Auto-merging drivers/media/platform/s5p-tv/sii9234_drv.c
4758 Auto-merging drivers/media/platform/s5p-tv/sdo_drv.c
4759 Auto-merging drivers/media/platform/s5p-tv/regs-sdo.h
4760 Auto-merging drivers/media/platform/s5p-tv/mixer_video.c
4761 Auto-merging drivers/media/platform/s5p-tv/mixer_drv.c
4762 Auto-merging drivers/media/platform/s5p-tv/hdmi_drv.c
4763 Auto-merging drivers/media/platform/s5p-tv/Makefile
4764 Auto-merging drivers/media/platform/s5p-tv/Kconfig
4765 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_shm.h
4766 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
4767 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
4768 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
4769 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
4770 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
4771 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_intr.h
4772 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_intr.c
4773 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
4774 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
4775 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
4776 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
4777 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
4778 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
4779 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
4780 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
4781 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
4782 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc.c
4783 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-regs.h
4784 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-hw.h
4785 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-core.h
4786 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-core.c
4787 Auto-merging drivers/media/platform/s5p-g2d/g2d.c
4788 Auto-merging drivers/media/platform/s5p-fimc/fimc-reg.c
4789 Auto-merging drivers/media/platform/s5p-fimc/fimc-mdevice.h
4790 Auto-merging drivers/media/platform/s5p-fimc/fimc-mdevice.c
4791 Auto-merging drivers/media/platform/s5p-fimc/fimc-m2m.c
4792 Auto-merging drivers/media/platform/s5p-fimc/fimc-lite.h
4793 Auto-merging drivers/media/platform/s5p-fimc/fimc-lite.c
4794 Auto-merging drivers/media/platform/s5p-fimc/fimc-lite-reg.c
4795 Auto-merging drivers/media/platform/s5p-fimc/fimc-core.h
4796 Auto-merging drivers/media/platform/s5p-fimc/fimc-capture.c
4797 Auto-merging drivers/media/platform/s5p-fimc/Kconfig
4798 Auto-merging drivers/media/platform/omap3isp/ispvideo.h
4799 Auto-merging drivers/media/platform/omap3isp/ispvideo.c
4800 Auto-merging drivers/media/platform/omap3isp/ispresizer.c
4801 Auto-merging drivers/media/platform/omap3isp/ispqueue.c
4802 Auto-merging drivers/media/platform/omap3isp/isppreview.h
4803 Auto-merging drivers/media/platform/omap3isp/isppreview.c
4804 Auto-merging drivers/media/platform/omap3isp/isphist.c
4805 Auto-merging drivers/media/platform/omap3isp/isph3a_af.c
4806 Auto-merging drivers/media/platform/omap3isp/isph3a_aewb.c
4807 Auto-merging drivers/media/platform/omap3isp/ispcsi2.c
4808 Auto-merging drivers/media/platform/omap3isp/ispccdc.h
4809 Auto-merging drivers/media/platform/omap3isp/ispccdc.c
4810 Auto-merging drivers/media/platform/omap3isp/isp.h
4811 Auto-merging drivers/media/platform/omap3isp/isp.c
4812 Auto-merging drivers/media/platform/omap3isp/cfa_coef_table.h
4813 Auto-merging drivers/media/platform/omap24xxcam.h
4814 Auto-merging drivers/media/platform/omap24xxcam.c
4815 Auto-merging drivers/media/platform/omap24xxcam-dma.c
4816 Auto-merging drivers/media/platform/omap/Makefile
4817 Auto-merging drivers/media/platform/mx2_emmaprp.c
4818 Auto-merging drivers/media/platform/mem2mem_testdev.c
4819 Auto-merging drivers/media/platform/fsl-viu.c
4820 Auto-merging drivers/media/platform/davinci/vpss.c
4821 Auto-merging drivers/media/platform/davinci/vpif_display.c
4822 Auto-merging drivers/media/platform/davinci/vpif_capture.c
4823 Auto-merging drivers/media/platform/davinci/vpif.c
4824 Auto-merging drivers/media/platform/davinci/vpfe_capture.c
4825 Auto-merging drivers/media/platform/davinci/vpbe_display.c
4826 Auto-merging drivers/media/platform/davinci/isif.c
4827 Auto-merging drivers/media/platform/davinci/dm644x_ccdc.c
4828 Auto-merging drivers/media/platform/davinci/dm355_ccdc.c
4829 Auto-merging drivers/media/platform/davinci/Kconfig
4830 Auto-merging drivers/media/platform/blackfin/bfin_capture.c
4831 Auto-merging drivers/media/pci/zoran/Kconfig
4832 Auto-merging drivers/media/pci/ttpci/budget.c
4833 Auto-merging drivers/media/pci/ttpci/Makefile
4834 Auto-merging drivers/media/pci/ttpci/Kconfig
4835 Auto-merging drivers/media/pci/saa7164/saa7164.h
4836 Auto-merging drivers/media/pci/saa7164/saa7164-core.c
4837 Auto-merging drivers/media/pci/saa7164/saa7164-api.c
4838 Auto-merging drivers/media/pci/saa7164/Makefile
4839 Auto-merging drivers/media/pci/saa7164/Kconfig
4840 Auto-merging drivers/media/pci/saa7134/saa7134.h
4841 Auto-merging drivers/media/pci/saa7134/saa7134-input.c
4842 Auto-merging drivers/media/pci/saa7134/saa7134-dvb.c
4843 Auto-merging drivers/media/pci/saa7134/Makefile
4844 Auto-merging drivers/media/pci/saa7134/Kconfig
4845 Auto-merging drivers/media/pci/pt1/va1j5jf8007s.c
4846 Auto-merging drivers/media/pci/pt1/Makefile
4847 Auto-merging drivers/media/pci/ngene/ngene-core.c
4848 Auto-merging drivers/media/pci/ngene/ngene-cards.c
4849 Auto-merging drivers/media/pci/ngene/Makefile
4850 Auto-merging drivers/media/pci/mantis/mantis_dvb.c
4851 Auto-merging drivers/media/pci/mantis/mantis_core.c
4852 Auto-merging drivers/media/pci/mantis/mantis_cards.c
4853 Auto-merging drivers/media/pci/mantis/Makefile
4854 Auto-merging drivers/media/pci/mantis/Kconfig
4855 Auto-merging drivers/media/pci/ivtv/ivtv-streams.c
4856 Auto-merging drivers/media/pci/ivtv/ivtv-irq.c
4857 Auto-merging drivers/media/pci/ivtv/ivtv-firmware.c
4858 Auto-merging drivers/media/pci/ivtv/ivtv-fileops.h
4859 Auto-merging drivers/media/pci/ivtv/ivtv-fileops.c
4860 Auto-merging drivers/media/pci/ivtv/ivtv-driver.h
4861 Auto-merging drivers/media/pci/ivtv/ivtv-driver.c
4862 Auto-merging drivers/media/pci/ivtv/Makefile
4863 Auto-merging drivers/media/pci/ivtv/Kconfig
4864 Auto-merging drivers/media/pci/dm1105/Kconfig
4865 Auto-merging drivers/media/pci/ddbridge/ddbridge-core.c
4866 Auto-merging drivers/media/pci/ddbridge/Makefile
4867 Auto-merging drivers/media/pci/ddbridge/Kconfig
4868 Auto-merging drivers/media/pci/cx88/cx88.h
4869 Auto-merging drivers/media/pci/cx88/cx88-dvb.c
4870 Auto-merging drivers/media/pci/cx88/cx88-core.c
4871 Auto-merging drivers/media/pci/cx88/cx88-cards.c
4872 Auto-merging drivers/media/pci/cx88/cx88-alsa.c
4873 Auto-merging drivers/media/pci/cx88/Makefile
4874 Auto-merging drivers/media/pci/cx88/Kconfig
4875 Auto-merging drivers/media/pci/cx25821/Makefile
4876 Auto-merging drivers/media/pci/cx23885/cx23885.h
4877 Auto-merging drivers/media/pci/cx23885/cx23885-input.c
4878 Auto-merging drivers/media/pci/cx23885/cx23885-dvb.c
4879 Auto-merging drivers/media/pci/cx23885/cx23885-cards.c
4880 Auto-merging drivers/media/pci/cx23885/cx23885-417.c
4881 Auto-merging drivers/media/pci/cx23885/altera-ci.c
4882 Auto-merging drivers/media/pci/cx23885/Makefile
4883 Auto-merging drivers/media/pci/cx18/cx18-firmware.c
4884 Auto-merging drivers/media/pci/cx18/cx18-dvb.c
4885 Auto-merging drivers/media/pci/cx18/cx18-driver.c
4886 Auto-merging drivers/media/pci/cx18/cx18-av-firmware.c
4887 Auto-merging drivers/media/pci/cx18/Makefile
4888 Auto-merging drivers/media/pci/cx18/Kconfig
4889 Auto-merging drivers/media/pci/bt8xx/dst_ca.c
4890 Auto-merging drivers/media/i2c/tvp514x_regs.h
4891 Auto-merging drivers/media/i2c/tvp514x.c
4892 Auto-merging drivers/media/i2c/tea6415c.c
4893 Auto-merging drivers/media/i2c/tcm825x.h
4894 Auto-merging drivers/media/i2c/tcm825x.c
4895 Auto-merging drivers/media/i2c/soc_camera/tw9910.c
4896 Auto-merging drivers/media/i2c/soc_camera/rj54n1cb0c.c
4897 Auto-merging drivers/media/i2c/soc_camera/ov9740.c
4898 Auto-merging drivers/media/i2c/soc_camera/ov9640.c
4899 Auto-merging drivers/media/i2c/soc_camera/ov772x.c
4900 Auto-merging drivers/media/i2c/soc_camera/ov6650.c
4901 Auto-merging drivers/media/i2c/soc_camera/ov5642.c
4902 Auto-merging drivers/media/i2c/soc_camera/ov2640.c
4903 Auto-merging drivers/media/i2c/soc_camera/mt9v022.c
4904 Auto-merging drivers/media/i2c/soc_camera/mt9t112.c
4905 Auto-merging drivers/media/i2c/soc_camera/mt9t031.c
4906 Auto-merging drivers/media/i2c/soc_camera/mt9m111.c
4907 Auto-merging drivers/media/i2c/soc_camera/mt9m001.c
4908 Auto-merging drivers/media/i2c/soc_camera/imx074.c
4909 Auto-merging drivers/media/i2c/smiapp/smiapp.h
4910 Auto-merging drivers/media/i2c/smiapp/smiapp-regs.c
4911 Auto-merging drivers/media/i2c/smiapp/smiapp-reg.h
4912 Auto-merging drivers/media/i2c/smiapp/smiapp-reg-defs.h
4913 Auto-merging drivers/media/i2c/smiapp/smiapp-quirk.h
4914 Auto-merging drivers/media/i2c/smiapp/smiapp-quirk.c
4915 Auto-merging drivers/media/i2c/smiapp/smiapp-limits.h
4916 Auto-merging drivers/media/i2c/smiapp/smiapp-limits.c
4917 Auto-merging drivers/media/i2c/smiapp/smiapp-core.c
4918 Auto-merging drivers/media/i2c/smiapp/Makefile
4919 Auto-merging drivers/media/i2c/smiapp-pll.h
4920 Auto-merging drivers/media/i2c/smiapp-pll.c
4921 Auto-merging drivers/media/i2c/saa7127.c
4922 Auto-merging drivers/media/i2c/s5k6aa.c
4923 Auto-merging drivers/media/i2c/mt9v032.c
4924 Auto-merging drivers/media/i2c/mt9p031.c
4925 Auto-merging drivers/media/i2c/mt9m032.c
4926 Auto-merging drivers/media/i2c/m5mols/m5mols_core.c
4927 Auto-merging drivers/media/i2c/m5mols/m5mols_controls.c
4928 Auto-merging drivers/media/i2c/m5mols/m5mols.h
4929 Auto-merging drivers/media/i2c/cx25840/cx25840-firmware.c
4930 Auto-merging drivers/media/i2c/cx25840/Makefile
4931 Auto-merging drivers/media/i2c/as3645a.c
4932 Auto-merging drivers/media/i2c/adp1653.c
4933 Auto-merging drivers/media/firewire/Makefile
4934 Removing drivers/media/dvb/ttusb-budget/Makefile
4935 Removing drivers/media/dvb/siano/Kconfig
4936 Removing drivers/media/dvb/pluto2/Makefile
4937 Removing drivers/media/dvb/ngene/Kconfig
4938 Removing drivers/media/dvb/frontends/ec100_priv.h
4939 Removing drivers/media/dvb/dvb-usb/mxl111sf.c
4940 Removing drivers/media/dvb/dvb-usb/it913x.c
4941 Removing drivers/media/dvb/dvb-usb/af9015.c
4942 Removing drivers/media/dvb/dvb-usb/Makefile
4943 Removing drivers/media/dvb/dvb-usb/Kconfig
4944 Removing drivers/media/dvb/dm1105/Makefile
4945 Removing drivers/media/dvb/bt8xx/Makefile
4946 Removing drivers/media/dvb/bt8xx/Kconfig
4947 Removing drivers/media/dvb/b2c2/MakefilResolved 'arch/arm/mach-imx/mach-imx27_visstrim_m10.c' using previous resolution.
4949 Removing drivers/media/dvb/b2c2/Kconfig
4950 Removing drivers/media/dvb/Makefile
4951 Removing drivers/media/dvb/Kconfig
4952 Auto-merging drivers/media/dvb-frontends/tda8261.c
4953 Auto-merging drivers/media/dvb-frontends/tda10071_priv.h
4954 Auto-merging drivers/media/dvb-frontends/tda10071.c
4955 Auto-merging drivers/media/dvb-frontends/stv090x.c
4956 Auto-merging drivers/media/dvb-frontends/stb0899_drv.c
4957 Auto-merging drivers/media/dvb-frontends/rtl2832_priv.h
4958 Auto-merging drivers/media/dvb-frontends/rtl2832.h
4959 Auto-merging drivers/media/dvb-frontends/rtl2832.c
4960 Auto-merging drivers/media/dvb-frontends/rtl2830_priv.h
4961 Auto-merging drivers/media/dvb-frontends/rtl2830.h
4962 Auto-merging drivers/media/dvb-frontends/rtl2830.c
4963 Auto-merging drivers/media/dvb-frontends/nxt200x.c
4964 Auto-merging drivers/media/dvb-frontends/m88rs2000.c
4965 Auto-merging drivers/media/dvb-frontends/lgs8gxx.c
4966 Auto-merging drivers/media/dvb-frontends/lgs8gl5.c
4967 Auto-merging drivers/media/dvb-frontends/it913x-fe.c
4968 Auto-merging drivers/media/dvb-frontends/hd29l2_priv.h
4969 Auto-merging drivers/media/dvb-frontends/hd29l2.h
4970 Auto-merging drivers/media/dvb-frontends/hd29l2.c
4971 Auto-merging drivers/media/dvb-frontends/ec100.h
4972 Auto-merging drivers/media/dvb-frontends/ec100.c
4973 Auto-merging drivers/media/dvb-frontends/dvb-pll.h
4974 Auto-merging drivers/media/dvb-frontends/dvb-pll.c
4975 Auto-merging drivers/media/dvb-frontends/cxd2820r_t.c
4976 Auto-merging drivers/media/dvb-frontends/au8522_priv.h
4977 Auto-merging drivers/media/dvb-frontends/au8522_dig.c
4978 Auto-merging drivers/media/dvb-frontends/au8522_decoder.c
4979 Auto-merging drivers/media/dvb-frontends/au8522_common.c
4980 Auto-merging drivers/media/dvb-frontends/atbm8830.c
4981 Auto-merging drivers/media/dvb-frontends/af9033.h
4982 Auto-merging drivers/media/dvb-frontends/af9033.c
4983 Auto-merging drivers/media/dvb-frontends/af9013_priv.h
4984 Auto-merging drivers/media/dvb-frontends/af9013.h
4985 Auto-merging drivers/media/dvb-frontends/af9013.c
4986 Auto-merging drivers/media/dvb-frontends/Makefile
4987 Auto-merging drivers/media/dvb-frontends/Kconfig
4988 Auto-merging drivers/media/dvb-core/dvbdev.h
4989 Auto-merging drivers/media/dvb-core/dvbdev.c
4990 Auto-merging drivers/media/dvb-core/dvb_frontend.h
4991 Auto-merging drivers/media/dvb-core/dvb_frontend.c
4992 Auto-merging drivers/media/dvb-core/dvb_demux.c
4993 Auto-merging drivers/media/dvb-core/dvb-usb-ids.h
4994 Auto-merging drivers/media/dvb-core/dmxdev.c
4995 Auto-merging drivers/media/common/siano/Makefile
4996 Auto-merging drivers/media/common/saa7146/saa7146_fops.c
4997 Auto-merging drivers/media/common/saa7146/saa7146_core.c
4998 Auto-merging drivers/media/common/b2c2/flexcop.c
4999 Auto-merging arch/arm/mach-imx/mach-imx27_visstrim_m10.c
5000 CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
5001 Auto-merging MAINTAINERS
5002 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.
5003 Automatic merge failed; fix conflicts and then commit the result.
5004 $ git rm -f Documentation/feature-removal-schedule.txt
5005 Documentation/feature-removal-schedule.txt: needs merge
5006 rm 'Documentation/feature-removal-schedule.txt'
5008 [master abc4f20f] Merge remote-tracking branch 'v4l-dvb/master'
5009 $ git diff -M --stat --summary HEAD^..
5010 Documentation/DocBook/media/Makefile | 2 +-
5011 Documentation/DocBook/media/dvb/audio.xml | 113 +-
5012 Documentation/DocBook/media/dvb/ca.xml | 353 ++
5013 Documentation/DocBook/media/dvb/demux.xml | 230 +-
5014 Documentation/DocBook/media/dvb/dvbapi.xml | 4 +-
5015 Documentation/DocBook/media/dvb/dvbproperty.xml | 97 +-
5016 Documentation/DocBook/media/dvb/frontend.xml | 71 +-
5017 Documentation/DocBook/media/dvb/intro.xml | 2 +-
5018 Documentation/DocBook/media/dvb/kdapi.xml | 2 +-
5019 Documentation/DocBook/media/dvb/net.xml | 127 +
5020 Documentation/DocBook/media/dvb/video.xml | 333 +-
5021 Documentation/DocBook/media/v4l/biblio.xml | 52 +-
5022 Documentation/DocBook/media/v4l/compat.xml | 16 -
5023 Documentation/DocBook/media/v4l/controls.xml | 614 +--
5024 Documentation/DocBook/media/v4l/dev-rds.xml | 2 +-
5025 Documentation/DocBook/media/v4l/dev-subdev.xml | 20 +-
5026 Documentation/DocBook/media/v4l/gen-errors.xml | 12 +-
5027 .../DocBook/media/v4l/pixfmt-srggb10dpcm8.xml | 3 +-
5028 Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml | 154 +
5029 Documentation/DocBook/media/v4l/pixfmt.xml | 1 +
5030 Documentation/DocBook/media/v4l/selection-api.xml | 22 +-
5031 Documentation/DocBook/media/v4l/v4l2.xml | 14 +-
5032 .../DocBook/media/v4l/vidioc-g-selection.xml | 9 +-
5033 Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 6 +
5034 Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 2 +
5035 .../media/v4l/vidioc-subdev-g-selection.xml | 8 +-
5036 Documentation/DocBook/media_api.tmpl | 9 +-
5037 Documentation/dvb/README.dvb-usb | 2 +-
5038 Documentation/ioctl/ioctl-number.txt | 5 -
5039 Documentation/video4linux/CARDLIST.cx23885 | 1 +
5041 arch/arm/mach-imx/clk-imx27.c | 4 +-
5042 arch/arm/mach-imx/devices-imx27.h | 4 +
5043 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 45 +-
5044 arch/arm/mach-omap2/board-rx51-peripherals.c | 30 +
5045 arch/arm/plat-mxc/devices/Kconfig | 6 +-
5046 arch/arm/plat-mxc/devices/Makefile | 1 +
5047 arch/arm/plat-mxc/devices/platform-imx27-coda.c | 37 +
5048 arch/arm/plat-mxc/include/mach/devices-common.h | 8 +
5049 drivers/gpio/gpio-bt8xx.c | 2 +-
5050 drivers/media/Kconfig | 53 +-
5051 drivers/media/Makefile | 23 +-
5052 drivers/media/common/Kconfig | 12 +-
5053 drivers/media/common/Makefile | 7 +-
5054 drivers/media/common/b2c2/Kconfig | 28 +
5055 drivers/media/common/b2c2/Makefile | 8 +
5056 .../media/{dvb => common}/b2c2/flexcop-common.h | 0
5057 .../media/{dvb => common}/b2c2/flexcop-eeprom.c | 0
5058 .../media/{dvb => common}/b2c2/flexcop-fe-tuner.c | 0
5059 .../media/{dvb => common}/b2c2/flexcop-hw-filter.c | 0
5060 drivers/media/{dvb => common}/b2c2/flexcop-i2c.c | 0
5061 drivers/media/{dvb => common}/b2c2/flexcop-misc.c | 0
5062 drivers/media/{dvb => common}/b2c2/flexcop-reg.h | 0
5063 drivers/media/{dvb => common}/b2c2/flexcop-sram.c | 0
5064 drivers/media/{dvb => common}/b2c2/flexcop.c | 1 +
5065 drivers/media/{dvb => common}/b2c2/flexcop.h | 0
5066 .../{dvb => common}/b2c2/flexcop_ibi_value_be.h | 0
5067 .../{dvb => common}/b2c2/flexcop_ibi_value_le.h | 0
5068 drivers/media/common/saa7146/Kconfig | 9 +
5069 drivers/media/common/saa7146/Makefile | 5 +
5070 drivers/media/common/{ => saa7146}/saa7146_core.c | 8 -
5071 drivers/media/common/{ => saa7146}/saa7146_fops.c | 55 +-
5072 drivers/media/common/{ => saa7146}/saa7146_hlp.c | 0
5073 drivers/media/common/{ => saa7146}/saa7146_i2c.c | 0
5074 drivers/media/common/{ => saa7146}/saa7146_vbi.c | 0
5075 drivers/media/common/{ => saa7146}/saa7146_video.c | 0
5076 drivers/media/common/siano/Kconfig | 17 +
5077 drivers/media/{dvb => common}/siano/Makefile | 6 +-
5078 drivers/media/{dvb => common}/siano/sms-cards.c | 0
5079 drivers/media/{dvb => common}/siano/sms-cards.h | 0
5080 drivers/media/{dvb => common}/siano/smscoreapi.c | 0
5081 drivers/media/{dvb => common}/siano/smscoreapi.h | 0
5082 drivers/media/{dvb => common}/siano/smsdvb.c | 0
5083 drivers/media/{dvb => common}/siano/smsendian.c | 0
5084 drivers/media/{dvb => common}/siano/smsendian.h | 0
5085 drivers/media/{dvb => common}/siano/smsir.c | 0
5086 drivers/media/{dvb => common}/siano/smsir.h | 0
5087 drivers/media/dvb-core/Kconfig | 29 +
5088 drivers/media/{dvb => }/dvb-core/Makefile | 0
5089 drivers/media/{dvb => }/dvb-core/demux.h | 0
5090 drivers/media/{dvb => }/dvb-core/dmxdev.c | 4 +-
5091 drivers/media/{dvb => }/dvb-core/dmxdev.h | 0
5092 .../media/{dvb/dvb-usb => dvb-core}/dvb-usb-ids.h | 2 +
5093 drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c | 0
5094 drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h | 0
5095 drivers/media/{dvb => }/dvb-core/dvb_demux.c | 29 +-
5096 drivers/media/{dvb => }/dvb-core/dvb_demux.h | 0
5097 drivers/media/{dvb => }/dvb-core/dvb_filter.c | 0
5098 drivers/media/{dvb => }/dvb-core/dvb_filter.h | 0
5099 drivers/media/{dvb => }/dvb-core/dvb_frontend.c | 329 +-
5100 drivers/media/{dvb => }/dvb-core/dvb_frontend.h | 11 +-
5101 drivers/media/{dvb => }/dvb-core/dvb_math.c | 0
5102 drivers/media/{dvb => }/dvb-core/dvb_math.h | 0
5103 drivers/media/{dvb => }/dvb-core/dvb_net.c | 0
5104 drivers/media/{dvb => }/dvb-core/dvb_net.h | 0
5105 drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c | 0
5106 drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h | 0
5107 drivers/media/{dvb => }/dvb-core/dvbdev.c | 2 +-
5108 drivers/media/{dvb => }/dvb-core/dvbdev.h | 26 -
5109 .../media/{dvb/frontends => dvb-frontends}/Kconfig | 195 +-
5110 .../{dvb/frontends => dvb-frontends}/Makefile | 12 +-
5111 .../media/{dvb/frontends => dvb-frontends}/a8293.c | 0
5112 .../media/{dvb/frontends => dvb-frontends}/a8293.h | 0
5113 .../{dvb/frontends => dvb-frontends}/af9013.c | 158 +-
5114 .../{dvb/frontends => dvb-frontends}/af9013.h | 2 +-
5115 .../{dvb/frontends => dvb-frontends}/af9013_priv.h | 15 +-
5116 .../{dvb/frontends => dvb-frontends}/af9033.c | 83 +-
5117 .../{dvb/frontends => dvb-frontends}/af9033.h | 2 +-
5118 .../{dvb/frontends => dvb-frontends}/af9033_priv.h | 0
5119 .../{dvb/frontends => dvb-frontends}/atbm8830.c | 2 +-
5120 .../{dvb/frontends => dvb-frontends}/atbm8830.h | 0
5121 .../frontends => dvb-frontends}/atbm8830_priv.h | 0
5122 .../{dvb/frontends => dvb-frontends}/au8522.h | 0
5123 .../frontends => dvb-frontends}/au8522_common.c | 22 +-
5124 .../frontends => dvb-frontends}/au8522_decoder.c | 11 +-
5125 .../{dvb/frontends => dvb-frontends}/au8522_dig.c | 98 +-
5126 .../{dvb/frontends => dvb-frontends}/au8522_priv.h | 29 +-
5127 .../{dvb/frontends => dvb-frontends}/bcm3510.c | 0
5128 .../{dvb/frontends => dvb-frontends}/bcm3510.h | 0
5129 .../frontends => dvb-frontends}/bcm3510_priv.h | 0
5130 .../{dvb/frontends => dvb-frontends}/bsbe1-d01a.h | 0
5131 .../media/{dvb/frontends => dvb-frontends}/bsbe1.h | 0
5132 .../media/{dvb/frontends => dvb-frontends}/bsru6.h | 0
5133 .../{dvb/frontends => dvb-frontends}/cx22700.c | 0
5134 .../{dvb/frontends => dvb-frontends}/cx22700.h | 0
5135 .../{dvb/frontends => dvb-frontends}/cx22702.c | 0
5136 .../{dvb/frontends => dvb-frontends}/cx22702.h | 0
5137 .../{dvb/frontends => dvb-frontends}/cx24110.c | 0
5138 .../{dvb/frontends => dvb-frontends}/cx24110.h | 0
5139 .../{dvb/frontends => dvb-frontends}/cx24113.c | 0
5140 .../{dvb/frontends => dvb-frontends}/cx24113.h | 0
5141 .../{dvb/frontends => dvb-frontends}/cx24116.c | 0
5142 .../{dvb/frontends => dvb-frontends}/cx24116.h | 0
5143 .../{dvb/frontends => dvb-frontends}/cx24123.c | 0
5144 .../{dvb/frontends => dvb-frontends}/cx24123.h | 0
5145 .../{dvb/frontends => dvb-frontends}/cxd2820r.h | 0
5146 .../{dvb/frontends => dvb-frontends}/cxd2820r_c.c | 0
5147 .../frontends => dvb-frontends}/cxd2820r_core.c | 0
5148 .../frontends => dvb-frontends}/cxd2820r_priv.h | 0
5149 .../{dvb/frontends => dvb-frontends}/cxd2820r_t.c | 3 +-
5150 .../{dvb/frontends => dvb-frontends}/cxd2820r_t2.c | 0
5151 .../{dvb/frontends => dvb-frontends}/dib0070.c | 0
5152 .../{dvb/frontends => dvb-frontends}/dib0070.h | 0
5153 .../{dvb/frontends => dvb-frontends}/dib0090.c | 0
5154 .../{dvb/frontends => dvb-frontends}/dib0090.h | 0
5155 .../{dvb/frontends => dvb-frontends}/dib3000.h | 0
5156 .../{dvb/frontends => dvb-frontends}/dib3000mb.c | 0
5157 .../frontends => dvb-frontends}/dib3000mb_priv.h | 0
5158 .../{dvb/frontends => dvb-frontends}/dib3000mc.c | 0
5159 .../{dvb/frontends => dvb-frontends}/dib3000mc.h | 0
5160 .../{dvb/frontends => dvb-frontends}/dib7000m.c | 0
5161 .../{dvb/frontends => dvb-frontends}/dib7000m.h | 0
5162 .../{dvb/frontends => dvb-frontends}/dib7000p.c | 0
5163 .../{dvb/frontends => dvb-frontends}/dib7000p.h | 0
5164 .../{dvb/frontends => dvb-frontends}/dib8000.c | 0
5165 .../{dvb/frontends => dvb-frontends}/dib8000.h | 0
5166 .../{dvb/frontends => dvb-frontends}/dib9000.c | 0
5167 .../{dvb/frontends => dvb-frontends}/dib9000.h | 0
5168 .../frontends => dvb-frontends}/dibx000_common.c | 0
5169 .../frontends => dvb-frontends}/dibx000_common.h | 0
5170 .../media/{dvb/frontends => dvb-frontends}/drxd.h | 0
5171 .../{dvb/frontends => dvb-frontends}/drxd_firm.c | 0
5172 .../{dvb/frontends => dvb-frontends}/drxd_firm.h | 0
5173 .../{dvb/frontends => dvb-frontends}/drxd_hard.c | 0
5174 .../frontends => dvb-frontends}/drxd_map_firm.h | 0
5175 .../media/{dvb/frontends => dvb-frontends}/drxk.h | 0
5176 .../{dvb/frontends => dvb-frontends}/drxk_hard.c | 0
5177 .../{dvb/frontends => dvb-frontends}/drxk_hard.h | 0
5178 .../{dvb/frontends => dvb-frontends}/drxk_map.h | 0
5179 .../{dvb/frontends => dvb-frontends}/ds3000.c | 0
5180 .../{dvb/frontends => dvb-frontends}/ds3000.h | 0
5181 .../{dvb/frontends => dvb-frontends}/dvb-pll.c | 26 +
5182 .../{dvb/frontends => dvb-frontends}/dvb-pll.h | 1 +
5183 .../frontends => dvb-frontends}/dvb_dummy_fe.c | 0
5184 .../frontends => dvb-frontends}/dvb_dummy_fe.h | 0
5185 .../media/{dvb/frontends => dvb-frontends}/ec100.c | 60 +-
5186 .../media/{dvb/frontends => dvb-frontends}/ec100.h | 2 +-
5187 .../{dvb/frontends => dvb-frontends}/eds1547.h | 0
5188 .../{dvb/frontends => dvb-frontends}/hd29l2.c | 75 +-
5189 .../{dvb/frontends => dvb-frontends}/hd29l2.h | 2 +-
5190 .../{dvb/frontends => dvb-frontends}/hd29l2_priv.h | 13 -
5191 .../{dvb/frontends => dvb-frontends}/isl6405.c | 0
5192 .../{dvb/frontends => dvb-frontends}/isl6405.h | 0
5193 .../{dvb/frontends => dvb-frontends}/isl6421.c | 0
5194 .../{dvb/frontends => dvb-frontends}/isl6421.h | 0
5195 .../{dvb/frontends => dvb-frontends}/isl6423.c | 0
5196 .../{dvb/frontends => dvb-frontends}/isl6423.h | 0
5197 .../frontends => dvb-frontends}/it913x-fe-priv.h | 0
5198 .../{dvb/frontends => dvb-frontends}/it913x-fe.c | 2 +-
5199 .../{dvb/frontends => dvb-frontends}/it913x-fe.h | 0
5200 .../{dvb/frontends => dvb-frontends}/itd1000.c | 0
5201 .../{dvb/frontends => dvb-frontends}/itd1000.h | 0
5202 .../frontends => dvb-frontends}/itd1000_priv.h | 0
5203 .../{dvb/frontends => dvb-frontends}/ix2505v.c | 0
5204 .../{dvb/frontends => dvb-frontends}/ix2505v.h | 0
5205 .../{dvb/frontends => dvb-frontends}/l64781.c | 0
5206 .../{dvb/frontends => dvb-frontends}/l64781.h | 0
5207 .../{dvb/frontends => dvb-frontends}/lg2160.c | 0
5208 .../{dvb/frontends => dvb-frontends}/lg2160.h | 0
5209 .../{dvb/frontends => dvb-frontends}/lgdt3305.c | 0
5210 .../{dvb/frontends => dvb-frontends}/lgdt3305.h | 0
5211 .../{dvb/frontends => dvb-frontends}/lgdt330x.c | 0
5212 .../{dvb/frontends => dvb-frontends}/lgdt330x.h | 0
5213 .../frontends => dvb-frontends}/lgdt330x_priv.h | 0
5214 .../{dvb/frontends => dvb-frontends}/lgs8gl5.c | 2 +-
5215 .../{dvb/frontends => dvb-frontends}/lgs8gl5.h | 0
5216 .../{dvb/frontends => dvb-frontends}/lgs8gxx.c | 2 +-
5217 .../{dvb/frontends => dvb-frontends}/lgs8gxx.h | 0
5218 .../frontends => dvb-frontends}/lgs8gxx_priv.h | 0
5219 .../{dvb/frontends => dvb-frontends}/lnbh24.h | 0
5220 .../{dvb/frontends => dvb-frontends}/lnbp21.c | 0
5221 .../{dvb/frontends => dvb-frontends}/lnbp21.h | 0
5222 .../{dvb/frontends => dvb-frontends}/lnbp22.c | 0
5223 .../{dvb/frontends => dvb-frontends}/lnbp22.h | 0
5224 .../{dvb/frontends => dvb-frontends}/m88rs2000.c | 2 +-
5225 .../{dvb/frontends => dvb-frontends}/m88rs2000.h | 0
5226 .../{dvb/frontends => dvb-frontends}/mb86a16.c | 0
5227 .../{dvb/frontends => dvb-frontends}/mb86a16.h | 0
5228 .../frontends => dvb-frontends}/mb86a16_priv.h | 0
5229 .../{dvb/frontends => dvb-frontends}/mb86a20s.c | 0
5230 .../{dvb/frontends => dvb-frontends}/mb86a20s.h | 0
5231 .../media/{dvb/frontends => dvb-frontends}/mt312.c | 0
5232 .../media/{dvb/frontends => dvb-frontends}/mt312.h | 0
5233 .../{dvb/frontends => dvb-frontends}/mt312_priv.h | 0
5234 .../media/{dvb/frontends => dvb-frontends}/mt352.c | 0
5235 .../media/{dvb/frontends => dvb-frontends}/mt352.h | 0
5236 .../{dvb/frontends => dvb-frontends}/mt352_priv.h | 0
5237 .../{dvb/frontends => dvb-frontends}/nxt200x.c | 64 +-
5238 .../{dvb/frontends => dvb-frontends}/nxt200x.h | 0
5239 .../{dvb/frontends => dvb-frontends}/nxt6000.c | 0
5240 .../{dvb/frontends => dvb-frontends}/nxt6000.h | 0
5241 .../frontends => dvb-frontends}/nxt6000_priv.h | 0
5242 .../{dvb/frontends => dvb-frontends}/or51132.c | 0
5243 .../{dvb/frontends => dvb-frontends}/or51132.h | 0
5244 .../{dvb/frontends => dvb-frontends}/or51211.c | 0
5245 .../{dvb/frontends => dvb-frontends}/or51211.h | 0
5246 .../{dvb/frontends => dvb-frontends}/rtl2830.c | 124 +-
5247 .../{dvb/frontends => dvb-frontends}/rtl2830.h | 9 +-
5248 .../frontends => dvb-frontends}/rtl2830_priv.h | 13 -
5249 .../{dvb/frontends => dvb-frontends}/rtl2832.c | 297 +-
5250 .../{dvb/frontends => dvb-frontends}/rtl2832.h | 12 +-
5251 .../frontends => dvb-frontends}/rtl2832_priv.h | 75 +-
5252 .../{dvb/frontends => dvb-frontends}/s5h1409.c | 0
5253 .../{dvb/frontends => dvb-frontends}/s5h1409.h | 0
5254 .../{dvb/frontends => dvb-frontends}/s5h1411.c | 0
5255 .../{dvb/frontends => dvb-frontends}/s5h1411.h | 0
5256 .../{dvb/frontends => dvb-frontends}/s5h1420.c | 0
5257 .../{dvb/frontends => dvb-frontends}/s5h1420.h | 0
5258 .../frontends => dvb-frontends}/s5h1420_priv.h | 0
5259 .../{dvb/frontends => dvb-frontends}/s5h1432.c | 0
5260 .../{dvb/frontends => dvb-frontends}/s5h1432.h | 0
5261 .../media/{dvb/frontends => dvb-frontends}/s921.c | 0
5262 .../media/{dvb/frontends => dvb-frontends}/s921.h | 0
5263 .../{dvb/frontends => dvb-frontends}/si21xx.c | 0
5264 .../{dvb/frontends => dvb-frontends}/si21xx.h | 0
5265 .../{dvb/frontends => dvb-frontends}/sp8870.c | 0
5266 .../{dvb/frontends => dvb-frontends}/sp8870.h | 0
5267 .../{dvb/frontends => dvb-frontends}/sp887x.c | 0
5268 .../{dvb/frontends => dvb-frontends}/sp887x.h | 0
5269 .../frontends => dvb-frontends}/stb0899_algo.c | 0
5270 .../{dvb/frontends => dvb-frontends}/stb0899_cfg.h | 0
5271 .../{dvb/frontends => dvb-frontends}/stb0899_drv.c | 1 +
5272 .../{dvb/frontends => dvb-frontends}/stb0899_drv.h | 0
5273 .../frontends => dvb-frontends}/stb0899_priv.h | 0
5274 .../{dvb/frontends => dvb-frontends}/stb0899_reg.h | 0
5275 .../{dvb/frontends => dvb-frontends}/stb6000.c | 0
5276 .../{dvb/frontends => dvb-frontends}/stb6000.h | 0
5277 .../{dvb/frontends => dvb-frontends}/stb6100.c | 0
5278 .../{dvb/frontends => dvb-frontends}/stb6100.h | 0
5279 .../{dvb/frontends => dvb-frontends}/stb6100_cfg.h | 0
5280 .../frontends => dvb-frontends}/stb6100_proc.h | 0
5281 .../{dvb/frontends => dvb-frontends}/stv0288.c | 0
5282 .../{dvb/frontends => dvb-frontends}/stv0288.h | 0
5283 .../{dvb/frontends => dvb-frontends}/stv0297.c | 0
5284 .../{dvb/frontends => dvb-frontends}/stv0297.h | 0
5285 .../{dvb/frontends => dvb-frontends}/stv0299.c | 0
5286 .../{dvb/frontends => dvb-frontends}/stv0299.h | 0
5287 .../{dvb/frontends => dvb-frontends}/stv0367.c | 0
5288 .../{dvb/frontends => dvb-frontends}/stv0367.h | 0
5289 .../frontends => dvb-frontends}/stv0367_priv.h | 0
5290 .../frontends => dvb-frontends}/stv0367_regs.h | 0
5291 .../{dvb/frontends => dvb-frontends}/stv0900.h | 0
5292 .../frontends => dvb-frontends}/stv0900_core.c | 0
5293 .../frontends => dvb-frontends}/stv0900_init.h | 0
5294 .../frontends => dvb-frontends}/stv0900_priv.h | 0
5295 .../{dvb/frontends => dvb-frontends}/stv0900_reg.h | 0
5296 .../{dvb/frontends => dvb-frontends}/stv0900_sw.c | 0
5297 .../{dvb/frontends => dvb-frontends}/stv090x.c | 32 +
5298 .../{dvb/frontends => dvb-frontends}/stv090x.h | 0
5299 .../frontends => dvb-frontends}/stv090x_priv.h | 0
5300 .../{dvb/frontends => dvb-frontends}/stv090x_reg.h | 0
5301 .../{dvb/frontends => dvb-frontends}/stv6110.c | 0
5302 .../{dvb/frontends => dvb-frontends}/stv6110.h | 0
5303 .../{dvb/frontends => dvb-frontends}/stv6110x.c | 0
5304 .../{dvb/frontends => dvb-frontends}/stv6110x.h | 0
5305 .../frontends => dvb-frontends}/stv6110x_priv.h | 0
5306 .../frontends => dvb-frontends}/stv6110x_reg.h | 0
5307 .../{dvb/frontends => dvb-frontends}/tda10021.c | 0
5308 .../{dvb/frontends => dvb-frontends}/tda10023.c | 0
5309 .../{dvb/frontends => dvb-frontends}/tda1002x.h | 0
5310 .../{dvb/frontends => dvb-frontends}/tda10048.c | 0
5311 .../{dvb/frontends => dvb-frontends}/tda10048.h | 0
5312 .../{dvb/frontends => dvb-frontends}/tda1004x.c | 0
5313 .../{dvb/frontends => dvb-frontends}/tda1004x.h | 0
5314 .../{dvb/frontends => dvb-frontends}/tda10071.c | 7 +-
5315 .../{dvb/frontends => dvb-frontends}/tda10071.h | 0
5316 .../frontends => dvb-frontends}/tda10071_priv.h | 2 +-
5317 .../{dvb/frontends => dvb-frontends}/tda10086.c | 0
5318 .../{dvb/frontends => dvb-frontends}/tda10086.h | 0
5319 .../frontends => dvb-frontends}/tda18271c2dd.c | 0
5320 .../frontends => dvb-frontends}/tda18271c2dd.h | 0
5321 .../tda18271c2dd_maps.h | 0
5322 .../{dvb/frontends => dvb-frontends}/tda665x.c | 0
5323 .../{dvb/frontends => dvb-frontends}/tda665x.h | 0
5324 .../{dvb/frontends => dvb-frontends}/tda8083.c | 0
5325 .../{dvb/frontends => dvb-frontends}/tda8083.h | 0
5326 .../{dvb/frontends => dvb-frontends}/tda8261.c | 28 +-
5327 .../{dvb/frontends => dvb-frontends}/tda8261.h | 0
5328 .../{dvb/frontends => dvb-frontends}/tda8261_cfg.h | 0
5329 .../{dvb/frontends => dvb-frontends}/tda826x.c | 0
5330 .../{dvb/frontends => dvb-frontends}/tda826x.h | 0
5331 .../media/{dvb/frontends => dvb-frontends}/tdhd1.h | 0
5332 .../{dvb/frontends => dvb-frontends}/tua6100.c | 0
5333 .../{dvb/frontends => dvb-frontends}/tua6100.h | 0
5334 .../{dvb/frontends => dvb-frontends}/ves1820.c | 0
5335 .../{dvb/frontends => dvb-frontends}/ves1820.h | 0
5336 .../{dvb/frontends => dvb-frontends}/ves1x93.c | 0
5337 .../{dvb/frontends => dvb-frontends}/ves1x93.h | 0
5338 .../{dvb/frontends => dvb-frontends}/z0194a.h | 0
5339 .../{dvb/frontends => dvb-frontends}/zl10036.c | 0
5340 .../{dvb/frontends => dvb-frontends}/zl10036.h | 0
5341 .../{dvb/frontends => dvb-frontends}/zl10039.c | 0
5342 .../{dvb/frontends => dvb-frontends}/zl10039.h | 0
5343 .../{dvb/frontends => dvb-frontends}/zl10353.c | 0
5344 .../{dvb/frontends => dvb-frontends}/zl10353.h | 0
5345 .../frontends => dvb-frontends}/zl10353_priv.h | 0
5346 drivers/media/dvb/Kconfig | 91 -
5347 drivers/media/dvb/Makefile | 21 -
5348 drivers/media/dvb/b2c2/Kconfig | 45 -
5349 drivers/media/dvb/b2c2/Makefile | 16 -
5350 drivers/media/dvb/bt8xx/Kconfig | 22 -
5351 drivers/media/dvb/bt8xx/Makefile | 6 -
5352 drivers/media/dvb/dm1105/Makefile | 3 -
5353 drivers/media/dvb/dvb-usb/Kconfig | 440 --
5354 drivers/media/dvb/dvb-usb/Makefile | 121 -
5355 drivers/media/dvb/dvb-usb/af9015.c | 1952 ---------
5356 drivers/media/dvb/dvb-usb/it913x.c | 931 -----
5357 drivers/media/dvb/dvb-usb/mxl111sf.c | 1835 ---------
5358 drivers/media/dvb/frontends/ec100_priv.h | 39 -
5359 drivers/media/dvb/ngene/Kconfig | 13 -
5360 drivers/media/dvb/pluto2/Makefile | 3 -
5361 drivers/media/dvb/siano/Kconfig | 34 -
5362 drivers/media/dvb/ttusb-budget/Makefile | 3 -
5363 drivers/media/{dvb => }/firewire/Kconfig | 0
5364 drivers/media/{dvb => }/firewire/Makefile | 4 +-
5365 drivers/media/{dvb => }/firewire/firedtv-avc.c | 0
5366 drivers/media/{dvb => }/firewire/firedtv-ci.c | 0
5367 drivers/media/{dvb => }/firewire/firedtv-dvb.c | 0
5368 drivers/media/{dvb => }/firewire/firedtv-fe.c | 0
5369 drivers/media/{dvb => }/firewire/firedtv-fw.c | 0
5370 drivers/media/{dvb => }/firewire/firedtv-rc.c | 0
5371 drivers/media/{dvb => }/firewire/firedtv.h | 0
5372 drivers/media/i2c/Kconfig | 584 +++
5373 drivers/media/i2c/Makefile | 66 +
5374 drivers/media/i2c/ad9389b.c | 1328 ++++++
5375 drivers/media/{video => i2c}/adp1653.c | 2 +-
5376 drivers/media/{video => i2c}/adv7170.c | 0
5377 drivers/media/{video => i2c}/adv7175.c | 0
5378 drivers/media/{video => i2c}/adv7180.c | 0
5379 drivers/media/{video => i2c}/adv7183.c | 0
5380 drivers/media/{video => i2c}/adv7183_regs.h | 0
5381 drivers/media/{video => i2c}/adv7343.c | 0
5382 drivers/media/{video => i2c}/adv7343_regs.h | 0
5383 drivers/media/{video => i2c}/adv7393.c | 0
5384 drivers/media/{video => i2c}/adv7393_regs.h | 0
5385 drivers/media/i2c/adv7604.c | 1959 +++++++++
5386 drivers/media/{video => i2c}/ak881x.c | 0
5387 drivers/media/{video => i2c}/aptina-pll.c | 0
5388 drivers/media/{video => i2c}/aptina-pll.h | 0
5389 drivers/media/{video => i2c}/as3645a.c | 2 +-
5390 drivers/media/{video => i2c}/bt819.c | 0
5391 drivers/media/{video => i2c}/bt856.c | 0
5392 drivers/media/{video => i2c}/bt866.c | 0
5393 drivers/media/{video => i2c}/btcx-risc.c | 0
5394 drivers/media/{video => i2c}/btcx-risc.h | 0
5395 drivers/media/{video => i2c}/cs5345.c | 0
5396 drivers/media/{video => i2c}/cs53l32a.c | 0
5397 drivers/media/{video => i2c}/cx2341x.c | 0
5398 drivers/media/{video => i2c}/cx25840/Kconfig | 0
5399 drivers/media/{video => i2c}/cx25840/Makefile | 2 +-
5400 .../media/{video => i2c}/cx25840/cx25840-audio.c | 0
5401 .../media/{video => i2c}/cx25840/cx25840-core.c | 0
5402 .../media/{video => i2c}/cx25840/cx25840-core.h | 0
5403 .../{video => i2c}/cx25840/cx25840-firmware.c | 15 +-
5404 drivers/media/{video => i2c}/cx25840/cx25840-ir.c | 0
5405 drivers/media/{video => i2c}/cx25840/cx25840-vbi.c | 0
5406 drivers/media/{video => i2c}/ir-kbd-i2c.c | 0
5407 drivers/media/{video => i2c}/ks0127.c | 0
5408 drivers/media/{video => i2c}/ks0127.h | 0
5409 drivers/media/{video => i2c}/m52790.c | 0
5410 drivers/media/{video => i2c}/m5mols/Kconfig | 0
5411 drivers/media/{video => i2c}/m5mols/Makefile | 0
5412 drivers/media/{video => i2c}/m5mols/m5mols.h | 4 +-
5413 .../media/{video => i2c}/m5mols/m5mols_capture.c | 0
5414 .../media/{video => i2c}/m5mols/m5mols_controls.c | 4 +-
5415 drivers/media/{video => i2c}/m5mols/m5mols_core.c | 6 +-
5416 drivers/media/{video => i2c}/m5mols/m5mols_reg.h | 0
5417 drivers/media/{video => i2c}/msp3400-driver.c | 0
5418 drivers/media/{video => i2c}/msp3400-driver.h | 0
5419 drivers/media/{video => i2c}/msp3400-kthreads.c | 0
5420 drivers/media/{video => i2c}/mt9m032.c | 2 +-
5421 drivers/media/{video => i2c}/mt9p031.c | 12 +-
5422 drivers/media/{video => i2c}/mt9t001.c | 0
5423 drivers/media/{video => i2c}/mt9v011.c | 0
5424 drivers/media/{video => i2c}/mt9v032.c | 100 +-
5425 drivers/media/{video => i2c}/noon010pc30.c | 0
5426 drivers/media/{video => i2c}/ov7670.c | 0
5427 drivers/media/{video => i2c}/s5k6aa.c | 9 +-
5428 drivers/media/{video => i2c}/saa6588.c | 0
5429 drivers/media/{video => i2c}/saa7110.c | 0
5430 drivers/media/{video => i2c}/saa7115.c | 0
5431 drivers/media/{video => i2c}/saa711x_regs.h | 0
5432 drivers/media/{video => i2c}/saa7127.c | 5 +-
5433 drivers/media/{video => i2c}/saa717x.c | 0
5434 drivers/media/{video => i2c}/saa7185.c | 0
5435 drivers/media/{video => i2c}/saa7191.c | 0
5436 drivers/media/{video => i2c}/saa7191.h | 0
5437 drivers/media/{video => i2c}/smiapp-pll.c | 2 +-
5438 drivers/media/{video => i2c}/smiapp-pll.h | 2 +-
5439 drivers/media/{video => i2c}/smiapp/Kconfig | 0
5440 drivers/media/{video => i2c}/smiapp/Makefile | 2 +-
5441 drivers/media/{video => i2c}/smiapp/smiapp-core.c | 2 +-
5442 .../media/{video => i2c}/smiapp/smiapp-limits.c | 2 +-
5443 .../media/{video => i2c}/smiapp/smiapp-limits.h | 2 +-
5444 drivers/media/{video => i2c}/smiapp/smiapp-quirk.c | 2 +-
5445 drivers/media/{video => i2c}/smiapp/smiapp-quirk.h | 2 +-
5446 .../media/{video => i2c}/smiapp/smiapp-reg-defs.h | 2 +-
5447 drivers/media/{video => i2c}/smiapp/smiapp-reg.h | 2 +-
5448 drivers/media/{video => i2c}/smiapp/smiapp-regs.c | 2 +-
5449 drivers/media/{video => i2c}/smiapp/smiapp-regs.h | 0
5450 drivers/media/{video => i2c}/smiapp/smiapp.h | 2 +-
5451 drivers/media/i2c/soc_camera/Kconfig | 89 +
5452 drivers/media/i2c/soc_camera/Makefile | 14 +
5453 drivers/media/{video => i2c/soc_camera}/imx074.c | 30 +-
5454 drivers/media/{video => i2c/soc_camera}/mt9m001.c | 26 +-
5455 drivers/media/{video => i2c/soc_camera}/mt9m111.c | 116 +-
5456 drivers/media/{video => i2c/soc_camera}/mt9t031.c | 48 +-
5457 drivers/media/{video => i2c/soc_camera}/mt9t112.c | 21 +-
5458 drivers/media/{video => i2c/soc_camera}/mt9v022.c | 50 +-
5459 drivers/media/{video => i2c/soc_camera}/ov2640.c | 20 +-
5460 drivers/media/{video => i2c/soc_camera}/ov5642.c | 31 +-
5461 drivers/media/{video => i2c/soc_camera}/ov6650.c | 28 +-
5462 drivers/media/{video => i2c/soc_camera}/ov772x.c | 447 ++-
5463 drivers/media/{video => i2c/soc_camera}/ov9640.c | 27 +-
5464 drivers/media/{video => i2c/soc_camera}/ov9640.h | 0
5465 drivers/media/{video => i2c/soc_camera}/ov9740.c | 47 +-
5466 .../media/{video => i2c/soc_camera}/rj54n1cb0c.c | 27 +-
5467 drivers/media/{video => i2c/soc_camera}/tw9910.c | 21 +-
5468 drivers/media/{video => i2c}/sr030pc30.c | 0
5469 drivers/media/{video => i2c}/tcm825x.c | 2 +-
5470 drivers/media/{video => i2c}/tcm825x.h | 2 +-
5471 drivers/media/{video => i2c}/tda7432.c | 0
5472 drivers/media/{video => i2c}/tda9840.c | 0
5473 drivers/media/{video => i2c}/tea6415c.c | 4 +-
5474 drivers/media/{video => i2c}/tea6415c.h | 0
5475 drivers/media/{video => i2c}/tea6420.c | 0
5476 drivers/media/{video => i2c}/tea6420.h | 0
5477 drivers/media/{video => i2c}/ths7303.c | 0
5478 drivers/media/{video => i2c}/tlv320aic23b.c | 0
5479 drivers/media/{video => i2c}/tvaudio.c | 0
5480 drivers/media/{video => i2c}/tveeprom.c | 0
5481 drivers/media/{video => i2c}/tvp514x.c | 2 +-
5482 drivers/media/{video => i2c}/tvp514x_regs.h | 2 +-
5483 drivers/media/{video => i2c}/tvp5150.c | 0
5484 drivers/media/{video => i2c}/tvp5150_reg.h | 0
5485 drivers/media/{video => i2c}/tvp7002.c | 0
5486 drivers/media/{video => i2c}/tvp7002_reg.h | 0
5487 drivers/media/{video => i2c}/upd64031a.c | 0
5488 drivers/media/{video => i2c}/upd64083.c | 0
5489 drivers/media/{video => i2c}/vp27smpx.c | 0
5490 drivers/media/{video => i2c}/vpx3220.c | 0
5491 drivers/media/{video => i2c}/vs6624.c | 0
5492 drivers/media/{video => i2c}/vs6624_regs.h | 0
5493 drivers/media/{video => i2c}/wm8739.c | 0
5494 drivers/media/{video => i2c}/wm8775.c | 0
5495 drivers/media/media-device.c | 4 +-
5496 drivers/media/mmc/Kconfig | 2 +
5497 drivers/media/mmc/Makefile | 1 +
5498 drivers/media/mmc/siano/Kconfig | 10 +
5499 drivers/media/mmc/siano/Makefile | 6 +
5500 drivers/media/{dvb => mmc}/siano/smssdio.c | 0
5501 drivers/media/parport/Kconfig | 52 +
5502 drivers/media/parport/Makefile | 4 +
5503 drivers/media/{video => parport}/bw-qcam.c | 0
5504 drivers/media/{video => parport}/c-qcam.c | 0
5505 drivers/media/{video => parport}/pms.c | 0
5506 drivers/media/{video => parport}/w9966.c | 0
5507 drivers/media/pci/Kconfig | 47 +
5508 drivers/media/pci/Makefile | 26 +
5509 drivers/media/pci/b2c2/Kconfig | 15 +
5510 drivers/media/pci/b2c2/Makefile | 9 +
5511 drivers/media/{dvb => pci}/b2c2/flexcop-dma.c | 0
5512 drivers/media/{dvb => pci}/b2c2/flexcop-pci.c | 0
5513 drivers/media/pci/bt8xx/Kconfig | 43 +
5514 drivers/media/pci/bt8xx/Makefile | 11 +
5515 drivers/media/{video => pci}/bt8xx/bt848.h | 0
5516 drivers/media/{dvb => pci}/bt8xx/bt878.c | 0
5517 drivers/media/{dvb => pci}/bt8xx/bt878.h | 0
5518 .../media/{video => pci}/bt8xx/bttv-audio-hook.c | 0
5519 .../media/{video => pci}/bt8xx/bttv-audio-hook.h | 0
5520 drivers/media/{video => pci}/bt8xx/bttv-cards.c | 0
5521 drivers/media/{video => pci}/bt8xx/bttv-driver.c | 0
5522 drivers/media/{video => pci}/bt8xx/bttv-gpio.c | 0
5523 drivers/media/{video => pci}/bt8xx/bttv-i2c.c | 0
5524 drivers/media/{video => pci}/bt8xx/bttv-if.c | 0
5525 drivers/media/{video => pci}/bt8xx/bttv-input.c | 0
5526 drivers/media/{video => pci}/bt8xx/bttv-risc.c | 0
5527 drivers/media/{video => pci}/bt8xx/bttv-vbi.c | 0
5528 drivers/media/{video => pci}/bt8xx/bttv.h | 0
5529 drivers/media/{video => pci}/bt8xx/bttvp.h | 0
5530 drivers/media/{dvb => pci}/bt8xx/dst.c | 0
5531 drivers/media/{dvb => pci}/bt8xx/dst_ca.c | 3 +-
5532 drivers/media/{dvb => pci}/bt8xx/dst_ca.h | 0
5533 drivers/media/{dvb => pci}/bt8xx/dst_common.h | 0
5534 drivers/media/{dvb => pci}/bt8xx/dst_priv.h | 0
5535 drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c | 0
5536 drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h | 0
5537 drivers/media/{video => pci}/cx18/Kconfig | 10 +-
5538 drivers/media/{video => pci}/cx18/Makefile | 6 +-
5539 drivers/media/{video => pci}/cx18/cx18-alsa-main.c | 0
5540 .../media/{video => pci}/cx18/cx18-alsa-mixer.c | 0
5541 .../media/{video => pci}/cx18/cx18-alsa-mixer.h | 0
5542 drivers/media/{video => pci}/cx18/cx18-alsa-pcm.c | 0
5543 drivers/media/{video => pci}/cx18/cx18-alsa-pcm.h | 0
5544 drivers/media/{video => pci}/cx18/cx18-alsa.h | 0
5545 drivers/media/{video => pci}/cx18/cx18-audio.c | 0
5546 drivers/media/{video => pci}/cx18/cx18-audio.h | 0
5547 drivers/media/{video => pci}/cx18/cx18-av-audio.c | 0
5548 drivers/media/{video => pci}/cx18/cx18-av-core.c | 0
5549 drivers/media/{video => pci}/cx18/cx18-av-core.h | 0
5550 .../media/{video => pci}/cx18/cx18-av-firmware.c | 2 +
5551 drivers/media/{video => pci}/cx18/cx18-av-vbi.c | 0
5552 drivers/media/{video => pci}/cx18/cx18-cards.c | 0
5553 drivers/media/{video => pci}/cx18/cx18-cards.h | 0
5554 drivers/media/{video => pci}/cx18/cx18-controls.c | 0
5555 drivers/media/{video => pci}/cx18/cx18-controls.h | 0
5556 drivers/media/{video => pci}/cx18/cx18-driver.c | 1 +
5557 drivers/media/{video => pci}/cx18/cx18-driver.h | 0
5558 drivers/media/{video => pci}/cx18/cx18-dvb.c | 6 +-
5559 drivers/media/{video => pci}/cx18/cx18-dvb.h | 0
5560 drivers/media/{video => pci}/cx18/cx18-fileops.c | 0
5561 drivers/media/{video => pci}/cx18/cx18-fileops.h | 0
5562 drivers/media/{video => pci}/cx18/cx18-firmware.c | 10 +-
5563 drivers/media/{video => pci}/cx18/cx18-firmware.h | 0
5564 drivers/media/{video => pci}/cx18/cx18-gpio.c | 0
5565 drivers/media/{video => pci}/cx18/cx18-gpio.h | 0
5566 drivers/media/{video => pci}/cx18/cx18-i2c.c | 0
5567 drivers/media/{video => pci}/cx18/cx18-i2c.h | 0
5568 drivers/media/{video => pci}/cx18/cx18-io.c | 0
5569 drivers/media/{video => pci}/cx18/cx18-io.h | 0
5570 drivers/media/{video => pci}/cx18/cx18-ioctl.c | 0
5571 drivers/media/{video => pci}/cx18/cx18-ioctl.h | 0
5572 drivers/media/{video => pci}/cx18/cx18-irq.c | 0
5573 drivers/media/{video => pci}/cx18/cx18-irq.h | 0
5574 drivers/media/{video => pci}/cx18/cx18-mailbox.c | 0
5575 drivers/media/{video => pci}/cx18/cx18-mailbox.h | 0
5576 drivers/media/{video => pci}/cx18/cx18-queue.c | 0
5577 drivers/media/{video => pci}/cx18/cx18-queue.h | 0
5578 drivers/media/{video => pci}/cx18/cx18-scb.c | 0
5579 drivers/media/{video => pci}/cx18/cx18-scb.h | 0
5580 drivers/media/{video => pci}/cx18/cx18-streams.c | 0
5581 drivers/media/{video => pci}/cx18/cx18-streams.h | 0
5582 drivers/media/{video => pci}/cx18/cx18-vbi.c | 0
5583 drivers/media/{video => pci}/cx18/cx18-vbi.h | 0
5584 drivers/media/{video => pci}/cx18/cx18-version.h | 0
5585 drivers/media/{video => pci}/cx18/cx18-video.c | 0
5586 drivers/media/{video => pci}/cx18/cx18-video.h | 0
5587 drivers/media/{video => pci}/cx18/cx23418.h | 0
5588 drivers/media/pci/cx23885/Kconfig | 48 +
5589 drivers/media/{video => pci}/cx23885/Makefile | 8 +-
5590 drivers/media/{video => pci}/cx23885/altera-ci.c | 4 +-
5591 drivers/media/{video => pci}/cx23885/altera-ci.h | 0
5592 drivers/media/{video => pci}/cx23885/cimax2.c | 0
5593 drivers/media/{video => pci}/cx23885/cimax2.h | 0
5594 drivers/media/{video => pci}/cx23885/cx23885-417.c | 2 +
5595 .../media/{video => pci}/cx23885/cx23885-alsa.c | 0
5596 drivers/media/{video => pci}/cx23885/cx23885-av.c | 0
5597 drivers/media/{video => pci}/cx23885/cx23885-av.h | 0
5598 .../media/{video => pci}/cx23885/cx23885-cards.c | 16 +-
5599 .../media/{video => pci}/cx23885/cx23885-core.c | 0
5600 drivers/media/{video => pci}/cx23885/cx23885-dvb.c | 59 +-
5601 .../media/{video => pci}/cx23885/cx23885-f300.c | 0
5602 .../media/{video => pci}/cx23885/cx23885-f300.h | 0
5603 drivers/media/{video => pci}/cx23885/cx23885-i2c.c | 0
5604 .../media/{video => pci}/cx23885/cx23885-input.c | 9 +
5605 .../media/{video => pci}/cx23885/cx23885-input.h | 0
5606 .../media/{video => pci}/cx23885/cx23885-ioctl.c | 0
5607 .../media/{video => pci}/cx23885/cx23885-ioctl.h | 0
5608 drivers/media/{video => pci}/cx23885/cx23885-ir.c | 0
5609 drivers/media/{video => pci}/cx23885/cx23885-ir.h | 0
5610 drivers/media/{video => pci}/cx23885/cx23885-reg.h | 0
5611 drivers/media/{video => pci}/cx23885/cx23885-vbi.c | 0
5612 .../media/{video => pci}/cx23885/cx23885-video.c | 0
5613 drivers/media/{video => pci}/cx23885/cx23885.h | 1 +
5614 drivers/media/{video => pci}/cx23885/cx23888-ir.c | 0
5615 drivers/media/{video => pci}/cx23885/cx23888-ir.h | 0
5616 .../media/{video => pci}/cx23885/netup-eeprom.c | 0
5617 .../media/{video => pci}/cx23885/netup-eeprom.h | 0
5618 drivers/media/{video => pci}/cx23885/netup-init.c | 0
5619 drivers/media/{video => pci}/cx23885/netup-init.h | 0
5620 drivers/media/{video => pci}/cx25821/Kconfig | 0
5621 drivers/media/{video => pci}/cx25821/Makefile | 8 +-
5622 .../media/{video => pci}/cx25821/cx25821-alsa.c | 0
5623 .../cx25821/cx25821-audio-upstream.c | 0
5624 .../cx25821/cx25821-audio-upstream.h | 0
5625 .../media/{video => pci}/cx25821/cx25821-audio.h | 0
5626 .../{video => pci}/cx25821/cx25821-biffuncs.h | 0
5627 .../media/{video => pci}/cx25821/cx25821-cards.c | 0
5628 .../media/{video => pci}/cx25821/cx25821-core.c | 0
5629 .../media/{video => pci}/cx25821/cx25821-gpio.c | 0
5630 drivers/media/{video => pci}/cx25821/cx25821-i2c.c | 0
5631 .../cx25821/cx25821-medusa-defines.h | 0
5632 .../{video => pci}/cx25821/cx25821-medusa-reg.h | 0
5633 .../{video => pci}/cx25821/cx25821-medusa-video.c | 0
5634 .../{video => pci}/cx25821/cx25821-medusa-video.h | 0
5635 drivers/media/{video => pci}/cx25821/cx25821-reg.h | 0
5636 .../media/{video => pci}/cx25821/cx25821-sram.h | 0
5637 .../cx25821/cx25821-video-upstream-ch2.c | 0
5638 .../cx25821/cx25821-video-upstream-ch2.h | 0
5639 .../cx25821/cx25821-video-upstream.c | 0
5640 .../cx25821/cx25821-video-upstream.h | 0
5641 .../media/{video => pci}/cx25821/cx25821-video.c | 0
5642 .../media/{video => pci}/cx25821/cx25821-video.h | 0
5643 drivers/media/{video => pci}/cx25821/cx25821.h | 0
5644 drivers/media/{video => pci}/cx88/Kconfig | 36 +-
5645 drivers/media/{video => pci}/cx88/Makefile | 8 +-
5646 drivers/media/{video => pci}/cx88/cx88-alsa.c | 2 +-
5647 drivers/media/{video => pci}/cx88/cx88-blackbird.c | 0
5648 drivers/media/{video => pci}/cx88/cx88-cards.c | 4 +-
5649 drivers/media/{video => pci}/cx88/cx88-core.c | 2 +-
5650 drivers/media/{video => pci}/cx88/cx88-dsp.c | 0
5651 drivers/media/{video => pci}/cx88/cx88-dvb.c | 2 +-
5652 drivers/media/{video => pci}/cx88/cx88-i2c.c | 0
5653 drivers/media/{video => pci}/cx88/cx88-input.c | 0
5654 drivers/media/{video => pci}/cx88/cx88-mpeg.c | 0
5655 drivers/media/{video => pci}/cx88/cx88-reg.h | 0
5656 drivers/media/{video => pci}/cx88/cx88-tvaudio.c | 0
5657 drivers/media/{video => pci}/cx88/cx88-vbi.c | 0
5658 drivers/media/{video => pci}/cx88/cx88-video.c | 0
5659 .../media/{video => pci}/cx88/cx88-vp3054-i2c.c | 0
5660 .../media/{video => pci}/cx88/cx88-vp3054-i2c.h | 0
5661 drivers/media/{video => pci}/cx88/cx88.h | 2 +-
5662 drivers/media/{dvb => pci}/ddbridge/Kconfig | 10 +-
5663 drivers/media/{dvb => pci}/ddbridge/Makefile | 6 +-
5664 .../media/{dvb => pci}/ddbridge/ddbridge-core.c | 15 +-
5665 .../media/{dvb => pci}/ddbridge/ddbridge-regs.h | 0
5666 drivers/media/{dvb => pci}/ddbridge/ddbridge.h | 0
5667 drivers/media/{dvb => pci}/dm1105/Kconfig | 14 +-
5668 drivers/media/pci/dm1105/Makefile | 3 +
5669 drivers/media/{dvb => pci}/dm1105/dm1105.c | 0
5670 drivers/media/{video => pci}/ivtv/Kconfig | 16 +
5671 drivers/media/{video => pci}/ivtv/Makefile | 10 +-
5672 drivers/media/pci/ivtv/ivtv-alsa-main.c | 303 ++
5673 drivers/media/pci/ivtv/ivtv-alsa-mixer.c | 175 +
5674 drivers/media/pci/ivtv/ivtv-alsa-mixer.h | 23 +
5675 drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 357 ++
5676 drivers/media/pci/ivtv/ivtv-alsa-pcm.h | 27 +
5677 drivers/media/pci/ivtv/ivtv-alsa.h | 75 +
5678 drivers/media/{video => pci}/ivtv/ivtv-cards.c | 0
5679 drivers/media/{video => pci}/ivtv/ivtv-cards.h | 0
5680 drivers/media/{video => pci}/ivtv/ivtv-controls.c | 0
5681 drivers/media/{video => pci}/ivtv/ivtv-controls.h | 0
5682 drivers/media/{video => pci}/ivtv/ivtv-driver.c | 37 +
5683 drivers/media/{video => pci}/ivtv/ivtv-driver.h | 11 +
5684 drivers/media/{video => pci}/ivtv/ivtv-fileops.c | 56 +-
5685 drivers/media/{video => pci}/ivtv/ivtv-fileops.h | 4 +-
5686 drivers/media/{video => pci}/ivtv/ivtv-firmware.c | 4 +
5687 drivers/media/{video => pci}/ivtv/ivtv-firmware.h | 0
5688 drivers/media/{video => pci}/ivtv/ivtv-gpio.c | 0
5689 drivers/media/{video => pci}/ivtv/ivtv-gpio.h | 0
5690 drivers/media/{video => pci}/ivtv/ivtv-i2c.c | 0
5691 drivers/media/{video => pci}/ivtv/ivtv-i2c.h | 0
5692 drivers/media/{video => pci}/ivtv/ivtv-ioctl.c | 0
5693 drivers/media/{video => pci}/ivtv/ivtv-ioctl.h | 0
5694 drivers/media/{video => pci}/ivtv/ivtv-irq.c | 50 +
5695 drivers/media/{video => pci}/ivtv/ivtv-irq.h | 0
5696 drivers/media/{video => pci}/ivtv/ivtv-mailbox.c | 0
5697 drivers/media/{video => pci}/ivtv/ivtv-mailbox.h | 0
5698 drivers/media/{video => pci}/ivtv/ivtv-queue.c | 0
5699 drivers/media/{video => pci}/ivtv/ivtv-queue.h | 0
5700 drivers/media/{video => pci}/ivtv/ivtv-routing.c | 0
5701 drivers/media/{video => pci}/ivtv/ivtv-routing.h | 0
5702 drivers/media/{video => pci}/ivtv/ivtv-streams.c | 6 +-
5703 drivers/media/{video => pci}/ivtv/ivtv-streams.h | 0
5704 drivers/media/{video => pci}/ivtv/ivtv-udma.c | 0
5705 drivers/media/{video => pci}/ivtv/ivtv-udma.h | 0
5706 drivers/media/{video => pci}/ivtv/ivtv-vbi.c | 0
5707 drivers/media/{video => pci}/ivtv/ivtv-vbi.h | 0
5708 drivers/media/{video => pci}/ivtv/ivtv-version.h | 0
5709 drivers/media/{video => pci}/ivtv/ivtv-yuv.c | 0
5710 drivers/media/{video => pci}/ivtv/ivtv-yuv.h | 0
5711 drivers/media/{video => pci}/ivtv/ivtvfb.c | 0
5712 drivers/media/{dvb => pci}/mantis/Kconfig | 20 +-
5713 drivers/media/{dvb => pci}/mantis/Makefile | 2 +-
5714 drivers/media/{dvb => pci}/mantis/hopper_cards.c | 0
5715 drivers/media/{dvb => pci}/mantis/hopper_vp3028.c | 0
5716 drivers/media/{dvb => pci}/mantis/hopper_vp3028.h | 0
5717 drivers/media/{dvb => pci}/mantis/mantis_ca.c | 0
5718 drivers/media/{dvb => pci}/mantis/mantis_ca.h | 0
5719 drivers/media/{dvb => pci}/mantis/mantis_cards.c | 2 +-
5720 drivers/media/{dvb => pci}/mantis/mantis_common.h | 0
5721 drivers/media/{dvb => pci}/mantis/mantis_core.c | 2 +-
5722 drivers/media/{dvb => pci}/mantis/mantis_core.h | 0
5723 drivers/media/{dvb => pci}/mantis/mantis_dma.c | 0
5724 drivers/media/{dvb => pci}/mantis/mantis_dma.h | 0
5725 drivers/media/{dvb => pci}/mantis/mantis_dvb.c | 6 +-
5726 drivers/media/{dvb => pci}/mantis/mantis_dvb.h | 0
5727 drivers/media/{dvb => pci}/mantis/mantis_evm.c | 0
5728 drivers/media/{dvb => pci}/mantis/mantis_hif.c | 0
5729 drivers/media/{dvb => pci}/mantis/mantis_hif.h | 0
5730 drivers/media/{dvb => pci}/mantis/mantis_i2c.c | 0
5731 drivers/media/{dvb => pci}/mantis/mantis_i2c.h | 0
5732 drivers/media/{dvb => pci}/mantis/mantis_input.c | 0
5733 drivers/media/{dvb => pci}/mantis/mantis_ioc.c | 0
5734 drivers/media/{dvb => pci}/mantis/mantis_ioc.h | 0
5735 drivers/media/{dvb => pci}/mantis/mantis_link.h | 0
5736 drivers/media/{dvb => pci}/mantis/mantis_pci.c | 0
5737 drivers/media/{dvb => pci}/mantis/mantis_pci.h | 0
5738 drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c | 0
5739 drivers/media/{dvb => pci}/mantis/mantis_reg.h | 0
5740 drivers/media/{dvb => pci}/mantis/mantis_uart.c | 0
5741 drivers/media/{dvb => pci}/mantis/mantis_uart.h | 0
5742 drivers/media/{dvb => pci}/mantis/mantis_vp1033.c | 0
5743 drivers/media/{dvb => pci}/mantis/mantis_vp1033.h | 0
5744 drivers/media/{dvb => pci}/mantis/mantis_vp1034.c | 0
5745 drivers/media/{dvb => pci}/mantis/mantis_vp1034.h | 0
5746 drivers/media/{dvb => pci}/mantis/mantis_vp1041.c | 0
5747 drivers/media/{dvb => pci}/mantis/mantis_vp1041.h | 0
5748 drivers/media/{dvb => pci}/mantis/mantis_vp2033.c | 0
5749 drivers/media/{dvb => pci}/mantis/mantis_vp2033.h | 0
5750 drivers/media/{dvb => pci}/mantis/mantis_vp2040.c | 0
5751 drivers/media/{dvb => pci}/mantis/mantis_vp2040.h | 0
5752 drivers/media/{dvb => pci}/mantis/mantis_vp3028.c | 0
5753 drivers/media/{dvb => pci}/mantis/mantis_vp3028.h | 0
5754 drivers/media/{dvb => pci}/mantis/mantis_vp3030.c | 0
5755 drivers/media/{dvb => pci}/mantis/mantis_vp3030.h | 0
5756 drivers/media/pci/meye/Kconfig | 13 +
5757 drivers/media/pci/meye/Makefile | 1 +
5758 drivers/media/{video => pci/meye}/meye.c | 0
5759 drivers/media/{video => pci/meye}/meye.h | 0
5760 drivers/media/pci/ngene/Kconfig | 13 +
5761 drivers/media/{dvb => pci}/ngene/Makefile | 6 +-
5762 drivers/media/{dvb => pci}/ngene/ngene-cards.c | 263 ++
5763 drivers/media/{dvb => pci}/ngene/ngene-core.c | 14 +-
5764 drivers/media/{dvb => pci}/ngene/ngene-dvb.c | 0
5765 drivers/media/{dvb => pci}/ngene/ngene-i2c.c | 0
5766 drivers/media/{dvb => pci}/ngene/ngene.h | 0
5767 drivers/media/{dvb => pci}/pluto2/Kconfig | 0
5768 drivers/media/pci/pluto2/Makefile | 3 +
5769 drivers/media/{dvb => pci}/pluto2/pluto2.c | 0
5770 drivers/media/{dvb => pci}/pt1/Kconfig | 0
5771 drivers/media/{dvb => pci}/pt1/Makefile | 2 +-
5772 drivers/media/{dvb => pci}/pt1/pt1.c | 0
5773 drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c | 11 +-
5774 drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h | 0
5775 drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c | 0
5776 drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h | 0
5777 drivers/media/{video => pci}/saa7134/Kconfig | 40 +-
5778 drivers/media/{video => pci}/saa7134/Makefile | 10 +-
5779 drivers/media/{video => pci}/saa7134/saa6752hs.c | 0
5780 .../media/{video => pci}/saa7134/saa7134-alsa.c | 0
5781 .../media/{video => pci}/saa7134/saa7134-cards.c | 0
5782 .../media/{video => pci}/saa7134/saa7134-core.c | 0
5783 drivers/media/{video => pci}/saa7134/saa7134-dvb.c | 4 +-
5784 .../media/{video => pci}/saa7134/saa7134-empress.c | 0
5785 drivers/media/{video => pci}/saa7134/saa7134-i2c.c | 0
5786 .../media/{video => pci}/saa7134/saa7134-input.c | 10 +-
5787 drivers/media/{video => pci}/saa7134/saa7134-reg.h | 0
5788 drivers/media/{video => pci}/saa7134/saa7134-ts.c | 0
5789 .../media/{video => pci}/saa7134/saa7134-tvaudio.c | 0
5790 drivers/media/{video => pci}/saa7134/saa7134-vbi.c | 0
5791 .../media/{video => pci}/saa7134/saa7134-video.c | 0
5792 drivers/media/{video => pci}/saa7134/saa7134.h | 1 -
5793 drivers/media/pci/saa7146/Kconfig | 38 +
5794 drivers/media/pci/saa7146/Makefile | 5 +
5795 .../media/{video => pci/saa7146}/hexium_gemini.c | 0
5796 .../media/{video => pci/saa7146}/hexium_orion.c | 0
5797 drivers/media/{video => pci/saa7146}/mxb.c | 0
5798 drivers/media/{video => pci}/saa7164/Kconfig | 8 +-
5799 drivers/media/{video => pci}/saa7164/Makefile | 8 +-
5800 drivers/media/{video => pci}/saa7164/saa7164-api.c | 15 +-
5801 .../media/{video => pci}/saa7164/saa7164-buffer.c | 0
5802 drivers/media/{video => pci}/saa7164/saa7164-bus.c | 0
5803 .../media/{video => pci}/saa7164/saa7164-cards.c | 0
5804 drivers/media/{video => pci}/saa7164/saa7164-cmd.c | 0
5805 .../media/{video => pci}/saa7164/saa7164-core.c | 46 +-
5806 drivers/media/{video => pci}/saa7164/saa7164-dvb.c | 0
5807 .../media/{video => pci}/saa7164/saa7164-encoder.c | 0
5808 drivers/media/{video => pci}/saa7164/saa7164-fw.c | 0
5809 drivers/media/{video => pci}/saa7164/saa7164-i2c.c | 0
5810 drivers/media/{video => pci}/saa7164/saa7164-reg.h | 0
5811 .../media/{video => pci}/saa7164/saa7164-types.h | 0
5812 drivers/media/{video => pci}/saa7164/saa7164-vbi.c | 0
5813 drivers/media/{video => pci}/saa7164/saa7164.h | 1 -
5814 drivers/media/pci/sta2x11/Kconfig | 12 +
5815 drivers/media/pci/sta2x11/Makefile | 1 +
5816 drivers/media/{video => pci/sta2x11}/sta2x11_vip.c | 0
5817 drivers/media/{video => pci/sta2x11}/sta2x11_vip.h | 0
5818 drivers/media/{dvb => pci}/ttpci/Kconfig | 84 +-
5819 drivers/media/{dvb => pci}/ttpci/Makefile | 4 +-
5820 drivers/media/{dvb => pci}/ttpci/av7110.c | 0
5821 drivers/media/{dvb => pci}/ttpci/av7110.h | 0
5822 drivers/media/{dvb => pci}/ttpci/av7110_av.c | 0
5823 drivers/media/{dvb => pci}/ttpci/av7110_av.h | 0
5824 drivers/media/{dvb => pci}/ttpci/av7110_ca.c | 0
5825 drivers/media/{dvb => pci}/ttpci/av7110_ca.h | 0
5826 drivers/media/{dvb => pci}/ttpci/av7110_hw.c | 0
5827 drivers/media/{dvb => pci}/ttpci/av7110_hw.h | 0
5828 drivers/media/{dvb => pci}/ttpci/av7110_ipack.c | 0
5829 drivers/media/{dvb => pci}/ttpci/av7110_ipack.h | 0
5830 drivers/media/{dvb => pci}/ttpci/av7110_ir.c | 0
5831 drivers/media/{dvb => pci}/ttpci/av7110_v4l.c | 0
5832 drivers/media/{dvb => pci}/ttpci/budget-av.c | 0
5833 drivers/media/{dvb => pci}/ttpci/budget-ci.c | 0
5834 drivers/media/{dvb => pci}/ttpci/budget-core.c | 0
5835 drivers/media/{dvb => pci}/ttpci/budget-patch.c | 0
5836 drivers/media/{dvb => pci}/ttpci/budget.c | 60 +
5837 drivers/media/{dvb => pci}/ttpci/budget.h | 0
5838 drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c | 0
5839 drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h | 0
5840 drivers/media/{video => pci}/zoran/Kconfig | 26 +-
5841 drivers/media/{video => pci}/zoran/Makefile | 0
5842 drivers/media/{video => pci}/zoran/videocodec.c | 0
5843 drivers/media/{video => pci}/zoran/videocodec.h | 0
5844 drivers/media/{video => pci}/zoran/zoran.h | 0
5845 drivers/media/{video => pci}/zoran/zoran_card.c | 0
5846 drivers/media/{video => pci}/zoran/zoran_card.h | 0
5847 drivers/media/{video => pci}/zoran/zoran_device.c | 0
5848 drivers/media/{video => pci}/zoran/zoran_device.h | 0
5849 drivers/media/{video => pci}/zoran/zoran_driver.c | 0
5850 drivers/media/{video => pci}/zoran/zoran_procfs.c | 0
5851 drivers/media/{video => pci}/zoran/zoran_procfs.h | 0
5852 drivers/media/{video => pci}/zoran/zr36016.c | 0
5853 drivers/media/{video => pci}/zoran/zr36016.h | 0
5854 drivers/media/{video => pci}/zoran/zr36050.c | 0
5855 drivers/media/{video => pci}/zoran/zr36050.h | 0
5856 drivers/media/{video => pci}/zoran/zr36057.h | 0
5857 drivers/media/{video => pci}/zoran/zr36060.c | 0
5858 drivers/media/{video => pci}/zoran/zr36060.h | 0
5859 drivers/media/platform/Kconfig | 222 +
5860 drivers/media/platform/Makefile | 50 +
5861 drivers/media/{video => platform}/arv.c | 0
5862 drivers/media/{video => platform}/blackfin/Kconfig | 0
5863 .../media/{video => platform}/blackfin/Makefile | 0
5864 .../{video => platform}/blackfin/bfin_capture.c | 18 +-
5865 drivers/media/{video => platform}/blackfin/ppi.c | 0
5866 drivers/media/platform/coda.c | 1847 +++++++++
5867 drivers/media/platform/coda.h | 216 +
5868 drivers/media/{video => platform}/davinci/Kconfig | 4 +-
5869 drivers/media/{video => platform}/davinci/Makefile | 0
5870 .../{video => platform}/davinci/ccdc_hw_device.h | 0
5871 .../media/{video => platform}/davinci/dm355_ccdc.c | 2 +-
5872 .../{video => platform}/davinci/dm355_ccdc_regs.h | 0
5873 .../{video => platform}/davinci/dm644x_ccdc.c | 2 +-
5874 .../{video => platform}/davinci/dm644x_ccdc_regs.h | 0
5875 drivers/media/{video => platform}/davinci/isif.c | 2 +-
5876 .../media/{video => platform}/davinci/isif_regs.h | 0
5877 drivers/media/{video => platform}/davinci/vpbe.c | 0
5878 .../{video => platform}/davinci/vpbe_display.c | 22 +-
5879 .../media/{video => platform}/davinci/vpbe_osd.c | 0
5880 .../{video => platform}/davinci/vpbe_osd_regs.h | 0
5881 .../media/{video => platform}/davinci/vpbe_venc.c | 0
5882 .../{video => platform}/davinci/vpbe_venc_regs.h | 0
5883 .../{video => platform}/davinci/vpfe_capture.c | 17 +-
5884 drivers/media/{video => platform}/davinci/vpif.c | 2 +-
5885 drivers/media/{video => platform}/davinci/vpif.h | 0
5886 .../{video => platform}/davinci/vpif_capture.c | 28 +-
5887 .../{video => platform}/davinci/vpif_capture.h | 0
5888 .../{video => platform}/davinci/vpif_display.c | 34 +-
5889 .../{video => platform}/davinci/vpif_display.h | 0
5890 drivers/media/{video => platform}/davinci/vpss.c | 2 +-
5891 drivers/media/platform/exynos-gsc/Makefile | 3 +
5892 drivers/media/platform/exynos-gsc/gsc-core.c | 1253 ++++++
5893 drivers/media/platform/exynos-gsc/gsc-core.h | 527 +++
5894 drivers/media/platform/exynos-gsc/gsc-m2m.c | 771 ++++
5895 drivers/media/platform/exynos-gsc/gsc-regs.c | 425 ++
5896 drivers/media/platform/exynos-gsc/gsc-regs.h | 172 +
5897 drivers/media/{video => platform}/fsl-viu.c | 27 +-
5898 drivers/media/{video => platform}/indycam.c | 0
5899 drivers/media/{video => platform}/indycam.h | 0
5900 drivers/media/platform/m2m-deinterlace.c | 1118 ++++++
5901 .../media/{video => platform}/marvell-ccic/Kconfig | 0
5902 .../{video => platform}/marvell-ccic/Makefile | 0
5903 .../{video => platform}/marvell-ccic/cafe-driver.c | 0
5904 .../{video => platform}/marvell-ccic/mcam-core.c | 0
5905 .../{video => platform}/marvell-ccic/mcam-core.h | 0
5906 .../{video => platform}/marvell-ccic/mmp-driver.c | 0
5907 .../media/{video => platform}/mem2mem_testdev.c | 40 +-
5908 drivers/media/{video => platform}/mx2_emmaprp.c | 77 +-
5909 drivers/media/{video => platform}/omap/Kconfig | 0
5910 drivers/media/{video => platform}/omap/Makefile | 2 +-
5911 drivers/media/{video => platform}/omap/omap_vout.c | 0
5912 .../{video => platform}/omap/omap_vout_vrfb.c | 0
5913 .../{video => platform}/omap/omap_vout_vrfb.h | 0
5914 .../media/{video => platform}/omap/omap_voutdef.h | 0
5915 .../media/{video => platform}/omap/omap_voutlib.c | 0
5916 .../media/{video => platform}/omap/omap_voutlib.h | 0
5917 .../media/{video => platform}/omap24xxcam-dma.c | 2 +-
5918 drivers/media/{video => platform}/omap24xxcam.c | 2 +-
5919 drivers/media/{video => platform}/omap24xxcam.h | 2 +-
5920 .../media/{video => platform}/omap3isp/Makefile | 0
5921 .../{video => platform}/omap3isp/cfa_coef_table.h | 16 +-
5922 .../{video => platform}/omap3isp/gamma_table.h | 0
5923 drivers/media/{video => platform}/omap3isp/isp.c | 51 +-
5924 drivers/media/{video => platform}/omap3isp/isp.h | 11 +-
5925 .../media/{video => platform}/omap3isp/ispccdc.c | 234 +-
5926 .../media/{video => platform}/omap3isp/ispccdc.h | 37 -
5927 .../media/{video => platform}/omap3isp/ispccp2.c | 0
5928 .../media/{video => platform}/omap3isp/ispccp2.h | 0
5929 .../media/{video => platform}/omap3isp/ispcsi2.c | 27 +-
5930 .../media/{video => platform}/omap3isp/ispcsi2.h | 0
5931 .../media/{video => platform}/omap3isp/ispcsiphy.c | 0
5932 .../media/{video => platform}/omap3isp/ispcsiphy.h | 0
5933 .../media/{video => platform}/omap3isp/isph3a.h | 0
5934 .../{video => platform}/omap3isp/isph3a_aewb.c | 10 +-
5935 .../media/{video => platform}/omap3isp/isph3a_af.c | 10 +-
5936 .../media/{video => platform}/omap3isp/isphist.c | 6 +-
5937 .../media/{video => platform}/omap3isp/isphist.h | 0
5938 .../{video => platform}/omap3isp/isppreview.c | 707 ++--
5939 .../{video => platform}/omap3isp/isppreview.h | 1 +
5940 .../media/{video => platform}/omap3isp/ispqueue.c | 15 +-
5941 .../media/{video => platform}/omap3isp/ispqueue.h | 0
5942 .../media/{video => platform}/omap3isp/ispreg.h | 0
5943 .../{video => platform}/omap3isp/ispresizer.c | 8 +-
5944 .../{video => platform}/omap3isp/ispresizer.h | 0
5945 .../media/{video => platform}/omap3isp/ispstat.c | 0
5946 .../media/{video => platform}/omap3isp/ispstat.h | 0
5947 .../media/{video => platform}/omap3isp/ispvideo.c | 57 +-
5948 .../media/{video => platform}/omap3isp/ispvideo.h | 6 +-
5949 .../omap3isp/luma_enhance_table.h | 0
5950 .../omap3isp/noise_filter_table.h | 0
5951 drivers/media/{video => platform}/s5p-fimc/Kconfig | 2 +-
5952 .../media/{video => platform}/s5p-fimc/Makefile | 0
5953 .../{video => platform}/s5p-fimc/fimc-capture.c | 31 +-
5954 .../media/{video => platform}/s5p-fimc/fimc-core.c | 0
5955 .../media/{video => platform}/s5p-fimc/fimc-core.h | 4 +-
5956 .../{video => platform}/s5p-fimc/fimc-lite-reg.c | 2 +-
5957 .../{video => platform}/s5p-fimc/fimc-lite-reg.h | 0
5958 .../media/{video => platform}/s5p-fimc/fimc-lite.c | 42 +-
5959 .../media/{video => platform}/s5p-fimc/fimc-lite.h | 2 +-
5960 .../media/{video => platform}/s5p-fimc/fimc-m2m.c | 42 +-
5961 .../{video => platform}/s5p-fimc/fimc-mdevice.c | 9 +-
5962 .../{video => platform}/s5p-fimc/fimc-mdevice.h | 6 +-
5963 .../media/{video => platform}/s5p-fimc/fimc-reg.c | 6 +-
5964 .../media/{video => platform}/s5p-fimc/fimc-reg.h | 0
5965 .../media/{video => platform}/s5p-fimc/mipi-csis.c | 0
5966 .../media/{video => platform}/s5p-fimc/mipi-csis.h | 0
5967 drivers/media/{video => platform}/s5p-g2d/Makefile | 0
5968 drivers/media/{video => platform}/s5p-g2d/g2d-hw.c | 0
5969 .../media/{video => platform}/s5p-g2d/g2d-regs.h | 0
5970 drivers/media/{video => platform}/s5p-g2d/g2d.c | 29 +-
5971 drivers/media/{video => platform}/s5p-g2d/g2d.h | 0
5972 .../media/{video => platform}/s5p-jpeg/Makefile | 0
5973 .../media/{video => platform}/s5p-jpeg/jpeg-core.c | 38 +-
5974 .../media/{video => platform}/s5p-jpeg/jpeg-core.h | 2 +-
5975 .../media/{video => platform}/s5p-jpeg/jpeg-hw.h | 2 +-
5976 .../media/{video => platform}/s5p-jpeg/jpeg-regs.h | 2 +-
5977 drivers/media/{video => platform}/s5p-mfc/Makefile | 0
5978 .../media/{video => platform}/s5p-mfc/regs-mfc.h | 0
5979 .../media/{video => platform}/s5p-mfc/s5p_mfc.c | 19 +-
5980 .../{video => platform}/s5p-mfc/s5p_mfc_cmd.c | 2 +-
5981 .../{video => platform}/s5p-mfc/s5p_mfc_cmd.h | 2 +-
5982 .../{video => platform}/s5p-mfc/s5p_mfc_common.h | 0
5983 .../{video => platform}/s5p-mfc/s5p_mfc_ctrl.c | 4 +-
5984 .../{video => platform}/s5p-mfc/s5p_mfc_ctrl.h | 2 +-
5985 .../{video => platform}/s5p-mfc/s5p_mfc_debug.h | 2 +-
5986 .../{video => platform}/s5p-mfc/s5p_mfc_dec.c | 2 +-
5987 .../{video => platform}/s5p-mfc/s5p_mfc_dec.h | 2 +-
5988 .../{video => platform}/s5p-mfc/s5p_mfc_enc.c | 2 +-
5989 .../{video => platform}/s5p-mfc/s5p_mfc_enc.h | 2 +-
5990 .../{video => platform}/s5p-mfc/s5p_mfc_intr.c | 2 +-
5991 .../{video => platform}/s5p-mfc/s5p_mfc_intr.h | 2 +-
5992 .../{video => platform}/s5p-mfc/s5p_mfc_opr.c | 2 +-
5993 .../{video => platform}/s5p-mfc/s5p_mfc_opr.h | 2 +-
5994 .../media/{video => platform}/s5p-mfc/s5p_mfc_pm.c | 2 +-
5995 .../media/{video => platform}/s5p-mfc/s5p_mfc_pm.h | 2 +-
5996 .../{video => platform}/s5p-mfc/s5p_mfc_shm.c | 2 +-
5997 .../{video => platform}/s5p-mfc/s5p_mfc_shm.h | 2 +-
5998 drivers/media/{video => platform}/s5p-tv/Kconfig | 2 +-
5999 drivers/media/{video => platform}/s5p-tv/Makefile | 2 +-
6000 .../media/{video => platform}/s5p-tv/hdmi_drv.c | 6 +-
6001 .../media/{video => platform}/s5p-tv/hdmiphy_drv.c | 0
6002 drivers/media/{video => platform}/s5p-tv/mixer.h | 0
6003 .../media/{video => platform}/s5p-tv/mixer_drv.c | 6 +-
6004 .../{video => platform}/s5p-tv/mixer_grp_layer.c | 0
6005 .../media/{video => platform}/s5p-tv/mixer_reg.c | 0
6006 .../media/{video => platform}/s5p-tv/mixer_video.c | 33 +-
6007 .../{video => platform}/s5p-tv/mixer_vp_layer.c | 0
6008 .../media/{video => platform}/s5p-tv/regs-hdmi.h | 0
6009 .../media/{video => platform}/s5p-tv/regs-mixer.h | 0
6010 .../media/{video => platform}/s5p-tv/regs-sdo.h | 2 +-
6011 drivers/media/{video => platform}/s5p-tv/regs-vp.h | 0
6012 drivers/media/{video => platform}/s5p-tv/sdo_drv.c | 10 +-
6013 .../media/{video => platform}/s5p-tv/sii9234_drv.c | 17 +-
6014 drivers/media/{video => platform}/sh_vou.c | 25 +-
6015 drivers/media/platform/soc_camera/Kconfig | 87 +
6016 drivers/media/platform/soc_camera/Makefile | 14 +
6017 .../{video => platform/soc_camera}/atmel-isi.c | 0
6018 .../{video => platform/soc_camera}/mx1_camera.c | 0
6019 .../{video => platform/soc_camera}/mx2_camera.c | 40 +
6020 .../{video => platform/soc_camera}/mx3_camera.c | 4 +-
6021 .../{video => platform/soc_camera}/omap1_camera.c | 2 +-
6022 .../{video => platform/soc_camera}/pxa_camera.c | 0
6023 .../soc_camera}/sh_mobile_ceu_camera.c | 0
6024 .../soc_camera}/sh_mobile_csi2.c | 0
6025 .../{video => platform/soc_camera}/soc_camera.c | 197 +-
6026 .../soc_camera}/soc_camera_platform.c | 11 +-
6027 .../{video => platform/soc_camera}/soc_mediabus.c | 0
6028 drivers/media/{video => platform}/timblogiw.c | 0
6029 drivers/media/{video => platform}/via-camera.c | 0
6030 drivers/media/{video => platform}/via-camera.h | 0
6031 drivers/media/{video => platform}/vino.c | 0
6032 drivers/media/{video => platform}/vino.h | 0
6033 drivers/media/{video => platform}/vivi.c | 49 +-
6034 drivers/media/radio/radio-shark.c | 44 +-
6035 drivers/media/radio/radio-shark2.c | 52 +-
6036 drivers/media/radio/radio-si4713.c | 7 +-
6037 drivers/media/radio/radio-tea5777.c | 198 +-
6038 drivers/media/radio/radio-tea5777.h | 3 +
6039 drivers/media/radio/radio-timb.c | 8 +-
6040 drivers/media/radio/radio-wl1273.c | 23 +-
6041 drivers/media/radio/wl128x/fmdrv_v4l2.c | 38 +-
6042 drivers/media/rc/Kconfig | 32 +-
6043 drivers/media/rc/Makefile | 2 +
6044 drivers/media/rc/ati_remote.c | 15 +-
6045 drivers/media/rc/fintek-cir.c | 11 +-
6046 drivers/media/rc/iguanair.c | 247 +-
6047 drivers/media/rc/ir-lirc-codec.c | 35 +-
6048 drivers/media/rc/ir-nec-decoder.c | 4 +-
6049 drivers/media/rc/ir-raw.c | 6 +-
6050 drivers/media/rc/ir-rx51.c | 498 +++
6051 drivers/media/rc/ite-cir.c | 2 +-
6052 drivers/media/rc/keymaps/rc-tt-1500.c | 2 +-
6053 drivers/media/rc/mceusb.c | 30 +-
6054 drivers/media/rc/rc-loopback.c | 12 -
6055 drivers/media/rc/redrat3.c | 5 +-
6056 drivers/media/rc/ttusbir.c | 447 +++
6057 drivers/media/{common => }/tuners/Kconfig | 102 +-
6058 drivers/media/{common => }/tuners/Makefile | 6 +-
6059 drivers/media/tuners/e4000.c | 408 ++
6060 drivers/media/tuners/e4000.h | 52 +
6061 drivers/media/tuners/e4000_priv.h | 147 +
6062 drivers/media/{common => }/tuners/fc0011.c | 0
6063 drivers/media/{common => }/tuners/fc0011.h | 0
6064 drivers/media/{common => }/tuners/fc0012-priv.h | 0
6065 drivers/media/{common => }/tuners/fc0012.c | 0
6066 drivers/media/{common => }/tuners/fc0012.h | 0
6067 drivers/media/{common => }/tuners/fc0013-priv.h | 0
6068 drivers/media/{common => }/tuners/fc0013.c | 0
6069 drivers/media/{common => }/tuners/fc0013.h | 0
6070 drivers/media/{common => }/tuners/fc001x-common.h | 0
6071 drivers/media/tuners/fc2580.c | 524 +++
6072 drivers/media/tuners/fc2580.h | 52 +
6073 drivers/media/tuners/fc2580_priv.h | 134 +
6074 drivers/media/{common => }/tuners/max2165.c | 0
6075 drivers/media/{common => }/tuners/max2165.h | 0
6076 drivers/media/{common => }/tuners/max2165_priv.h | 0
6077 drivers/media/{common => }/tuners/mc44s803.c | 9 +-
6078 drivers/media/{common => }/tuners/mc44s803.h | 0
6079 drivers/media/{common => }/tuners/mc44s803_priv.h | 0
6080 drivers/media/{common => }/tuners/mt2060.c | 0
6081 drivers/media/{common => }/tuners/mt2060.h | 0
6082 drivers/media/{common => }/tuners/mt2060_priv.h | 0
6083 drivers/media/{common => }/tuners/mt2063.c | 0
6084 drivers/media/{common => }/tuners/mt2063.h | 0
6085 drivers/media/{common => }/tuners/mt20xx.c | 0
6086 drivers/media/{common => }/tuners/mt20xx.h | 0
6087 drivers/media/{common => }/tuners/mt2131.c | 0
6088 drivers/media/{common => }/tuners/mt2131.h | 0
6089 drivers/media/{common => }/tuners/mt2131_priv.h | 0
6090 drivers/media/{common => }/tuners/mt2266.c | 0
6091 drivers/media/{common => }/tuners/mt2266.h | 0
6092 drivers/media/{common => }/tuners/mxl5005s.c | 11 +
6093 drivers/media/{common => }/tuners/mxl5005s.h | 0
6094 drivers/media/{common => }/tuners/mxl5007t.c | 0
6095 drivers/media/{common => }/tuners/mxl5007t.h | 0
6096 drivers/media/{common => }/tuners/qt1010.c | 66 +-
6097 drivers/media/{common => }/tuners/qt1010.h | 0
6098 drivers/media/{common => }/tuners/qt1010_priv.h | 0
6099 drivers/media/{common => }/tuners/tda18212.c | 37 +-
6100 drivers/media/{common => }/tuners/tda18212.h | 0
6101 drivers/media/{common => }/tuners/tda18218.c | 52 +-
6102 drivers/media/{common => }/tuners/tda18218.h | 0
6103 drivers/media/{common => }/tuners/tda18218_priv.h | 13 +-
6104 .../media/{common => }/tuners/tda18271-common.c | 10 +-
6105 drivers/media/{common => }/tuners/tda18271-fe.c | 0
6106 drivers/media/{common => }/tuners/tda18271-maps.c | 0
6107 drivers/media/{common => }/tuners/tda18271-priv.h | 0
6108 drivers/media/{common => }/tuners/tda18271.h | 0
6109 drivers/media/{common => }/tuners/tda827x.c | 0
6110 drivers/media/{common => }/tuners/tda827x.h | 0
6111 drivers/media/{common => }/tuners/tda8290.c | 0
6112 drivers/media/{common => }/tuners/tda8290.h | 0
6113 drivers/media/{common => }/tuners/tda9887.c | 0
6114 drivers/media/{common => }/tuners/tda9887.h | 0
6115 drivers/media/{common => }/tuners/tea5761.c | 0
6116 drivers/media/{common => }/tuners/tea5761.h | 0
6117 drivers/media/{common => }/tuners/tea5767.c | 0
6118 drivers/media/{common => }/tuners/tea5767.h | 0
6119 drivers/media/{common => }/tuners/tua9001.c | 95 +-
6120 drivers/media/{common => }/tuners/tua9001.h | 20 +
6121 drivers/media/{common => }/tuners/tua9001_priv.h | 0
6122 drivers/media/{common => }/tuners/tuner-i2c.h | 0
6123 drivers/media/{common => }/tuners/tuner-simple.c | 0
6124 drivers/media/{common => }/tuners/tuner-simple.h | 0
6125 drivers/media/{common => }/tuners/tuner-types.c | 0
6126 .../media/{common => }/tuners/tuner-xc2028-types.h | 0
6127 drivers/media/{common => }/tuners/tuner-xc2028.c | 7 +-
6128 drivers/media/{common => }/tuners/tuner-xc2028.h | 0
6129 drivers/media/{common => }/tuners/xc4000.c | 3 +-
6130 drivers/media/{common => }/tuners/xc4000.h | 0
6131 drivers/media/{common => }/tuners/xc5000.c | 161 +-
6132 drivers/media/{common => }/tuners/xc5000.h | 0
6133 drivers/media/usb/Kconfig | 54 +
6134 drivers/media/usb/Makefile | 22 +
6135 drivers/media/{video => usb}/au0828/Kconfig | 11 +-
6136 drivers/media/{video => usb}/au0828/Makefile | 6 +-
6137 drivers/media/{video => usb}/au0828/au0828-cards.c | 4 +-
6138 drivers/media/{video => usb}/au0828/au0828-cards.h | 0
6139 drivers/media/{video => usb}/au0828/au0828-core.c | 59 +-
6140 drivers/media/{video => usb}/au0828/au0828-dvb.c | 54 +-
6141 drivers/media/{video => usb}/au0828/au0828-i2c.c | 21 +-
6142 drivers/media/{video => usb}/au0828/au0828-reg.h | 1 +
6143 drivers/media/{video => usb}/au0828/au0828-vbi.c | 0
6144 drivers/media/{video => usb}/au0828/au0828-video.c | 76 +-
6145 drivers/media/{video => usb}/au0828/au0828.h | 2 +
6146 drivers/media/usb/b2c2/Kconfig | 15 +
6147 drivers/media/usb/b2c2/Makefile | 5 +
6148 drivers/media/{dvb => usb}/b2c2/flexcop-usb.c | 5 +-
6149 drivers/media/{dvb => usb}/b2c2/flexcop-usb.h | 0
6150 drivers/media/{video => usb}/cpia2/Kconfig | 0
6151 drivers/media/{video => usb}/cpia2/Makefile | 0
6152 drivers/media/{video => usb}/cpia2/cpia2.h | 0
6153 drivers/media/{video => usb}/cpia2/cpia2_core.c | 6 +-
6154 .../media/{video => usb}/cpia2/cpia2_registers.h | 0
6155 drivers/media/{video => usb}/cpia2/cpia2_usb.c | 0
6156 drivers/media/{video => usb}/cpia2/cpia2_v4l.c | 39 +-
6157 drivers/media/{video => usb}/cx231xx/Kconfig | 8 +-
6158 drivers/media/{video => usb}/cx231xx/Makefile | 11 +-
6159 drivers/media/{video => usb}/cx231xx/cx231xx-417.c | 2 +
6160 .../media/{video => usb}/cx231xx/cx231xx-audio.c | 0
6161 .../media/{video => usb}/cx231xx/cx231xx-avcore.c | 0
6162 .../media/{video => usb}/cx231xx/cx231xx-cards.c | 0
6163 .../{video => usb}/cx231xx/cx231xx-conf-reg.h | 0
6164 .../media/{video => usb}/cx231xx/cx231xx-core.c | 0
6165 drivers/media/{video => usb}/cx231xx/cx231xx-dif.h | 0
6166 drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c | 0
6167 drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c | 0
6168 .../media/{video => usb}/cx231xx/cx231xx-input.c | 0
6169 .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c | 0
6170 .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h | 0
6171 drivers/media/{video => usb}/cx231xx/cx231xx-reg.h | 0
6172 drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c | 0
6173 drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h | 0
6174 .../media/{video => usb}/cx231xx/cx231xx-video.c | 47 +-
6175 drivers/media/{video => usb}/cx231xx/cx231xx.h | 0
6176 drivers/media/usb/dvb-usb-v2/Kconfig | 148 +
6177 drivers/media/usb/dvb-usb-v2/Makefile | 49 +
6178 drivers/media/usb/dvb-usb-v2/af9015.c | 1454 +++++++
6179 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9015.h | 55 +-
6180 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.c | 796 ++--
6181 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.h | 6 +-
6182 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.c | 663 ++-
6183 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.h | 9 +-
6184 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.c | 123 +-
6185 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.h | 13 +-
6186 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/az6007.c | 410 +-
6187 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.c | 188 +-
6188 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.h | 33 +-
6189 drivers/media/usb/dvb-usb-v2/cypress_firmware.c | 125 +
6190 drivers/media/usb/dvb-usb-v2/cypress_firmware.h | 31 +
6191 drivers/media/usb/dvb-usb-v2/dvb_usb.h | 403 ++
6192 drivers/media/usb/dvb-usb-v2/dvb_usb_common.h | 35 +
6193 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 1046 +++++
6194 drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 77 +
6195 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.c | 326 +-
6196 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.h | 24 +-
6197 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.c | 132 +-
6198 .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.h | 5 +-
6199 drivers/media/usb/dvb-usb-v2/it913x.c | 799 ++++
6200 .../{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.c | 586 ++-
6201 .../{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.h | 0
6202 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.c | 0
6203 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.h | 0
6204 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.c | 0
6205 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.h | 0
6206 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.c | 0
6207 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.h | 0
6208 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.c | 0
6209 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.h | 0
6210 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-reg.h | 0
6211 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.c | 2 +
6212 .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.h | 0
6213 drivers/media/usb/dvb-usb-v2/mxl111sf.c | 1431 +++++++
6214 .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf.h | 22 +-
6215 .../{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.c | 777 ++--
6216 .../{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.h | 28 +-
6217 drivers/media/usb/dvb-usb-v2/usb_urb.c | 358 ++
6218 drivers/media/usb/dvb-usb/Kconfig | 313 ++
6219 drivers/media/usb/dvb-usb/Makefile | 83 +
6220 drivers/media/{dvb => usb}/dvb-usb/a800.c | 0
6221 drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c | 0
6222 drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c | 0
6223 drivers/media/{dvb => usb}/dvb-usb/af9005-script.h | 0
6224 drivers/media/{dvb => usb}/dvb-usb/af9005.c | 0
6225 drivers/media/{dvb => usb}/dvb-usb/af9005.h | 0
6226 drivers/media/{dvb => usb}/dvb-usb/az6027.c | 0
6227 drivers/media/{dvb => usb}/dvb-usb/az6027.h | 0
6228 .../media/{dvb => usb}/dvb-usb/cinergyT2-core.c | 0
6229 drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c | 0
6230 drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h | 0
6231 drivers/media/{dvb => usb}/dvb-usb/cxusb.c | 0
6232 drivers/media/{dvb => usb}/dvb-usb/cxusb.h | 0
6233 drivers/media/{dvb => usb}/dvb-usb/dib0700.h | 0
6234 drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c | 6 +-
6235 .../media/{dvb => usb}/dvb-usb/dib0700_devices.c | 0
6236 drivers/media/{dvb => usb}/dvb-usb/dib07x0.h | 0
6237 drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c | 0
6238 drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c | 0
6239 drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c | 0
6240 drivers/media/{dvb => usb}/dvb-usb/dibusb.h | 0
6241 drivers/media/{dvb => usb}/dvb-usb/digitv.c | 0
6242 drivers/media/{dvb => usb}/dvb-usb/digitv.h | 0
6243 drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c | 0
6244 drivers/media/{dvb => usb}/dvb-usb/dtt200u.c | 0
6245 drivers/media/{dvb => usb}/dvb-usb/dtt200u.h | 0
6246 drivers/media/{dvb => usb}/dvb-usb/dtv5100.c | 0
6247 drivers/media/{dvb => usb}/dvb-usb/dtv5100.h | 0
6248 .../media/{dvb => usb}/dvb-usb/dvb-usb-common.h | 0
6249 drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c | 1 -
6250 .../media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c | 0
6251 drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c | 0
6252 drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c | 0
6253 .../media/{dvb => usb}/dvb-usb/dvb-usb-remote.c | 0
6254 drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c | 0
6255 drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h | 2 -
6256 drivers/media/{dvb => usb}/dvb-usb/dw2102.c | 0
6257 drivers/media/{dvb => usb}/dvb-usb/dw2102.h | 0
6258 drivers/media/{dvb => usb}/dvb-usb/friio-fe.c | 0
6259 drivers/media/{dvb => usb}/dvb-usb/friio.c | 0
6260 drivers/media/{dvb => usb}/dvb-usb/friio.h | 0
6261 drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c | 0
6262 drivers/media/{dvb => usb}/dvb-usb/gp8psk.c | 0
6263 drivers/media/{dvb => usb}/dvb-usb/gp8psk.h | 0
6264 drivers/media/{dvb => usb}/dvb-usb/m920x.c | 0
6265 drivers/media/{dvb => usb}/dvb-usb/m920x.h | 0
6266 drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c | 0
6267 drivers/media/{dvb => usb}/dvb-usb/opera1.c | 0
6268 drivers/media/{dvb => usb}/dvb-usb/pctv452e.c | 7 +-
6269 .../media/{dvb => usb}/dvb-usb/technisat-usb2.c | 0
6270 drivers/media/{dvb => usb}/dvb-usb/ttusb2.c | 2 +-
6271 drivers/media/{dvb => usb}/dvb-usb/ttusb2.h | 0
6272 drivers/media/{dvb => usb}/dvb-usb/umt-010.c | 0
6273 drivers/media/{dvb => usb}/dvb-usb/usb-urb.c | 0
6274 drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c | 0
6275 drivers/media/{dvb => usb}/dvb-usb/vp702x.c | 0
6276 drivers/media/{dvb => usb}/dvb-usb/vp702x.h | 0
6277 drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c | 0
6278 drivers/media/{dvb => usb}/dvb-usb/vp7045.c | 0
6279 drivers/media/{dvb => usb}/dvb-usb/vp7045.h | 0
6280 drivers/media/{video => usb}/em28xx/Kconfig | 28 +-
6281 drivers/media/{video => usb}/em28xx/Makefile | 10 +-
6282 drivers/media/{video => usb}/em28xx/em28xx-audio.c | 1 -
6283 drivers/media/{video => usb}/em28xx/em28xx-cards.c | 0
6284 drivers/media/{video => usb}/em28xx/em28xx-core.c | 4 -
6285 drivers/media/{video => usb}/em28xx/em28xx-dvb.c | 0
6286 drivers/media/{video => usb}/em28xx/em28xx-i2c.c | 0
6287 drivers/media/{video => usb}/em28xx/em28xx-input.c | 0
6288 drivers/media/{video => usb}/em28xx/em28xx-reg.h | 0
6289 drivers/media/{video => usb}/em28xx/em28xx-vbi.c | 0
6290 drivers/media/{video => usb}/em28xx/em28xx-video.c | 52 +-
6291 drivers/media/{video => usb}/em28xx/em28xx.h | 0
6292 drivers/media/{video => usb}/gspca/Kconfig | 6 +-
6293 drivers/media/{video => usb}/gspca/Makefile | 0
6294 .../{video => usb}/gspca/autogain_functions.c | 0
6295 .../{video => usb}/gspca/autogain_functions.h | 0
6296 drivers/media/{video => usb}/gspca/benq.c | 0
6297 drivers/media/{video => usb}/gspca/conex.c | 0
6298 drivers/media/{video => usb}/gspca/cpia1.c | 2 +-
6299 drivers/media/{video => usb}/gspca/etoms.c | 0
6300 drivers/media/{video => usb}/gspca/finepix.c | 18 +-
6301 drivers/media/{video => usb}/gspca/gl860/Kconfig | 0
6302 drivers/media/{video => usb}/gspca/gl860/Makefile | 2 +-
6303 .../{video => usb}/gspca/gl860/gl860-mi1320.c | 0
6304 .../{video => usb}/gspca/gl860/gl860-mi2020.c | 0
6305 .../{video => usb}/gspca/gl860/gl860-ov2640.c | 0
6306 .../{video => usb}/gspca/gl860/gl860-ov9655.c | 0
6307 drivers/media/{video => usb}/gspca/gl860/gl860.c | 0
6308 drivers/media/{video => usb}/gspca/gl860/gl860.h | 0
6309 drivers/media/{video => usb}/gspca/gspca.c | 12 +-
6310 drivers/media/{video => usb}/gspca/gspca.h | 0
6311 drivers/media/{video => usb}/gspca/jeilinj.c | 0
6312 drivers/media/{video => usb}/gspca/jl2005bcd.c | 18 +-
6313 drivers/media/{video => usb}/gspca/jpeg.h | 0
6314 drivers/media/{video => usb}/gspca/kinect.c | 0
6315 drivers/media/{video => usb}/gspca/konica.c | 0
6316 drivers/media/{video => usb}/gspca/m5602/Kconfig | 0
6317 drivers/media/{video => usb}/gspca/m5602/Makefile | 2 +-
6318 .../{video => usb}/gspca/m5602/m5602_bridge.h | 0
6319 .../media/{video => usb}/gspca/m5602/m5602_core.c | 0
6320 .../{video => usb}/gspca/m5602/m5602_mt9m111.c | 0
6321 .../{video => usb}/gspca/m5602/m5602_mt9m111.h | 0
6322 .../{video => usb}/gspca/m5602/m5602_ov7660.c | 0
6323 .../{video => usb}/gspca/m5602/m5602_ov7660.h | 0
6324 .../{video => usb}/gspca/m5602/m5602_ov9650.c | 0
6325 .../{video => usb}/gspca/m5602/m5602_ov9650.h | 0
6326 .../{video => usb}/gspca/m5602/m5602_po1030.c | 0
6327 .../{video => usb}/gspca/m5602/m5602_po1030.h | 0
6328 .../{video => usb}/gspca/m5602/m5602_s5k4aa.c | 0
6329 .../{video => usb}/gspca/m5602/m5602_s5k4aa.h | 0
6330 .../{video => usb}/gspca/m5602/m5602_s5k83a.c | 0
6331 .../{video => usb}/gspca/m5602/m5602_s5k83a.h | 0
6332 .../{video => usb}/gspca/m5602/m5602_sensor.h | 0
6333 drivers/media/{video => usb}/gspca/mars.c | 0
6334 drivers/media/{video => usb}/gspca/mr97310a.c | 0
6335 drivers/media/{video => usb}/gspca/nw80x.c | 0
6336 drivers/media/{video => usb}/gspca/ov519.c | 16 +-
6337 drivers/media/{video => usb}/gspca/ov534.c | 0
6338 drivers/media/{video => usb}/gspca/ov534_9.c | 0
6339 drivers/media/{video => usb}/gspca/pac207.c | 0
6340 drivers/media/{video => usb}/gspca/pac7302.c | 47 +-
6341 drivers/media/{video => usb}/gspca/pac7311.c | 0
6342 drivers/media/{video => usb}/gspca/pac_common.h | 0
6343 drivers/media/{video => usb}/gspca/se401.c | 0
6344 drivers/media/{video => usb}/gspca/se401.h | 0
6345 drivers/media/{video => usb}/gspca/sn9c2028.c | 0
6346 drivers/media/{video => usb}/gspca/sn9c2028.h | 0
6347 drivers/media/{video => usb}/gspca/sn9c20x.c | 2 +
6348 drivers/media/{video => usb}/gspca/sonixb.c | 0
6349 drivers/media/{video => usb}/gspca/sonixj.c | 2 +
6350 drivers/media/{video => usb}/gspca/spca1528.c | 0
6351 drivers/media/{video => usb}/gspca/spca500.c | 0
6352 drivers/media/{video => usb}/gspca/spca501.c | 0
6353 drivers/media/{video => usb}/gspca/spca505.c | 0
6354 drivers/media/{video => usb}/gspca/spca506.c | 0
6355 drivers/media/{video => usb}/gspca/spca508.c | 0
6356 drivers/media/{video => usb}/gspca/spca561.c | 0
6357 drivers/media/{video => usb}/gspca/sq905.c | 19 +-
6358 drivers/media/{video => usb}/gspca/sq905c.c | 25 +-
6359 drivers/media/{video => usb}/gspca/sq930x.c | 10 +-
6360 drivers/media/{video => usb}/gspca/stk014.c | 0
6361 drivers/media/{video => usb}/gspca/stv0680.c | 0
6362 drivers/media/{video => usb}/gspca/stv06xx/Kconfig | 0
6363 .../media/{video => usb}/gspca/stv06xx/Makefile | 2 +-
6364 .../media/{video => usb}/gspca/stv06xx/stv06xx.c | 0
6365 .../media/{video => usb}/gspca/stv06xx/stv06xx.h | 0
6366 .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.c | 0
6367 .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.h | 0
6368 .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.c | 0
6369 .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.h | 0
6370 .../{video => usb}/gspca/stv06xx/stv06xx_sensor.h | 0
6371 .../{video => usb}/gspca/stv06xx/stv06xx_st6422.c | 0
6372 .../{video => usb}/gspca/stv06xx/stv06xx_st6422.h | 0
6373 .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.c | 0
6374 .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.h | 0
6375 drivers/media/{video => usb}/gspca/sunplus.c | 0
6376 drivers/media/{video => usb}/gspca/t613.c | 0
6377 drivers/media/{video => usb}/gspca/topro.c | 0
6378 drivers/media/{video => usb}/gspca/tv8532.c | 0
6379 drivers/media/{video => usb}/gspca/vc032x.c | 7 +-
6380 drivers/media/{video => usb}/gspca/vicam.c | 17 +-
6381 drivers/media/{video => usb}/gspca/w996Xcf.c | 0
6382 drivers/media/{video => usb}/gspca/xirlink_cit.c | 4 +-
6383 drivers/media/{video => usb}/gspca/zc3xx-reg.h | 0
6384 drivers/media/{video => usb}/gspca/zc3xx.c | 8 +-
6385 drivers/media/{video => usb}/hdpvr/Kconfig | 0
6386 drivers/media/{video => usb}/hdpvr/Makefile | 2 +-
6387 drivers/media/{video => usb}/hdpvr/hdpvr-control.c | 0
6388 drivers/media/{video => usb}/hdpvr/hdpvr-core.c | 0
6389 drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c | 0
6390 drivers/media/{video => usb}/hdpvr/hdpvr-video.c | 0
6391 drivers/media/{video => usb}/hdpvr/hdpvr.h | 0
6392 drivers/media/{video => usb}/pvrusb2/Kconfig | 14 +-
6393 drivers/media/{video => usb}/pvrusb2/Makefile | 8 +-
6394 .../media/{video => usb}/pvrusb2/pvrusb2-audio.c | 0
6395 .../media/{video => usb}/pvrusb2/pvrusb2-audio.h | 0
6396 .../media/{video => usb}/pvrusb2/pvrusb2-context.c | 0
6397 .../media/{video => usb}/pvrusb2/pvrusb2-context.h | 0
6398 .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.c | 0
6399 .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.h | 0
6400 .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.c | 0
6401 .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.h | 0
6402 .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c | 0
6403 .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h | 0
6404 .../media/{video => usb}/pvrusb2/pvrusb2-debug.h | 0
6405 .../{video => usb}/pvrusb2/pvrusb2-debugifc.c | 0
6406 .../{video => usb}/pvrusb2/pvrusb2-debugifc.h | 0
6407 .../media/{video => usb}/pvrusb2/pvrusb2-devattr.c | 17 +-
6408 .../media/{video => usb}/pvrusb2/pvrusb2-devattr.h | 0
6409 drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c | 0
6410 drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h | 0
6411 .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.c | 0
6412 .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.h | 0
6413 .../media/{video => usb}/pvrusb2/pvrusb2-encoder.c | 0
6414 .../media/{video => usb}/pvrusb2/pvrusb2-encoder.h | 0
6415 .../media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h | 0
6416 .../{video => usb}/pvrusb2/pvrusb2-hdw-internal.h | 0
6417 drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c | 0
6418 drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h | 0
6419 .../{video => usb}/pvrusb2/pvrusb2-i2c-core.c | 0
6420 .../{video => usb}/pvrusb2/pvrusb2-i2c-core.h | 0
6421 drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c | 0
6422 drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h | 0
6423 .../media/{video => usb}/pvrusb2/pvrusb2-ioread.c | 0
6424 .../media/{video => usb}/pvrusb2/pvrusb2-ioread.h | 0
6425 .../media/{video => usb}/pvrusb2/pvrusb2-main.c | 0
6426 drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c | 0
6427 drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h | 0
6428 .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.c | 0
6429 .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.h | 0
6430 .../media/{video => usb}/pvrusb2/pvrusb2-util.h | 0
6431 .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.c | 0
6432 .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.h | 0
6433 .../{video => usb}/pvrusb2/pvrusb2-video-v4l.c | 0
6434 .../{video => usb}/pvrusb2/pvrusb2-video-v4l.h | 0
6435 .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.c | 0
6436 .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.h | 0
6437 drivers/media/{video => usb}/pvrusb2/pvrusb2.h | 0
6438 drivers/media/{video => usb}/pwc/Kconfig | 0
6439 drivers/media/{video => usb}/pwc/Makefile | 2 +-
6440 drivers/media/{video => usb}/pwc/philips.txt | 0
6441 drivers/media/{video => usb}/pwc/pwc-ctrl.c | 0
6442 drivers/media/{video => usb}/pwc/pwc-dec1.c | 0
6443 drivers/media/{video => usb}/pwc/pwc-dec1.h | 0
6444 drivers/media/{video => usb}/pwc/pwc-dec23.c | 0
6445 drivers/media/{video => usb}/pwc/pwc-dec23.h | 0
6446 drivers/media/{video => usb}/pwc/pwc-if.c | 3 +-
6447 drivers/media/{video => usb}/pwc/pwc-kiara.c | 0
6448 drivers/media/{video => usb}/pwc/pwc-kiara.h | 0
6449 drivers/media/{video => usb}/pwc/pwc-misc.c | 0
6450 drivers/media/{video => usb}/pwc/pwc-nala.h | 0
6451 drivers/media/{video => usb}/pwc/pwc-timon.c | 0
6452 drivers/media/{video => usb}/pwc/pwc-timon.h | 0
6453 drivers/media/{video => usb}/pwc/pwc-uncompress.c | 0
6454 drivers/media/{video => usb}/pwc/pwc-v4l.c | 0
6455 drivers/media/{video => usb}/pwc/pwc.h | 0
6456 drivers/media/usb/s2255/Kconfig | 9 +
6457 drivers/media/usb/s2255/Makefile | 2 +
6458 drivers/media/{video => usb/s2255}/s2255drv.c | 43 +-
6459 drivers/media/usb/siano/Kconfig | 10 +
6460 drivers/media/usb/siano/Makefile | 6 +
6461 drivers/media/{dvb => usb}/siano/smsusb.c | 0
6462 drivers/media/{video => usb}/sn9c102/Kconfig | 0
6463 drivers/media/{video => usb}/sn9c102/Makefile | 0
6464 drivers/media/{video => usb}/sn9c102/sn9c102.h | 0
6465 .../media/{video => usb}/sn9c102/sn9c102_config.h | 0
6466 .../media/{video => usb}/sn9c102/sn9c102_core.c | 0
6467 .../{video => usb}/sn9c102/sn9c102_devtable.h | 0
6468 .../media/{video => usb}/sn9c102/sn9c102_hv7131d.c | 0
6469 .../media/{video => usb}/sn9c102/sn9c102_hv7131r.c | 0
6470 .../media/{video => usb}/sn9c102/sn9c102_mi0343.c | 0
6471 .../media/{video => usb}/sn9c102/sn9c102_mi0360.c | 0
6472 .../media/{video => usb}/sn9c102/sn9c102_mt9v111.c | 0
6473 .../media/{video => usb}/sn9c102/sn9c102_ov7630.c | 0
6474 .../media/{video => usb}/sn9c102/sn9c102_ov7660.c | 0
6475 .../media/{video => usb}/sn9c102/sn9c102_pas106b.c | 0
6476 .../{video => usb}/sn9c102/sn9c102_pas202bcb.c | 0
6477 .../media/{video => usb}/sn9c102/sn9c102_sensor.h | 0
6478 .../{video => usb}/sn9c102/sn9c102_tas5110c1b.c | 0
6479 .../{video => usb}/sn9c102/sn9c102_tas5110d.c | 0
6480 .../{video => usb}/sn9c102/sn9c102_tas5130d1b.c | 0
6481 drivers/media/usb/stk1160/Kconfig | 20 +
6482 drivers/media/usb/stk1160/Makefile | 11 +
6483 drivers/media/usb/stk1160/stk1160-ac97.c | 152 +
6484 drivers/media/usb/stk1160/stk1160-core.c | 430 ++
6485 drivers/media/usb/stk1160/stk1160-i2c.c | 294 ++
6486 drivers/media/usb/stk1160/stk1160-reg.h | 93 +
6487 drivers/media/usb/stk1160/stk1160-v4l.c | 739 ++++
6488 drivers/media/usb/stk1160/stk1160-video.c | 518 +++
6489 drivers/media/usb/stk1160/stk1160.h | 208 +
6490 drivers/media/usb/stkwebcam/Kconfig | 13 +
6491 drivers/media/usb/stkwebcam/Makefile | 4 +
6492 .../media/{video => usb/stkwebcam}/stk-sensor.c | 0
6493 .../media/{video => usb/stkwebcam}/stk-webcam.c | 0
6494 .../media/{video => usb/stkwebcam}/stk-webcam.h | 0
6495 drivers/media/{video => usb}/tlg2300/Kconfig | 0
6496 drivers/media/usb/tlg2300/Makefile | 9 +
6497 drivers/media/{video => usb}/tlg2300/pd-alsa.c | 4 +
6498 drivers/media/{video => usb}/tlg2300/pd-common.h | 0
6499 drivers/media/{video => usb}/tlg2300/pd-dvb.c | 0
6500 drivers/media/{video => usb}/tlg2300/pd-main.c | 0
6501 drivers/media/{video => usb}/tlg2300/pd-radio.c | 0
6502 drivers/media/{video => usb}/tlg2300/pd-video.c | 0
6503 drivers/media/{video => usb}/tlg2300/vendorcmds.h | 0
6504 drivers/media/{video => usb}/tm6000/Kconfig | 0
6505 drivers/media/{video => usb}/tm6000/Makefile | 8 +-
6506 drivers/media/{video => usb}/tm6000/tm6000-alsa.c | 3 +-
6507 drivers/media/{video => usb}/tm6000/tm6000-cards.c | 0
6508 drivers/media/{video => usb}/tm6000/tm6000-core.c | 0
6509 drivers/media/{video => usb}/tm6000/tm6000-dvb.c | 0
6510 drivers/media/{video => usb}/tm6000/tm6000-i2c.c | 0
6511 drivers/media/{video => usb}/tm6000/tm6000-input.c | 3 +-
6512 drivers/media/{video => usb}/tm6000/tm6000-regs.h | 0
6513 drivers/media/{video => usb}/tm6000/tm6000-stds.c | 0
6514 .../media/{video => usb}/tm6000/tm6000-usb-isoc.h | 0
6515 drivers/media/{video => usb}/tm6000/tm6000-video.c | 52 +-
6516 drivers/media/{video => usb}/tm6000/tm6000.h | 0
6517 drivers/media/{dvb => usb}/ttusb-budget/Kconfig | 14 +-
6518 drivers/media/usb/ttusb-budget/Makefile | 3 +
6519 .../{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c | 0
6520 drivers/media/{dvb => usb}/ttusb-dec/Kconfig | 0
6521 drivers/media/{dvb => usb}/ttusb-dec/Makefile | 2 +-
6522 drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c | 0
6523 drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c | 0
6524 drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h | 0
6525 drivers/media/{video => usb}/usbvision/Kconfig | 2 +-
6526 drivers/media/{video => usb}/usbvision/Makefile | 4 +-
6527 .../{video => usb}/usbvision/usbvision-cards.c | 0
6528 .../{video => usb}/usbvision/usbvision-cards.h | 0
6529 .../{video => usb}/usbvision/usbvision-core.c | 0
6530 .../media/{video => usb}/usbvision/usbvision-i2c.c | 0
6531 .../{video => usb}/usbvision/usbvision-video.c | 42 +-
6532 drivers/media/{video => usb}/usbvision/usbvision.h | 0
6533 drivers/media/{video => usb}/uvc/Kconfig | 0
6534 drivers/media/{video => usb}/uvc/Makefile | 0
6535 drivers/media/{video => usb}/uvc/uvc_ctrl.c | 0
6536 drivers/media/{video => usb}/uvc/uvc_debugfs.c | 0
6537 drivers/media/{video => usb}/uvc/uvc_driver.c | 40 +-
6538 drivers/media/{video => usb}/uvc/uvc_entity.c | 0
6539 drivers/media/{video => usb}/uvc/uvc_isight.c | 0
6540 drivers/media/{video => usb}/uvc/uvc_queue.c | 0
6541 drivers/media/{video => usb}/uvc/uvc_status.c | 0
6542 drivers/media/{video => usb}/uvc/uvc_v4l2.c | 0
6543 drivers/media/{video => usb}/uvc/uvc_video.c | 30 +-
6544 drivers/media/{video => usb}/uvc/uvcvideo.h | 9 +
6545 drivers/media/usb/zr364xx/Kconfig | 14 +
6546 drivers/media/usb/zr364xx/Makefile | 2 +
6547 drivers/media/{video => usb/zr364xx}/zr364xx.c | 0
6548 drivers/media/v4l2-core/Kconfig | 81 +
6549 drivers/media/v4l2-core/Makefile | 35 +
6550 drivers/media/{video => v4l2-core}/tuner-core.c | 0
6551 drivers/media/{video => v4l2-core}/v4l2-common.c | 360 +-
6552 .../{video => v4l2-core}/v4l2-compat-ioctl32.c | 57 +
6553 drivers/media/{video => v4l2-core}/v4l2-ctrls.c | 174 +-
6554 drivers/media/{video => v4l2-core}/v4l2-dev.c | 51 +-
6555 drivers/media/{video => v4l2-core}/v4l2-device.c | 0
6556 drivers/media/{video => v4l2-core}/v4l2-event.c | 0
6557 drivers/media/{video => v4l2-core}/v4l2-fh.c | 0
6558 .../media/{video => v4l2-core}/v4l2-int-device.c | 0
6559 drivers/media/{video => v4l2-core}/v4l2-ioctl.c | 21 +-
6560 drivers/media/{video => v4l2-core}/v4l2-mem2mem.c | 6 +-
6561 drivers/media/{video => v4l2-core}/v4l2-subdev.c | 6 +
6562 drivers/media/{video => v4l2-core}/videobuf-core.c | 0
6563 .../{video => v4l2-core}/videobuf-dma-contig.c | 0
6564 .../media/{video => v4l2-core}/videobuf-dma-sg.c | 0
6565 drivers/media/{video => v4l2-core}/videobuf-dvb.c | 11 +-
6566 .../media/{video => v4l2-core}/videobuf-vmalloc.c | 0
6567 .../media/{video => v4l2-core}/videobuf2-core.c | 21 +-
6568 .../{video => v4l2-core}/videobuf2-dma-contig.c | 0
6569 .../media/{video => v4l2-core}/videobuf2-dma-sg.c | 0
6570 .../media/{video => v4l2-core}/videobuf2-memops.c | 0
6571 .../media/{video => v4l2-core}/videobuf2-vmalloc.c | 1 +
6572 drivers/media/video/Kconfig | 1263 ------
6573 drivers/media/video/Makefile | 218 -
6574 drivers/media/video/bt8xx/Kconfig | 27 -
6575 drivers/media/video/bt8xx/Makefile | 13 -
6576 drivers/media/video/cx23885/Kconfig | 46 -
6577 drivers/media/video/tlg2300/Makefile | 9 -
6578 drivers/staging/media/Kconfig | 2 -
6579 drivers/staging/media/Makefile | 1 -
6580 drivers/staging/media/as102/Makefile | 2 +-
6581 drivers/staging/media/cxd2099/Makefile | 6 +-
6582 drivers/staging/media/cxd2099/cxd2099.c | 13 +-
6583 drivers/staging/media/dt3155v4l/dt3155v4l.c | 29 +-
6584 drivers/staging/media/easycap/Kconfig | 30 -
6585 drivers/staging/media/easycap/Makefile | 10 -
6586 drivers/staging/media/easycap/README | 141 -
6587 drivers/staging/media/easycap/easycap.h | 567 ---
6588 drivers/staging/media/easycap/easycap_ioctl.c | 2443 -----------
6589 drivers/staging/media/easycap/easycap_low.c | 968 -----
6590 drivers/staging/media/easycap/easycap_main.c | 4239 --------------------
6591 drivers/staging/media/easycap/easycap_settings.c | 696 ----
6592 drivers/staging/media/easycap/easycap_sound.c | 750 ----
6593 drivers/staging/media/easycap/easycap_testcard.c | 155 -
6594 drivers/staging/media/go7007/Makefile | 6 +-
6595 drivers/staging/media/lirc/Kconfig | 6 -
6596 drivers/staging/media/lirc/Makefile | 1 -
6597 drivers/staging/media/lirc/lirc_ene0100.h | 169 -
6598 drivers/staging/media/lirc/lirc_igorplugusb.c | 4 +-
6599 drivers/staging/media/lirc/lirc_ttusbir.c | 376 --
6600 drivers/staging/media/lirc/lirc_zilog.c | 3 +-
6601 include/linux/dvb/frontend.h | 59 +-
6602 include/linux/dvb/version.h | 2 +-
6603 include/linux/omap3isp.h | 6 +-
6604 include/linux/v4l2-common.h | 8 +-
6605 include/linux/v4l2-subdev.h | 10 +
6606 include/linux/videodev2.h | 24 +
6607 include/media/ad9389b.h | 49 +
6608 include/media/adv7604.h | 153 +
6609 include/media/ir-rx51.h | 10 +
6610 include/media/mt9v032.h | 3 +
6611 include/media/omap3isp.h | 14 +-
6612 include/media/saa7146.h | 4 -
6613 include/media/soc_camera.h | 12 +
6614 include/media/v4l2-chip-ident.h | 6 +
6615 include/media/v4l2-common.h | 17 +-
6616 include/media/v4l2-ctrls.h | 23 +
6617 include/media/v4l2-dev.h | 3 -
6618 include/media/v4l2-mem2mem.h | 4 +-
6619 include/media/v4l2-subdev.h | 4 +-
6620 include/media/videobuf-dvb.h | 4 +-
6621 include/sound/tea575x-tuner.h | 4 +
6622 sound/i2c/other/tea575x-tuner.c | 200 +-
6623 sound/pci/Kconfig | 4 +-
6624 1614 files changed, 34031 insertions(+), 24099 deletions(-)
6625 create mode 100644 Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml
6626 create mode 100644 arch/arm/plat-mxc/devices/platform-imx27-coda.c
6627 create mode 100644 drivers/media/common/b2c2/Kconfig
6628 create mode 100644 drivers/media/common/b2c2/Makefile
6629 rename drivers/media/{dvb => common}/b2c2/flexcop-common.h (100%)
6630 rename drivers/media/{dvb => common}/b2c2/flexcop-eeprom.c (100%)
6631 rename drivers/media/{dvb => common}/b2c2/flexcop-fe-tuner.c (100%)
6632 rename drivers/media/{dvb => common}/b2c2/flexcop-hw-filter.c (100%)
6633 rename drivers/media/{dvb => common}/b2c2/flexcop-i2c.c (100%)
6634 rename drivers/media/{dvb => common}/b2c2/flexcop-misc.c (100%)
6635 rename drivers/media/{dvb => common}/b2c2/flexcop-reg.h (100%)
6636 rename drivers/media/{dvb => common}/b2c2/flexcop-sram.c (100%)
6637 rename drivers/media/{dvb => common}/b2c2/flexcop.c (99%)
6638 rename drivers/media/{dvb => common}/b2c2/flexcop.h (100%)
6639 rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_be.h (100%)
6640 rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_le.h (100%)
6641 create mode 100644 drivers/media/common/saa7146/Kconfig
6642 create mode 100644 drivers/media/common/saa7146/Makefile
6643 rename drivers/media/common/{ => saa7146}/saa7146_core.c (98%)
6644 rename drivers/media/common/{ => saa7146}/saa7146_fops.c (94%)
6645 rename drivers/media/common/{ => saa7146}/saa7146_hlp.c (100%)
6646 rename drivers/media/common/{ => saa7146}/saa7146_i2c.c (100%)
6647 rename drivers/media/common/{ => saa7146}/saa7146_vbi.c (100%)
6648 rename drivers/media/common/{ => saa7146}/saa7146_video.c (100%)
6649 create mode 100644 drivers/media/common/siano/Kconfig
6650 rename drivers/media/{dvb => common}/siano/Makefile (57%)
6651 rename drivers/media/{dvb => common}/siano/sms-cards.c (100%)
6652 rename drivers/media/{dvb => common}/siano/sms-cards.h (100%)
6653 rename drivers/media/{dvb => common}/siano/smscoreapi.c (100%)
6654 rename drivers/media/{dvb => common}/siano/smscoreapi.h (100%)
6655 rename drivers/media/{dvb => common}/siano/smsdvb.c (100%)
6656 rename drivers/media/{dvb => common}/siano/smsendian.c (100%)
6657 rename drivers/media/{dvb => common}/siano/smsendian.h (100%)
6658 rename drivers/media/{dvb => common}/siano/smsir.c (100%)
6659 rename drivers/media/{dvb => common}/siano/smsir.h (100%)
6660 create mode 100644 drivers/media/dvb-core/Kconfig
6661 rename drivers/media/{dvb => }/dvb-core/Makefile (100%)
6662 rename drivers/media/{dvb => }/dvb-core/demux.h (100%)
6663 rename drivers/media/{dvb => }/dvb-core/dmxdev.c (99%)
6664 rename drivers/media/{dvb => }/dvb-core/dmxdev.h (100%)
6665 rename drivers/media/{dvb/dvb-usb => dvb-core}/dvb-usb-ids.h (99%)
6666 rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c (100%)
6667 rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h (100%)
6668 rename drivers/media/{dvb => }/dvb-core/dvb_demux.c (98%)
6669 rename drivers/media/{dvb => }/dvb-core/dvb_demux.h (100%)
6670 rename drivers/media/{dvb => }/dvb-core/dvb_filter.c (100%)
6671 rename drivers/media/{dvb => }/dvb-core/dvb_filter.h (100%)
6672 rename drivers/media/{dvb => }/dvb-core/dvb_frontend.c (90%)
6673 rename drivers/media/{dvb => }/dvb-core/dvb_frontend.h (98%)
6674 rename drivers/media/{dvb => }/dvb-core/dvb_math.c (100%)
6675 rename drivers/media/{dvb => }/dvb-core/dvb_math.h (100%)
6676 rename drivers/media/{dvb => }/dvb-core/dvb_net.c (100%)
6677 rename drivers/media/{dvb => }/dvb-core/dvb_net.h (100%)
6678 rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c (100%)
6679 rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h (100%)
6680 rename drivers/media/{dvb => }/dvb-core/dvbdev.c (99%)
6681 rename drivers/media/{dvb => }/dvb-core/dvbdev.h (80%)
6682 rename drivers/media/{dvb/frontends => dvb-frontends}/Kconfig (83%)
6683 rename drivers/media/{dvb/frontends => dvb-frontends}/Makefile (92%)
6684 rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.c (100%)
6685 rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.h (100%)
6686 rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.c (86%)
6687 rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.h (97%)
6688 rename drivers/media/{dvb/frontends => dvb-frontends}/af9013_priv.h (98%)
6689 rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.c (88%)
6690 rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.h (96%)
6691 rename drivers/media/{dvb/frontends => dvb-frontends}/af9033_priv.h (100%)
6692 rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.c (99%)
6693 rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.h (100%)
6694 rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830_priv.h (100%)
6695 rename drivers/media/{dvb/frontends => dvb-frontends}/au8522.h (100%)
6696 rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_common.c (93%)
6697 rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_decoder.c (98%)
6698 rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_dig.c (95%)
6699 rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_priv.h (93%)
6700 rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.c (100%)
6701 rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.h (100%)
6702 rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510_priv.h (100%)
6703 rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1-d01a.h (100%)
6704 rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1.h (100%)
6705 rename drivers/media/{dvb/frontends => dvb-frontends}/bsru6.h (100%)
6706 rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.c (100%)
6707 rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.h (100%)
6708 rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.c (100%)
6709 rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.h (100%)
6710 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.c (100%)
6711 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.h (100%)
6712 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.c (100%)
6713 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.h (100%)
6714 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.c (100%)
6715 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.h (100%)
6716 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.c (100%)
6717 rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.h (100%)
6718 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r.h (100%)
6719 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_c.c (100%)
6720 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_core.c (100%)
6721 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_priv.h (100%)
6722 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t.c (99%)
6723 rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t2.c (100%)
6724 rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.c (100%)
6725 rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.h (100%)
6726 rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.c (100%)
6727 rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.h (100%)
6728 rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000.h (100%)
6729 rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb.c (100%)
6730 rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb_priv.h (100%)
6731 rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.c (100%)
6732 rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.h (100%)
6733 rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.c (100%)
6734 rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.h (100%)
6735 rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.c (100%)
6736 rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.h (100%)
6737 rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.c (100%)
6738 rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.h (100%)
6739 rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.c (100%)
6740 rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.h (100%)
6741 rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.c (100%)
6742 rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.h (100%)
6743 rename drivers/media/{dvb/frontends => dvb-frontends}/drxd.h (100%)
6744 rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.c (100%)
6745 rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.h (100%)
6746 rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_hard.c (100%)
6747 rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_map_firm.h (100%)
6748 rename drivers/media/{dvb/frontends => dvb-frontends}/drxk.h (100%)
6749 rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.c (100%)
6750 rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.h (100%)
6751 rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_map.h (100%)
6752 rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.c (100%)
6753 rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.h (100%)
6754 rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.c (96%)
6755 rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.h (97%)
6756 rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.c (100%)
6757 rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.h (100%)
6758 rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.c (87%)
6759 rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.h (95%)
6760 rename drivers/media/{dvb/frontends => dvb-frontends}/eds1547.h (100%)
6761 rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.c (89%)
6762 rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.h (96%)
6763 rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2_priv.h (96%)
6764 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.c (100%)
6765 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.h (100%)
6766 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.c (100%)
6767 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.h (100%)
6768 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.c (100%)
6769 rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.h (100%)
6770 rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe-priv.h (100%)
6771 rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.c (99%)
6772 rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.h (100%)
6773 rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.c (100%)
6774 rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.h (100%)
6775 rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000_priv.h (100%)
6776 rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.c (100%)
6777 rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.h (100%)
6778 rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.c (100%)
6779 rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.h (100%)
6780 rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.c (100%)
6781 rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.h (100%)
6782 rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.c (100%)
6783 rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.h (100%)
6784 rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.c (100%)
6785 rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.h (100%)
6786 rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x_priv.h (100%)
6787 rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.c (99%)
6788 rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.h (100%)
6789 rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.c (99%)
6790 rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.h (100%)
6791 rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx_priv.h (100%)
6792 rename drivers/media/{dvb/frontends => dvb-frontends}/lnbh24.h (100%)
6793 rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.c (100%)
6794 rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.h (100%)
6795 rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.c (100%)
6796 rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.h (100%)
6797 rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.c (99%)
6798 rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.h (100%)
6799 rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.c (100%)
6800 rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.h (100%)
6801 rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16_priv.h (100%)
6802 rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.c (100%)
6803 rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.h (100%)
6804 rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.c (100%)
6805 rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.h (100%)
6806 rename drivers/media/{dvb/frontends => dvb-frontends}/mt312_priv.h (100%)
6807 rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.c (100%)
6808 rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.h (100%)
6809 rename drivers/media/{dvb/frontends => dvb-frontends}/mt352_priv.h (100%)
6810 rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.c (93%)
6811 rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.h (100%)
6812 rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.c (100%)
6813 rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.h (100%)
6814 rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000_priv.h (100%)
6815 rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.c (100%)
6816 rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.h (100%)
6817 rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.c (100%)
6818 rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.h (100%)
6819 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.c (88%)
6820 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.h (90%)
6821 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830_priv.h (75%)
6822 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832.c (77%)
6823 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832.h (86%)
6824 rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832_priv.h (67%)
6825 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.c (100%)
6826 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.h (100%)
6827 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.c (100%)
6828 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.h (100%)
6829 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.c (100%)
6830 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.h (100%)
6831 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420_priv.h (100%)
6832 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.c (100%)
6833 rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.h (100%)
6834 rename drivers/media/{dvb/frontends => dvb-frontends}/s921.c (100%)
6835 rename drivers/media/{dvb/frontends => dvb-frontends}/s921.h (100%)
6836 rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.c (100%)
6837 rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.h (100%)
6838 rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.c (100%)
6839 rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.h (100%)
6840 rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.c (100%)
6841 rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.h (100%)
6842 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_algo.c (100%)
6843 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_cfg.h (100%)
6844 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.c (99%)
6845 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.h (100%)
6846 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_priv.h (100%)
6847 rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_reg.h (100%)
6848 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.c (100%)
6849 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.h (100%)
6850 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.c (100%)
6851 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.h (100%)
6852 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_cfg.h (100%)
6853 rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_proc.h (100%)
6854 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.c (100%)
6855 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.h (100%)
6856 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.c (100%)
6857 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.h (100%)
6858 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.c (100%)
6859 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.h (100%)
6860 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.c (100%)
6861 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.h (100%)
6862 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_priv.h (100%)
6863 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_regs.h (100%)
6864 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900.h (100%)
6865 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_core.c (100%)
6866 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_init.h (100%)
6867 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_priv.h (100%)
6868 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_reg.h (100%)
6869 rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_sw.c (100%)
6870 rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.c (99%)
6871 rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.h (100%)
6872 rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_priv.h (100%)
6873 rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_reg.h (100%)
6874 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.c (100%)
6875 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.h (100%)
6876 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.c (100%)
6877 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.h (100%)
6878 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_priv.h (100%)
6879 rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_reg.h (100%)
6880 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10021.c (100%)
6881 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10023.c (100%)
6882 rename drivers/media/{dvb/frontends => dvb-frontends}/tda1002x.h (100%)
6883 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.c (100%)
6884 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.h (100%)
6885 rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.c (100%)
6886 rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.h (100%)
6887 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.c (99%)
6888 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.h (100%)
6889 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071_priv.h (98%)
6890 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.c (100%)
6891 rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.h (100%)
6892 rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.c (100%)
6893 rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.h (100%)
6894 rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd_maps.h (100%)
6895 rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.c (100%)
6896 rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.h (100%)
6897 rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.c (100%)
6898 rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.h (100%)
6899 rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.c (86%)
6900 rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.h (100%)
6901 rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261_cfg.h (100%)
6902 rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.c (100%)
6903 rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.h (100%)
6904 rename drivers/media/{dvb/frontends => dvb-frontends}/tdhd1.h (100%)
6905 rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.c (100%)
6906 rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.h (100%)
6907 rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.c (100%)
6908 rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.h (100%)
6909 rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.c (100%)
6910 rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.h (100%)
6911 rename drivers/media/{dvb/frontends => dvb-frontends}/z0194a.h (100%)
6912 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.c (100%)
6913 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.h (100%)
6914 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.c (100%)
6915 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.h (100%)
6916 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.c (100%)
6917 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.h (100%)
6918 rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353_priv.h (100%)
6919 delete mode 100644 drivers/media/dvb/Kconfig
6920 delete mode 100644 drivers/media/dvb/Makefile
6921 delete mode 100644 drivers/media/dvb/b2c2/Kconfig
6922 delete mode 100644 drivers/media/dvb/b2c2/Makefile
6923 delete mode 100644 drivers/media/dvb/bt8xx/Kconfig
6924 delete mode 100644 drivers/media/dvb/bt8xx/Makefile
6925 delete mode 100644 drivers/media/dvb/dm1105/Makefile
6926 delete mode 100644 drivers/media/dvb/dvb-usb/Kconfig
6927 delete mode 100644 drivers/media/dvb/dvb-usb/Makefile
6928 delete mode 100644 drivers/media/dvb/dvb-usb/af9015.c
6929 delete mode 100644 drivers/media/dvb/dvb-usb/it913x.c
6930 delete mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.c
6931 delete mode 100644 drivers/media/dvb/frontends/ec100_priv.h
6932 delete mode 100644 drivers/media/dvb/ngene/Kconfig
6933 delete mode 100644 drivers/media/dvb/pluto2/Makefile
6934 delete mode 100644 drivers/media/dvb/siano/Kconfig
6935 delete mode 100644 drivers/media/dvb/ttusb-budget/Makefile
6936 rename drivers/media/{dvb => }/firewire/Kconfig (100%)
6937 rename drivers/media/{dvb => }/firewire/Makefile (51%)
6938 rename drivers/media/{dvb => }/firewire/firedtv-avc.c (100%)
6939 rename drivers/media/{dvb => }/firewire/firedtv-ci.c (100%)
6940 rename drivers/media/{dvb => }/firewire/firedtv-dvb.c (100%)
6941 rename drivers/media/{dvb => }/firewire/firedtv-fe.c (100%)
6942 rename drivers/media/{dvb => }/firewire/firedtv-fw.c (100%)
6943 rename drivers/media/{dvb => }/firewire/firedtv-rc.c (100%)
6944 rename drivers/media/{dvb => }/firewire/firedtv.h (100%)
6945 create mode 100644 drivers/media/i2c/Kconfig
6946 create mode 100644 drivers/media/i2c/Makefile
6947 create mode 100644 drivers/media/i2c/ad9389b.c
6948 rename drivers/media/{video => i2c}/adp1653.c (99%)
6949 rename drivers/media/{video => i2c}/adv7170.c (100%)
6950 rename drivers/media/{video => i2c}/adv7175.c (100%)
6951 rename drivers/media/{video => i2c}/adv7180.c (100%)
6952 rename drivers/media/{video => i2c}/adv7183.c (100%)
6953 rename drivers/media/{video => i2c}/adv7183_regs.h (100%)
6954 rename drivers/media/{video => i2c}/adv7343.c (100%)
6955 rename drivers/media/{video => i2c}/adv7343_regs.h (100%)
6956 rename drivers/media/{video => i2c}/adv7393.c (100%)
6957 rename drivers/media/{video => i2c}/adv7393_regs.h (100%)
6958 create mode 100644 drivers/media/i2c/adv7604.c
6959 rename drivers/media/{video => i2c}/ak881x.c (100%)
6960 rename drivers/media/{video => i2c}/aptina-pll.c (100%)
6961 rename drivers/media/{video => i2c}/aptina-pll.h (100%)
6962 rename drivers/media/{video => i2c}/as3645a.c (99%)
6963 rename drivers/media/{video => i2c}/bt819.c (100%)
6964 rename drivers/media/{video => i2c}/bt856.c (100%)
6965 rename drivers/media/{video => i2c}/bt866.c (100%)
6966 rename drivers/media/{video => i2c}/btcx-risc.c (100%)
6967 rename drivers/media/{video => i2c}/btcx-risc.h (100%)
6968 rename drivers/media/{video => i2c}/cs5345.c (100%)
6969 rename drivers/media/{video => i2c}/cs53l32a.c (100%)
6970 rename drivers/media/{video => i2c}/cx2341x.c (100%)
6971 rename drivers/media/{video => i2c}/cx25840/Kconfig (100%)
6972 rename drivers/media/{video => i2c}/cx25840/Makefile (80%)
6973 rename drivers/media/{video => i2c}/cx25840/cx25840-audio.c (100%)
6974 rename drivers/media/{video => i2c}/cx25840/cx25840-core.c (100%)
6975 rename drivers/media/{video => i2c}/cx25840/cx25840-core.h (100%)
6976 rename drivers/media/{video => i2c}/cx25840/cx25840-firmware.c (92%)
6977 rename drivers/media/{video => i2c}/cx25840/cx25840-ir.c (100%)
6978 rename drivers/media/{video => i2c}/cx25840/cx25840-vbi.c (100%)
6979 rename drivers/media/{video => i2c}/ir-kbd-i2c.c (100%)
6980 rename drivers/media/{video => i2c}/ks0127.c (100%)
6981 rename drivers/media/{video => i2c}/ks0127.h (100%)
6982 rename drivers/media/{video => i2c}/m52790.c (100%)
6983 rename drivers/media/{video => i2c}/m5mols/Kconfig (100%)
6984 rename drivers/media/{video => i2c}/m5mols/Makefile (100%)
6985 rename drivers/media/{video => i2c}/m5mols/m5mols.h (99%)
6986 rename drivers/media/{video => i2c}/m5mols/m5mols_capture.c (100%)
6987 rename drivers/media/{video => i2c}/m5mols/m5mols_controls.c (99%)
6988 rename drivers/media/{video => i2c}/m5mols/m5mols_core.c (99%)
6989 rename drivers/media/{video => i2c}/m5mols/m5mols_reg.h (100%)
6990 rename drivers/media/{video => i2c}/msp3400-driver.c (100%)
6991 rename drivers/media/{video => i2c}/msp3400-driver.h (100%)
6992 rename drivers/media/{video => i2c}/msp3400-kthreads.c (100%)
6993 rename drivers/media/{video => i2c}/mt9m032.c (99%)
6994 rename drivers/media/{video => i2c}/mt9p031.c (98%)
6995 rename drivers/media/{video => i2c}/mt9t001.c (100%)
6996 rename drivers/media/{video => i2c}/mt9v011.c (100%)
6997 rename drivers/media/{video => i2c}/mt9v032.c (88%)
6998 rename drivers/media/{video => i2c}/noon010pc30.c (100%)
6999 rename drivers/media/{video => i2c}/ov7670.c (100%)
7000 rename drivers/media/{video => i2c}/s5k6aa.c (99%)
7001 rename drivers/media/{video => i2c}/saa6588.c (100%)
7002 rename drivers/media/{video => i2c}/saa7110.c (100%)
7003 rename drivers/media/{video => i2c}/saa7115.c (100%)
7004 rename drivers/media/{video => i2c}/saa711x_regs.h (100%)
7005 rename drivers/media/{video => i2c}/saa7127.c (99%)
7006 rename drivers/media/{video => i2c}/saa717x.c (100%)
7007 rename drivers/media/{video => i2c}/saa7185.c (100%)
7008 rename drivers/media/{video => i2c}/saa7191.c (100%)
7009 rename drivers/media/{video => i2c}/saa7191.h (100%)
7010 rename drivers/media/{video => i2c}/smiapp-pll.c (99%)
7011 rename drivers/media/{video => i2c}/smiapp-pll.h (98%)
7012 rename drivers/media/{video => i2c}/smiapp/Kconfig (100%)
7013 rename drivers/media/{video => i2c}/smiapp/Makefile (78%)
7014 rename drivers/media/{video => i2c}/smiapp/smiapp-core.c (99%)
7015 rename drivers/media/{video => i2c}/smiapp/smiapp-limits.c (99%)
7016 rename drivers/media/{video => i2c}/smiapp/smiapp-limits.h (99%)
7017 rename drivers/media/{video => i2c}/smiapp/smiapp-quirk.c (99%)
7018 rename drivers/media/{video => i2c}/smiapp/smiapp-quirk.h (98%)
7019 rename drivers/media/{video => i2c}/smiapp/smiapp-reg-defs.h (99%)
7020 rename drivers/media/{video => i2c}/smiapp/smiapp-reg.h (98%)
7021 rename drivers/media/{video => i2c}/smiapp/smiapp-regs.c (99%)
7022 rename drivers/media/{video => i2c}/smiapp/smiapp-regs.h (100%)
7023 rename drivers/media/{video => i2c}/smiapp/smiapp.h (99%)
7024 create mode 100644 drivers/media/i2c/soc_camera/Kconfig
7025 create mode 100644 drivers/media/i2c/soc_camera/Makefile
7026 rename drivers/media/{video => i2c/soc_camera}/imx074.c (95%)
7027 rename drivers/media/{video => i2c/soc_camera}/mt9m001.c (97%)
7028 rename drivers/media/{video => i2c/soc_camera}/mt9m111.c (96%)
7029 rename drivers/media/{video => i2c/soc_camera}/mt9t031.c (98%)
7030 rename drivers/media/{video => i2c/soc_camera}/mt9t112.c (98%)
7031 rename drivers/media/{video => i2c/soc_camera}/mt9v022.c (94%)
7032 rename drivers/media/{video => i2c/soc_camera}/ov2640.c (98%)
7033 rename drivers/media/{video => i2c/soc_camera}/ov5642.c (98%)
7034 rename drivers/media/{video => i2c/soc_camera}/ov6650.c (98%)
7035 rename drivers/media/{video => i2c/soc_camera}/ov772x.c (81%)
7036 rename drivers/media/{video => i2c/soc_camera}/ov9640.c (97%)
7037 rename drivers/media/{video => i2c/soc_camera}/ov9640.h (100%)
7038 rename drivers/media/{video => i2c/soc_camera}/ov9740.c (97%)
7039 rename drivers/media/{video => i2c/soc_camera}/rj54n1cb0c.c (98%)
7040 rename drivers/media/{video => i2c/soc_camera}/tw9910.c (98%)
7041 rename drivers/media/{video => i2c}/sr030pc30.c (100%)
7042 rename drivers/media/{video => i2c}/tcm825x.c (99%)
7043 rename drivers/media/{video => i2c}/tcm825x.h (99%)
7044 rename drivers/media/{video => i2c}/tda7432.c (100%)
7045 rename drivers/media/{video => i2c}/tda9840.c (100%)
7046 rename drivers/media/{video => i2c}/tea6415c.c (99%)
7047 rename drivers/media/{video => i2c}/tea6415c.h (100%)
7048 rename drivers/media/{video => i2c}/tea6420.c (100%)
7049 rename drivers/media/{video => i2c}/tea6420.h (100%)
7050 rename drivers/media/{video => i2c}/ths7303.c (100%)
7051 rename drivers/media/{video => i2c}/tlv320aic23b.c (100%)
7052 rename drivers/media/{video => i2c}/tvaudio.c (100%)
7053 rename drivers/media/{video => i2c}/tveeprom.c (100%)
7054 rename drivers/media/{video => i2c}/tvp514x.c (99%)
7055 rename drivers/media/{video => i2c}/tvp514x_regs.h (99%)
7056 rename drivers/media/{video => i2c}/tvp5150.c (100%)
7057 rename drivers/media/{video => i2c}/tvp5150_reg.h (100%)
7058 rename drivers/media/{video => i2c}/tvp7002.c (100%)
7059 rename drivers/media/{video => i2c}/tvp7002_reg.h (100%)
7060 rename drivers/media/{video => i2c}/upd64031a.c (100%)
7061 rename drivers/media/{video => i2c}/upd64083.c (100%)
7062 rename drivers/media/{video => i2c}/vp27smpx.c (100%)
7063 rename drivers/media/{video => i2c}/vpx3220.c (100%)
7064 rename drivers/media/{video => i2c}/vs6624.c (100%)
7065 rename drivers/media/{video => i2c}/vs6624_regs.h (100%)
7066 rename drivers/media/{video => i2c}/wm8739.c (100%)
7067 rename drivers/media/{video => i2c}/wm8775.c (100%)
7068 create mode 100644 drivers/media/mmc/Kconfig
7069 create mode 100644 drivers/media/mmc/Makefile
7070 create mode 100644 drivers/media/mmc/siano/Kconfig
7071 create mode 100644 drivers/media/mmc/siano/Makefile
7072 rename drivers/media/{dvb => mmc}/siano/smssdio.c (100%)
7073 create mode 100644 drivers/media/parport/Kconfig
7074 create mode 100644 drivers/media/parport/Makefile
7075 rename drivers/media/{video => parport}/bw-qcam.c (100%)
7076 rename drivers/media/{video => parport}/c-qcam.c (100%)
7077 rename drivers/media/{video => parport}/pms.c (100%)
7078 rename drivers/media/{video => parport}/w9966.c (100%)
7079 create mode 100644 drivers/media/pci/Kconfig
7080 create mode 100644 drivers/media/pci/Makefile
7081 create mode 100644 drivers/media/pci/b2c2/Kconfig
7082 create mode 100644 drivers/media/pci/b2c2/Makefile
7083 rename drivers/media/{dvb => pci}/b2c2/flexcop-dma.c (100%)
7084 rename drivers/media/{dvb => pci}/b2c2/flexcop-pci.c (100%)
7085 create mode 100644 drivers/media/pci/bt8xx/Kconfig
7086 create mode 100644 drivers/media/pci/bt8xx/Makefile
7087 rename drivers/media/{video => pci}/bt8xx/bt848.h (100%)
7088 rename drivers/media/{dvb => pci}/bt8xx/bt878.c (100%)
7089 rename drivers/media/{dvb => pci}/bt8xx/bt878.h (100%)
7090 rename drivers/media/{video => pci}/bt8xx/bttv-audio-hook.c (100%)
7091 rename drivers/media/{video => pci}/bt8xx/bttv-audio-hook.h (100%)
7092 rename drivers/media/{video => pci}/bt8xx/bttv-cards.c (100%)
7093 rename drivers/media/{video => pci}/bt8xx/bttv-driver.c (100%)
7094 rename drivers/media/{video => pci}/bt8xx/bttv-gpio.c (100%)
7095 rename drivers/media/{video => pci}/bt8xx/bttv-i2c.c (100%)
7096 rename drivers/media/{video => pci}/bt8xx/bttv-if.c (100%)
7097 rename drivers/media/{video => pci}/bt8xx/bttv-input.c (100%)
7098 rename drivers/media/{video => pci}/bt8xx/bttv-risc.c (100%)
7099 rename drivers/media/{video => pci}/bt8xx/bttv-vbi.c (100%)
7100 rename drivers/media/{video => pci}/bt8xx/bttv.h (100%)
7101 rename drivers/media/{video => pci}/bt8xx/bttvp.h (100%)
7102 rename drivers/media/{dvb => pci}/bt8xx/dst.c (100%)
7103 rename drivers/media/{dvb => pci}/bt8xx/dst_ca.c (99%)
7104 rename drivers/media/{dvb => pci}/bt8xx/dst_ca.h (100%)
7105 rename drivers/media/{dvb => pci}/bt8xx/dst_common.h (100%)
7106 rename drivers/media/{dvb => pci}/bt8xx/dst_priv.h (100%)
7107 rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c (100%)
7108 rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h (100%)
7109 rename drivers/media/{video => pci}/cx18/Kconfig (77%)
7110 rename drivers/media/{video => pci}/cx18/Makefile (78%)
7111 rename drivers/media/{video => pci}/cx18/cx18-alsa-main.c (100%)
7112 rename drivers/media/{video => pci}/cx18/cx18-alsa-mixer.c (100%)
7113 rename drivers/media/{video => pci}/cx18/cx18-alsa-mixer.h (100%)
7114 rename drivers/media/{video => pci}/cx18/cx18-alsa-pcm.c (100%)
7115 rename drivers/media/{video => pci}/cx18/cx18-alsa-pcm.h (100%)
7116 rename drivers/media/{video => pci}/cx18/cx18-alsa.h (100%)
7117 rename drivers/media/{video => pci}/cx18/cx18-audio.c (100%)
7118 rename drivers/media/{video => pci}/cx18/cx18-audio.h (100%)
7119 rename drivers/media/{video => pci}/cx18/cx18-av-audio.c (100%)
7120 rename drivers/media/{video => pci}/cx18/cx18-av-core.c (100%)
7121 rename drivers/media/{video => pci}/cx18/cx18-av-core.h (100%)
7122 rename drivers/media/{video => pci}/cx18/cx18-av-firmware.c (99%)
7123 rename drivers/media/{video => pci}/cx18/cx18-av-vbi.c (100%)
7124 rename drivers/media/{video => pci}/cx18/cx18-cards.c (100%)
7125 rename drivers/media/{video => pci}/cx18/cx18-cards.h (100%)
7126 rename drivers/media/{video => pci}/cx18/cx18-controls.c (100%)
7127 rename drivers/media/{video => pci}/cx18/cx18-controls.h (100%)
7128 rename drivers/media/{video => pci}/cx18/cx18-driver.c (99%)
7129 rename drivers/media/{video => pci}/cx18/cx18-driver.h (100%)
7130 rename drivers/media/{video => pci}/cx18/cx18-dvb.c (99%)
7131 rename drivers/media/{video => pci}/cx18/cx18-dvb.h (100%)
7132 rename drivers/media/{video => pci}/cx18/cx18-fileops.c (100%)
7133 rename drivers/media/{video => pci}/cx18/cx18-fileops.h (100%)
7134 rename drivers/media/{video => pci}/cx18/cx18-firmware.c (98%)
7135 rename drivers/media/{video => pci}/cx18/cx18-firmware.h (100%)
7136 rename drivers/media/{video => pci}/cx18/cx18-gpio.c (100%)
7137 rename drivers/media/{video => pci}/cx18/cx18-gpio.h (100%)
7138 rename drivers/media/{video => pci}/cx18/cx18-i2c.c (100%)
7139 rename drivers/media/{video => pci}/cx18/cx18-i2c.h (100%)
7140 rename drivers/media/{video => pci}/cx18/cx18-io.c (100%)
7141 rename drivers/media/{video => pci}/cx18/cx18-io.h (100%)
7142 rename drivers/media/{video => pci}/cx18/cx18-ioctl.c (100%)
7143 rename drivers/media/{video => pci}/cx18/cx18-ioctl.h (100%)
7144 rename drivers/media/{video => pci}/cx18/cx18-irq.c (100%)
7145 rename drivers/media/{video => pci}/cx18/cx18-irq.h (100%)
7146 rename drivers/media/{video => pci}/cx18/cx18-mailbox.c (100%)
7147 rename drivers/media/{video => pci}/cx18/cx18-mailbox.h (100%)
7148 rename drivers/media/{video => pci}/cx18/cx18-queue.c (100%)
7149 rename drivers/media/{video => pci}/cx18/cx18-queue.h (100%)
7150 rename drivers/media/{video => pci}/cx18/cx18-scb.c (100%)
7151 rename drivers/media/{video => pci}/cx18/cx18-scb.h (100%)
7152 rename drivers/media/{video => pci}/cx18/cx18-streams.c (100%)
7153 rename drivers/media/{video => pci}/cx18/cx18-streams.h (100%)
7154 rename drivers/media/{video => pci}/cx18/cx18-vbi.c (100%)
7155 rename drivers/media/{video => pci}/cx18/cx18-vbi.h (100%)
7156 rename drivers/media/{video => pci}/cx18/cx18-version.h (100%)
7157 rename drivers/media/{video => pci}/cx18/cx18-video.c (100%)
7158 rename drivers/media/{video => pci}/cx18/cx18-video.h (100%)
7159 rename drivers/media/{video => pci}/cx18/cx23418.h (100%)
7160 create mode 100644 drivers/media/pci/cx23885/Kconfig
7161 rename drivers/media/{video => pci}/cx23885/Makefile (72%)
7162 rename drivers/media/{video => pci}/cx23885/altera-ci.c (99%)
7163 rename drivers/media/{video => pci}/cx23885/altera-ci.h (100%)
7164 rename drivers/media/{video => pci}/cx23885/cimax2.c (100%)
7165 rename drivers/media/{video => pci}/cx23885/cimax2.h (100%)
7166 rename drivers/media/{video => pci}/cx23885/cx23885-417.c (99%)
7167 rename drivers/media/{video => pci}/cx23885/cx23885-alsa.c (100%)
7168 rename drivers/media/{video => pci}/cx23885/cx23885-av.c (100%)
7169 rename drivers/media/{video => pci}/cx23885/cx23885-av.h (100%)
7170 rename drivers/media/{video => pci}/cx23885/cx23885-cards.c (98%)
7171 rename drivers/media/{video => pci}/cx23885/cx23885-core.c (100%)
7172 rename drivers/media/{video => pci}/cx23885/cx23885-dvb.c (95%)
7173 rename drivers/media/{video => pci}/cx23885/cx23885-f300.c (100%)
7174 rename drivers/media/{video => pci}/cx23885/cx23885-f300.h (100%)
7175 rename drivers/media/{video => pci}/cx23885/cx23885-i2c.c (100%)
7176 rename drivers/media/{video => pci}/cx23885/cx23885-input.c (96%)
7177 rename drivers/media/{video => pci}/cx23885/cx23885-input.h (100%)
7178 rename drivers/media/{video => pci}/cx23885/cx23885-ioctl.c (100%)
7179 rename drivers/media/{video => pci}/cx23885/cx23885-ioctl.h (100%)
7180 rename drivers/media/{video => pci}/cx23885/cx23885-ir.c (100%)
7181 rename drivers/media/{video => pci}/cx23885/cx23885-ir.h (100%)
7182 rename drivers/media/{video => pci}/cx23885/cx23885-reg.h (100%)
7183 rename drivers/media/{video => pci}/cx23885/cx23885-vbi.c (100%)
7184 rename drivers/media/{video => pci}/cx23885/cx23885-video.c (100%)
7185 rename drivers/media/{video => pci}/cx23885/cx23885.h (99%)
7186 rename drivers/media/{video => pci}/cx23885/cx23888-ir.c (100%)
7187 rename drivers/media/{video => pci}/cx23885/cx23888-ir.h (100%)
7188 rename drivers/media/{video => pci}/cx23885/netup-eeprom.c (100%)
7189 rename drivers/media/{video => pci}/cx23885/netup-eeprom.h (100%)
7190 rename drivers/media/{video => pci}/cx23885/netup-init.c (100%)
7191 rename drivers/media/{video => pci}/cx23885/netup-init.h (100%)
7192 rename drivers/media/{video => pci}/cx25821/Kconfig (100%)
7193 rename drivers/media/{video => pci}/cx25821/Makefile (67%)
7194 rename drivers/media/{video => pci}/cx25821/cx25821-alsa.c (100%)
7195 rename drivers/media/{video => pci}/cx25821/cx25821-audio-upstream.c (100%)
7196 rename drivers/media/{video => pci}/cx25821/cx25821-audio-upstream.h (100%)
7197 rename drivers/media/{video => pci}/cx25821/cx25821-audio.h (100%)
7198 rename drivers/media/{video => pci}/cx25821/cx25821-biffuncs.h (100%)
7199 rename drivers/media/{video => pci}/cx25821/cx25821-cards.c (100%)
7200 rename drivers/media/{video => pci}/cx25821/cx25821-core.c (100%)
7201 rename drivers/media/{video => pci}/cx25821/cx25821-gpio.c (100%)
7202 rename drivers/media/{video => pci}/cx25821/cx25821-i2c.c (100%)
7203 rename drivers/media/{video => pci}/cx25821/cx25821-medusa-defines.h (100%)
7204 rename drivers/media/{video => pci}/cx25821/cx25821-medusa-reg.h (100%)
7205 rename drivers/media/{video => pci}/cx25821/cx25821-medusa-video.c (100%)
7206 rename drivers/media/{video => pci}/cx25821/cx25821-medusa-video.h (100%)
7207 rename drivers/media/{video => pci}/cx25821/cx25821-reg.h (100%)
7208 rename drivers/media/{video => pci}/cx25821/cx25821-sram.h (100%)
7209 rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream-ch2.c (100%)
7210 rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream-ch2.h (100%)
7211 rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream.c (100%)
7212 rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream.h (100%)
7213 rename drivers/media/{video => pci}/cx25821/cx25821-video.c (100%)
7214 rename drivers/media/{video => pci}/cx25821/cx25821-video.h (100%)
7215 rename drivers/media/{video => pci}/cx25821/cx25821.h (100%)
7216 rename drivers/media/{video => pci}/cx88/Kconfig (70%)
7217 rename drivers/media/{video => pci}/cx88/Makefile (73%)
7218 rename drivers/media/{video => pci}/cx88/cx88-alsa.c (99%)
7219 rename drivers/media/{video => pci}/cx88/cx88-blackbird.c (100%)
7220 rename drivers/media/{video => pci}/cx88/cx88-cards.c (99%)
7221 rename drivers/media/{video => pci}/cx88/cx88-core.c (99%)
7222 rename drivers/media/{video => pci}/cx88/cx88-dsp.c (100%)
7223 rename drivers/media/{video => pci}/cx88/cx88-dvb.c (99%)
7224 rename drivers/media/{video => pci}/cx88/cx88-i2c.c (100%)
7225 rename drivers/media/{video => pci}/cx88/cx88-input.c (100%)
7226 rename drivers/media/{video => pci}/cx88/cx88-mpeg.c (100%)
7227 rename drivers/media/{video => pci}/cx88/cx88-reg.h (100%)
7228 rename drivers/media/{video => pci}/cx88/cx88-tvaudio.c (100%)
7229 rename drivers/media/{video => pci}/cx88/cx88-vbi.c (100%)
7230 rename drivers/media/{video => pci}/cx88/cx88-video.c (100%)
7231 rename drivers/media/{video => pci}/cx88/cx88-vp3054-i2c.c (100%)
7232 rename drivers/media/{video => pci}/cx88/cx88-vp3054-i2c.h (100%)
7233 rename drivers/media/{video => pci}/cx88/cx88.h (99%)
7234 rename drivers/media/{dvb => pci}/ddbridge/Kconfig (60%)
7235 rename drivers/media/{dvb => pci}/ddbridge/Makefile (61%)
7236 rename drivers/media/{dvb => pci}/ddbridge/ddbridge-core.c (99%)
7237 rename drivers/media/{dvb => pci}/ddbridge/ddbridge-regs.h (100%)
7238 rename drivers/media/{dvb => pci}/ddbridge/ddbridge.h (100%)
7239 rename drivers/media/{dvb => pci}/dm1105/Kconfig (57%)
7240 create mode 100644 drivers/media/pci/dm1105/Makefile
7241 rename drivers/media/{dvb => pci}/dm1105/dm1105.c (100%)
7242 rename drivers/media/{video => pci}/ivtv/Kconfig (67%)
7243 rename drivers/media/{video => pci}/ivtv/Makefile (53%)
7244 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-main.c
7245 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-mixer.c
7246 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-mixer.h
7247 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-pcm.c
7248 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-pcm.h
7249 create mode 100644 drivers/media/pci/ivtv/ivtv-alsa.h
7250 rename drivers/media/{video => pci}/ivtv/ivtv-cards.c (100%)
7251 rename drivers/media/{video => pci}/ivtv/ivtv-cards.h (100%)
7252 rename drivers/media/{video => pci}/ivtv/ivtv-controls.c (100%)
7253 rename drivers/media/{video => pci}/ivtv/ivtv-controls.h (100%)
7254 rename drivers/media/{video => pci}/ivtv/ivtv-driver.c (98%)
7255 rename drivers/media/{video => pci}/ivtv/ivtv-driver.h (98%)
7256 rename drivers/media/{video => pci}/ivtv/ivtv-fileops.c (96%)
7257 rename drivers/media/{video => pci}/ivtv/ivtv-fileops.h (94%)
7258 rename drivers/media/{video => pci}/ivtv/ivtv-firmware.c (98%)
7259 rename drivers/media/{video => pci}/ivtv/ivtv-firmware.h (100%)
7260 rename drivers/media/{video => pci}/ivtv/ivtv-gpio.c (100%)
7261 rename drivers/media/{video => pci}/ivtv/ivtv-gpio.h (100%)
7262 rename drivers/media/{video => pci}/ivtv/ivtv-i2c.c (100%)
7263 rename drivers/media/{video => pci}/ivtv/ivtv-i2c.h (100%)
7264 rename drivers/media/{video => pci}/ivtv/ivtv-ioctl.c (100%)
7265 rename drivers/media/{video => pci}/ivtv/ivtv-ioctl.h (100%)
7266 rename drivers/media/{video => pci}/ivtv/ivtv-irq.c (95%)
7267 rename drivers/media/{video => pci}/ivtv/ivtv-irq.h (100%)
7268 rename drivers/media/{video => pci}/ivtv/ivtv-mailbox.c (100%)
7269 rename drivers/media/{video => pci}/ivtv/ivtv-mailbox.h (100%)
7270 rename drivers/media/{video => pci}/ivtv/ivtv-queue.c (100%)
7271 rename drivers/media/{video => pci}/ivtv/ivtv-queue.h (100%)
7272 rename drivers/media/{video => pci}/ivtv/ivtv-routing.c (100%)
7273 rename drivers/media/{video => pci}/ivtv/ivtv-routing.h (100%)
7274 rename drivers/media/{video => pci}/ivtv/ivtv-streams.c (99%)
7275 rename drivers/media/{video => pci}/ivtv/ivtv-streams.h (100%)
7276 rename drivers/media/{video => pci}/ivtv/ivtv-udma.c (100%)
7277 rename drivers/media/{video => pci}/ivtv/ivtv-udma.h (100%)
7278 rename drivers/media/{video => pci}/ivtv/ivtv-vbi.c (100%)
7279 rename drivers/media/{video => pci}/ivtv/ivtv-vbi.h (100%)
7280 rename drivers/media/{video => pci}/ivtv/ivtv-version.h (100%)
7281 rename drivers/media/{video => pci}/ivtv/ivtv-yuv.c (100%)
7282 rename drivers/media/{video => pci}/ivtv/ivtv-yuv.h (100%)
7283 rename drivers/media/{video => pci}/ivtv/ivtvfb.c (100%)
7284 rename drivers/media/{dvb => pci}/mantis/Kconfig (62%)
7285 rename drivers/media/{dvb => pci}/mantis/Makefile (88%)
7286 rename drivers/media/{dvb => pci}/mantis/hopper_cards.c (100%)
7287 rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.c (100%)
7288 rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.h (100%)
7289 rename drivers/media/{dvb => pci}/mantis/mantis_ca.c (100%)
7290 rename drivers/media/{dvb => pci}/mantis/mantis_ca.h (100%)
7291 rename drivers/media/{dvb => pci}/mantis/mantis_cards.c (99%)
7292 rename drivers/media/{dvb => pci}/mantis/mantis_common.h (100%)
7293 rename drivers/media/{dvb => pci}/mantis/mantis_core.c (99%)
7294 rename drivers/media/{dvb => pci}/mantis/mantis_core.h (100%)
7295 rename drivers/media/{dvb => pci}/mantis/mantis_dma.c (100%)
7296 rename drivers/media/{dvb => pci}/mantis/mantis_dma.h (100%)
7297 rename drivers/media/{dvb => pci}/mantis/mantis_dvb.c (98%)
7298 rename drivers/media/{dvb => pci}/mantis/mantis_dvb.h (100%)
7299 rename drivers/media/{dvb => pci}/mantis/mantis_evm.c (100%)
7300 rename drivers/media/{dvb => pci}/mantis/mantis_hif.c (100%)
7301 rename drivers/media/{dvb => pci}/mantis/mantis_hif.h (100%)
7302 rename drivers/media/{dvb => pci}/mantis/mantis_i2c.c (100%)
7303 rename drivers/media/{dvb => pci}/mantis/mantis_i2c.h (100%)
7304 rename drivers/media/{dvb => pci}/mantis/mantis_input.c (100%)
7305 rename drivers/media/{dvb => pci}/mantis/mantis_ioc.c (100%)
7306 rename drivers/media/{dvb => pci}/mantis/mantis_ioc.h (100%)
7307 rename drivers/media/{dvb => pci}/mantis/mantis_link.h (100%)
7308 rename drivers/media/{dvb => pci}/mantis/mantis_pci.c (100%)
7309 rename drivers/media/{dvb => pci}/mantis/mantis_pci.h (100%)
7310 rename drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c (100%)
7311 rename drivers/media/{dvb => pci}/mantis/mantis_reg.h (100%)
7312 rename drivers/media/{dvb => pci}/mantis/mantis_uart.c (100%)
7313 rename drivers/media/{dvb => pci}/mantis/mantis_uart.h (100%)
7314 rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.c (100%)
7315 rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.h (100%)
7316 rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.c (100%)
7317 rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.h (100%)
7318 rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.c (100%)
7319 rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.h (100%)
7320 rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.c (100%)
7321 rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.h (100%)
7322 rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.c (100%)
7323 rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.h (100%)
7324 rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.c (100%)
7325 rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.h (100%)
7326 rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.c (100%)
7327 rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.h (100%)
7328 create mode 100644 drivers/media/pci/meye/Kconfig
7329 create mode 100644 drivers/media/pci/meye/Makefile
7330 rename drivers/media/{video => pci/meye}/meye.c (100%)
7331 rename drivers/media/{video => pci/meye}/meye.h (100%)
7332 create mode 100644 drivers/media/pci/ngene/Kconfig
7333 rename drivers/media/{dvb => pci}/ngene/Makefile (63%)
7334 rename drivers/media/{dvb => pci}/ngene/ngene-cards.c (71%)
7335 rename drivers/media/{dvb => pci}/ngene/ngene-core.c (98%)
7336 rename drivers/media/{dvb => pci}/ngene/ngene-dvb.c (100%)
7337 rename drivers/media/{dvb => pci}/ngene/ngene-i2c.c (100%)
7338 rename drivers/media/{dvb => pci}/ngene/ngene.h (100%)
7339 rename drivers/media/{dvb => pci}/pluto2/Kconfig (100%)
7340 create mode 100644 drivers/media/pci/pluto2/Makefile
7341 rename drivers/media/{dvb => pci}/pluto2/pluto2.c (100%)
7342 rename drivers/media/{dvb => pci}/pt1/Kconfig (100%)
7343 rename drivers/media/{dvb => pci}/pt1/Makefile (56%)
7344 rename drivers/media/{dvb => pci}/pt1/pt1.c (100%)
7345 rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c (98%)
7346 rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h (100%)
7347 rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c (100%)
7348 rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h (100%)
7349 rename drivers/media/{video => pci}/saa7134/Kconfig (56%)
7350 rename drivers/media/{video => pci}/saa7134/Makefile (54%)
7351 rename drivers/media/{video => pci}/saa7134/saa6752hs.c (100%)
7352 rename drivers/media/{video => pci}/saa7134/saa7134-alsa.c (100%)
7353 rename drivers/media/{video => pci}/saa7134/saa7134-cards.c (100%)
7354 rename drivers/media/{video => pci}/saa7134/saa7134-core.c (100%)
7355 rename drivers/media/{video => pci}/saa7134/saa7134-dvb.c (99%)
7356 rename drivers/media/{video => pci}/saa7134/saa7134-empress.c (100%)
7357 rename drivers/media/{video => pci}/saa7134/saa7134-i2c.c (100%)
7358 rename drivers/media/{video => pci}/saa7134/saa7134-input.c (99%)
7359 rename drivers/media/{video => pci}/saa7134/saa7134-reg.h (100%)
7360 rename drivers/media/{video => pci}/saa7134/saa7134-ts.c (100%)
7361 rename drivers/media/{video => pci}/saa7134/saa7134-tvaudio.c (100%)
7362 rename drivers/media/{video => pci}/saa7134/saa7134-vbi.c (100%)
7363 rename drivers/media/{video => pci}/saa7134/saa7134-video.c (100%)
7364 rename drivers/media/{video => pci}/saa7134/saa7134.h (99%)
7365 create mode 100644 drivers/media/pci/saa7146/Kconfig
7366 create mode 100644 drivers/media/pci/saa7146/Makefile
7367 rename drivers/media/{video => pci/saa7146}/hexium_gemini.c (100%)
7368 rename drivers/media/{video => pci/saa7146}/hexium_orion.c (100%)
7369 rename drivers/media/{video => pci/saa7146}/mxb.c (100%)
7370 rename drivers/media/{video => pci}/saa7164/Kconfig (62%)
7371 rename drivers/media/{video => pci}/saa7164/Makefile (57%)
7372 rename drivers/media/{video => pci}/saa7164/saa7164-api.c (98%)
7373 rename drivers/media/{video => pci}/saa7164/saa7164-buffer.c (100%)
7374 rename drivers/media/{video => pci}/saa7164/saa7164-bus.c (100%)
7375 rename drivers/media/{video => pci}/saa7164/saa7164-cards.c (100%)
7376 rename drivers/media/{video => pci}/saa7164/saa7164-cmd.c (100%)
7377 rename drivers/media/{video => pci}/saa7164/saa7164-core.c (96%)
7378 rename drivers/media/{video => pci}/saa7164/saa7164-dvb.c (100%)
7379 rename drivers/media/{video => pci}/saa7164/saa7164-encoder.c (100%)
7380 rename drivers/media/{video => pci}/saa7164/saa7164-fw.c (100%)
7381 rename drivers/media/{video => pci}/saa7164/saa7164-i2c.c (100%)
7382 rename drivers/media/{video => pci}/saa7164/saa7164-reg.h (100%)
7383 rename drivers/media/{video => pci}/saa7164/saa7164-types.h (100%)
7384 rename drivers/media/{video => pci}/saa7164/saa7164-vbi.c (100%)
7385 rename drivers/media/{video => pci}/saa7164/saa7164.h (99%)
7386 create mode 100644 drivers/media/pci/sta2x11/Kconfig
7387 create mode 100644 drivers/media/pci/sta2x11/Makefile
7388 rename drivers/media/{video => pci/sta2x11}/sta2x11_vip.c (100%)
7389 rename drivers/media/{video => pci/sta2x11}/sta2x11_vip.h (100%)
7390 rename drivers/media/{dvb => pci}/ttpci/Kconfig (66%)
7391 rename drivers/media/{dvb => pci}/ttpci/Makefile (82%)
7392 rename drivers/media/{dvb => pci}/ttpci/av7110.c (100%)
7393 rename drivers/media/{dvb => pci}/ttpci/av7110.h (100%)
7394 rename drivers/media/{dvb => pci}/ttpci/av7110_av.c (100%)
7395 rename drivers/media/{dvb => pci}/ttpci/av7110_av.h (100%)
7396 rename drivers/media/{dvb => pci}/ttpci/av7110_ca.c (100%)
7397 rename drivers/media/{dvb => pci}/ttpci/av7110_ca.h (100%)
7398 rename drivers/media/{dvb => pci}/ttpci/av7110_hw.c (100%)
7399 rename drivers/media/{dvb => pci}/ttpci/av7110_hw.h (100%)
7400 rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.c (100%)
7401 rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.h (100%)
7402 rename drivers/media/{dvb => pci}/ttpci/av7110_ir.c (100%)
7403 rename drivers/media/{dvb => pci}/ttpci/av7110_v4l.c (100%)
7404 rename drivers/media/{dvb => pci}/ttpci/budget-av.c (100%)
7405 rename drivers/media/{dvb => pci}/ttpci/budget-ci.c (100%)
7406 rename drivers/media/{dvb => pci}/ttpci/budget-core.c (100%)
7407 rename drivers/media/{dvb => pci}/ttpci/budget-patch.c (100%)
7408 rename drivers/media/{dvb => pci}/ttpci/budget.c (91%)
7409 rename drivers/media/{dvb => pci}/ttpci/budget.h (100%)
7410 rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c (100%)
7411 rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h (100%)
7412 rename drivers/media/{video => pci}/zoran/Kconfig (75%)
7413 rename drivers/media/{video => pci}/zoran/Makefile (100%)
7414 rename drivers/media/{video => pci}/zoran/videocodec.c (100%)
7415 rename drivers/media/{video => pci}/zoran/videocodec.h (100%)
7416 rename drivers/media/{video => pci}/zoran/zoran.h (100%)
7417 rename drivers/media/{video => pci}/zoran/zoran_card.c (100%)
7418 rename drivers/media/{video => pci}/zoran/zoran_card.h (100%)
7419 rename drivers/media/{video => pci}/zoran/zoran_device.c (100%)
7420 rename drivers/media/{video => pci}/zoran/zoran_device.h (100%)
7421 rename drivers/media/{video => pci}/zoran/zoran_driver.c (100%)
7422 rename drivers/media/{video => pci}/zoran/zoran_procfs.c (100%)
7423 rename drivers/media/{video => pci}/zoran/zoran_procfs.h (100%)
7424 rename drivers/media/{video => pci}/zoran/zr36016.c (100%)
7425 rename drivers/media/{video => pci}/zoran/zr36016.h (100%)
7426 rename drivers/media/{video => pci}/zoran/zr36050.c (100%)
7427 rename drivers/media/{video => pci}/zoran/zr36050.h (100%)
7428 rename drivers/media/{video => pci}/zoran/zr36057.h (100%)
7429 rename drivers/media/{video => pci}/zoran/zr36060.c (100%)
7430 rename drivers/media/{video => pci}/zoran/zr36060.h (100%)
7431 create mode 100644 drivers/media/platform/Kconfig
7432 create mode 100644 drivers/media/platform/Makefile
7433 rename drivers/media/{video => platform}/arv.c (100%)
7434 rename drivers/media/{video => platform}/blackfin/Kconfig (100%)
7435 rename drivers/media/{video => platform}/blackfin/Makefile (100%)
7436 rename drivers/media/{video => platform}/blackfin/bfin_capture.c (98%)
7437 rename drivers/media/{video => platform}/blackfin/ppi.c (100%)
7438 create mode 100644 drivers/media/platform/coda.c
7439 create mode 100644 drivers/media/platform/coda.h
7440 rename drivers/media/{video => platform}/davinci/Kconfig (97%)
7441 rename drivers/media/{video => platform}/davinci/Makefile (100%)
7442 rename drivers/media/{video => platform}/davinci/ccdc_hw_device.h (100%)
7443 rename drivers/media/{video => platform}/davinci/dm355_ccdc.c (99%)
7444 rename drivers/media/{video => platform}/davinci/dm355_ccdc_regs.h (100%)
7445 rename drivers/media/{video => platform}/davinci/dm644x_ccdc.c (99%)
7446 rename drivers/media/{video => platform}/davinci/dm644x_ccdc_regs.h (100%)
7447 rename drivers/media/{video => platform}/davinci/isif.c (99%)
7448 rename drivers/media/{video => platform}/davinci/isif_regs.h (100%)
7449 rename drivers/media/{video => platform}/davinci/vpbe.c (100%)
7450 rename drivers/media/{video => platform}/davinci/vpbe_display.c (99%)
7451 rename drivers/media/{video => platform}/davinci/vpbe_osd.c (100%)
7452 rename drivers/media/{video => platform}/davinci/vpbe_osd_regs.h (100%)
7453 rename drivers/media/{video => platform}/davinci/vpbe_venc.c (100%)
7454 rename drivers/media/{video => platform}/davinci/vpbe_venc_regs.h (100%)
7455 rename drivers/media/{video => platform}/davinci/vpfe_capture.c (99%)
7456 rename drivers/media/{video => platform}/davinci/vpif.c (99%)
7457 rename drivers/media/{video => platform}/davinci/vpif.h (100%)
7458 rename drivers/media/{video => platform}/davinci/vpif_capture.c (99%)
7459 rename drivers/media/{video => platform}/davinci/vpif_capture.h (100%)
7460 rename drivers/media/{video => platform}/davinci/vpif_display.c (98%)
7461 rename drivers/media/{video => platform}/davinci/vpif_display.h (100%)
7462 rename drivers/media/{video => platform}/davinci/vpss.c (99%)
7463 create mode 100644 drivers/media/platform/exynos-gsc/Makefile
7464 create mode 100644 drivers/media/platform/exynos-gsc/gsc-core.c
7465 create mode 100644 drivers/media/platform/exynos-gsc/gsc-core.h
7466 create mode 100644 drivers/media/platform/exynos-gsc/gsc-m2m.c
7467 create mode 100644 drivers/media/platform/exynos-gsc/gsc-regs.c
7468 create mode 100644 drivers/media/platform/exynos-gsc/gsc-regs.h
7469 rename drivers/media/{video => platform}/fsl-viu.c (98%)
7470 rename drivers/media/{video => platform}/indycam.c (100%)
7471 rename drivers/media/{video => platform}/indycam.h (100%)
7472 create mode 100644 drivers/media/platform/m2m-deinterlace.c
7473 rename drivers/media/{video => platform}/marvell-ccic/Kconfig (100%)
7474 rename drivers/media/{video => platform}/marvell-ccic/Makefile (100%)
7475 rename drivers/media/{video => platform}/marvell-ccic/cafe-driver.c (100%)
7476 rename drivers/media/{video => platform}/marvell-ccic/mcam-core.c (100%)
7477 rename drivers/media/{video => platform}/marvell-ccic/mcam-core.h (100%)
7478 rename drivers/media/{video => platform}/marvell-ccic/mmp-driver.c (100%)
7479 rename drivers/media/{video => platform}/mem2mem_testdev.c (97%)
7480 rename drivers/media/{video => platform}/mx2_emmaprp.c (94%)
7481 rename drivers/media/{video => platform}/omap/Kconfig (100%)
7482 rename drivers/media/{video => platform}/omap/Makefile (81%)
7483 rename drivers/media/{video => platform}/omap/omap_vout.c (100%)
7484 rename drivers/media/{video => platform}/omap/omap_vout_vrfb.c (100%)
7485 rename drivers/media/{video => platform}/omap/omap_vout_vrfb.h (100%)
7486 rename drivers/media/{video => platform}/omap/omap_voutdef.h (100%)
7487 rename drivers/media/{video => platform}/omap/omap_voutlib.c (100%)
7488 rename drivers/media/{video => platform}/omap/omap_voutlib.h (100%)
7489 rename drivers/media/{video => platform}/omap24xxcam-dma.c (99%)
7490 rename drivers/media/{video => platform}/omap24xxcam.c (99%)
7491 rename drivers/media/{video => platform}/omap24xxcam.h (99%)
7492 rename drivers/media/{video => platform}/omap3isp/Makefile (100%)
7493 rename drivers/media/{video => platform}/omap3isp/cfa_coef_table.h (91%)
7494 rename drivers/media/{video => platform}/omap3isp/gamma_table.h (100%)
7495 rename drivers/media/{video => platform}/omap3isp/isp.c (98%)
7496 rename drivers/media/{video => platform}/omap3isp/isp.h (97%)
7497 rename drivers/media/{video => platform}/omap3isp/ispccdc.c (94%)
7498 rename drivers/media/{video => platform}/omap3isp/ispccdc.h (83%)
7499 rename drivers/media/{video => platform}/omap3isp/ispccp2.c (100%)
7500 rename drivers/media/{video => platform}/omap3isp/ispccp2.h (100%)
7501 rename drivers/media/{video => platform}/omap3isp/ispcsi2.c (98%)
7502 rename drivers/media/{video => platform}/omap3isp/ispcsi2.h (100%)
7503 rename drivers/media/{video => platform}/omap3isp/ispcsiphy.c (100%)
7504 rename drivers/media/{video => platform}/omap3isp/ispcsiphy.h (100%)
7505 rename drivers/media/{video => platform}/omap3isp/isph3a.h (100%)
7506 rename drivers/media/{video => platform}/omap3isp/isph3a_aewb.c (96%)
7507 rename drivers/media/{video => platform}/omap3isp/isph3a_af.c (96%)
7508 rename drivers/media/{video => platform}/omap3isp/isphist.c (98%)
7509 rename drivers/media/{video => platform}/omap3isp/isphist.h (100%)
7510 rename drivers/media/{video => platform}/omap3isp/isppreview.c (89%)
7511 rename drivers/media/{video => platform}/omap3isp/isppreview.h (99%)
7512 rename drivers/media/{video => platform}/omap3isp/ispqueue.c (98%)
7513 rename drivers/media/{video => platform}/omap3isp/ispqueue.h (100%)
7514 rename drivers/media/{video => platform}/omap3isp/ispreg.h (100%)
7515 rename drivers/media/{video => platform}/omap3isp/ispresizer.c (99%)
7516 rename drivers/media/{video => platform}/omap3isp/ispresizer.h (100%)
7517 rename drivers/media/{video => platform}/omap3isp/ispstat.c (100%)
7518 rename drivers/media/{video => platform}/omap3isp/ispstat.h (100%)
7519 rename drivers/media/{video => platform}/omap3isp/ispvideo.c (96%)
7520 rename drivers/media/{video => platform}/omap3isp/ispvideo.h (97%)
7521 rename drivers/media/{video => platform}/omap3isp/luma_enhance_table.h (100%)
7522 rename drivers/media/{video => platform}/omap3isp/noise_filter_table.h (100%)
7523 rename drivers/media/{video => platform}/s5p-fimc/Kconfig (96%)
7524 rename drivers/media/{video => platform}/s5p-fimc/Makefile (100%)
7525 rename drivers/media/{video => platform}/s5p-fimc/fimc-capture.c (98%)
7526 rename drivers/media/{video => platform}/s5p-fimc/fimc-core.c (100%)
7527 rename drivers/media/{video => platform}/s5p-fimc/fimc-core.h (99%)
7528 rename drivers/media/{video => platform}/s5p-fimc/fimc-lite-reg.c (99%)
7529 rename drivers/media/{video => platform}/s5p-fimc/fimc-lite-reg.h (100%)
7530 rename drivers/media/{video => platform}/s5p-fimc/fimc-lite.c (98%)
7531 rename drivers/media/{video => platform}/s5p-fimc/fimc-lite.h (99%)
7532 rename drivers/media/{video => platform}/s5p-fimc/fimc-m2m.c (96%)
7533 rename drivers/media/{video => platform}/s5p-fimc/fimc-mdevice.c (99%)
7534 rename drivers/media/{video => platform}/s5p-fimc/fimc-mdevice.h (94%)
7535 rename drivers/media/{video => platform}/s5p-fimc/fimc-reg.c (99%)
7536 rename drivers/media/{video => platform}/s5p-fimc/fimc-reg.h (100%)
7537 rename drivers/media/{video => platform}/s5p-fimc/mipi-csis.c (100%)
7538 rename drivers/media/{video => platform}/s5p-fimc/mipi-csis.h (100%)
7539 rename drivers/media/{video => platform}/s5p-g2d/Makefile (100%)
7540 rename drivers/media/{video => platform}/s5p-g2d/g2d-hw.c (100%)
7541 rename drivers/media/{video => platform}/s5p-g2d/g2d-regs.h (100%)
7542 rename drivers/media/{video => platform}/s5p-g2d/g2d.c (97%)
7543 rename drivers/media/{video => platform}/s5p-g2d/g2d.h (100%)
7544 rename drivers/media/{video => platform}/s5p-jpeg/Makefile (100%)
7545 rename drivers/media/{video => platform}/s5p-jpeg/jpeg-core.c (98%)
7546 rename drivers/media/{video => platform}/s5p-jpeg/jpeg-core.h (98%)
7547 rename drivers/media/{video => platform}/s5p-jpeg/jpeg-hw.h (99%)
7548 rename drivers/media/{video => platform}/s5p-jpeg/jpeg-regs.h (98%)
7549 rename drivers/media/{video => platform}/s5p-mfc/Makefile (100%)
7550 rename drivers/media/{video => platform}/s5p-mfc/regs-mfc.h (100%)
7551 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc.c (98%)
7552 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_cmd.c (98%)
7553 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_cmd.h (93%)
7554 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_common.h (100%)
7555 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_ctrl.c (98%)
7556 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_ctrl.h (93%)
7557 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_debug.h (95%)
7558 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_dec.c (99%)
7559 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_dec.h (93%)
7560 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_enc.c (99%)
7561 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_enc.h (93%)
7562 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_intr.c (97%)
7563 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_intr.h (93%)
7564 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_opr.c (99%)
7565 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_opr.h (98%)
7566 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_pm.c (98%)
7567 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_pm.h (92%)
7568 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_shm.c (96%)
7569 rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_shm.h (98%)
7570 rename drivers/media/{video => platform}/s5p-tv/Kconfig (98%)
7571 rename drivers/media/{video => platform}/s5p-tv/Makefile (92%)
7572 rename drivers/media/{video => platform}/s5p-tv/hdmi_drv.c (99%)
7573 rename drivers/media/{video => platform}/s5p-tv/hdmiphy_drv.c (100%)
7574 rename drivers/media/{video => platform}/s5p-tv/mixer.h (100%)
7575 rename drivers/media/{video => platform}/s5p-tv/mixer_drv.c (98%)
7576 rename drivers/media/{video => platform}/s5p-tv/mixer_grp_layer.c (100%)
7577 rename drivers/media/{video => platform}/s5p-tv/mixer_reg.c (100%)
7578 rename drivers/media/{video => platform}/s5p-tv/mixer_video.c (97%)
7579 rename drivers/media/{video => platform}/s5p-tv/mixer_vp_layer.c (100%)
7580 rename drivers/media/{video => platform}/s5p-tv/regs-hdmi.h (100%)
7581 rename drivers/media/{video => platform}/s5p-tv/regs-mixer.h (100%)
7582 rename drivers/media/{video => platform}/s5p-tv/regs-sdo.h (97%)
7583 rename drivers/media/{video => platform}/s5p-tv/regs-vp.h (100%)
7584 rename drivers/media/{video => platform}/s5p-tv/sdo_drv.c (98%)
7585 rename drivers/media/{video => platform}/s5p-tv/sii9234_drv.c (97%)
7586 rename drivers/media/{video => platform}/sh_vou.c (98%)
7587 create mode 100644 drivers/media/platform/soc_camera/Kconfig
7588 create mode 100644 drivers/media/platform/soc_camera/Makefile
7589 rename drivers/media/{video => platform/soc_camera}/atmel-isi.c (100%)
7590 rename drivers/media/{video => platform/soc_camera}/mx1_camera.c (100%)
7591 rename drivers/media/{video => platform/soc_camera}/mx2_camera.c (97%)
7592 rename drivers/media/{video => platform/soc_camera}/mx3_camera.c (99%)
7593 rename drivers/media/{video => platform/soc_camera}/omap1_camera.c (99%)
7594 rename drivers/media/{video => platform/soc_camera}/pxa_camera.c (100%)
7595 rename drivers/media/{video => platform/soc_camera}/sh_mobile_ceu_camera.c (100%)
7596 rename drivers/media/{video => platform/soc_camera}/sh_mobile_csi2.c (100%)
7597 rename drivers/media/{video => platform/soc_camera}/soc_camera.c (92%)
7598 rename drivers/media/{video => platform/soc_camera}/soc_camera_platform.c (94%)
7599 rename drivers/media/{video => platform/soc_camera}/soc_mediabus.c (100%)
7600 rename drivers/media/{video => platform}/timblogiw.c (100%)
7601 rename drivers/media/{video => platform}/via-camera.c (100%)
7602 rename drivers/media/{video => platform}/via-camera.h (100%)
7603 rename drivers/media/{video => platform}/vino.c (100%)
7604 rename drivers/media/{video => platform}/vino.h (100%)
7605 rename drivers/media/{video => platform}/vivi.c (97%)
7606 create mode 100644 drivers/media/rc/ir-rx51.c
7607 create mode 100644 drivers/media/rc/ttusbir.c
7608 rename drivers/media/{common => }/tuners/Kconfig (72%)
7609 rename drivers/media/{common => }/tuners/Makefile (88%)
7610 create mode 100644 drivers/media/tuners/e4000.c
7611 create mode 100644 drivers/media/tuners/e4000.h
7612 create mode 100644 drivers/media/tuners/e4000_priv.h
7613 rename drivers/media/{common => }/tuners/fc0011.c (100%)
7614 rename drivers/media/{common => }/tuners/fc0011.h (100%)
7615 rename drivers/media/{common => }/tuners/fc0012-priv.h (100%)
7616 rename drivers/media/{common => }/tuners/fc0012.c (100%)
7617 rename drivers/media/{common => }/tuners/fc0012.h (100%)
7618 rename drivers/media/{common => }/tuners/fc0013-priv.h (100%)
7619 rename drivers/media/{common => }/tuners/fc0013.c (100%)
7620 rename drivers/media/{common => }/tuners/fc0013.h (100%)
7621 rename drivers/media/{common => }/tuners/fc001x-common.h (100%)
7622 create mode 100644 drivers/media/tuners/fc2580.c
7623 create mode 100644 drivers/media/tuners/fc2580.h
7624 create mode 100644 drivers/media/tuners/fc2580_priv.h
7625 rename drivers/media/{common => }/tuners/max2165.c (100%)
7626 rename drivers/media/{common => }/tuners/max2165.h (100%)
7627 rename drivers/media/{common => }/tuners/max2165_priv.h (100%)
7628 rename drivers/media/{common => }/tuners/mc44s803.c (97%)
7629 rename drivers/media/{common => }/tuners/mc44s803.h (100%)
7630 rename drivers/media/{common => }/tuners/mc44s803_priv.h (100%)
7631 rename drivers/media/{common => }/tuners/mt2060.c (100%)
7632 rename drivers/media/{common => }/tuners/mt2060.h (100%)
7633 rename drivers/media/{common => }/tuners/mt2060_priv.h (100%)
7634 rename drivers/media/{common => }/tuners/mt2063.c (100%)
7635 rename drivers/media/{common => }/tuners/mt2063.h (100%)
7636 rename drivers/media/{common => }/tuners/mt20xx.c (100%)
7637 rename drivers/media/{common => }/tuners/mt20xx.h (100%)
7638 rename drivers/media/{common => }/tuners/mt2131.c (100%)
7639 rename drivers/media/{common => }/tuners/mt2131.h (100%)
7640 rename drivers/media/{common => }/tuners/mt2131_priv.h (100%)
7641 rename drivers/media/{common => }/tuners/mt2266.c (100%)
7642 rename drivers/media/{common => }/tuners/mt2266.h (100%)
7643 rename drivers/media/{common => }/tuners/mxl5005s.c (99%)
7644 rename drivers/media/{common => }/tuners/mxl5005s.h (100%)
7645 rename drivers/media/{common => }/tuners/mxl5007t.c (100%)
7646 rename drivers/media/{common => }/tuners/mxl5007t.h (100%)
7647 rename drivers/media/{common => }/tuners/qt1010.c (90%)
7648 rename drivers/media/{common => }/tuners/qt1010.h (100%)
7649 rename drivers/media/{common => }/tuners/qt1010_priv.h (100%)
7650 rename drivers/media/{common => }/tuners/tda18212.c (91%)
7651 rename drivers/media/{common => }/tuners/tda18212.h (100%)
7652 rename drivers/media/{common => }/tuners/tda18218.c (87%)
7653 rename drivers/media/{common => }/tuners/tda18218.h (100%)
7654 rename drivers/media/{common => }/tuners/tda18218_priv.h (90%)
7655 rename drivers/media/{common => }/tuners/tda18271-common.c (99%)
7656 rename drivers/media/{common => }/tuners/tda18271-fe.c (100%)
7657 rename drivers/media/{common => }/tuners/tda18271-maps.c (100%)
7658 rename drivers/media/{common => }/tuners/tda18271-priv.h (100%)
7659 rename drivers/media/{common => }/tuners/tda18271.h (100%)
7660 rename drivers/media/{common => }/tuners/tda827x.c (100%)
7661 rename drivers/media/{common => }/tuners/tda827x.h (100%)
7662 rename drivers/media/{common => }/tuners/tda8290.c (100%)
7663 rename drivers/media/{common => }/tuners/tda8290.h (100%)
7664 rename drivers/media/{common => }/tuners/tda9887.c (100%)
7665 rename drivers/media/{common => }/tuners/tda9887.h (100%)
7666 rename drivers/media/{common => }/tuners/tea5761.c (100%)
7667 rename drivers/media/{common => }/tuners/tea5761.h (100%)
7668 rename drivers/media/{common => }/tuners/tea5767.c (100%)
7669 rename drivers/media/{common => }/tuners/tea5767.h (100%)
7670 rename drivers/media/{common => }/tuners/tua9001.c (68%)
7671 rename drivers/media/{common => }/tuners/tua9001.h (78%)
7672 rename drivers/media/{common => }/tuners/tua9001_priv.h (100%)
7673 rename drivers/media/{common => }/tuners/tuner-i2c.h (100%)
7674 rename drivers/media/{common => }/tuners/tuner-simple.c (100%)
7675 rename drivers/media/{common => }/tuners/tuner-simple.h (100%)
7676 rename drivers/media/{common => }/tuners/tuner-types.c (100%)
7677 rename drivers/media/{common => }/tuners/tuner-xc2028-types.h (100%)
7678 rename drivers/media/{common => }/tuners/tuner-xc2028.c (99%)
7679 rename drivers/media/{common => }/tuners/tuner-xc2028.h (100%)
7680 rename drivers/media/{common => }/tuners/xc4000.c (99%)
7681 rename drivers/media/{common => }/tuners/xc4000.h (100%)
7682 rename drivers/media/{common => }/tuners/xc5000.c (88%)
7683 rename drivers/media/{common => }/tuners/xc5000.h (100%)
7684 create mode 100644 drivers/media/usb/Kconfig
7685 create mode 100644 drivers/media/usb/Makefile
7686 rename drivers/media/{video => usb}/au0828/Kconfig (54%)
7687 rename drivers/media/{video => usb}/au0828/Makefile (59%)
7688 rename drivers/media/{video => usb}/au0828/au0828-cards.c (99%)
7689 rename drivers/media/{video => usb}/au0828/au0828-cards.h (100%)
7690 rename drivers/media/{video => usb}/au0828/au0828-core.c (85%)
7691 rename drivers/media/{video => usb}/au0828/au0828-dvb.c (90%)
7692 rename drivers/media/{video => usb}/au0828/au0828-i2c.c (93%)
7693 rename drivers/media/{video => usb}/au0828/au0828-reg.h (98%)
7694 rename drivers/media/{video => usb}/au0828/au0828-vbi.c (100%)
7695 rename drivers/media/{video => usb}/au0828/au0828-video.c (96%)
7696 rename drivers/media/{video => usb}/au0828/au0828.h (98%)
7697 create mode 100644 drivers/media/usb/b2c2/Kconfig
7698 create mode 100644 drivers/media/usb/b2c2/Makefile
7699 rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.c (99%)
7700 rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.h (100%)
7701 rename drivers/media/{video => usb}/cpia2/Kconfig (100%)
7702 rename drivers/media/{video => usb}/cpia2/Makefile (100%)
7703 rename drivers/media/{video => usb}/cpia2/cpia2.h (100%)
7704 rename drivers/media/{video => usb}/cpia2/cpia2_core.c (99%)
7705 rename drivers/media/{video => usb}/cpia2/cpia2_registers.h (100%)
7706 rename drivers/media/{video => usb}/cpia2/cpia2_usb.c (100%)
7707 rename drivers/media/{video => usb}/cpia2/cpia2_v4l.c (97%)
7708 rename drivers/media/{video => usb}/cx231xx/Kconfig (86%)
7709 rename drivers/media/{video => usb}/cx231xx/Makefile (65%)
7710 rename drivers/media/{video => usb}/cx231xx/cx231xx-417.c (99%)
7711 rename drivers/media/{video => usb}/cx231xx/cx231xx-audio.c (100%)
7712 rename drivers/media/{video => usb}/cx231xx/cx231xx-avcore.c (100%)
7713 rename drivers/media/{video => usb}/cx231xx/cx231xx-cards.c (100%)
7714 rename drivers/media/{video => usb}/cx231xx/cx231xx-conf-reg.h (100%)
7715 rename drivers/media/{video => usb}/cx231xx/cx231xx-core.c (100%)
7716 rename drivers/media/{video => usb}/cx231xx/cx231xx-dif.h (100%)
7717 rename drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c (100%)
7718 rename drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c (100%)
7719 rename drivers/media/{video => usb}/cx231xx/cx231xx-input.c (100%)
7720 rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c (100%)
7721 rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h (100%)
7722 rename drivers/media/{video => usb}/cx231xx/cx231xx-reg.h (100%)
7723 rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c (100%)
7724 rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h (100%)
7725 rename drivers/media/{video => usb}/cx231xx/cx231xx-video.c (98%)
7726 rename drivers/media/{video => usb}/cx231xx/cx231xx.h (100%)
7727 create mode 100644 drivers/media/usb/dvb-usb-v2/Kconfig
7728 create mode 100644 drivers/media/usb/dvb-usb-v2/Makefile
7729 create mode 100644 drivers/media/usb/dvb-usb-v2/af9015.c
7730 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9015.h (78%)
7731 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.c (57%)
7732 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.h (96%)
7733 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.c (67%)
7734 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.h (97%)
7735 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.c (64%)
7736 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.h (80%)
7737 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/az6007.c (63%)
7738 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.c (58%)
7739 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.h (58%)
7740 create mode 100644 drivers/media/usb/dvb-usb-v2/cypress_firmware.c
7741 create mode 100644 drivers/media/usb/dvb-usb-v2/cypress_firmware.h
7742 create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb.h
7743 create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
7744 create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
7745 create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
7746 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.c (57%)
7747 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.h (62%)
7748 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.c (54%)
7749 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.h (59%)
7750 create mode 100644 drivers/media/usb/dvb-usb-v2/it913x.c
7751 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.c (69%)
7752 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.h (100%)
7753 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.c (100%)
7754 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.h (100%)
7755 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.c (100%)
7756 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.h (100%)
7757 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.c (100%)
7758 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.h (100%)
7759 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.c (100%)
7760 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.h (100%)
7761 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-reg.h (100%)
7762 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.c (99%)
7763 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.h (100%)
7764 create mode 100644 drivers/media/usb/dvb-usb-v2/mxl111sf.c
7765 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf.h (98%)
7766 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.c (66%)
7767 rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.h (91%)
7768 create mode 100644 drivers/media/usb/dvb-usb-v2/usb_urb.c
7769 create mode 100644 drivers/media/usb/dvb-usb/Kconfig
7770 create mode 100644 drivers/media/usb/dvb-usb/Makefile
7771 rename drivers/media/{dvb => usb}/dvb-usb/a800.c (100%)
7772 rename drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c (100%)
7773 rename drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c (100%)
7774 rename drivers/media/{dvb => usb}/dvb-usb/af9005-script.h (100%)
7775 rename drivers/media/{dvb => usb}/dvb-usb/af9005.c (100%)
7776 rename drivers/media/{dvb => usb}/dvb-usb/af9005.h (100%)
7777 rename drivers/media/{dvb => usb}/dvb-usb/az6027.c (100%)
7778 rename drivers/media/{dvb => usb}/dvb-usb/az6027.h (100%)
7779 rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-core.c (100%)
7780 rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c (100%)
7781 rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h (100%)
7782 rename drivers/media/{dvb => usb}/dvb-usb/cxusb.c (100%)
7783 rename drivers/media/{dvb => usb}/dvb-usb/cxusb.h (100%)
7784 rename drivers/media/{dvb => usb}/dvb-usb/dib0700.h (100%)
7785 rename drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c (99%)
7786 rename drivers/media/{dvb => usb}/dvb-usb/dib0700_devices.c (100%)
7787 rename drivers/media/{dvb => usb}/dvb-usb/dib07x0.h (100%)
7788 rename drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c (100%)
7789 rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c (100%)
7790 rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c (100%)
7791 rename drivers/media/{dvb => usb}/dvb-usb/dibusb.h (100%)
7792 rename drivers/media/{dvb => usb}/dvb-usb/digitv.c (100%)
7793 rename drivers/media/{dvb => usb}/dvb-usb/digitv.h (100%)
7794 rename drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c (100%)
7795 rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.c (100%)
7796 rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.h (100%)
7797 rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.c (100%)
7798 rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.h (100%)
7799 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-common.h (100%)
7800 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c (99%)
7801 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c (100%)
7802 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c (100%)
7803 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c (100%)
7804 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-remote.c (100%)
7805 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c (100%)
7806 rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h (99%)
7807 rename drivers/media/{dvb => usb}/dvb-usb/dw2102.c (100%)
7808 rename drivers/media/{dvb => usb}/dvb-usb/dw2102.h (100%)
7809 rename drivers/media/{dvb => usb}/dvb-usb/friio-fe.c (100%)
7810 rename drivers/media/{dvb => usb}/dvb-usb/friio.c (100%)
7811 rename drivers/media/{dvb => usb}/dvb-usb/friio.h (100%)
7812 rename drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c (100%)
7813 rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.c (100%)
7814 rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.h (100%)
7815 rename drivers/media/{dvb => usb}/dvb-usb/m920x.c (100%)
7816 rename drivers/media/{dvb => usb}/dvb-usb/m920x.h (100%)
7817 rename drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c (100%)
7818 rename drivers/media/{dvb => usb}/dvb-usb/opera1.c (100%)
7819 rename drivers/media/{dvb => usb}/dvb-usb/pctv452e.c (99%)
7820 rename drivers/media/{dvb => usb}/dvb-usb/technisat-usb2.c (100%)
7821 rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.c (99%)
7822 rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.h (100%)
7823 rename drivers/media/{dvb => usb}/dvb-usb/umt-010.c (100%)
7824 rename drivers/media/{dvb => usb}/dvb-usb/usb-urb.c (100%)
7825 rename drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c (100%)
7826 rename drivers/media/{dvb => usb}/dvb-usb/vp702x.c (100%)
7827 rename drivers/media/{dvb => usb}/dvb-usb/vp702x.h (100%)
7828 rename drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c (100%)
7829 rename drivers/media/{dvb => usb}/dvb-usb/vp7045.c (100%)
7830 rename drivers/media/{dvb => usb}/dvb-usb/vp7045.h (100%)
7831 rename drivers/media/{video => usb}/em28xx/Kconfig (67%)
7832 rename drivers/media/{video => usb}/em28xx/Makefile (57%)
7833 rename drivers/media/{video => usb}/em28xx/em28xx-audio.c (99%)
7834 rename drivers/media/{video => usb}/em28xx/em28xx-cards.c (100%)
7835 rename drivers/media/{video => usb}/em28xx/em28xx-core.c (99%)
7836 rename drivers/media/{video => usb}/em28xx/em28xx-dvb.c (100%)
7837 rename drivers/media/{video => usb}/em28xx/em28xx-i2c.c (100%)
7838 rename drivers/media/{video => usb}/em28xx/em28xx-input.c (100%)
7839 rename drivers/media/{video => usb}/em28xx/em28xx-reg.h (100%)
7840 rename drivers/media/{video => usb}/em28xx/em28xx-vbi.c (100%)
7841 rename drivers/media/{video => usb}/em28xx/em28xx-video.c (98%)
7842 rename drivers/media/{video => usb}/em28xx/em28xx.h (100%)
7843 rename drivers/media/{video => usb}/gspca/Kconfig (98%)
7844 rename drivers/media/{video => usb}/gspca/Makefile (100%)
7845 rename drivers/media/{video => usb}/gspca/autogain_functions.c (100%)
7846 rename drivers/media/{video => usb}/gspca/autogain_functions.h (100%)
7847 rename drivers/media/{video => usb}/gspca/benq.c (100%)
7848 rename drivers/media/{video => usb}/gspca/conex.c (100%)
7849 rename drivers/media/{video => usb}/gspca/cpia1.c (99%)
7850 rename drivers/media/{video => usb}/gspca/etoms.c (100%)
7851 rename drivers/media/{video => usb}/gspca/finepix.c (92%)
7852 rename drivers/media/{video => usb}/gspca/gl860/Kconfig (100%)
7853 rename drivers/media/{video => usb}/gspca/gl860/Makefile (75%)
7854 rename drivers/media/{video => usb}/gspca/gl860/gl860-mi1320.c (100%)
7855 rename drivers/media/{video => usb}/gspca/gl860/gl860-mi2020.c (100%)
7856 rename drivers/media/{video => usb}/gspca/gl860/gl860-ov2640.c (100%)
7857 rename drivers/media/{video => usb}/gspca/gl860/gl860-ov9655.c (100%)
7858 rename drivers/media/{video => usb}/gspca/gl860/gl860.c (100%)
7859 rename drivers/media/{video => usb}/gspca/gl860/gl860.h (100%)
7860 rename drivers/media/{video => usb}/gspca/gspca.c (99%)
7861 rename drivers/media/{video => usb}/gspca/gspca.h (100%)
7862 rename drivers/media/{video => usb}/gspca/jeilinj.c (100%)
7863 rename drivers/media/{video => usb}/gspca/jl2005bcd.c (95%)
7864 rename drivers/media/{video => usb}/gspca/jpeg.h (100%)
7865 rename drivers/media/{video => usb}/gspca/kinect.c (100%)
7866 rename drivers/media/{video => usb}/gspca/konica.c (100%)
7867 rename drivers/media/{video => usb}/gspca/m5602/Kconfig (100%)
7868 rename drivers/media/{video => usb}/gspca/m5602/Makefile (80%)
7869 rename drivers/media/{video => usb}/gspca/m5602/m5602_bridge.h (100%)
7870 rename drivers/media/{video => usb}/gspca/m5602/m5602_core.c (100%)
7871 rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.c (100%)
7872 rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.h (100%)
7873 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.c (100%)
7874 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.h (100%)
7875 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.c (100%)
7876 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.h (100%)
7877 rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.c (100%)
7878 rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.h (100%)
7879 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.c (100%)
7880 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.h (100%)
7881 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.c (100%)
7882 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.h (100%)
7883 rename drivers/media/{video => usb}/gspca/m5602/m5602_sensor.h (100%)
7884 rename drivers/media/{video => usb}/gspca/mars.c (100%)
7885 rename drivers/media/{video => usb}/gspca/mr97310a.c (100%)
7886 rename drivers/media/{video => usb}/gspca/nw80x.c (100%)
7887 rename drivers/media/{video => usb}/gspca/ov519.c (99%)
7888 rename drivers/media/{video => usb}/gspca/ov534.c (100%)
7889 rename drivers/media/{video => usb}/gspca/ov534_9.c (100%)
7890 rename drivers/media/{video => usb}/gspca/pac207.c (100%)
7891 rename drivers/media/{video => usb}/gspca/pac7302.c (95%)
7892 rename drivers/media/{video => usb}/gspca/pac7311.c (100%)
7893 rename drivers/media/{video => usb}/gspca/pac_common.h (100%)
7894 rename drivers/media/{video => usb}/gspca/se401.c (100%)
7895 rename drivers/media/{video => usb}/gspca/se401.h (100%)
7896 rename drivers/media/{video => usb}/gspca/sn9c2028.c (100%)
7897 rename drivers/media/{video => usb}/gspca/sn9c2028.h (100%)
7898 rename drivers/media/{video => usb}/gspca/sn9c20x.c (99%)
7899 rename drivers/media/{video => usb}/gspca/sonixb.c (100%)
7900 rename drivers/media/{video => usb}/gspca/sonixj.c (99%)
7901 rename drivers/media/{video => usb}/gspca/spca1528.c (100%)
7902 rename drivers/media/{video => usb}/gspca/spca500.c (100%)
7903 rename drivers/media/{video => usb}/gspca/spca501.c (100%)
7904 rename drivers/media/{video => usb}/gspca/spca505.c (100%)
7905 rename drivers/media/{video => usb}/gspca/spca506.c (100%)
7906 rename drivers/media/{video => usb}/gspca/spca508.c (100%)
7907 rename drivers/media/{video => usb}/gspca/spca561.c (100%)
7908 rename drivers/media/{video => usb}/gspca/sq905.c (95%)
7909 rename drivers/media/{video => usb}/gspca/sq905c.c (91%)
7910 rename drivers/media/{video => usb}/gspca/sq930x.c (99%)
7911 rename drivers/media/{video => usb}/gspca/stk014.c (100%)
7912 rename drivers/media/{video => usb}/gspca/stv0680.c (100%)
7913 rename drivers/media/{video => usb}/gspca/stv06xx/Kconfig (100%)
7914 rename drivers/media/{video => usb}/gspca/stv06xx/Makefile (78%)
7915 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.c (100%)
7916 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.h (100%)
7917 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.c (100%)
7918 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.h (100%)
7919 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.c (100%)
7920 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.h (100%)
7921 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_sensor.h (100%)
7922 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.c (100%)
7923 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.h (100%)
7924 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.c (100%)
7925 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.h (100%)
7926 rename drivers/media/{video => usb}/gspca/sunplus.c (100%)
7927 rename drivers/media/{video => usb}/gspca/t613.c (100%)
7928 rename drivers/media/{video => usb}/gspca/topro.c (100%)
7929 rename drivers/media/{video => usb}/gspca/tv8532.c (100%)
7930 rename drivers/media/{video => usb}/gspca/vc032x.c (99%)
7931 rename drivers/media/{video => usb}/gspca/vicam.c (94%)
7932 rename drivers/media/{video => usb}/gspca/w996Xcf.c (100%)
7933 rename drivers/media/{video => usb}/gspca/xirlink_cit.c (99%)
7934 rename drivers/media/{video => usb}/gspca/zc3xx-reg.h (100%)
7935 rename drivers/media/{video => usb}/gspca/zc3xx.c (99%)
7936 rename drivers/media/{video => usb}/hdpvr/Kconfig (100%)
7937 rename drivers/media/{video => usb}/hdpvr/Makefile (81%)
7938 rename drivers/media/{video => usb}/hdpvr/hdpvr-control.c (100%)
7939 rename drivers/media/{video => usb}/hdpvr/hdpvr-core.c (100%)
7940 rename drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c (100%)
7941 rename drivers/media/{video => usb}/hdpvr/hdpvr-video.c (100%)
7942 rename drivers/media/{video => usb}/hdpvr/hdpvr.h (100%)
7943 rename drivers/media/{video => usb}/pvrusb2/Kconfig (82%)
7944 rename drivers/media/{video => usb}/pvrusb2/Makefile (80%)
7945 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.c (100%)
7946 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.h (100%)
7947 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.c (100%)
7948 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.h (100%)
7949 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.c (100%)
7950 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.h (100%)
7951 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.c (100%)
7952 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.h (100%)
7953 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c (100%)
7954 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h (100%)
7955 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debug.h (100%)
7956 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.c (100%)
7957 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.h (100%)
7958 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.c (97%)
7959 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.h (100%)
7960 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c (100%)
7961 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h (100%)
7962 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.c (100%)
7963 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.h (100%)
7964 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.c (100%)
7965 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.h (100%)
7966 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h (100%)
7967 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw-internal.h (100%)
7968 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c (100%)
7969 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h (100%)
7970 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.c (100%)
7971 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.h (100%)
7972 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c (100%)
7973 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h (100%)
7974 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.c (100%)
7975 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.h (100%)
7976 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-main.c (100%)
7977 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c (100%)
7978 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h (100%)
7979 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.c (100%)
7980 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.h (100%)
7981 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-util.h (100%)
7982 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.c (100%)
7983 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.h (100%)
7984 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.c (100%)
7985 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.h (100%)
7986 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.c (100%)
7987 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.h (100%)
7988 rename drivers/media/{video => usb}/pvrusb2/pvrusb2.h (100%)
7989 rename drivers/media/{video => usb}/pwc/Kconfig (100%)
7990 rename drivers/media/{video => usb}/pwc/Makefile (60%)
7991 rename drivers/media/{video => usb}/pwc/philips.txt (100%)
7992 rename drivers/media/{video => usb}/pwc/pwc-ctrl.c (100%)
7993 rename drivers/media/{video => usb}/pwc/pwc-dec1.c (100%)
7994 rename drivers/media/{video => usb}/pwc/pwc-dec1.h (100%)
7995 rename drivers/media/{video => usb}/pwc/pwc-dec23.c (100%)
7996 rename drivers/media/{video => usb}/pwc/pwc-dec23.h (100%)
7997 rename drivers/media/{video => usb}/pwc/pwc-if.c (99%)
7998 rename drivers/media/{video => usb}/pwc/pwc-kiara.c (100%)
7999 rename drivers/media/{video => usb}/pwc/pwc-kiara.h (100%)
8000 rename drivers/media/{video => usb}/pwc/pwc-misc.c (100%)
8001 rename drivers/media/{video => usb}/pwc/pwc-nala.h (100%)
8002 rename drivers/media/{video => usb}/pwc/pwc-timon.c (100%)
8003 rename drivers/media/{video => usb}/pwc/pwc-timon.h (100%)
8004 rename drivers/media/{video => usb}/pwc/pwc-uncompress.c (100%)
8005 rename drivers/media/{video => usb}/pwc/pwc-v4l.c (100%)
8006 rename drivers/media/{video => usb}/pwc/pwc.h (100%)
8007 create mode 100644 drivers/media/usb/s2255/Kconfig
8008 create mode 100644 drivers/media/usb/s2255/Makefile
8009 rename drivers/media/{video => usb/s2255}/s2255drv.c (99%)
8010 create mode 100644 drivers/media/usb/siano/Kconfig
8011 create mode 100644 drivers/media/usb/siano/Makefile
8012 rename drivers/media/{dvb => usb}/siano/smsusb.c (100%)
8013 rename drivers/media/{video => usb}/sn9c102/Kconfig (100%)
8014 rename drivers/media/{video => usb}/sn9c102/Makefile (100%)
8015 rename drivers/media/{video => usb}/sn9c102/sn9c102.h (100%)
8016 rename drivers/media/{video => usb}/sn9c102/sn9c102_config.h (100%)
8017 rename drivers/media/{video => usb}/sn9c102/sn9c102_core.c (100%)
8018 rename drivers/media/{video => usb}/sn9c102/sn9c102_devtable.h (100%)
8019 rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131d.c (100%)
8020 rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131r.c (100%)
8021 rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0343.c (100%)
8022 rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0360.c (100%)
8023 rename drivers/media/{video => usb}/sn9c102/sn9c102_mt9v111.c (100%)
8024 rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7630.c (100%)
8025 rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7660.c (100%)
8026 rename drivers/media/{video => usb}/sn9c102/sn9c102_pas106b.c (100%)
8027 rename drivers/media/{video => usb}/sn9c102/sn9c102_pas202bcb.c (100%)
8028 rename drivers/media/{video => usb}/sn9c102/sn9c102_sensor.h (100%)
8029 rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110c1b.c (100%)
8030 rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110d.c (100%)
8031 rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5130d1b.c (100%)
8032 create mode 100644 drivers/media/usb/stk1160/Kconfig
8033 create mode 100644 drivers/media/usb/stk1160/Makefile
8034 create mode 100644 drivers/media/usb/stk1160/stk1160-ac97.c
8035 create mode 100644 drivers/media/usb/stk1160/stk1160-core.c
8036 create mode 100644 drivers/media/usb/stk1160/stk1160-i2c.c
8037 create mode 100644 drivers/media/usb/stk1160/stk1160-reg.h
8038 create mode 100644 drivers/media/usb/stk1160/stk1160-v4l.c
8039 create mode 100644 drivers/media/usb/stk1160/stk1160-video.c
8040 create mode 100644 drivers/media/usb/stk1160/stk1160.h
8041 create mode 100644 drivers/media/usb/stkwebcam/Kconfig
8042 create mode 100644 drivers/media/usb/stkwebcam/Makefile
8043 rename drivers/media/{video => usb/stkwebcam}/stk-sensor.c (100%)
8044 rename drivers/media/{video => usb/stkwebcam}/stk-webcam.c (100%)
8045 rename drivers/media/{video => usb/stkwebcam}/stk-webcam.h (100%)
8046 rename drivers/media/{video => usb}/tlg2300/Kconfig (100%)
8047 create mode 100644 drivers/media/usb/tlg2300/Makefile
8048 rename drivers/media/{video => usb}/tlg2300/pd-alsa.c (99%)
8049 rename drivers/media/{video => usb}/tlg2300/pd-common.h (100%)
8050 rename drivers/media/{video => usb}/tlg2300/pd-dvb.c (100%)
8051 rename drivers/media/{video => usb}/tlg2300/pd-main.c (100%)
8052 rename drivers/media/{video => usb}/tlg2300/pd-radio.c (100%)
8053 rename drivers/media/{video => usb}/tlg2300/pd-video.c (100%)
8054 rename drivers/media/{video => usb}/tlg2300/vendorcmds.h (100%)
8055 rename drivers/media/{video => usb}/tm6000/Kconfig (100%)
8056 rename drivers/media/{video => usb}/tm6000/Makefile (62%)
8057 rename drivers/media/{video => usb}/tm6000/tm6000-alsa.c (99%)
8058 rename drivers/media/{video => usb}/tm6000/tm6000-cards.c (100%)
8059 rename drivers/media/{video => usb}/tm6000/tm6000-core.c (100%)
8060 rename drivers/media/{video => usb}/tm6000/tm6000-dvb.c (100%)
8061 rename drivers/media/{video => usb}/tm6000/tm6000-i2c.c (100%)
8062 rename drivers/media/{video => usb}/tm6000/tm6000-input.c (99%)
8063 rename drivers/media/{video => usb}/tm6000/tm6000-regs.h (100%)
8064 rename drivers/media/{video => usb}/tm6000/tm6000-stds.c (100%)
8065 rename drivers/media/{video => usb}/tm6000/tm6000-usb-isoc.h (100%)
8066 rename drivers/media/{video => usb}/tm6000/tm6000-video.c (97%)
8067 rename drivers/media/{video => usb}/tm6000/tm6000.h (100%)
8068 rename drivers/media/{dvb => usb}/ttusb-budget/Kconfig (56%)
8069 create mode 100644 drivers/media/usb/ttusb-budget/Makefile
8070 rename drivers/media/{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c (100%)
8071 rename drivers/media/{dvb => usb}/ttusb-dec/Kconfig (100%)
8072 rename drivers/media/{dvb => usb}/ttusb-dec/Makefile (57%)
8073 rename drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c (100%)
8074 rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c (100%)
8075 rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h (100%)
8076 rename drivers/media/{video => usb}/usbvision/Kconfig (88%)
8077 rename drivers/media/{video => usb}/usbvision/Makefile (63%)
8078 rename drivers/media/{video => usb}/usbvision/usbvision-cards.c (100%)
8079 rename drivers/media/{video => usb}/usbvision/usbvision-cards.h (100%)
8080 rename drivers/media/{video => usb}/usbvision/usbvision-core.c (100%)
8081 rename drivers/media/{video => usb}/usbvision/usbvision-i2c.c (100%)
8082 rename drivers/media/{video => usb}/usbvision/usbvision-video.c (97%)
8083 rename drivers/media/{video => usb}/usbvision/usbvision.h (100%)
8084 rename drivers/media/{video => usb}/uvc/Kconfig (100%)
8085 rename drivers/media/{video => usb}/uvc/Makefile (100%)
8086 rename drivers/media/{video => usb}/uvc/uvc_ctrl.c (100%)
8087 rename drivers/media/{video => usb}/uvc/uvc_debugfs.c (100%)
8088 rename drivers/media/{video => usb}/uvc/uvc_driver.c (98%)
8089 rename drivers/media/{video => usb}/uvc/uvc_entity.c (100%)
8090 rename drivers/media/{video => usb}/uvc/uvc_isight.c (100%)
8091 rename drivers/media/{video => usb}/uvc/uvc_queue.c (100%)
8092 rename drivers/media/{video => usb}/uvc/uvc_status.c (100%)
8093 rename drivers/media/{video => usb}/uvc/uvc_v4l2.c (100%)
8094 rename drivers/media/{video => usb}/uvc/uvc_video.c (98%)
8095 rename drivers/media/{video => usb}/uvc/uvcvideo.h (98%)
8096 create mode 100644 drivers/media/usb/zr364xx/Kconfig
8097 create mode 100644 drivers/media/usb/zr364xx/Makefile
8098 rename drivers/media/{video => usb/zr364xx}/zr364xx.c (100%)
8099 create mode 100644 drivers/media/v4l2-core/Kconfig
8100 create mode 100644 drivers/media/v4l2-core/Makefile
8101 rename drivers/media/{video => v4l2-core}/tuner-core.c (100%)
8102 rename drivers/media/{video => v4l2-core}/v4l2-common.c (62%)
8103 rename drivers/media/{video => v4l2-core}/v4l2-compat-ioctl32.c (94%)
8104 rename drivers/media/{video => v4l2-core}/v4l2-ctrls.c (95%)
8105 rename drivers/media/{video => v4l2-core}/v4l2-dev.c (95%)
8106 rename drivers/media/{video => v4l2-core}/v4l2-device.c (100%)
8107 rename drivers/media/{video => v4l2-core}/v4l2-event.c (100%)
8108 rename drivers/media/{video => v4l2-core}/v4l2-fh.c (100%)
8109 rename drivers/media/{video => v4l2-core}/v4l2-int-device.c (100%)
8110 rename drivers/media/{video => v4l2-core}/v4l2-ioctl.c (99%)
8111 rename drivers/media/{video => v4l2-core}/v4l2-mem2mem.c (98%)
8112 rename drivers/media/{video => v4l2-core}/v4l2-subdev.c (98%)
8113 rename drivers/media/{video => v4l2-core}/videobuf-core.c (100%)
8114 rename drivers/media/{video => v4l2-core}/videobuf-dma-contig.c (100%)
8115 rename drivers/media/{video => v4l2-core}/videobuf-dma-sg.c (100%)
8116 rename drivers/media/{video => v4l2-core}/videobuf-dvb.c (96%)
8117 rename drivers/media/{video => v4l2-core}/videobuf-vmalloc.c (100%)
8118 rename drivers/media/{video => v4l2-core}/videobuf2-core.c (98%)
8119 rename drivers/media/{video => v4l2-core}/videobuf2-dma-contig.c (100%)
8120 rename drivers/media/{video => v4l2-core}/videobuf2-dma-sg.c (100%)
8121 rename drivers/media/{video => v4l2-core}/videobuf2-memops.c (100%)
8122 rename drivers/media/{video => v4l2-core}/videobuf2-vmalloc.c (99%)
8123 delete mode 100644 drivers/media/video/Kconfig
8124 delete mode 100644 drivers/media/video/Makefile
8125 delete mode 100644 drivers/media/video/bt8xx/Kconfig
8126 delete mode 100644 drivers/media/video/bt8xx/Makefile
8127 delete mode 100644 drivers/media/video/cx23885/Kconfig
8128 delete mode 100644 drivers/media/video/tlg2300/Makefile
8129 delete mode 100644 drivers/staging/media/easycap/Kconfig
8130 delete mode 100644 drivers/staging/media/easycap/Makefile
8131 delete mode 100644 drivers/staging/media/easycap/README
8132 delete mode 100644 drivers/staging/media/easycap/easycap.h
8133 delete mode 100644 drivers/staging/media/easycap/easycap_ioctl.c
8134 delete mode 100644 drivers/staging/media/easycap/easycap_low.c
8135 delete mode 100644 drivers/staging/media/easycap/easycap_main.c
8136 delete mode 100644 drivers/staging/media/easycap/easycap_settings.c
8137 delete mode 100644 drivers/staging/media/easycap/easycap_sound.c
8138 delete mode 100644 drivers/staging/media/easycap/easycap_testcard.c
8139 delete mode 100644 drivers/staging/media/lirc/lirc_ene0100.h
8140 delete mode 100644 drivers/staging/media/lirc/lirc_ttusbir.c
8141 create mode 100644 include/media/ad9389b.h
8142 create mode 100644 include/media/adv7604.h
8143 create mode 100644 include/media/ir-rx51.h
8144 Merging kbuild/for-next (ea8fafa Merge branches 'kbuild/rc-fixes', 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
8145 $ git merge kbuild/for-next
8146 Auto-merging tools/testing/ktest/ktest.pl
8147 Auto-merging scripts/kernel-doc
8148 Auto-merging Makefile
8149 Auto-merging MAINTAINERS
8150 Merge made by the 'recursive' strategy.
8153 scripts/Makefile.modinst | 2 +-
8154 scripts/Makefile.modpost | 2 +-
8155 scripts/coccinelle/api/ptr_ret.cocci | 26 ++++
8156 scripts/kconfig/Makefile | 12 +-
8157 scripts/kconfig/conf.c | 25 ++--
8158 scripts/kconfig/expr.h | 11 ++
8159 scripts/kconfig/lkc_proto.h | 6 +-
8160 scripts/kconfig/lxdialog/dialog.h | 9 +-
8161 scripts/kconfig/lxdialog/textbox.c | 171 +++++++++++----------
8162 scripts/kconfig/lxdialog/util.c | 7 +
8163 scripts/kconfig/mconf.c | 123 +++++++++++----
8164 scripts/kconfig/menu.c | 53 +++++--
8165 scripts/kconfig/nconf.c | 2 +-
8166 scripts/kernel-doc | 273 +++++++++++++++++++++++++++++++++-
8167 scripts/package/buildtar | 6 +-
8168 scripts/tags.sh | 8 +-
8169 tools/testing/ktest/ktest.pl | 15 +-
8170 19 files changed, 602 insertions(+), 173 deletions(-)
8171 Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
8172 $ git merge kconfig/for-next
8174 Merging libata/NEXT (633de4c [libata] export ata_dev_set_feature())
8175 $ git merge libata/NEXT
8176 Auto-merging drivers/ata/libata-core.c
8177 Merge made by the 'recursive' strategy.
8178 .../devicetree/bindings/arm/calxeda/combophy.txt | 17 +
8179 .../devicetree/bindings/ata/ahci-platform.txt | 8 +
8180 .../devicetree/bindings/ata/pata-arasan.txt | 17 +
8181 arch/arm/boot/dts/highbank.dts | 17 +
8182 drivers/ata/Kconfig | 8 +
8183 drivers/ata/Makefile | 1 +
8184 drivers/ata/ahci.h | 16 +
8185 drivers/ata/ahci_platform.c | 58 ++-
8186 drivers/ata/libahci.c | 97 ++++-
8187 drivers/ata/libata-core.c | 32 +-
8188 drivers/ata/libata-eh.c | 12 +-
8189 drivers/ata/libata-scsi.c | 255 ++++++++++-
8190 drivers/ata/libata.h | 2 +
8191 drivers/ata/pata_arasan_cf.c | 14 +-
8192 drivers/ata/sata_fsl.c | 39 +-
8193 drivers/ata/sata_highbank.c | 450 ++++++++++++++++++++
8194 include/linux/ata.h | 30 +-
8195 include/linux/libata.h | 4 +
8196 18 files changed, 1020 insertions(+), 57 deletions(-)
8197 create mode 100644 Documentation/devicetree/bindings/arm/calxeda/combophy.txt
8198 create mode 100644 Documentation/devicetree/bindings/ata/pata-arasan.txt
8199 create mode 100644 drivers/ata/sata_highbank.c
8200 Merging infiniband/for-next (e3e5475 Merge branch 'qib' into for-next)
8201 $ git merge infiniband/for-next
8202 Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c
8203 Auto-merging drivers/infiniband/core/ucma.c
8204 Merge made by the 'recursive' strategy.
8205 drivers/infiniband/core/cache.c | 43 +-
8206 drivers/infiniband/core/cma.c | 5 +-
8207 drivers/infiniband/core/device.c | 16 +-
8208 drivers/infiniband/core/ucm.c | 1 -
8209 drivers/infiniband/core/ucma.c | 1 -
8210 drivers/infiniband/hw/cxgb4/qp.c | 62 +-
8211 drivers/infiniband/hw/mlx4/Makefile | 2 +-
8212 drivers/infiniband/hw/mlx4/alias_GUID.c | 688 +++++++++
8213 drivers/infiniband/hw/mlx4/cm.c | 437 ++++++
8214 drivers/infiniband/hw/mlx4/cq.c | 31 +-
8215 drivers/infiniband/hw/mlx4/mad.c | 1573 +++++++++++++++++++-
8216 drivers/infiniband/hw/mlx4/main.c | 273 +++-
8217 drivers/infiniband/hw/mlx4/mcg.c | 1254 ++++++++++++++++
8218 drivers/infiniband/hw/mlx4/mlx4_ib.h | 341 ++++-
8219 drivers/infiniband/hw/mlx4/qp.c | 660 +++++++-
8220 drivers/infiniband/hw/mlx4/sysfs.c | 794 ++++++++++
8221 drivers/infiniband/hw/nes/nes.h | 15 +-
8222 drivers/infiniband/hw/nes/nes_cm.c | 34 +-
8223 drivers/infiniband/hw/nes/nes_hw.c | 4 +-
8224 drivers/infiniband/hw/nes/nes_nic.c | 40 +-
8225 drivers/infiniband/hw/nes/nes_utils.c | 2 +-
8226 drivers/infiniband/hw/nes/nes_verbs.c | 14 +-
8227 drivers/infiniband/hw/qib/qib_common.h | 14 +-
8228 drivers/infiniband/hw/qib/qib_driver.c | 3 +-
8229 drivers/infiniband/hw/qib/qib_keys.c | 5 +-
8230 drivers/infiniband/hw/qib/qib_verbs.c | 2 +-
8231 drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +-
8232 drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 19 +-
8233 drivers/infiniband/ulp/srp/ib_srp.c | 3 +-
8234 drivers/net/ethernet/mellanox/mlx4/cmd.c | 242 ++-
8235 drivers/net/ethernet/mellanox/mlx4/eq.c | 245 ++-
8236 drivers/net/ethernet/mellanox/mlx4/fw.c | 246 ++-
8237 drivers/net/ethernet/mellanox/mlx4/fw.h | 11 +-
8238 drivers/net/ethernet/mellanox/mlx4/main.c | 171 ++-
8239 drivers/net/ethernet/mellanox/mlx4/mlx4.h | 59 +-
8240 drivers/net/ethernet/mellanox/mlx4/port.c | 10 +
8241 drivers/net/ethernet/mellanox/mlx4/qp.c | 100 +-
8242 .../net/ethernet/mellanox/mlx4/resource_tracker.c | 222 ++-
8243 include/linux/mlx4/device.h | 69 +-
8244 include/linux/mlx4/driver.h | 2 +
8245 include/linux/mlx4/qp.h | 3 +-
8246 include/rdma/ib_cache.h | 16 +
8247 include/rdma/ib_verbs.h | 3 +
8248 43 files changed, 7289 insertions(+), 448 deletions(-)
8249 create mode 100644 drivers/infiniband/hw/mlx4/alias_GUID.c
8250 create mode 100644 drivers/infiniband/hw/mlx4/cm.c
8251 create mode 100644 drivers/infiniband/hw/mlx4/mcg.c
8252 create mode 100644 drivers/infiniband/hw/mlx4/sysfs.c
8253 Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
8254 $ git merge pstore/master
8255 Auto-merging kernel/trace/trace_functions.c
8256 Auto-merging MAINTAINERS
8257 Merge made by the 'recursive' strategy.
8258 Documentation/ramoops.txt | 4 +-
8259 MAINTAINERS | 12 +++++
8260 fs/pstore/Kconfig | 1 +
8261 fs/pstore/ftrace.c | 96 +++++++++++++++++++++++++++++++++++++++-
8262 fs/pstore/internal.h | 6 +++
8263 fs/pstore/platform.c | 9 +++-
8264 fs/pstore/ram.c | 28 ++++++------
8265 include/linux/pstore.h | 8 ----
8266 kernel/trace/trace_functions.c | 15 +------
8267 9 files changed, 139 insertions(+), 40 deletions(-)
8268 Merging acpi/next (0a72714 Merge branch 'intel_idle' into next)
8269 $ git merge acpi/next
8270 Resolved 'drivers/usb/core/usb-acpi.c' using previous resolution.
8271 Auto-merging drivers/usb/core/usb-acpi.c
8272 CONFLICT (content): Merge conflict in drivers/usb/core/usb-acpi.c
8273 Automatic merge failed; fix conflicts and then commit the result.
8275 [master 9a5ec5f] Merge remote-tracking branch 'acpi/next'
8276 $ git diff -M --stat --summary HEAD^..
8277 drivers/acpi/acpica/Makefile | 1 +
8278 drivers/acpi/acpica/achware.h | 3 +-
8279 drivers/acpi/acpica/aclocal.h | 23 +-
8280 drivers/acpi/acpica/acmacros.h | 29 +-
8281 drivers/acpi/acpica/dswload.c | 14 +
8282 drivers/acpi/acpica/dswload2.c | 14 +
8283 drivers/acpi/acpica/evgpe.c | 24 +-
8284 drivers/acpi/acpica/evxfgpe.c | 3 +-
8285 drivers/acpi/acpica/hwgpe.c | 15 +-
8286 drivers/acpi/acpica/hwxfsleep.c | 1 -
8287 drivers/acpi/acpica/nsdump.c | 2 +-
8288 drivers/acpi/acpica/tbinstal.c | 20 +-
8289 drivers/acpi/acpica/tbxface.c | 41 +--
8290 drivers/acpi/acpica/utosi.c | 1 +
8291 drivers/acpi/acpica/utxface.c | 354 +++++--------------
8292 drivers/acpi/acpica/utxfinit.c | 317 +++++++++++++++++
8293 drivers/acpi/bus.c | 8 +-
8294 drivers/acpi/button.c | 13 +-
8295 drivers/acpi/fan.c | 22 +-
8296 drivers/acpi/glue.c | 135 ++++---
8297 drivers/acpi/hed.c | 20 +-
8298 drivers/acpi/proc.c | 57 +--
8299 drivers/acpi/sbshc.c | 18 +-
8300 drivers/acpi/scan.c | 2 +
8301 drivers/acpi/utils.c | 11 +-
8302 drivers/i2c/busses/i2c-scmi.c | 14 +-
8303 drivers/input/misc/atlas_btns.c | 17 +-
8304 drivers/platform/x86/hp_accel.c | 25 +-
8305 drivers/platform/x86/ideapad-laptop.c | 14 +-
8306 drivers/platform/x86/topstar-laptop.c | 22 +-
8307 drivers/platform/x86/toshiba_bluetooth.c | 22 +-
8308 drivers/platform/x86/xo15-ebook.c | 14 +-
8309 drivers/pnp/pnpacpi/core.c | 7 +-
8310 include/acpi/acbuffer.h | 235 +++++++++++++
8311 include/acpi/acnames.h | 3 +-
8312 include/acpi/acpi_bus.h | 59 ++--
8313 include/acpi/acpixf.h | 7 +-
8314 include/acpi/actbl.h | 60 ++--
8315 include/acpi/actbl1.h | 16 +-
8316 include/acpi/actbl2.h | 123 ++++++-
8317 include/acpi/actbl3.h | 13 +-
8318 include/acpi/actypes.h | 7 -
8319 tools/power/acpi/Makefile | 18 +
8320 tools/power/acpi/acpidump.8 | 59 ++++
8321 tools/power/acpi/acpidump.c | 560 ++++++++++++++++++++++++++++++
8322 tools/power/x86/turbostat/turbostat.8 | 22 +-
8323 tools/power/x86/turbostat/turbostat.c | 202 +++++++++--
8324 47 files changed, 1952 insertions(+), 715 deletions(-)
8325 create mode 100644 drivers/acpi/acpica/utxfinit.c
8326 create mode 100644 include/acpi/acbuffer.h
8327 create mode 100644 tools/power/acpi/Makefile
8328 create mode 100644 tools/power/acpi/acpidump.8
8329 create mode 100644 tools/power/acpi/acpidump.c
8330 $ git am -3 ../patches/0001-usb-acpi-Comply-with-the-ACPI-API-change-after-usb-t.patch
8331 Applying: usb-acpi: Comply with the ACPI API change after usb tree merge
8333 Unstaged changes after reset:
8334 M drivers/usb/core/usb-acpi.c
8336 $ git commit -v -a --amend
8337 [master 12e680e] Merge remote-tracking branch 'acpi/next'
8338 Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
8339 $ git merge cpuidle/cpuidle-next
8340 Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
8341 Resolved 'include/linux/cpuidle.h' using previous resolution.
8342 Auto-merging include/linux/cpuidle.h
8343 CONFLICT (content): Merge conflict in include/linux/cpuidle.h
8344 Auto-merging drivers/cpuidle/coupled.c
8345 CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
8346 Automatic merge failed; fix conflicts and then commit the result.
8348 [master f33d2d3] Merge remote-tracking branch 'cpuidle/cpuidle-next'
8349 $ git diff -M --stat --summary HEAD^..
8350 Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
8351 $ git merge cpupowerutils/master
8353 Merging thermal/next (4b69a04 thermal: user_space: Add missing static storage class specifiers)
8354 $ git merge thermal/next
8355 Resolved 'drivers/staging/omap-thermal/omap-thermal-common.c' using previous resolution.
8356 Auto-merging include/linux/platform_data/exynos_thermal.h
8357 Auto-merging drivers/staging/omap-thermal/omap-thermal-common.c
8358 CONFLICT (content): Merge conflict in drivers/staging/omap-thermal/omap-thermal-common.c
8359 Removing drivers/hwmon/exynos4_tmu.c
8360 Auto-merging drivers/hwmon/Makefile
8361 Auto-merging drivers/hwmon/Kconfig
8362 Auto-merging drivers/acpi/thermal.c
8363 Auto-merging Documentation/thermal/exynos_thermal
8364 Automatic merge failed; fix conflicts and then commit the result.
8366 [master cef363b] Merge remote-tracking branch 'thermal/next'
8367 $ git diff -M --stat --summary HEAD^..
8368 Documentation/thermal/cpu-cooling-api.txt | 32 +
8369 .../{hwmon/exynos4_tmu => thermal/exynos_thermal} | 35 +-
8370 Documentation/thermal/sysfs-api.txt | 73 +-
8371 drivers/acpi/thermal.c | 97 +-
8372 drivers/hwmon/Kconfig | 10 -
8373 drivers/hwmon/Makefile | 1 -
8374 drivers/hwmon/exynos4_tmu.c | 518 ----------
8375 drivers/platform/x86/acerhdf.c | 5 +-
8376 drivers/platform/x86/intel_mid_thermal.c | 2 +-
8377 drivers/power/power_supply_core.c | 2 +-
8378 drivers/staging/omap-thermal/omap-thermal-common.c | 8 +-
8379 drivers/thermal/Kconfig | 75 ++
8380 drivers/thermal/Makefile | 8 +-
8381 drivers/thermal/cpu_cooling.c | 449 +++++++++
8382 drivers/thermal/exynos_thermal.c | 997 ++++++++++++++++++++
8383 drivers/thermal/fair_share.c | 133 +++
8384 drivers/thermal/rcar_thermal.c | 260 +++++
8385 drivers/thermal/spear_thermal.c | 2 +-
8386 drivers/thermal/step_wise.c | 194 ++++
8387 drivers/thermal/thermal_core.h | 53 ++
8388 drivers/thermal/thermal_sys.c | 767 ++++++++++-----
8389 drivers/thermal/user_space.c | 68 ++
8390 include/linux/cpu_cooling.h | 58 ++
8391 .../{exynos4_tmu.h => exynos_thermal.h} | 47 +-
8392 include/linux/thermal.h | 150 ++-
8393 25 files changed, 3164 insertions(+), 880 deletions(-)
8394 create mode 100644 Documentation/thermal/cpu-cooling-api.txt
8395 rename Documentation/{hwmon/exynos4_tmu => thermal/exynos_thermal} (71%)
8396 delete mode 100644 drivers/hwmon/exynos4_tmu.c
8397 create mode 100644 drivers/thermal/cpu_cooling.c
8398 create mode 100644 drivers/thermal/exynos_thermal.c
8399 create mode 100644 drivers/thermal/fair_share.c
8400 create mode 100644 drivers/thermal/rcar_thermal.c
8401 create mode 100644 drivers/thermal/step_wise.c
8402 create mode 100644 drivers/thermal/thermal_core.h
8403 create mode 100644 drivers/thermal/user_space.c
8404 create mode 100644 include/linux/cpu_cooling.h
8405 rename include/linux/platform_data/{exynos4_tmu.h => exynos_thermal.h} (64%)
8406 Merging ieee1394/for-next (4d50c44 firewire: addendum to address handler RCU conversion)
8407 $ git merge ieee1394/for-next
8408 Merge made by the 'recursive' strategy.
8409 drivers/firewire/core-device.c | 3 +++
8410 drivers/firewire/core-transaction.c | 33 +++++++++++++++++++--------------
8411 drivers/firewire/ohci.c | 28 +++++++++++++++++++++++++++-
8412 include/linux/firewire.h | 12 ++++++++++--
8413 4 files changed, 59 insertions(+), 17 deletions(-)
8414 Merging ubi/linux-next (55393ba UBI: fix trivial typo 'it' => 'is')
8415 $ git merge ubi/linux-next
8416 Auto-merging drivers/mtd/ubi/vtbl.c
8417 Merge made by the 'recursive' strategy.
8418 arch/arm/configs/sam9_l9260_defconfig | 2 +-
8419 drivers/mtd/mtdpart.c | 12 +-
8420 drivers/mtd/ubi/Kconfig | 40 ++++---
8421 drivers/mtd/ubi/attach.c | 46 ++++----
8422 drivers/mtd/ubi/build.c | 204 ++++++++++++++++++++-------------
8423 drivers/mtd/ubi/cdev.c | 18 +--
8424 drivers/mtd/ubi/debug.c | 153 ++++++++++++-------------
8425 drivers/mtd/ubi/debug.h | 12 +-
8426 drivers/mtd/ubi/eba.c | 33 +++---
8427 drivers/mtd/ubi/gluebi.c | 30 +++--
8428 drivers/mtd/ubi/io.c | 80 +++++++------
8429 drivers/mtd/ubi/misc.c | 14 ++-
8430 drivers/mtd/ubi/ubi.h | 16 +--
8431 drivers/mtd/ubi/vtbl.c | 10 +-
8432 drivers/mtd/ubi/wl.c | 48 +++++---
8433 include/linux/mtd/partitions.h | 3 +-
8434 include/mtd/ubi-user.h | 16 ++-
8435 17 files changed, 412 insertions(+), 325 deletions(-)
8436 Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
8437 $ git merge dlm/next
8439 Merging scsi/for-next (3da4202 Merge branch 'misc' into for-next)
8440 $ git merge scsi/for-next
8441 Resolved 'drivers/scsi/ipr.c' using previous resolution.
8442 Resolved 'drivers/scsi/qla2xxx/qla_nx.c' using previous resolution.
8443 Auto-merging include/linux/pci_ids.h
8444 Auto-merging include/linux/libata.h
8445 Auto-merging drivers/scsi/qla4xxx/ql4_os.c
8446 Auto-merging drivers/scsi/qla4xxx/ql4_nx.c
8447 Auto-merging drivers/scsi/qla2xxx/qla_os.c
8448 Auto-merging drivers/scsi/qla2xxx/qla_nx.c
8449 CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_nx.c
8450 Auto-merging drivers/scsi/mpt2sas/mpt2sas_scsih.c
8451 Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c
8452 Auto-merging drivers/scsi/lpfc/lpfc_sli.c
8453 Auto-merging drivers/scsi/lpfc/lpfc_init.c
8454 Auto-merging drivers/scsi/isci/init.c
8455 Auto-merging drivers/scsi/isci/host.c
8456 Auto-merging drivers/scsi/ipr.c
8457 CONFLICT (content): Merge conflict in drivers/scsi/ipr.c
8458 Removing drivers/scsi/ibmvscsi/rpa_vscsi.c
8459 Auto-merging drivers/scsi/hpsa.c
8460 Auto-merging drivers/scsi/bfa/bfa_ioc.h
8461 Auto-merging drivers/scsi/bfa/bfa_ioc.c
8462 Auto-merging drivers/ata/libata-eh.c
8463 Auto-merging drivers/ata/libata-core.c
8464 Auto-merging MAINTAINERS
8465 Auto-merging Documentation/kernel-parameters.txt
8466 Automatic merge failed; fix conflicts and then commit the result.
8468 [master f4c9b0b] Merge remote-tracking branch 'scsi/for-next'
8469 $ git diff -M --stat --summary HEAD^..
8470 Documentation/kernel-parameters.txt | 3 +
8471 Documentation/scsi/ChangeLog.megaraid_sas | 10 +
8472 Documentation/scsi/LICENSE.qla2xxx | 2 +-
8473 Documentation/scsi/LICENSE.qla4xxx | 2 +-
8474 Documentation/scsi/st.txt | 6 +-
8476 drivers/ata/libata-core.c | 69 +-
8477 drivers/ata/libata-eh.c | 2 +
8478 drivers/message/fusion/mptbase.c | 18 +-
8479 drivers/s390/scsi/zfcp_aux.c | 1 +
8480 drivers/s390/scsi/zfcp_ccw.c | 80 +-
8481 drivers/s390/scsi/zfcp_cfdc.c | 2 +-
8482 drivers/s390/scsi/zfcp_dbf.c | 22 +-
8483 drivers/s390/scsi/zfcp_dbf.h | 1 +
8484 drivers/s390/scsi/zfcp_def.h | 2 +
8485 drivers/s390/scsi/zfcp_erp.c | 2 +-
8486 drivers/s390/scsi/zfcp_ext.h | 4 +
8487 drivers/s390/scsi/zfcp_fc.c | 23 +-
8488 drivers/s390/scsi/zfcp_fsf.c | 59 +-
8489 drivers/s390/scsi/zfcp_qdio.c | 16 +-
8490 drivers/s390/scsi/zfcp_sysfs.c | 18 +-
8491 drivers/s390/scsi/zfcp_unit.c | 36 +-
8492 drivers/scsi/be2iscsi/be_cmds.c | 160 ++-
8493 drivers/scsi/be2iscsi/be_cmds.h | 27 +
8494 drivers/scsi/be2iscsi/be_iscsi.c | 355 ++++--
8495 drivers/scsi/be2iscsi/be_main.c | 890 +++++++++------
8496 drivers/scsi/be2iscsi/be_main.h | 40 +-
8497 drivers/scsi/be2iscsi/be_mgmt.c | 314 +++++-
8498 drivers/scsi/be2iscsi/be_mgmt.h | 11 +
8499 drivers/scsi/bfa/bfa_core.c | 21 +-
8500 drivers/scsi/bfa/bfa_cs.h | 4 +-
8501 drivers/scsi/bfa/bfa_defs_fcs.h | 18 +
8502 drivers/scsi/bfa/bfa_fc.h | 10 +
8503 drivers/scsi/bfa/bfa_fcbuild.c | 21 +
8504 drivers/scsi/bfa/bfa_fcbuild.h | 2 +
8505 drivers/scsi/bfa/bfa_fcpim.c | 12 +-
8506 drivers/scsi/bfa/bfa_fcs.c | 182 ++-
8507 drivers/scsi/bfa/bfa_fcs.h | 66 +-
8508 drivers/scsi/bfa/bfa_fcs_fcpim.c | 129 ++-
8509 drivers/scsi/bfa/bfa_fcs_lport.c | 632 ++++++++++-
8510 drivers/scsi/bfa/bfa_fcs_rport.c | 466 ++++++--
8511 drivers/scsi/bfa/bfa_ioc.c | 24 +-
8512 drivers/scsi/bfa/bfa_ioc.h | 2 +
8513 drivers/scsi/bfa/bfa_modules.h | 1 +
8514 drivers/scsi/bfa/bfa_svc.c | 95 +-
8515 drivers/scsi/bfa/bfa_svc.h | 23 +-
8516 drivers/scsi/bfa/bfad.c | 236 +++-
8517 drivers/scsi/bfa/bfad_attr.c | 46 +-
8518 drivers/scsi/bfa/bfad_bsg.c | 39 +-
8519 drivers/scsi/bfa/bfad_bsg.h | 2 +
8520 drivers/scsi/bfa/bfad_drv.h | 5 +-
8521 drivers/scsi/bfa/bfad_im.c | 9 +
8522 drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +-
8523 drivers/scsi/constants.c | 3 +-
8524 drivers/scsi/device_handler/scsi_dh_alua.c | 3 +-
8525 drivers/scsi/device_handler/scsi_dh_rdac.c | 26 +-
8526 drivers/scsi/hpsa.c | 39 +-
8527 drivers/scsi/ibmvscsi/Makefile | 6 +-
8528 drivers/scsi/ibmvscsi/ibmvfc.c | 36 +-
8529 drivers/scsi/ibmvscsi/ibmvfc.h | 4 +-
8530 drivers/scsi/ibmvscsi/ibmvscsi.c | 352 +++++-
8531 drivers/scsi/ibmvscsi/ibmvscsi.h | 22 -
8532 drivers/scsi/ibmvscsi/rpa_vscsi.c | 368 ------
8533 drivers/scsi/ipr.c | 168 ++-
8534 drivers/scsi/ipr.h | 5 +-
8535 drivers/scsi/isci/host.c | 24 +-
8536 drivers/scsi/isci/host.h | 2 +-
8537 drivers/scsi/isci/init.c | 59 +-
8538 drivers/scsi/isci/phy.c | 4 +-
8539 drivers/scsi/isci/probe_roms.c | 1 -
8540 drivers/scsi/isci/remote_node_context.h | 2 +-
8541 drivers/scsi/iscsi_tcp.c | 2 +-
8542 drivers/scsi/libsas/sas_ata.c | 91 +-
8543 drivers/scsi/libsas/sas_discover.c | 69 +-
8544 drivers/scsi/libsas/sas_dump.c | 1 +
8545 drivers/scsi/libsas/sas_event.c | 4 +-
8546 drivers/scsi/libsas/sas_init.c | 90 +-
8547 drivers/scsi/libsas/sas_internal.h | 1 +
8548 drivers/scsi/libsas/sas_phy.c | 21 +
8549 drivers/scsi/libsas/sas_port.c | 52 +-
8550 drivers/scsi/lpfc/lpfc.h | 6 +-
8551 drivers/scsi/lpfc/lpfc_attr.c | 76 +-
8552 drivers/scsi/lpfc/lpfc_bsg.c | 8 +-
8553 drivers/scsi/lpfc/lpfc_crtn.h | 6 +-
8554 drivers/scsi/lpfc/lpfc_ct.c | 16 +-
8555 drivers/scsi/lpfc/lpfc_debugfs.c | 494 ++++----
8556 drivers/scsi/lpfc/lpfc_debugfs.h | 72 +-
8557 drivers/scsi/lpfc/lpfc_disc.h | 10 +-
8558 drivers/scsi/lpfc/lpfc_els.c | 186 +++-
8559 drivers/scsi/lpfc/lpfc_hbadisc.c | 98 +-
8560 drivers/scsi/lpfc/lpfc_hw.h | 18 +-
8561 drivers/scsi/lpfc/lpfc_hw4.h | 42 +-
8562 drivers/scsi/lpfc/lpfc_init.c | 839 +++++++-------
8563 drivers/scsi/lpfc/lpfc_mbox.c | 38 +-
8564 drivers/scsi/lpfc/lpfc_mem.c | 6 +-
8565 drivers/scsi/lpfc/lpfc_nportdisc.c | 127 +++
8566 drivers/scsi/lpfc/lpfc_scsi.c | 144 ++-
8567 drivers/scsi/lpfc/lpfc_sli.c | 621 ++++++-----
8568 drivers/scsi/lpfc/lpfc_sli.h | 42 +-
8569 drivers/scsi/lpfc/lpfc_sli4.h | 63 +-
8570 drivers/scsi/lpfc/lpfc_version.h | 7 +-
8571 drivers/scsi/megaraid/megaraid_sas.h | 8 +-
8572 drivers/scsi/megaraid/megaraid_sas_base.c | 39 +-
8573 drivers/scsi/megaraid/megaraid_sas_fusion.c | 12 +-
8574 drivers/scsi/mpt2sas/Kconfig | 2 +-
8575 drivers/scsi/mpt2sas/mpi/mpi2.h | 14 +-
8576 drivers/scsi/mpt2sas/mpi/mpi2_init.h | 9 +-
8577 drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 8 +-
8578 drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 7 +-
8579 drivers/scsi/mpt2sas/mpt2sas_base.c | 6 +-
8580 drivers/scsi/mpt2sas/mpt2sas_base.h | 14 +-
8581 drivers/scsi/mpt2sas/mpt2sas_config.c | 38 +-
8582 drivers/scsi/mpt2sas/mpt2sas_ctl.c | 80 +-
8583 drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +-
8584 drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +-
8585 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 59 +-
8586 drivers/scsi/mpt2sas/mpt2sas_transport.c | 2 +-
8587 drivers/scsi/mvsas/mv_sas.c | 2 +-
8588 drivers/scsi/qla2xxx/qla_attr.c | 147 ++-
8589 drivers/scsi/qla2xxx/qla_bsg.c | 376 ++++++-
8590 drivers/scsi/qla2xxx/qla_bsg.h | 30 +-
8591 drivers/scsi/qla2xxx/qla_dbg.c | 29 +-
8592 drivers/scsi/qla2xxx/qla_dbg.h | 2 +-
8593 drivers/scsi/qla2xxx/qla_def.h | 166 ++-
8594 drivers/scsi/qla2xxx/qla_dfs.c | 2 +-
8595 drivers/scsi/qla2xxx/qla_fw.h | 49 +-
8596 drivers/scsi/qla2xxx/qla_gbl.h | 39 +-
8597 drivers/scsi/qla2xxx/qla_gs.c | 4 +-
8598 drivers/scsi/qla2xxx/qla_init.c | 565 ++++++++--
8599 drivers/scsi/qla2xxx/qla_inline.h | 28 +-
8600 drivers/scsi/qla2xxx/qla_iocb.c | 261 ++++-
8601 drivers/scsi/qla2xxx/qla_isr.c | 437 +++++++-
8602 drivers/scsi/qla2xxx/qla_mbx.c | 224 +++-
8603 drivers/scsi/qla2xxx/qla_mid.c | 5 +-
8604 drivers/scsi/qla2xxx/qla_nx.c | 151 +--
8605 drivers/scsi/qla2xxx/qla_nx.h | 17 +-
8606 drivers/scsi/qla2xxx/qla_os.c | 770 ++++++++++++-
8607 drivers/scsi/qla2xxx/qla_settings.h | 2 +-
8608 drivers/scsi/qla2xxx/qla_sup.c | 67 +-
8609 drivers/scsi/qla2xxx/qla_version.h | 6 +-
8610 drivers/scsi/qla4xxx/Kconfig | 4 +-
8611 drivers/scsi/qla4xxx/Makefile | 2 +-
8612 drivers/scsi/qla4xxx/ql4_83xx.c | 1611 +++++++++++++++++++++++++++
8613 drivers/scsi/qla4xxx/ql4_83xx.h | 283 +++++
8614 drivers/scsi/qla4xxx/ql4_attr.c | 26 +-
8615 drivers/scsi/qla4xxx/ql4_dbg.c | 32 +-
8616 drivers/scsi/qla4xxx/ql4_dbg.h | 2 +-
8617 drivers/scsi/qla4xxx/ql4_def.h | 65 +-
8618 drivers/scsi/qla4xxx/ql4_fw.h | 59 +-
8619 drivers/scsi/qla4xxx/ql4_glbl.h | 94 +-
8620 drivers/scsi/qla4xxx/ql4_init.c | 23 +-
8621 drivers/scsi/qla4xxx/ql4_inline.h | 2 +-
8622 drivers/scsi/qla4xxx/ql4_iocb.c | 28 +-
8623 drivers/scsi/qla4xxx/ql4_isr.c | 406 +++++--
8624 drivers/scsi/qla4xxx/ql4_mbx.c | 186 ++--
8625 drivers/scsi/qla4xxx/ql4_nvram.c | 2 +-
8626 drivers/scsi/qla4xxx/ql4_nvram.h | 2 +-
8627 drivers/scsi/qla4xxx/ql4_nx.c | 1432 ++++++++++++++++--------
8628 drivers/scsi/qla4xxx/ql4_nx.h | 198 ++--
8629 drivers/scsi/qla4xxx/ql4_os.c | 494 +++++---
8630 drivers/scsi/qla4xxx/ql4_version.h | 4 +-
8631 drivers/scsi/scsi_debug.c | 30 +-
8632 drivers/scsi/scsi_devinfo.c | 1 +
8633 drivers/scsi/scsi_lib.c | 3 +-
8634 drivers/scsi/scsi_scan.c | 3 +
8635 drivers/scsi/scsi_sysfs.c | 30 +-
8636 drivers/scsi/sd.c | 80 +-
8637 drivers/scsi/sd.h | 2 +-
8638 drivers/scsi/sd_dif.c | 25 +-
8639 drivers/scsi/st.c | 416 +++----
8640 drivers/scsi/st.h | 5 +-
8641 include/linux/libata.h | 15 +-
8642 include/linux/pci_ids.h | 1 +
8643 include/scsi/libsas.h | 20 +-
8644 include/scsi/sas_ata.h | 10 +
8645 include/scsi/scsi_bsg_fc.h | 2 -
8646 include/scsi/scsi_device.h | 4 +
8647 include/scsi/scsi_devinfo.h | 1 +
8648 include/scsi/scsi_host.h | 6 +
8649 179 files changed, 13464 insertions(+), 4430 deletions(-)
8650 delete mode 100644 drivers/scsi/ibmvscsi/rpa_vscsi.c
8651 create mode 100644 drivers/scsi/qla4xxx/ql4_83xx.c
8652 create mode 100644 drivers/scsi/qla4xxx/ql4_83xx.h
8653 Merging target-updates/for-next (a0c0e03 iscsi-target: Change iscsi_target_seq_pdu_list.c to honor MaxXmitDataSegmentLength)
8654 $ git merge target-updates/for-next
8655 Auto-merging drivers/usb/gadget/tcm_usb_gadget.c
8656 Auto-merging drivers/target/iscsi/iscsi_target_parameters.c
8657 Merge made by the 'recursive' strategy.
8658 Documentation/target/tcm_mod_builder.py | 16 --
8659 drivers/infiniband/ulp/srpt/ib_srpt.c | 12 --
8660 drivers/scsi/qla2xxx/qla_target.c | 2 +-
8661 drivers/scsi/qla2xxx/tcm_qla2xxx.c | 15 --
8662 drivers/target/iscsi/iscsi_target.c | 38 +++--
8663 drivers/target/iscsi/iscsi_target_configfs.c | 29 +---
8664 drivers/target/iscsi/iscsi_target_core.h | 2 +
8665 drivers/target/iscsi/iscsi_target_erl2.c | 1 +
8666 drivers/target/iscsi/iscsi_target_nego.c | 5 +-
8667 drivers/target/iscsi/iscsi_target_parameters.c | 71 +++++++--
8668 drivers/target/iscsi/iscsi_target_parameters.h | 7 +-
8669 drivers/target/iscsi/iscsi_target_seq_pdu_list.c | 61 +++----
8670 drivers/target/iscsi/iscsi_target_tmr.c | 9 +-
8671 drivers/target/loopback/tcm_loop.c | 12 --
8672 drivers/target/sbp/sbp_target.c | 27 +---
8673 drivers/target/target_core_alua.c | 2 +-
8674 drivers/target/target_core_configfs.c | 18 +--
8675 drivers/target/target_core_device.c | 16 +-
8676 drivers/target/target_core_fabric_configfs.c | 1 -
8677 drivers/target/target_core_fabric_lib.c | 8 +-
8678 drivers/target/target_core_file.c | 38 ++++-
8679 drivers/target/target_core_file.h | 1 +
8680 drivers/target/target_core_iblock.c | 17 +-
8681 drivers/target/target_core_pr.c | 14 +-
8682 drivers/target/target_core_pscsi.c | 2 +-
8683 drivers/target/target_core_sbc.c | 23 ++-
8684 drivers/target/target_core_spc.c | 48 ++----
8685 drivers/target/target_core_stat.c | 1 -
8686 drivers/target/target_core_tpg.c | 2 +-
8687 drivers/target/target_core_transport.c | 184 +++++++++-------------
8688 drivers/target/tcm_fc/tfc_cmd.c | 1 -
8689 drivers/target/tcm_fc/tfc_conf.c | 12 --
8690 drivers/target/tcm_fc/tfc_io.c | 4 +-
8691 drivers/target/tcm_fc/tfc_sess.c | 1 -
8692 drivers/usb/gadget/tcm_usb_gadget.c | 12 --
8693 drivers/vhost/tcm_vhost.c | 13 --
8694 include/target/target_core_backend.h | 3 -
8695 include/target/target_core_fabric.h | 2 -
8696 38 files changed, 324 insertions(+), 406 deletions(-)
8697 Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2)
8698 $ git merge target-merge/for-next-merge
8700 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
8701 $ git merge ibft/linux-next
8703 Merging isci/all (6734092 isci: add a couple __iomem annotations)
8704 $ git merge isci/all
8706 Merging slave-dma/next (fed2574 dw_dmac: introduce software emulation of LLP transfers)
8707 $ git merge slave-dma/next
8708 Auto-merging drivers/dma/tegra20-apb-dma.c
8709 Auto-merging drivers/dma/pl330.c
8710 Merge made by the 'recursive' strategy.
8711 arch/arm/mach-exynos/dma.c | 2 +
8712 arch/arm/mach-spear13xx/spear13xx.c | 3 +
8713 arch/avr32/mach-at32ap/at32ap700x.c | 3 +
8714 drivers/dma/Kconfig | 17 +
8715 drivers/dma/Makefile | 2 +
8716 drivers/dma/amba-pl08x.c | 2 +
8717 drivers/dma/dw_dmac.c | 257 +++++++---
8718 drivers/dma/dw_dmac_regs.h | 48 +-
8719 drivers/dma/edma.c | 671 +++++++++++++++++++++++++
8720 drivers/dma/ioat/dma_v2.c | 3 +-
8721 drivers/dma/ioat/pci.c | 22 +
8722 drivers/dma/mmp_pdma.c | 875 +++++++++++++++++++++++++++++++++
8723 drivers/dma/mmp_tdma.c | 51 +-
8724 drivers/dma/mxs-dma.c | 14 +-
8725 drivers/dma/pl330.c | 76 +--
8726 drivers/dma/sirf-dma.c | 23 +-
8727 drivers/dma/ste_dma40.c | 14 +-
8728 drivers/dma/tegra20-apb-dma.c | 6 +-
8729 drivers/mmc/host/davinci_mmc.c | 271 +++-------
8730 drivers/spi/Kconfig | 1 +
8731 drivers/spi/spi-davinci.c | 292 +++++------
8732 include/linux/dw_dmac.h | 7 +
8733 include/linux/edma.h | 29 ++
8734 include/linux/platform_data/mmp_dma.h | 19 +
8735 24 files changed, 2162 insertions(+), 546 deletions(-)
8736 create mode 100644 drivers/dma/edma.c
8737 create mode 100644 drivers/dma/mmp_pdma.c
8738 create mode 100644 include/linux/edma.h
8739 create mode 100644 include/linux/platform_data/mmp_dma.h
8740 $ git am -3 ../patches/DMA__PL330__Fix_build_error_on_linux-next-20120924.patch
8741 Applying: DMA: PL330: Fix build error (on linux-next-20120924)
8743 Unstaged changes after reset:
8744 M drivers/dma/pl330.c
8746 $ git commit -v -a --amend
8747 [master 916720d] Merge remote-tracking branch 'slave-dma/next'
8748 Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
8749 $ git merge dmaengine/next
8751 Merging net-next/master (d342894 vxlan: virtual extensible lan)
8752 $ git merge net-next/master
8753 Resolved 'drivers/net/wireless/ath/ath9k/pci.c' using previous resolution.
8754 Resolved 'net/socket.c' using previous resolution.
8755 Auto-merging net/socket.c
8756 CONFLICT (content): Merge conflict in net/socket.c
8757 Auto-merging net/sctp/socket.c
8758 Auto-merging net/nfc/hci/llc_shdlc.c
8759 Removing net/netfilter/xt_NOTRACK.c
8760 Auto-merging net/netfilter/nf_nat_tftp.c
8761 Auto-merging net/netfilter/nf_nat_sip.c
8762 Auto-merging net/netfilter/nf_nat_proto_unknown.c
8763 Auto-merging net/netfilter/nf_nat_proto_udplite.c
8764 Auto-merging net/netfilter/nf_nat_proto_udp.c
8765 Auto-merging net/netfilter/nf_nat_proto_tcp.c
8766 Auto-merging net/netfilter/nf_nat_proto_sctp.c
8767 Auto-merging net/netfilter/nf_nat_proto_dccp.c
8768 Auto-merging net/netfilter/nf_nat_proto_common.c
8769 Auto-merging net/netfilter/nf_nat_irc.c
8770 Auto-merging net/netfilter/nf_nat_helper.c
8771 Auto-merging net/netfilter/nf_nat_ftp.c
8772 Auto-merging net/netfilter/nf_nat_core.c
8773 Auto-merging net/netfilter/nf_nat_amanda.c
8774 Removing net/ipv4/netfilter/nf_nat_rule.c
8775 Auto-merging net/ipv4/netfilter/iptable_nat.c
8776 Removing net/ipv4/netfilter/ipt_REDIRECT.c
8777 Removing net/ipv4/netfilter/ipt_NETMAP.c
8778 Auto-merging net/core/scm.c
8779 Auto-merging net/core/netprio_cgroup.c
8780 Auto-merging net/core/dev.c
8781 Auto-merging kernel/taskstats.c
8782 Auto-merging kernel/fork.c
8783 Auto-merging kernel/exit.c
8784 Auto-merging init/Kconfig
8785 Removing include/net/nfc/shdlc.h
8786 Removing include/net/netfilter/nf_nat_rule.h
8787 Removing include/net/netfilter/nf_nat_protocol.h
8788 Auto-merging include/linux/sched.h
8789 Auto-merging include/linux/netdevice.h
8790 Auto-merging include/linux/Kbuild
8791 Auto-merging fs/namei.c
8792 Removing firmware/cxgb3/t3fw-7.10.0.bin.ihex
8793 Auto-merging firmware/Makefile
8794 Auto-merging drivers/s390/net/qeth_core_main.c
8795 Removing drivers/nfc/pn544.c
8796 Auto-merging drivers/net/wireless/rtlwifi/rtl8192de/fw.c
8797 Auto-merging drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
8798 Auto-merging drivers/net/wireless/rtlwifi/pci.c
8799 Auto-merging drivers/net/wireless/iwlwifi/pcie/trans.c
8800 Auto-merging drivers/net/wireless/iwlegacy/common.h
8801 Auto-merging drivers/net/wireless/ath/ath9k/pci.c
8802 CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/pci.c
8803 Auto-merging drivers/net/ieee802154/fakehard.c
8804 Auto-merging drivers/net/ieee802154/at86rf230.c
8805 Auto-merging drivers/net/ieee802154/Makefile
8806 Auto-merging drivers/net/ieee802154/Kconfig
8807 Auto-merging drivers/net/ethernet/realtek/r8169.c
8808 Removing drivers/net/ethernet/mipsnet.c
8809 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
8810 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
8811 Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
8812 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
8813 Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
8814 Removing drivers/net/ethernet/freescale/fsl_pq_mdio.h
8815 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
8816 Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
8817 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
8818 Auto-merging drivers/net/ethernet/broadcom/tg3.c
8819 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
8820 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
8821 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c
8822 Auto-merging drivers/infiniband/hw/cxgb4/qp.c
8823 Auto-merging arch/powerpc/configs/ppc64_defconfig
8824 Auto-merging MAINTAINERS
8825 CONFLICT (modify/delete): Documentation/feature-removal-schedule.txt deleted in HEAD and modified in net-next/master. Version net-next/master of Documentation/feature-removal-schedule.txt left in tree.
8826 Automatic merge failed; fix conflicts and then commit the result.
8827 $ git rm -f Documentation/feature-removal-schedule.txt
8828 Documentation/feature-removal-schedule.txt: needs merge
8829 rm 'Documentation/feature-removal-schedule.txt'
8831 [master a29e921] Merge remote-tracking branch 'net-next/master'
8832 $ git diff -M --stat --summary HEAD^..
8833 Documentation/ABI/testing/sysfs-ptp | 6 +-
8834 .../devicetree/bindings/net/can/c_can.txt | 49 +
8835 Documentation/devicetree/bindings/net/cpsw.txt | 109 +
8836 .../devicetree/bindings/net/davinci-mdio.txt | 33 +
8837 .../devicetree/bindings/net/mdio-mux-mmioreg.txt | 75 +
8838 Documentation/filesystems/nfs/nfsroot.txt | 10 +-
8839 Documentation/infiniband/ipoib.txt | 3 +
8840 Documentation/networking/batman-adv.txt | 7 +-
8841 Documentation/networking/bonding.txt | 30 +-
8842 Documentation/networking/ip-sysctl.txt | 37 +-
8843 Documentation/networking/stmmac.txt | 5 -
8844 Documentation/networking/vxlan.txt | 47 +
8846 arch/m68k/configs/amiga_defconfig | 1 -
8847 arch/m68k/configs/apollo_defconfig | 1 -
8848 arch/m68k/configs/atari_defconfig | 1 -
8849 arch/m68k/configs/bvme6000_defconfig | 1 -
8850 arch/m68k/configs/hp300_defconfig | 1 -
8851 arch/m68k/configs/mac_defconfig | 1 -
8852 arch/m68k/configs/multi_defconfig | 1 -
8853 arch/m68k/configs/mvme147_defconfig | 1 -
8854 arch/m68k/configs/mvme16x_defconfig | 1 -
8855 arch/m68k/configs/q40_defconfig | 1 -
8856 arch/m68k/configs/sun3_defconfig | 1 -
8857 arch/m68k/configs/sun3x_defconfig | 1 -
8858 arch/mips/configs/ar7_defconfig | 1 -
8859 arch/mips/configs/bcm47xx_defconfig | 1 -
8860 arch/mips/configs/ip22_defconfig | 1 -
8861 arch/mips/configs/jazz_defconfig | 1 -
8862 arch/mips/configs/malta_defconfig | 1 -
8863 arch/mips/configs/markeins_defconfig | 1 -
8864 arch/mips/configs/nlm_xlp_defconfig | 1 -
8865 arch/mips/configs/nlm_xlr_defconfig | 1 -
8866 arch/mips/configs/rm200_defconfig | 1 -
8867 arch/powerpc/configs/pmac32_defconfig | 1 -
8868 arch/powerpc/configs/ppc64_defconfig | 1 -
8869 arch/powerpc/configs/ppc64e_defconfig | 1 -
8870 arch/powerpc/configs/ppc6xx_defconfig | 1 -
8871 arch/sparc/net/bpf_jit_comp.c | 4 +
8872 arch/tile/configs/tilegx_defconfig | 1 -
8873 arch/tile/configs/tilepro_defconfig | 1 -
8874 arch/x86/net/bpf_jit_comp.c | 34 +
8875 crypto/crypto_user.c | 7 +-
8876 drivers/Makefile | 1 -
8877 drivers/bcma/Kconfig | 4 +-
8878 drivers/bcma/bcma_private.h | 2 +
8879 drivers/bcma/core.c | 2 +-
8880 drivers/bcma/driver_chipcommon_nflash.c | 28 +-
8881 drivers/bcma/driver_chipcommon_pmu.c | 9 +-
8882 drivers/bcma/driver_chipcommon_sflash.c | 123 +-
8883 drivers/bcma/driver_pci.c | 6 +-
8884 drivers/bcma/driver_pci_host.c | 8 +-
8885 drivers/bcma/host_pci.c | 12 +-
8886 drivers/bcma/host_soc.c | 2 +-
8887 drivers/bcma/main.c | 27 +
8888 drivers/bcma/sprom.c | 2 +
8889 drivers/bluetooth/bcm203x.c | 8 +-
8890 drivers/bluetooth/bfusb.c | 12 +-
8891 drivers/bluetooth/bluecard_cs.c | 7 +-
8892 drivers/bluetooth/bpa10x.c | 8 +-
8893 drivers/bluetooth/bt3c_cs.c | 5 +-
8894 drivers/bluetooth/btmrvl_sdio.c | 18 +-
8895 drivers/bluetooth/btsdio.c | 8 +-
8896 drivers/bluetooth/btuart_cs.c | 7 +-
8897 drivers/bluetooth/btusb.c | 16 +-
8898 drivers/bluetooth/btwilink.c | 24 +-
8899 drivers/bluetooth/dtl1_cs.c | 3 +-
8900 drivers/bluetooth/hci_ldisc.c | 2 +-
8901 drivers/bluetooth/hci_ll.c | 2 +-
8902 drivers/bluetooth/hci_vhci.c | 2 +-
8903 drivers/connector/connector.c | 3 +-
8904 drivers/infiniband/core/netlink.c | 2 +-
8905 drivers/infiniband/hw/cxgb4/qp.c | 2 +-
8906 drivers/infiniband/ulp/ipoib/Makefile | 3 +-
8907 drivers/infiniband/ulp/ipoib/ipoib.h | 16 +
8908 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 34 +-
8909 drivers/infiniband/ulp/ipoib/ipoib_main.c | 41 +-
8910 drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 172 +
8911 drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 124 +-
8912 drivers/isdn/gigaset/common.c | 1 -
8913 drivers/net/Kconfig | 17 +-
8914 drivers/net/Makefile | 2 +
8915 drivers/net/bonding/bond_main.c | 140 +-
8916 drivers/net/can/c_can/c_can.c | 130 +-
8917 drivers/net/can/c_can/c_can.h | 14 +-
8918 drivers/net/can/c_can/c_can_pci.c | 6 +-
8919 drivers/net/can/c_can/c_can_platform.c | 123 +-
8920 drivers/net/can/flexcan.c | 29 +-
8921 drivers/net/can/mscan/mpc5xxx_can.c | 4 +-
8922 drivers/net/can/sja1000/sja1000.c | 31 +-
8923 drivers/net/can/usb/peak_usb/pcan_usb_core.c | 8 +-
8924 drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 +-
8925 drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 8 +-
8926 drivers/net/ethernet/Kconfig | 9 -
8927 drivers/net/ethernet/Makefile | 1 -
8928 drivers/net/ethernet/broadcom/Kconfig | 1 +
8929 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 4 +-
8930 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 24 +-
8931 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 16 +-
8932 drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 12 +-
8933 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 58 +-
8934 .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 3 -
8935 drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 109 +-
8936 drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +-
8937 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 1701 +++++-----
8938 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 7 +-
8939 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 34 +-
8940 drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 14 +-
8941 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 5 +-
8942 drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 35 +-
8943 drivers/net/ethernet/broadcom/cnic.c | 116 +-
8944 drivers/net/ethernet/broadcom/cnic.h | 5 +
8945 drivers/net/ethernet/broadcom/cnic_defs.h | 2 +-
8946 drivers/net/ethernet/broadcom/cnic_if.h | 4 +-
8947 drivers/net/ethernet/broadcom/tg3.c | 534 ++-
8948 drivers/net/ethernet/broadcom/tg3.h | 9 +-
8949 drivers/net/ethernet/brocade/bna/bnad.c | 1 +
8950 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 51 +-
8951 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 954 +++++-
8952 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 2 +
8953 drivers/net/ethernet/chelsio/cxgb4/sge.c | 341 +-
8954 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 734 ++++-
8955 drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 80 +
8956 drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 185 +-
8957 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 97 +-
8958 drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 5 +-
8959 drivers/net/ethernet/emulex/benet/be.h | 2 +-
8960 drivers/net/ethernet/emulex/benet/be_cmds.c | 55 +-
8961 drivers/net/ethernet/emulex/benet/be_cmds.h | 6 +-
8962 drivers/net/ethernet/emulex/benet/be_ethtool.c | 57 +-
8963 drivers/net/ethernet/emulex/benet/be_main.c | 96 +-
8964 drivers/net/ethernet/freescale/Kconfig | 7 +
8965 drivers/net/ethernet/freescale/Makefile | 1 +
8966 drivers/net/ethernet/freescale/fsl_pq_mdio.c | 549 ++--
8967 drivers/net/ethernet/freescale/fsl_pq_mdio.h | 52 -
8968 drivers/net/ethernet/freescale/gianfar.c | 12 +-
8969 drivers/net/ethernet/freescale/gianfar.h | 11 +-
8970 drivers/net/ethernet/freescale/gianfar_ptp.c | 2 +-
8971 drivers/net/ethernet/freescale/ucc_geth.c | 1 -
8972 drivers/net/ethernet/freescale/xgmac_mdio.c | 274 ++
8973 drivers/net/ethernet/i825xx/Kconfig | 2 +-
8974 drivers/net/ethernet/i825xx/znet.c | 4 +-
8975 drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 39 +
8976 drivers/net/ethernet/intel/e1000/e1000_main.c | 14 +
8977 drivers/net/ethernet/intel/e1000e/82571.c | 4 +-
8978 drivers/net/ethernet/intel/e1000e/ethtool.c | 44 +-
8979 drivers/net/ethernet/intel/e1000e/netdev.c | 19 +-
8980 drivers/net/ethernet/intel/e1000e/phy.c | 31 +-
8981 drivers/net/ethernet/intel/igb/e1000_82575.c | 17 +-
8982 drivers/net/ethernet/intel/igb/e1000_defines.h | 11 +-
8983 drivers/net/ethernet/intel/igb/e1000_phy.c | 29 +-
8984 drivers/net/ethernet/intel/igb/e1000_phy.h | 5 +-
8985 drivers/net/ethernet/intel/igb/e1000_regs.h | 3 +
8986 drivers/net/ethernet/intel/igb/igb.h | 41 +-
8987 drivers/net/ethernet/intel/igb/igb_ethtool.c | 198 +-
8988 drivers/net/ethernet/intel/igb/igb_main.c | 711 ++--
8989 drivers/net/ethernet/intel/igb/igb_ptp.c | 677 +++-
8990 drivers/net/ethernet/intel/ixgbe/Makefile | 2 +-
8991 drivers/net/ethernet/intel/ixgbe/ixgbe.h | 35 +-
8992 drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 300 ++
8993 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 573 ++--
8994 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 3 +-
8995 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 105 +-
8996 drivers/net/ethernet/intel/ixgbevf/defines.h | 1 +
8997 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 9 +-
8998 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 272 +-
8999 drivers/net/ethernet/intel/ixgbevf/mbx.c | 15 +-
9000 drivers/net/ethernet/intel/ixgbevf/mbx.h | 21 +-
9001 drivers/net/ethernet/intel/ixgbevf/vf.c | 122 +-
9002 drivers/net/ethernet/intel/ixgbevf/vf.h | 4 +
9003 drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 -
9004 drivers/net/ethernet/mipsnet.c | 345 --
9005 drivers/net/ethernet/nvidia/forcedeth.c | 17 +-
9006 drivers/net/ethernet/realtek/r8169.c | 4 +-
9007 drivers/net/ethernet/sfc/Kconfig | 7 +
9008 drivers/net/ethernet/sfc/Makefile | 1 +
9009 drivers/net/ethernet/sfc/efx.c | 250 +-
9010 drivers/net/ethernet/sfc/efx.h | 1 +
9011 drivers/net/ethernet/sfc/ethtool.c | 5 +-
9012 drivers/net/ethernet/sfc/falcon_boards.c | 2 +-
9013 drivers/net/ethernet/sfc/mcdi.c | 49 +-
9014 drivers/net/ethernet/sfc/mcdi.h | 6 +
9015 drivers/net/ethernet/sfc/mcdi_pcol.h | 29 +-
9016 drivers/net/ethernet/sfc/mtd.c | 7 +-
9017 drivers/net/ethernet/sfc/net_driver.h | 78 +-
9018 drivers/net/ethernet/sfc/nic.c | 6 +-
9019 drivers/net/ethernet/sfc/nic.h | 36 +
9020 drivers/net/ethernet/sfc/ptp.c | 1484 +++++++++
9021 drivers/net/ethernet/sfc/rx.c | 20 +-
9022 drivers/net/ethernet/sfc/siena.c | 1 +
9023 drivers/net/ethernet/sfc/siena_sriov.c | 7 +
9024 drivers/net/ethernet/sfc/tx.c | 627 ++--
9025 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 11 +-
9026 drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 -
9027 .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 39 +-
9028 drivers/net/ethernet/sun/sunbmac.c | 1 -
9029 drivers/net/ethernet/ti/Kconfig | 4 +-
9030 drivers/net/ethernet/ti/cpsw.c | 179 +-
9031 drivers/net/ethernet/ti/davinci_mdio.c | 41 +-
9032 drivers/net/ethernet/tundra/tsi108_eth.c | 1 -
9033 drivers/net/ethernet/wiznet/w5100.c | 3 +-
9034 drivers/net/ethernet/wiznet/w5300.c | 3 +-
9035 drivers/net/hyperv/netvsc_drv.c | 2 +-
9036 drivers/net/hyperv/rndis_filter.c | 8 +-
9037 drivers/{ => net}/ieee802154/Kconfig | 11 +
9038 drivers/{ => net}/ieee802154/Makefile | 1 +
9039 drivers/{ => net}/ieee802154/at86rf230.c | 12 +-
9040 drivers/{ => net}/ieee802154/fakehard.c | 1 -
9041 drivers/{ => net}/ieee802154/fakelb.c | 0
9042 drivers/net/ieee802154/mrf24j40.c | 767 +++++
9043 drivers/net/loopback.c | 3 +-
9044 drivers/net/macvlan.c | 6 +-
9045 drivers/net/phy/Kconfig | 13 +
9046 drivers/net/phy/Makefile | 1 +
9047 drivers/net/phy/dp83640.c | 2 +-
9048 drivers/net/phy/lxt.c | 127 +
9049 drivers/net/phy/mdio-gpio.c | 132 +-
9050 drivers/net/phy/mdio-mux-mmioreg.c | 171 +
9051 drivers/net/phy/phy.c | 74 +-
9052 drivers/net/ppp/ppp_generic.c | 58 +-
9053 drivers/net/team/Kconfig | 4 +-
9054 drivers/net/team/team.c | 342 +-
9055 drivers/net/team/team_mode_broadcast.c | 8 +-
9056 drivers/net/team/team_mode_roundrobin.c | 8 +-
9057 drivers/net/tun.c | 46 +-
9058 drivers/net/usb/asix_devices.c | 40 +-
9059 drivers/net/usb/catc.c | 55 +-
9060 drivers/net/usb/cx82310_eth.c | 11 +-
9061 drivers/net/usb/gl620a.c | 10 +-
9062 drivers/net/usb/kaweth.c | 134 +-
9063 drivers/net/usb/net1080.c | 51 +-
9064 drivers/net/usb/qmi_wwan.c | 47 +-
9065 drivers/net/usb/rtl8150.c | 6 +-
9066 drivers/net/usb/sierra_net.c | 25 +-
9067 drivers/net/usb/smsc75xx.c | 240 +-
9068 drivers/net/usb/smsc95xx.c | 560 ++--
9069 drivers/net/usb/smsc95xx.h | 12 +-
9070 drivers/net/veth.c | 3 +
9071 drivers/net/virtio_net.c | 2 +-
9072 drivers/net/vxlan.c | 1217 +++++++
9073 drivers/net/wimax/i2400m/driver.c | 3 +-
9074 drivers/net/wireless/adm8211.c | 4 +-
9075 drivers/net/wireless/airo.c | 55 +-
9076 drivers/net/wireless/at76c50x-usb.c | 58 +-
9077 drivers/net/wireless/ath/ath.h | 1 +
9078 drivers/net/wireless/ath/ath5k/ath5k.h | 2 +-
9079 drivers/net/wireless/ath/ath5k/base.c | 6 +-
9080 drivers/net/wireless/ath/ath5k/mac80211-ops.c | 12 +-
9081 drivers/net/wireless/ath/ath5k/phy.c | 45 +-
9082 drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +-
9083 drivers/net/wireless/ath/ath6kl/cfg80211.h | 2 +-
9084 drivers/net/wireless/ath/ath9k/ani.c | 2 +-
9085 drivers/net/wireless/ath/ath9k/antenna.c | 117 +-
9086 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 288 +-
9087 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 3 +-
9088 drivers/net/wireless/ath/ath9k/ar9003_hw.c | 57 +-
9089 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 21 +-
9090 drivers/net/wireless/ath/ath9k/ar9003_mci.c | 43 +-
9091 drivers/net/wireless/ath/ath9k/ar9003_mci.h | 14 +-
9092 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 197 +-
9093 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 95 +-
9094 .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 2 +-
9095 .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 1231 +++++++
9096 drivers/net/wireless/ath/ath9k/ath9k.h | 12 +-
9097 drivers/net/wireless/ath/ath9k/btcoex.c | 65 +-
9098 drivers/net/wireless/ath/ath9k/btcoex.h | 3 +-
9099 drivers/net/wireless/ath/ath9k/debug.c | 58 +-
9100 drivers/net/wireless/ath/ath9k/debug.h | 4 +-
9101 drivers/net/wireless/ath/ath9k/eeprom.h | 3 +-
9102 drivers/net/wireless/ath/ath9k/gpio.c | 72 +-
9103 drivers/net/wireless/ath/ath9k/hif_usb.c | 38 +-
9104 drivers/net/wireless/ath/ath9k/hif_usb.h | 4 +-
9105 drivers/net/wireless/ath/ath9k/htc.h | 1 +
9106 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 2 +-
9107 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 13 +-
9108 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 5 +
9109 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 51 +-
9110 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +-
9111 drivers/net/wireless/ath/ath9k/hw-ops.h | 7 +
9112 drivers/net/wireless/ath/ath9k/hw.c | 57 +-
9113 drivers/net/wireless/ath/ath9k/hw.h | 4 +-
9114 drivers/net/wireless/ath/ath9k/init.c | 15 +-
9115 drivers/net/wireless/ath/ath9k/main.c | 66 +-
9116 drivers/net/wireless/ath/ath9k/mci.c | 94 +-
9117 drivers/net/wireless/ath/ath9k/pci.c | 6 +-
9118 drivers/net/wireless/ath/ath9k/rc.c | 819 ++---
9119 drivers/net/wireless/ath/ath9k/rc.h | 4 -
9120 drivers/net/wireless/ath/ath9k/recv.c | 4 +-
9121 drivers/net/wireless/ath/ath9k/reg.h | 9 +
9122 drivers/net/wireless/ath/ath9k/wow.c | 2 +-
9123 drivers/net/wireless/ath/ath9k/xmit.c | 15 +-
9124 drivers/net/wireless/ath/carl9170/carl9170.h | 5 +-
9125 drivers/net/wireless/ath/carl9170/fw.c | 1 +
9126 drivers/net/wireless/ath/carl9170/mac.c | 5 +-
9127 drivers/net/wireless/ath/carl9170/main.c | 6 +-
9128 drivers/net/wireless/ath/carl9170/rx.c | 16 +-
9129 drivers/net/wireless/ath/carl9170/tx.c | 16 +-
9130 drivers/net/wireless/b43/Makefile | 1 +
9131 drivers/net/wireless/b43/b43.h | 10 +-
9132 drivers/net/wireless/b43/main.c | 54 +-
9133 drivers/net/wireless/b43/phy_common.c | 17 +-
9134 drivers/net/wireless/b43/phy_common.h | 6 +
9135 drivers/net/wireless/b43/phy_n.c | 668 +++-
9136 drivers/net/wireless/b43/phy_n.h | 1 +
9137 drivers/net/wireless/b43/radio_2057.c | 141 +
9138 drivers/net/wireless/b43/radio_2057.h | 430 +++
9139 drivers/net/wireless/b43/tables_nphy.c | 75 +
9140 drivers/net/wireless/b43/tables_nphy.h | 10 +
9141 drivers/net/wireless/b43legacy/main.c | 5 +-
9142 drivers/net/wireless/brcm80211/Kconfig | 8 +
9143 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 39 +-
9144 .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 27 +-
9145 drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 62 +-
9146 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 2 +-
9147 .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 73 +-
9148 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 2 +
9149 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 65 +-
9150 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1047 +++---
9151 .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 17 +
9152 .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 2 +
9153 drivers/net/wireless/brcm80211/brcmfmac/usb.c | 353 +-
9154 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 3425 +++++++++++++++-----
9155 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 296 +-
9156 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 3 -
9157 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 15 +-
9158 drivers/net/wireless/brcm80211/brcmsmac/main.c | 13 +-
9159 .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 +
9160 .../net/wireless/brcm80211/include/brcmu_wifi.h | 5 -
9161 drivers/net/wireless/hostap/hostap_info.c | 4 +-
9162 drivers/net/wireless/hostap/hostap_ioctl.c | 15 +-
9163 drivers/net/wireless/hostap/hostap_main.c | 2 +-
9164 drivers/net/wireless/ipw2x00/ipw2100.c | 11 +-
9165 drivers/net/wireless/ipw2x00/ipw2200.c | 11 +-
9166 drivers/net/wireless/ipw2x00/libipw_wx.c | 2 +-
9167 drivers/net/wireless/iwlegacy/3945-mac.c | 12 +-
9168 drivers/net/wireless/iwlegacy/4965-mac.c | 26 +-
9169 drivers/net/wireless/iwlegacy/4965.h | 8 +-
9170 drivers/net/wireless/iwlegacy/common.c | 19 +-
9171 drivers/net/wireless/iwlegacy/common.h | 2 -
9172 drivers/net/wireless/iwlwifi/dvm/agn.h | 13 +-
9173 drivers/net/wireless/iwlwifi/dvm/commands.h | 3 +-
9174 drivers/net/wireless/iwlwifi/dvm/debugfs.c | 56 +-
9175 drivers/net/wireless/iwlwifi/dvm/dev.h | 1 +
9176 drivers/net/wireless/iwlwifi/dvm/mac80211.c | 8 +-
9177 drivers/net/wireless/iwlwifi/dvm/main.c | 24 +-
9178 drivers/net/wireless/iwlwifi/dvm/rx.c | 11 +
9179 drivers/net/wireless/iwlwifi/dvm/scan.c | 4 +-
9180 drivers/net/wireless/iwlwifi/dvm/sta.c | 9 +-
9181 drivers/net/wireless/iwlwifi/dvm/tx.c | 18 +-
9182 drivers/net/wireless/iwlwifi/dvm/ucode.c | 4 +-
9183 drivers/net/wireless/iwlwifi/iwl-devtrace.h | 34 +-
9184 drivers/net/wireless/iwlwifi/iwl-drv.c | 167 +-
9185 drivers/net/wireless/iwlwifi/iwl-drv.h | 6 +-
9186 drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 2 -
9187 drivers/net/wireless/iwlwifi/iwl-fw.h | 3 +-
9188 drivers/net/wireless/iwlwifi/iwl-op-mode.h | 3 +-
9189 drivers/net/wireless/iwlwifi/iwl-trans.h | 12 +-
9190 drivers/net/wireless/iwlwifi/pcie/drv.c | 19 +-
9191 drivers/net/wireless/iwlwifi/pcie/internal.h | 3 +-
9192 drivers/net/wireless/iwlwifi/pcie/rx.c | 91 +-
9193 drivers/net/wireless/iwlwifi/pcie/trans.c | 112 +-
9194 drivers/net/wireless/iwlwifi/pcie/tx.c | 51 +-
9195 drivers/net/wireless/libertas/cmd.c | 16 +
9196 drivers/net/wireless/libertas/cmd.h | 1 +
9197 drivers/net/wireless/libertas/main.c | 4 +-
9198 drivers/net/wireless/libertas_tf/main.c | 4 +-
9199 drivers/net/wireless/mac80211_hwsim.c | 59 +-
9200 drivers/net/wireless/mwifiex/11n.c | 64 +-
9201 drivers/net/wireless/mwifiex/11n.h | 20 +-
9202 drivers/net/wireless/mwifiex/11n_aggr.c | 14 +-
9203 drivers/net/wireless/mwifiex/11n_rxreorder.c | 115 +-
9204 drivers/net/wireless/mwifiex/11n_rxreorder.h | 10 +
9205 drivers/net/wireless/mwifiex/Makefile | 2 +
9206 drivers/net/wireless/mwifiex/cfg80211.c | 460 ++-
9207 drivers/net/wireless/mwifiex/cmdevt.c | 7 +-
9208 drivers/net/wireless/mwifiex/decl.h | 9 +-
9209 drivers/net/wireless/mwifiex/fw.h | 93 +-
9210 drivers/net/wireless/mwifiex/ie.c | 88 +-
9211 drivers/net/wireless/mwifiex/init.c | 126 +-
9212 drivers/net/wireless/mwifiex/ioctl.h | 14 +-
9213 drivers/net/wireless/mwifiex/main.c | 39 +-
9214 drivers/net/wireless/mwifiex/main.h | 87 +-
9215 drivers/net/wireless/mwifiex/scan.c | 15 +-
9216 drivers/net/wireless/mwifiex/sta_cmd.c | 150 +-
9217 drivers/net/wireless/mwifiex/sta_cmdresp.c | 77 +-
9218 drivers/net/wireless/mwifiex/sta_event.c | 74 +-
9219 drivers/net/wireless/mwifiex/sta_ioctl.c | 124 +-
9220 drivers/net/wireless/mwifiex/sta_rx.c | 44 +-
9221 drivers/net/wireless/mwifiex/sta_tx.c | 12 +-
9222 drivers/net/wireless/mwifiex/txrx.c | 11 +-
9223 drivers/net/wireless/mwifiex/uap_cmd.c | 62 +-
9224 drivers/net/wireless/mwifiex/uap_event.c | 290 ++
9225 drivers/net/wireless/mwifiex/uap_txrx.c | 340 ++
9226 drivers/net/wireless/mwifiex/util.c | 40 +
9227 drivers/net/wireless/mwifiex/wmm.c | 77 +-
9228 drivers/net/wireless/mwl8k.c | 17 +-
9229 drivers/net/wireless/orinoco/wext.c | 7 +-
9230 drivers/net/wireless/p54/eeprom.c | 108 +-
9231 drivers/net/wireless/p54/eeprom.h | 12 +
9232 drivers/net/wireless/p54/lmac.h | 4 +-
9233 drivers/net/wireless/p54/main.c | 15 +-
9234 drivers/net/wireless/p54/p54pci.c | 88 +-
9235 drivers/net/wireless/p54/p54pci.h | 1 +
9236 drivers/net/wireless/p54/txrx.c | 15 +-
9237 drivers/net/wireless/rndis_wlan.c | 3 -
9238 drivers/net/wireless/rt2x00/rt2400pci.c | 5 +-
9239 drivers/net/wireless/rt2x00/rt2400pci.h | 27 +-
9240 drivers/net/wireless/rt2x00/rt2500pci.c | 3 +-
9241 drivers/net/wireless/rt2x00/rt2500pci.h | 18 +-
9242 drivers/net/wireless/rt2x00/rt2500usb.c | 5 +-
9243 drivers/net/wireless/rt2x00/rt2500usb.h | 27 +-
9244 drivers/net/wireless/rt2x00/rt2800.h | 52 +-
9245 drivers/net/wireless/rt2x00/rt2800lib.c | 397 ++-
9246 drivers/net/wireless/rt2x00/rt2800lib.h | 22 +-
9247 drivers/net/wireless/rt2x00/rt2800pci.c | 83 +-
9248 drivers/net/wireless/rt2x00/rt2800usb.c | 62 +-
9249 drivers/net/wireless/rt2x00/rt2x00.h | 20 +-
9250 drivers/net/wireless/rt2x00/rt2x00dev.c | 35 +-
9251 drivers/net/wireless/rt2x00/rt2x00mac.c | 44 +-
9252 drivers/net/wireless/rt2x00/rt2x00queue.c | 20 +-
9253 drivers/net/wireless/rt2x00/rt61pci.c | 13 +-
9254 drivers/net/wireless/rt2x00/rt61pci.h | 28 +-
9255 drivers/net/wireless/rt2x00/rt73usb.c | 5 +-
9256 drivers/net/wireless/rt2x00/rt73usb.h | 34 +-
9257 drivers/net/wireless/rtl818x/rtl8180/dev.c | 6 +-
9258 drivers/net/wireless/rtl818x/rtl8187/dev.c | 6 +-
9259 drivers/net/wireless/rtlwifi/Kconfig | 8 +-
9260 drivers/net/wireless/rtlwifi/base.c | 3 +-
9261 drivers/net/wireless/rtlwifi/core.c | 8 +-
9262 drivers/net/wireless/rtlwifi/pci.c | 16 +-
9263 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 41 +-
9264 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 3 +-
9265 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 4 +-
9266 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 2 +-
9267 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 5 +-
9268 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 1 +
9269 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 7 +-
9270 drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 4 +-
9271 drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 10 +-
9272 drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 3 +-
9273 drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 2 +-
9274 drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 5 +-
9275 drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 1 +
9276 drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 11 +-
9277 drivers/net/wireless/rtlwifi/rtl8192se/trx.h | 1 +
9278 drivers/net/wireless/rtlwifi/usb.c | 17 +-
9279 drivers/net/wireless/rtlwifi/wifi.h | 121 +-
9280 drivers/net/wireless/ti/wl1251/main.c | 4 +-
9281 drivers/net/wireless/ti/wl12xx/main.c | 79 +-
9282 drivers/net/wireless/ti/wl12xx/wl12xx.h | 7 +
9283 drivers/net/wireless/ti/wl18xx/debugfs.c | 2 +-
9284 drivers/net/wireless/ti/wl18xx/main.c | 129 +-
9285 drivers/net/wireless/ti/wl18xx/wl18xx.h | 7 +
9286 drivers/net/wireless/ti/wlcore/cmd.c | 21 +-
9287 drivers/net/wireless/ti/wlcore/cmd.h | 5 -
9288 drivers/net/wireless/ti/wlcore/conf.h | 3 +-
9289 drivers/net/wireless/ti/wlcore/debug.h | 16 +-
9290 drivers/net/wireless/ti/wlcore/debugfs.c | 32 +-
9291 drivers/net/wireless/ti/wlcore/init.c | 12 +-
9292 drivers/net/wireless/ti/wlcore/io.h | 4 +-
9293 drivers/net/wireless/ti/wlcore/main.c | 372 ++-
9294 drivers/net/wireless/ti/wlcore/ps.c | 10 +-
9295 drivers/net/wireless/ti/wlcore/rx.c | 2 +-
9296 drivers/net/wireless/ti/wlcore/scan.c | 20 +-
9297 drivers/net/wireless/ti/wlcore/spi.c | 10 +-
9298 drivers/net/wireless/ti/wlcore/testmode.c | 4 +-
9299 drivers/net/wireless/ti/wlcore/tx.c | 112 +-
9300 drivers/net/wireless/ti/wlcore/tx.h | 4 +-
9301 drivers/net/wireless/ti/wlcore/wlcore.h | 23 +-
9302 drivers/net/wireless/ti/wlcore/wlcore_i.h | 13 +-
9303 drivers/net/wireless/wl3501_cs.c | 3 +-
9304 drivers/net/wireless/zd1211rw/zd_mac.c | 9 +-
9305 drivers/net/xen-netfront.c | 2 +-
9306 drivers/nfc/Kconfig | 14 +-
9307 drivers/nfc/Makefile | 1 -
9308 drivers/nfc/nfcwilink.c | 20 +-
9309 drivers/nfc/pn533.c | 107 +-
9310 drivers/nfc/pn544.c | 893 -----
9311 drivers/nfc/pn544_hci.c | 177 +-
9312 drivers/ptp/ptp_clock.c | 16 +-
9313 drivers/ptp/ptp_ixp46x.c | 2 +-
9314 drivers/ptp/ptp_pch.c | 2 +-
9315 drivers/ptp/ptp_private.h | 1 +
9316 drivers/s390/net/ctcm_fsms.c | 2 +-
9317 drivers/s390/net/ctcm_main.c | 2 +-
9318 drivers/s390/net/lcs.c | 2 +-
9319 drivers/s390/net/qeth_core_main.c | 78 +-
9320 drivers/s390/net/qeth_l3_main.c | 2 +
9321 drivers/scsi/scsi_netlink.c | 557 +---
9322 drivers/scsi/scsi_transport_iscsi.c | 7 +-
9323 drivers/ssb/driver_mipscore.c | 28 +-
9324 drivers/staging/gdm72xx/netlink_k.c | 4 +-
9325 drivers/staging/winbond/wbusb.c | 4 +-
9326 firmware/Makefile | 1 -
9327 firmware/cxgb3/t3fw-7.10.0.bin.ihex | 1935 -----------
9328 fs/dlm/netlink.c | 8 +-
9331 include/linux/Kbuild | 2 +
9332 include/linux/bcma/bcma_driver_chipcommon.h | 111 +
9333 include/linux/bcma/bcma_regs.h | 4 +
9334 include/linux/etherdevice.h | 11 +
9335 include/linux/ethtool.h | 17 +-
9336 include/linux/filter.h | 7 +
9337 include/linux/hash.h | 10 +
9338 include/linux/ieee80211.h | 80 -
9339 include/linux/if_arp.h | 1 +
9340 include/linux/if_link.h | 34 +
9341 include/linux/if_team.h | 11 +-
9342 include/linux/if_tunnel.h | 3 +
9343 include/linux/if_vlan.h | 9 +-
9344 include/linux/inet_diag.h | 1 +
9345 include/linux/inetdevice.h | 11 +-
9346 include/linux/ip6_tunnel.h | 17 +
9347 include/linux/ipv6.h | 1 +
9348 include/linux/jiffies.h | 6 +
9349 include/linux/mdio.h | 83 +
9350 include/linux/netdevice.h | 51 +-
9351 include/linux/netfilter.h | 14 +-
9352 include/linux/netfilter/ipset/ip_set.h | 15 +-
9353 include/linux/netfilter/ipset/ip_set_ahash.h | 106 +-
9354 include/linux/netfilter/nf_conntrack_amanda.h | 1 +
9355 include/linux/netfilter/nf_conntrack_ftp.h | 7 +-
9356 include/linux/netfilter/nf_conntrack_h323.h | 15 +-
9357 include/linux/netfilter/nf_conntrack_irc.h | 1 +
9358 include/linux/netfilter/nf_conntrack_pptp.h | 2 +
9359 include/linux/netfilter/nf_conntrack_sip.h | 21 +-
9360 include/linux/netfilter/nf_nat.h | 8 +
9361 include/linux/netfilter/nfnetlink_conntrack.h | 8 +-
9362 include/linux/netfilter/nfnetlink_queue.h | 1 +
9363 include/linux/netfilter/xt_time.h | 5 +
9364 include/linux/netfilter_ipv4.h | 1 -
9365 include/linux/netfilter_ipv6/Kbuild | 1 +
9366 include/linux/netfilter_ipv6/ip6t_NPT.h | 16 +
9367 include/linux/netlink.h | 40 +-
9368 include/linux/nfc.h | 11 +
9369 include/linux/nl80211.h | 54 +-
9370 include/linux/of_mdio.h | 33 +
9371 include/linux/packet_diag.h | 72 +
9372 include/linux/pps_kernel.h | 9 +
9373 include/linux/ptp_clock_kernel.h | 21 +-
9374 include/linux/rfkill.h | 31 +
9375 include/linux/sched.h | 3 +
9376 include/linux/seq_file.h | 14 +
9377 include/linux/skbuff.h | 9 +-
9378 include/linux/snmp.h | 16 +-
9379 include/linux/ssb/ssb_driver_chipcommon.h | 4 +-
9380 include/linux/stmmac.h | 1 -
9381 include/linux/tcp.h | 49 +-
9382 include/linux/tcp_metrics.h | 54 +
9383 include/linux/tipc_config.h | 8 +-
9384 include/net/addrconf.h | 2 +-
9385 include/net/arp.h | 3 +-
9386 include/net/ax25.h | 4 +-
9387 include/net/bluetooth/bluetooth.h | 10 +
9388 include/net/bluetooth/hci.h | 32 +
9389 include/net/bluetooth/hci_core.h | 48 +-
9390 include/net/bluetooth/l2cap.h | 20 +-
9391 include/net/bluetooth/mgmt.h | 16 +
9392 include/net/bluetooth/smp.h | 8 +-
9393 include/net/cfg80211.h | 68 +-
9394 include/net/checksum.h | 3 +
9395 include/net/dst.h | 10 +-
9396 include/net/genetlink.h | 34 +-
9397 include/net/gro_cells.h | 103 +
9398 include/net/ieee80211_radiotap.h | 11 +
9399 include/net/inet_ecn.h | 76 +
9400 include/net/inet_frag.h | 4 +-
9401 include/net/inet_sock.h | 4 +-
9402 include/net/ip.h | 2 +
9403 include/net/ip6_fib.h | 1 +
9404 include/net/ip6_tunnel.h | 41 +-
9405 include/net/ip_vs.h | 16 +-
9406 include/net/ipip.h | 3 +
9407 include/net/ipv6.h | 38 +-
9408 include/net/llc.h | 1 -
9409 include/net/mac80211.h | 99 +-
9410 include/net/ndisc.h | 3 +-
9411 include/net/neighbour.h | 14 +-
9412 include/net/net_namespace.h | 15 +
9413 include/net/netfilter/nf_conntrack_ecache.h | 32 +-
9414 include/net/netfilter/nf_conntrack_expect.h | 2 +-
9415 include/net/netfilter/nf_conntrack_timeout.h | 20 +
9416 include/net/netfilter/nf_nat.h | 6 +-
9417 include/net/netfilter/nf_nat_core.h | 5 +-
9418 include/net/netfilter/nf_nat_helper.h | 11 +-
9419 include/net/netfilter/nf_nat_l3proto.h | 52 +
9420 include/net/netfilter/nf_nat_l4proto.h | 72 +
9421 include/net/netfilter/nf_nat_protocol.h | 67 -
9422 include/net/netfilter/nf_nat_rule.h | 15 -
9423 include/net/netlink.h | 124 +-
9424 include/net/netns/conntrack.h | 4 +
9425 include/net/netns/ipv4.h | 5 +-
9426 include/net/netns/ipv6.h | 9 +
9427 include/net/netns/packet.h | 4 +-
9428 include/net/netns/sctp.h | 131 +
9429 include/net/nfc/hci.h | 21 +-
9430 include/net/nfc/llc.h | 54 +
9431 include/net/nfc/nci.h | 29 +
9432 include/net/nfc/nci_core.h | 5 +
9433 include/net/nfc/nfc.h | 4 +-
9434 include/net/nfc/shdlc.h | 107 -
9435 include/net/request_sock.h | 49 +-
9436 include/net/sch_generic.h | 3 +-
9437 include/net/scm.h | 25 +-
9438 include/net/sctp/sctp.h | 69 +-
9439 include/net/sctp/sm.h | 8 +-
9440 include/net/sctp/structs.h | 154 +-
9441 include/net/snmp.h | 10 +-
9442 include/net/sock.h | 40 +-
9443 include/net/tcp.h | 93 +-
9444 include/net/xfrm.h | 8 +-
9445 include/scsi/scsi_netlink.h | 24 -
9447 kernel/audit.c | 23 +-
9451 kernel/pid_namespace.c | 2 +
9452 kernel/taskstats.c | 4 +-
9453 lib/kobject_uevent.c | 5 +-
9455 net/8021q/vlan_core.c | 6 +
9457 net/appletalk/atalk_proc.c | 3 +-
9458 net/atm/resources.c | 2 +-
9459 net/ax25/ax25_uid.c | 21 +-
9460 net/batman-adv/bat_iv_ogm.c | 86 +-
9461 net/batman-adv/bridge_loop_avoidance.c | 214 +-
9462 net/batman-adv/bridge_loop_avoidance.h | 11 +-
9463 net/batman-adv/debugfs.c | 12 +
9464 net/batman-adv/gateway_client.c | 53 +-
9465 net/batman-adv/hard-interface.c | 13 +-
9466 net/batman-adv/main.c | 27 +-
9467 net/batman-adv/main.h | 29 +-
9468 net/batman-adv/packet.h | 35 +-
9469 net/batman-adv/routing.c | 85 +-
9470 net/batman-adv/send.c | 8 +-
9471 net/batman-adv/soft-interface.c | 79 +-
9472 net/batman-adv/soft-interface.h | 5 +-
9473 net/batman-adv/translation-table.c | 416 ++-
9474 net/batman-adv/translation-table.h | 4 +-
9475 net/batman-adv/types.h | 120 +-
9476 net/batman-adv/unicast.c | 16 +-
9477 net/batman-adv/vis.c | 144 +-
9478 net/batman-adv/vis.h | 2 +-
9479 net/bluetooth/a2mp.c | 16 +-
9480 net/bluetooth/af_bluetooth.c | 139 +
9481 net/bluetooth/bnep/sock.c | 22 +-
9482 net/bluetooth/cmtp/sock.c | 23 +-
9483 net/bluetooth/hci_conn.c | 100 +-
9484 net/bluetooth/hci_core.c | 12 +-
9485 net/bluetooth/hci_event.c | 190 +-
9486 net/bluetooth/hci_sock.c | 13 +-
9487 net/bluetooth/hidp/sock.c | 22 +-
9488 net/bluetooth/l2cap_core.c | 37 +-
9489 net/bluetooth/l2cap_sock.c | 22 +-
9490 net/bluetooth/mgmt.c | 62 +-
9491 net/bluetooth/rfcomm/sock.c | 14 +-
9492 net/bluetooth/sco.c | 16 +-
9493 net/bridge/br_fdb.c | 17 +-
9494 net/bridge/br_netlink.c | 2 +-
9495 net/bridge/br_private.h | 6 +-
9496 net/bridge/br_stp_timer.c | 2 +-
9497 net/bridge/netfilter/ebt_ulog.c | 3 +-
9498 net/bridge/netfilter/ebtable_filter.c | 4 +-
9499 net/bridge/netfilter/ebtable_nat.c | 4 +-
9501 net/core/dev.c | 116 +-
9502 net/core/dev_addr_lists.c | 40 +-
9503 net/core/dst.c | 2 +-
9504 net/core/ethtool.c | 12 -
9505 net/core/fib_rules.c | 6 +-
9506 net/core/filter.c | 27 +-
9507 net/core/link_watch.c | 8 +
9508 net/core/neighbour.c | 8 +-
9509 net/core/net-sysfs.c | 18 +-
9510 net/core/netpoll.c | 5 +-
9511 net/core/netprio_cgroup.c | 41 +-
9512 net/core/request_sock.c | 95 +
9513 net/core/rtnetlink.c | 38 +-
9514 net/core/scm.c | 44 +-
9515 net/core/secure_seq.c | 1 +
9516 net/core/skbuff.c | 86 +-
9517 net/core/sock.c | 74 +-
9518 net/core/sock_diag.c | 3 +-
9519 net/core/utils.c | 20 +
9520 net/dcb/dcbnl.c | 18 +-
9521 net/decnet/af_decnet.c | 4 +-
9522 net/decnet/dn_dev.c | 6 +-
9523 net/decnet/dn_route.c | 16 +-
9524 net/decnet/dn_table.c | 12 +-
9525 net/decnet/netfilter/dn_rtmsg.c | 3 +-
9526 net/ieee802154/6lowpan.c | 53 +-
9527 net/ieee802154/nl-mac.c | 6 +-
9528 net/ieee802154/nl-phy.c | 6 +-
9529 net/ipv4/af_inet.c | 27 +-
9530 net/ipv4/devinet.c | 67 +-
9531 net/ipv4/fib_frontend.c | 25 +-
9532 net/ipv4/fib_semantics.c | 8 +-
9533 net/ipv4/fib_trie.c | 15 +-
9534 net/ipv4/igmp.c | 38 +-
9535 net/ipv4/inet_connection_sock.c | 57 +-
9536 net/ipv4/inet_diag.c | 45 +-
9537 net/ipv4/inet_fragment.c | 9 +-
9538 net/ipv4/ip_fragment.c | 13 +-
9539 net/ipv4/ip_gre.c | 128 +-
9540 net/ipv4/ip_output.c | 74 +-
9541 net/ipv4/ip_vti.c | 5 -
9542 net/ipv4/ipconfig.c | 43 +-
9543 net/ipv4/ipip.c | 51 +-
9544 net/ipv4/ipmr.c | 12 +-
9545 net/ipv4/netfilter.c | 41 +-
9546 net/ipv4/netfilter/Kconfig | 90 +-
9547 net/ipv4/netfilter/Makefile | 18 +-
9548 net/ipv4/netfilter/ipt_MASQUERADE.c | 18 +-
9549 net/ipv4/netfilter/ipt_NETMAP.c | 98 -
9550 net/ipv4/netfilter/ipt_REDIRECT.c | 110 -
9551 net/ipv4/netfilter/ipt_ULOG.c | 3 +-
9552 net/ipv4/netfilter/ipt_rpfilter.c | 2 +-
9553 net/ipv4/netfilter/iptable_filter.c | 10 +-
9554 net/ipv4/netfilter/iptable_mangle.c | 10 +-
9555 .../{nf_nat_standalone.c => iptable_nat.c} | 264 +-
9556 net/ipv4/netfilter/iptable_raw.c | 10 +-
9557 net/ipv4/netfilter/iptable_security.c | 5 +-
9558 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 8 +-
9559 net/ipv4/netfilter/nf_nat_h323.c | 71 +-
9560 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 281 ++
9561 net/ipv4/netfilter/nf_nat_pptp.c | 21 +-
9562 net/ipv4/netfilter/nf_nat_proto_gre.c | 30 +-
9563 net/ipv4/netfilter/nf_nat_proto_icmp.c | 24 +-
9564 net/ipv4/netfilter/nf_nat_rule.c | 214 --
9565 net/ipv4/ping.c | 22 +-
9566 net/ipv4/proc.c | 4 +
9567 net/ipv4/raw.c | 4 +-
9568 net/ipv4/route.c | 30 +-
9569 net/ipv4/syncookies.c | 1 +
9570 net/ipv4/sysctl_net_ipv4.c | 87 +-
9571 net/ipv4/tcp.c | 135 +-
9572 net/ipv4/tcp_fastopen.c | 83 +-
9573 net/ipv4/tcp_input.c | 281 +-
9574 net/ipv4/tcp_ipv4.c | 332 +-
9575 net/ipv4/tcp_metrics.c | 354 +-
9576 net/ipv4/tcp_minisocks.c | 75 +-
9577 net/ipv4/tcp_output.c | 27 +-
9578 net/ipv4/tcp_timer.c | 39 +-
9579 net/ipv4/udp.c | 4 +-
9580 net/ipv4/udp_diag.c | 9 +-
9581 net/ipv6/Kconfig | 16 +
9582 net/ipv6/Makefile | 1 +
9583 net/ipv6/addrconf.c | 83 +-
9584 net/ipv6/addrlabel.c | 24 +-
9585 net/ipv6/ip6_fib.c | 20 +-
9586 net/ipv6/ip6_flowlabel.c | 47 +-
9587 net/ipv6/ip6_gre.c | 1770 ++++++++++
9588 net/ipv6/ip6_output.c | 85 +-
9589 net/ipv6/ip6_tunnel.c | 91 +-
9590 net/ipv6/ip6mr.c | 10 +-
9591 net/ipv6/netfilter.c | 8 +
9592 net/ipv6/netfilter/Kconfig | 37 +-
9593 net/ipv6/netfilter/Makefile | 6 +
9594 net/ipv6/netfilter/ip6t_MASQUERADE.c | 135 +
9595 net/ipv6/netfilter/ip6t_NPT.c | 165 +
9596 net/ipv6/netfilter/ip6table_filter.c | 4 +-
9597 net/ipv6/netfilter/ip6table_mangle.c | 4 +-
9598 net/ipv6/netfilter/ip6table_nat.c | 321 ++
9599 net/ipv6/netfilter/ip6table_raw.c | 4 +-
9600 net/ipv6/netfilter/ip6table_security.c | 5 +-
9601 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 137 +-
9602 net/ipv6/netfilter/nf_conntrack_reasm.c | 218 +-
9603 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 288 ++
9604 net/ipv6/netfilter/nf_nat_proto_icmpv6.c | 90 +
9605 net/ipv6/raw.c | 3 +-
9606 net/ipv6/reassembly.c | 89 +-
9607 net/ipv6/route.c | 96 +-
9608 net/ipv6/sit.c | 6 -
9609 net/ipv6/syncookies.c | 1 +
9610 net/ipv6/tcp_ipv6.c | 46 +-
9611 net/ipv6/udp.c | 3 +-
9612 net/ipx/ipx_proc.c | 3 +-
9613 net/irda/irnetlink.c | 2 +-
9614 net/key/af_key.c | 41 +-
9615 net/l2tp/Kconfig | 1 +
9616 net/l2tp/l2tp_eth.c | 3 +-
9617 net/l2tp/l2tp_netlink.c | 24 +-
9618 net/llc/llc_proc.c | 2 +-
9619 net/llc/llc_station.c | 600 +---
9620 net/llc/sysctl_net_llc.c | 7 -
9621 net/mac80211/aes_cmac.c | 6 +-
9622 net/mac80211/agg-tx.c | 2 +-
9623 net/mac80211/cfg.c | 103 +-
9624 net/mac80211/chan.c | 67 +-
9625 net/mac80211/debugfs.c | 36 +-
9626 net/mac80211/driver-ops.h | 11 +-
9627 net/mac80211/ibss.c | 50 +-
9628 net/mac80211/ieee80211_i.h | 53 +-
9629 net/mac80211/iface.c | 316 +-
9630 net/mac80211/key.c | 2 +-
9631 net/mac80211/main.c | 31 +-
9632 net/mac80211/mesh.c | 49 +-
9633 net/mac80211/mesh.h | 5 +-
9634 net/mac80211/mesh_hwmp.c | 2 -
9635 net/mac80211/mesh_pathtbl.c | 44 +-
9636 net/mac80211/mesh_plink.c | 85 +-
9637 net/mac80211/mlme.c | 443 ++-
9638 net/mac80211/offchannel.c | 9 +-
9639 net/mac80211/rate.h | 2 +-
9640 net/mac80211/rx.c | 60 +-
9641 net/mac80211/scan.c | 53 +-
9642 net/mac80211/sta_info.c | 123 +-
9643 net/mac80211/sta_info.h | 2 +
9644 net/mac80211/status.c | 42 +-
9645 net/mac80211/trace.h | 11 +-
9646 net/mac80211/tx.c | 73 +-
9647 net/mac80211/util.c | 108 +-
9648 net/netfilter/Kconfig | 83 +-
9649 net/netfilter/Makefile | 21 +-
9650 net/netfilter/core.c | 21 +-
9651 net/netfilter/ipset/ip_set_bitmap_ip.c | 19 +-
9652 net/netfilter/ipset/ip_set_bitmap_ipmac.c | 18 +-
9653 net/netfilter/ipset/ip_set_bitmap_port.c | 9 +-
9654 net/netfilter/ipset/ip_set_core.c | 39 +-
9655 net/netfilter/ipset/ip_set_hash_ip.c | 15 +-
9656 net/netfilter/ipset/ip_set_hash_ipport.c | 24 +-
9657 net/netfilter/ipset/ip_set_hash_ipportip.c | 24 +-
9658 net/netfilter/ipset/ip_set_hash_ipportnet.c | 47 +-
9659 net/netfilter/ipset/ip_set_hash_net.c | 25 +-
9660 net/netfilter/ipset/ip_set_hash_netiface.c | 66 +-
9661 net/netfilter/ipset/ip_set_hash_netport.c | 36 +-
9662 net/netfilter/ipset/ip_set_list_set.c | 9 +-
9663 net/netfilter/ipvs/Kconfig | 3 +-
9664 net/netfilter/ipvs/ip_vs_app.c | 58 +-
9665 net/netfilter/ipvs/ip_vs_core.c | 76 +-
9666 net/netfilter/ipvs/ip_vs_ctl.c | 25 +-
9667 net/netfilter/ipvs/ip_vs_ftp.c | 22 +-
9668 net/netfilter/ipvs/ip_vs_xmit.c | 111 +-
9669 net/netfilter/nf_conntrack_amanda.c | 5 +-
9670 net/netfilter/nf_conntrack_core.c | 15 +-
9671 net/netfilter/nf_conntrack_ecache.c | 2 +-
9672 net/netfilter/nf_conntrack_ftp.c | 24 +-
9673 net/netfilter/nf_conntrack_h323_main.c | 232 +-
9674 net/netfilter/nf_conntrack_irc.c | 3 +-
9675 net/netfilter/nf_conntrack_netlink.c | 114 +-
9676 net/netfilter/nf_conntrack_pptp.c | 18 +-
9677 net/netfilter/nf_conntrack_proto.c | 5 -
9678 net/netfilter/nf_conntrack_proto_tcp.c | 8 +-
9679 net/netfilter/nf_conntrack_sip.c | 143 +-
9680 net/netfilter/nf_internals.h | 4 +-
9681 net/{ipv4 => }/netfilter/nf_nat_amanda.c | 4 +-
9682 net/{ipv4 => }/netfilter/nf_nat_core.c | 679 ++--
9683 net/{ipv4 => }/netfilter/nf_nat_ftp.c | 34 +-
9684 net/{ipv4 => }/netfilter/nf_nat_helper.c | 109 +-
9685 net/{ipv4 => }/netfilter/nf_nat_irc.c | 10 +-
9686 net/{ipv4 => }/netfilter/nf_nat_proto_common.c | 54 +-
9687 net/{ipv4 => }/netfilter/nf_nat_proto_dccp.c | 56 +-
9688 net/{ipv4 => }/netfilter/nf_nat_proto_sctp.c | 53 +-
9689 net/{ipv4 => }/netfilter/nf_nat_proto_tcp.c | 40 +-
9690 net/{ipv4 => }/netfilter/nf_nat_proto_udp.c | 42 +-
9691 net/{ipv4 => }/netfilter/nf_nat_proto_udplite.c | 58 +-
9692 net/{ipv4 => }/netfilter/nf_nat_proto_unknown.c | 16 +-
9693 net/{ipv4 => }/netfilter/nf_nat_sip.c | 270 +-
9694 net/{ipv4 => }/netfilter/nf_nat_tftp.c | 1 -
9695 net/netfilter/nf_queue.c | 10 +-
9696 net/netfilter/nfnetlink.c | 2 +-
9697 net/netfilter/nfnetlink_acct.c | 16 +-
9698 net/netfilter/nfnetlink_cthelper.c | 17 +-
9699 net/netfilter/nfnetlink_cttimeout.c | 12 +-
9700 net/netfilter/nfnetlink_log.c | 27 +-
9701 net/netfilter/nfnetlink_queue_core.c | 50 +-
9702 net/netfilter/xt_CT.c | 262 +-
9703 net/netfilter/xt_LOG.c | 8 +-
9704 net/netfilter/xt_NETMAP.c | 165 +
9705 net/netfilter/xt_NFQUEUE.c | 8 +-
9706 net/netfilter/xt_NOTRACK.c | 53 -
9707 net/netfilter/xt_REDIRECT.c | 190 ++
9708 net/netfilter/xt_nat.c | 170 +
9709 net/netfilter/xt_osf.c | 2 +-
9710 net/netfilter/xt_owner.c | 30 +-
9711 net/netfilter/xt_recent.c | 13 +-
9712 net/netfilter/xt_set.c | 22 +
9713 net/netfilter/xt_socket.c | 12 +-
9714 net/netfilter/xt_time.c | 24 +-
9715 net/netlabel/netlabel_cipso_v4.c | 2 +-
9716 net/netlabel/netlabel_mgmt.c | 4 +-
9717 net/netlabel/netlabel_unlabeled.c | 2 +-
9718 net/netlink/af_netlink.c | 216 +-
9719 net/netlink/genetlink.c | 48 +-
9720 net/nfc/core.c | 13 +-
9721 net/nfc/hci/Makefile | 4 +-
9722 net/nfc/hci/command.c | 45 +-
9723 net/nfc/hci/core.c | 336 +-
9724 net/nfc/hci/hci.h | 15 +-
9725 net/nfc/hci/hcp.c | 6 +-
9726 net/nfc/hci/llc.c | 170 +
9727 net/nfc/hci/llc.h | 69 +
9728 net/nfc/hci/llc_nop.c | 99 +
9729 net/nfc/hci/{shdlc.c => llc_shdlc.c} | 544 ++--
9730 net/nfc/llcp/commands.c | 2 +
9731 net/nfc/llcp/llcp.c | 131 +-
9732 net/nfc/llcp/llcp.h | 6 +-
9733 net/nfc/llcp/sock.c | 93 +-
9734 net/nfc/nci/core.c | 91 +-
9735 net/nfc/nci/ntf.c | 52 +
9736 net/nfc/nci/rsp.c | 14 +
9737 net/nfc/netlink.c | 68 +-
9738 net/openvswitch/actions.c | 6 +-
9739 net/openvswitch/datapath.c | 453 ++-
9740 net/openvswitch/datapath.h | 52 +-
9741 net/openvswitch/dp_notify.c | 8 +-
9742 net/openvswitch/flow.c | 21 +-
9743 net/openvswitch/flow.h | 3 +-
9744 net/openvswitch/vport-internal_dev.c | 7 +-
9745 net/openvswitch/vport-netdev.c | 2 +-
9746 net/openvswitch/vport.c | 27 +-
9747 net/openvswitch/vport.h | 13 +-
9748 net/packet/Kconfig | 8 +
9749 net/packet/Makefile | 2 +
9750 net/packet/af_packet.c | 145 +-
9751 net/packet/diag.c | 242 ++
9752 net/packet/internal.h | 121 +
9753 net/phonet/pn_netlink.c | 14 +-
9754 net/phonet/socket.c | 6 +-
9755 net/rds/tcp_connect.c | 4 +-
9756 net/rds/tcp_listen.c | 4 +-
9757 net/rds/tcp_recv.c | 4 +-
9758 net/rds/tcp_send.c | 4 +-
9759 net/rfkill/core.c | 22 +-
9760 net/sched/act_api.c | 52 +-
9761 net/sched/cls_api.c | 16 +-
9762 net/sched/cls_basic.c | 3 +-
9763 net/sched/cls_cgroup.c | 3 +-
9764 net/sched/cls_flow.c | 19 +-
9765 net/sched/cls_fw.c | 3 +-
9766 net/sched/cls_route.c | 3 +-
9767 net/sched/cls_rsvp.h | 3 +-
9768 net/sched/cls_tcindex.c | 3 +-
9769 net/sched/cls_u32.c | 3 +-
9770 net/sched/em_meta.c | 2 +-
9771 net/sched/sch_api.c | 44 +-
9772 net/sched/sch_drr.c | 2 +-
9773 net/sched/sch_generic.c | 27 +-
9774 net/sched/sch_qfq.c | 2 +-
9775 net/sctp/associola.c | 25 +-
9776 net/sctp/auth.c | 20 +-
9777 net/sctp/bind_addr.c | 20 +-
9778 net/sctp/chunk.c | 2 +-
9779 net/sctp/endpointola.c | 25 +-
9780 net/sctp/input.c | 115 +-
9781 net/sctp/ipv6.c | 36 +-
9782 net/sctp/objcnt.c | 8 +-
9783 net/sctp/output.c | 2 +-
9784 net/sctp/outqueue.c | 28 +-
9785 net/sctp/primitive.c | 4 +-
9786 net/sctp/proc.c | 61 +-
9787 net/sctp/protocol.c | 454 +--
9788 net/sctp/sm_make_chunk.c | 61 +-
9789 net/sctp/sm_sideeffect.c | 26 +-
9790 net/sctp/sm_statefuns.c | 725 +++--
9791 net/sctp/sm_statetable.c | 17 +-
9792 net/sctp/socket.c | 119 +-
9793 net/sctp/sysctl.c | 198 +-
9794 net/sctp/transport.c | 23 +-
9795 net/sctp/ulpqueue.c | 18 +-
9796 net/socket.c | 89 +-
9797 net/tipc/bearer.c | 21 +-
9798 net/tipc/config.c | 48 +-
9799 net/tipc/core.c | 22 +-
9800 net/tipc/core.h | 18 +-
9801 net/tipc/eth_media.c | 29 +-
9802 net/tipc/handler.c | 2 +-
9803 net/tipc/link.c | 4 +-
9804 net/tipc/name_table.c | 16 +-
9805 net/tipc/net.c | 3 +-
9806 net/tipc/net.h | 2 +-
9807 net/tipc/netlink.c | 2 +-
9808 net/tipc/subscr.c | 4 +-
9809 net/unix/af_unix.c | 17 +-
9810 net/unix/diag.c | 14 +-
9811 net/wireless/chan.c | 7 +-
9812 net/wireless/core.c | 53 +-
9813 net/wireless/core.h | 2 +-
9814 net/wireless/mlme.c | 37 +-
9815 net/wireless/nl80211.c | 266 +-
9816 net/wireless/nl80211.h | 5 +
9817 net/wireless/radiotap.c | 2 +
9818 net/wireless/reg.c | 45 +-
9819 net/wireless/scan.c | 2 +-
9820 net/wireless/util.c | 36 +-
9821 net/wireless/wext-core.c | 8 +-
9822 net/xfrm/xfrm_policy.c | 83 +-
9823 net/xfrm/xfrm_state.c | 12 +-
9824 net/xfrm/xfrm_user.c | 77 +-
9825 security/selinux/netlink.c | 5 +-
9826 993 files changed, 42925 insertions(+), 21938 deletions(-)
9827 create mode 100644 Documentation/devicetree/bindings/net/can/c_can.txt
9828 create mode 100644 Documentation/devicetree/bindings/net/cpsw.txt
9829 create mode 100644 Documentation/devicetree/bindings/net/davinci-mdio.txt
9830 create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt
9831 create mode 100644 Documentation/networking/vxlan.txt
9832 create mode 100644 drivers/infiniband/ulp/ipoib/ipoib_netlink.c
9833 delete mode 100644 drivers/net/ethernet/freescale/fsl_pq_mdio.h
9834 create mode 100644 drivers/net/ethernet/freescale/xgmac_mdio.c
9835 create mode 100644 drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
9836 delete mode 100644 drivers/net/ethernet/mipsnet.c
9837 create mode 100644 drivers/net/ethernet/sfc/ptp.c
9838 rename drivers/{ => net}/ieee802154/Kconfig (76%)
9839 rename drivers/{ => net}/ieee802154/Makefile (74%)
9840 rename drivers/{ => net}/ieee802154/at86rf230.c (98%)
9841 rename drivers/{ => net}/ieee802154/fakehard.c (99%)
9842 rename drivers/{ => net}/ieee802154/fakelb.c (100%)
9843 create mode 100644 drivers/net/ieee802154/mrf24j40.c
9844 create mode 100644 drivers/net/phy/mdio-mux-mmioreg.c
9845 create mode 100644 drivers/net/vxlan.c
9846 create mode 100644 drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h
9847 create mode 100644 drivers/net/wireless/b43/radio_2057.c
9848 create mode 100644 drivers/net/wireless/b43/radio_2057.h
9849 create mode 100644 drivers/net/wireless/mwifiex/uap_event.c
9850 create mode 100644 drivers/net/wireless/mwifiex/uap_txrx.c
9851 delete mode 100644 drivers/nfc/pn544.c
9852 delete mode 100644 firmware/cxgb3/t3fw-7.10.0.bin.ihex
9853 create mode 100644 include/linux/netfilter_ipv6/ip6t_NPT.h
9854 create mode 100644 include/linux/packet_diag.h
9855 create mode 100644 include/linux/tcp_metrics.h
9856 create mode 100644 include/net/gro_cells.h
9857 create mode 100644 include/net/netfilter/nf_nat_l3proto.h
9858 create mode 100644 include/net/netfilter/nf_nat_l4proto.h
9859 delete mode 100644 include/net/netfilter/nf_nat_protocol.h
9860 delete mode 100644 include/net/netfilter/nf_nat_rule.h
9861 create mode 100644 include/net/netns/sctp.h
9862 create mode 100644 include/net/nfc/llc.h
9863 delete mode 100644 include/net/nfc/shdlc.h
9864 delete mode 100644 net/ipv4/netfilter/ipt_NETMAP.c
9865 delete mode 100644 net/ipv4/netfilter/ipt_REDIRECT.c
9866 rename net/ipv4/netfilter/{nf_nat_standalone.c => iptable_nat.c} (52%)
9867 create mode 100644 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
9868 delete mode 100644 net/ipv4/netfilter/nf_nat_rule.c
9869 create mode 100644 net/ipv6/ip6_gre.c
9870 create mode 100644 net/ipv6/netfilter/ip6t_MASQUERADE.c
9871 create mode 100644 net/ipv6/netfilter/ip6t_NPT.c
9872 create mode 100644 net/ipv6/netfilter/ip6table_nat.c
9873 create mode 100644 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
9874 create mode 100644 net/ipv6/netfilter/nf_nat_proto_icmpv6.c
9875 rename net/{ipv4 => }/netfilter/nf_nat_amanda.c (96%)
9876 rename net/{ipv4 => }/netfilter/nf_nat_core.c (51%)
9877 rename net/{ipv4 => }/netfilter/nf_nat_ftp.c (79%)
9878 rename net/{ipv4 => }/netfilter/nf_nat_helper.c (82%)
9879 rename net/{ipv4 => }/netfilter/nf_nat_irc.c (89%)
9880 rename net/{ipv4 => }/netfilter/nf_nat_proto_common.c (62%)
9881 rename net/{ipv4 => }/netfilter/nf_nat_proto_dccp.c (61%)
9882 rename net/{ipv4 => }/netfilter/nf_nat_proto_sctp.c (61%)
9883 rename net/{ipv4 => }/netfilter/nf_nat_proto_tcp.c (65%)
9884 rename net/{ipv4 => }/netfilter/nf_nat_proto_udp.c (60%)
9885 rename net/{ipv4 => }/netfilter/nf_nat_proto_udplite.c (58%)
9886 rename net/{ipv4 => }/netfilter/nf_nat_proto_unknown.c (76%)
9887 rename net/{ipv4 => }/netfilter/nf_nat_sip.c (62%)
9888 rename net/{ipv4 => }/netfilter/nf_nat_tftp.c (97%)
9889 create mode 100644 net/netfilter/xt_NETMAP.c
9890 delete mode 100644 net/netfilter/xt_NOTRACK.c
9891 create mode 100644 net/netfilter/xt_REDIRECT.c
9892 create mode 100644 net/netfilter/xt_nat.c
9893 create mode 100644 net/nfc/hci/llc.c
9894 create mode 100644 net/nfc/hci/llc.h
9895 create mode 100644 net/nfc/hci/llc_nop.c
9896 rename net/nfc/hci/{shdlc.c => llc_shdlc.c} (54%)
9897 create mode 100644 net/packet/diag.c
9898 create mode 100644 net/packet/internal.h
9899 $ git am -3 ../patches/0001-net-cope-with-sock_alloc_file-API-change.patch
9900 Applying: net: cope with sock_alloc_file() API change
9902 Unstaged changes after reset:
9903 M include/linux/net.h
9907 $ git commit -v -a --amend
9908 [master 176d04f] Merge remote-tracking branch 'net-next/master'
9909 Merging wireless-next/master (5160b46 ath9k: Fix BTCOEX weight initialization)
9910 $ git merge wireless-next/master
9912 Merging bluetooth/master (dfee1eb Bluetooth: remove unused member of hci_dev.)
9913 $ git merge bluetooth/master
9914 Auto-merging net/bluetooth/rfcomm/tty.c
9915 Auto-merging net/bluetooth/rfcomm/sock.c
9916 Auto-merging net/bluetooth/mgmt.c
9917 Auto-merging net/bluetooth/l2cap_core.c
9918 Auto-merging net/bluetooth/hci_core.c
9919 Merge made by the 'recursive' strategy.
9920 drivers/bluetooth/btmrvl_sdio.c | 24 +-
9921 include/net/bluetooth/a2mp.h | 22 ++
9922 include/net/bluetooth/amp.h | 50 ++++
9923 include/net/bluetooth/bluetooth.h | 1 -
9924 include/net/bluetooth/hci.h | 39 +++-
9925 include/net/bluetooth/hci_core.h | 13 +-
9926 include/net/bluetooth/l2cap.h | 4 +
9927 net/bluetooth/Kconfig | 1 +
9928 net/bluetooth/Makefile | 2 +-
9929 net/bluetooth/a2mp.c | 458 ++++++++++++++++++++++++++++++++++---
9930 net/bluetooth/af_bluetooth.c | 10 +-
9931 net/bluetooth/amp.c | 367 +++++++++++++++++++++++++++++
9932 net/bluetooth/bnep/core.c | 3 +-
9933 net/bluetooth/cmtp/core.c | 2 +-
9934 net/bluetooth/hci_conn.c | 6 +-
9935 net/bluetooth/hci_core.c | 30 +--
9936 net/bluetooth/hci_event.c | 141 +++++++++++-
9937 net/bluetooth/hci_sysfs.c | 10 +-
9938 net/bluetooth/hidp/core.c | 8 +-
9939 net/bluetooth/l2cap_core.c | 84 ++++---
9940 net/bluetooth/lib.c | 14 --
9941 net/bluetooth/mgmt.c | 5 +-
9942 net/bluetooth/rfcomm/core.c | 15 +-
9943 net/bluetooth/rfcomm/sock.c | 9 +-
9944 net/bluetooth/rfcomm/tty.c | 6 +-
9945 net/bluetooth/sco.c | 12 +-
9946 26 files changed, 1185 insertions(+), 151 deletions(-)
9947 create mode 100644 include/net/bluetooth/amp.h
9948 create mode 100644 net/bluetooth/amp.c
9949 Merging mtd/master (e2d3a35 mtd: nand: detect Samsung K9GBG08U0A, K9GAG08U0F ID)
9950 $ git merge mtd/master
9951 Auto-merging fs/jffs2/super.c
9952 Removing drivers/mtd/nand/nand_bcm_umi.h
9953 Removing drivers/mtd/nand/nand_bcm_umi.c
9954 Auto-merging drivers/mtd/nand/fsl_ifc_nand.c
9955 Removing drivers/mtd/nand/bcm_umi_nand.c
9956 Removing drivers/mtd/nand/bcm_umi_bch.c
9957 Auto-merging drivers/mtd/mtdpart.c
9958 Removing drivers/mtd/maps/wr_sbc82xx_flash.c
9959 Auto-merging arch/powerpc/configs/mpc83xx_defconfig
9960 Auto-merging MAINTAINERS
9961 Merge made by the 'recursive' strategy.
9962 Documentation/DocBook/mtdnand.tmpl | 2 -
9963 .../devicetree/bindings/arm/davinci/nand.txt | 51 +
9964 .../devicetree/bindings/mtd/atmel-nand.txt | 40 +-
9965 .../devicetree/bindings/mtd/gpmi-nand.txt | 4 +
9966 .../devicetree/bindings/mtd/lpc32xx-mlc.txt | 50 +
9967 .../devicetree/bindings/mtd/lpc32xx-slc.txt | 52 +
9968 .../devicetree/bindings/mtd/mtd-physmap.txt | 7 +
9970 arch/arm/boot/dts/imx51.dtsi | 7 +
9971 arch/arm/boot/dts/imx53.dtsi | 7 +
9972 arch/arm/configs/bcmring_defconfig | 1 -
9973 arch/arm/configs/cam60_defconfig | 1 -
9974 arch/arm/configs/corgi_defconfig | 1 -
9975 arch/arm/configs/ep93xx_defconfig | 1 -
9976 arch/arm/configs/mini2440_defconfig | 1 -
9977 arch/arm/configs/mv78xx0_defconfig | 1 -
9978 arch/arm/configs/nhk8815_defconfig | 1 -
9979 arch/arm/configs/orion5x_defconfig | 1 -
9980 arch/arm/configs/pxa3xx_defconfig | 1 -
9981 arch/arm/configs/spitz_defconfig | 1 -
9982 arch/arm/mach-clps711x/autcpu12.c | 19 +
9983 arch/arm/mach-imx/clk-imx51-imx53.c | 2 +
9984 arch/arm/plat-mxc/devices/platform-mxc_nand.c | 11 +-
9985 arch/blackfin/configs/BF561-ACVILON_defconfig | 1 -
9986 arch/mips/configs/rb532_defconfig | 1 -
9987 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 1 -
9988 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 1 -
9989 arch/powerpc/configs/mpc83xx_defconfig | 1 -
9990 drivers/mtd/Kconfig | 7 +
9991 drivers/mtd/Makefile | 1 +
9992 drivers/mtd/bcm47xxpart.c | 202 ++++
9993 drivers/mtd/chips/Kconfig | 11 +-
9994 drivers/mtd/chips/cfi_cmdset_0001.c | 14 +-
9995 drivers/mtd/chips/cfi_cmdset_0002.c | 67 ++
9996 drivers/mtd/cmdlinepart.c | 183 ++--
9997 drivers/mtd/devices/Kconfig | 10 +-
9998 drivers/mtd/devices/Makefile | 1 +
9999 drivers/mtd/devices/bcm47xxsflash.c | 105 ++
10000 drivers/mtd/devices/doc2001plus.c | 14 +-
10001 drivers/mtd/devices/docg3.c | 12 +-
10002 drivers/mtd/devices/m25p80.c | 24 +-
10003 drivers/mtd/devices/spear_smi.c | 141 +--
10004 drivers/mtd/maps/Kconfig | 16 +-
10005 drivers/mtd/maps/Makefile | 1 -
10006 drivers/mtd/maps/autcpu12-nvram.c | 153 +--
10007 drivers/mtd/maps/pci.c | 23 -
10008 drivers/mtd/maps/physmap_of.c | 14 +
10009 drivers/mtd/maps/rbtx4939-flash.c | 2 -
10010 drivers/mtd/maps/uclinux.c | 15 +-
10011 drivers/mtd/maps/wr_sbc82xx_flash.c | 174 ----
10012 drivers/mtd/mtdcore.c | 21 +
10013 drivers/mtd/mtdoops.c | 14 +-
10014 drivers/mtd/mtdpart.c | 5 +-
10015 drivers/mtd/nand/Kconfig | 101 +-
10016 drivers/mtd/nand/Makefile | 4 +-
10017 drivers/mtd/nand/ams-delta.c | 13 -
10018 drivers/mtd/nand/atmel_nand.c | 987 +++++++++++++++++--
10019 drivers/mtd/nand/atmel_nand_ecc.h | 114 ++-
10020 drivers/mtd/nand/au1550nd.c | 46 -
10021 drivers/mtd/nand/bcm_umi_bch.c | 217 ----
10022 drivers/mtd/nand/bcm_umi_nand.c | 555 -----------
10023 drivers/mtd/nand/bf5xx_nand.c | 6 +-
10024 drivers/mtd/nand/cafe_nand.c | 20 +-
10025 drivers/mtd/nand/cmx270_nand.c | 13 -
10026 drivers/mtd/nand/davinci_nand.c | 78 +-
10027 drivers/mtd/nand/denali.c | 12 +-
10028 drivers/mtd/nand/diskonchip.c | 63 --
10029 drivers/mtd/nand/docg4.c | 43 +-
10030 drivers/mtd/nand/fsl_elbc_nand.c | 51 +-
10031 drivers/mtd/nand/fsl_ifc_nand.c | 52 +-
10032 drivers/mtd/nand/gpio.c | 54 +-
10033 drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 322 +++++-
10034 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 152 ++-
10035 drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 26 +-
10036 drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 12 +
10037 drivers/mtd/nand/lpc32xx_mlc.c | 924 +++++++++++++++++
10038 drivers/mtd/nand/lpc32xx_slc.c | 1039 ++++++++++++++++++++
10039 drivers/mtd/nand/mpc5121_nfc.c | 22 -
10040 drivers/mtd/nand/mxc_nand.c | 168 ++--
10041 drivers/mtd/nand/nand_base.c | 529 ++++++----
10042 drivers/mtd/nand/nand_bbt.c | 148 +--
10043 drivers/mtd/nand/nand_bcm_umi.c | 149 ---
10044 drivers/mtd/nand/nand_bcm_umi.h | 337 -------
10045 drivers/mtd/nand/nand_ids.c | 7 +-
10046 drivers/mtd/nand/nandsim.c | 17 +-
10047 drivers/mtd/nand/ndfc.c | 13 -
10048 drivers/mtd/nand/nuc900_nand.c | 17 -
10049 drivers/mtd/nand/omap2.c | 36 +-
10050 drivers/mtd/nand/orion_nand.c | 1 -
10051 drivers/mtd/nand/plat_nand.c | 5 +
10052 drivers/mtd/nand/pxa3xx_nand.c | 12 +-
10053 drivers/mtd/nand/r852.c | 22 -
10054 drivers/mtd/nand/s3c2410.c | 191 ++--
10055 drivers/mtd/nand/sh_flctl.c | 327 +++---
10056 drivers/mtd/nand/socrates_nand.c | 19 -
10057 drivers/mtd/nand/tmio_nand.c | 13 -
10058 drivers/mtd/nand/txx9ndfmc.c | 13 -
10059 drivers/mtd/nand/xway_nand.c | 201 ++++
10060 drivers/mtd/sm_ftl.c | 1 -
10061 drivers/mtd/tests/Makefile | 1 +
10062 drivers/mtd/tests/mtd_nandbiterrs.c | 460 +++++++++
10063 drivers/mtd/tests/mtd_nandecctest.c | 294 +++++-
10064 drivers/mtd/tests/mtd_speedtest.c | 16 +-
10065 drivers/mtd/tests/mtd_stresstest.c | 39 +-
10066 fs/jffs2/super.c | 4 +
10067 fs/jffs2/wbuf.c | 8 +-
10068 include/linux/bcma/bcma_driver_chipcommon.h | 2 +
10069 include/linux/mtd/bbm.h | 7 +-
10070 include/linux/mtd/lpc32xx_mlc.h | 20 +
10071 include/linux/mtd/lpc32xx_slc.h | 20 +
10072 include/linux/mtd/mtd.h | 9 +-
10073 include/linux/mtd/nand.h | 72 +-
10074 include/linux/mtd/sh_flctl.h | 23 +-
10075 113 files changed, 6350 insertions(+), 3283 deletions(-)
10076 create mode 100644 Documentation/devicetree/bindings/arm/davinci/nand.txt
10077 create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt
10078 create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt
10079 create mode 100644 drivers/mtd/bcm47xxpart.c
10080 create mode 100644 drivers/mtd/devices/bcm47xxsflash.c
10081 delete mode 100644 drivers/mtd/maps/wr_sbc82xx_flash.c
10082 delete mode 100644 drivers/mtd/nand/bcm_umi_bch.c
10083 delete mode 100644 drivers/mtd/nand/bcm_umi_nand.c
10084 create mode 100644 drivers/mtd/nand/lpc32xx_mlc.c
10085 create mode 100644 drivers/mtd/nand/lpc32xx_slc.c
10086 delete mode 100644 drivers/mtd/nand/nand_bcm_umi.c
10087 delete mode 100644 drivers/mtd/nand/nand_bcm_umi.h
10088 create mode 100644 drivers/mtd/nand/xway_nand.c
10089 create mode 100644 drivers/mtd/tests/mtd_nandbiterrs.c
10090 create mode 100644 include/linux/mtd/lpc32xx_mlc.h
10091 create mode 100644 include/linux/mtd/lpc32xx_slc.h
10092 Merging l2-mtd/master (e2d3a35 mtd: nand: detect Samsung K9GBG08U0A, K9GAG08U0F ID)
10093 $ git merge l2-mtd/master
10094 Already up-to-date.
10095 Merging crypto/master (200429c crypto: cast5/avx - fix storing of new IV in CBC encryption)
10096 $ git merge crypto/master
10097 Resolved 'crypto/Kconfig' using previous resolution.
10098 Auto-merging drivers/crypto/hifn_795x.c
10099 Auto-merging drivers/crypto/caam/key_gen.c
10100 Auto-merging crypto/crypto_user.c
10101 Auto-merging crypto/cast6_generic.c
10102 Auto-merging crypto/cast5_generic.c
10103 Auto-merging crypto/Kconfig
10104 CONFLICT (content): Merge conflict in crypto/Kconfig
10105 Auto-merging arch/powerpc/kernel/prom_init.c
10106 Auto-merging arch/powerpc/configs/pseries_defconfig
10107 Auto-merging arch/powerpc/configs/ppc64_defconfig
10108 Auto-merging arch/arm/Makefile
10109 Auto-merging MAINTAINERS
10110 Automatic merge failed; fix conflicts and then commit the result.
10112 [master ac11df6] Merge remote-tracking branch 'crypto/master'
10113 $ git diff -M --stat --summary HEAD^..
10115 arch/arm/Makefile | 1 +
10116 arch/arm/crypto/Makefile | 9 +
10117 arch/arm/crypto/aes-armv4.S | 1112 ++++++
10118 arch/arm/crypto/aes_glue.c | 108 +
10119 arch/arm/crypto/sha1-armv4-large.S | 503 +++
10120 arch/arm/crypto/sha1_glue.c | 179 +
10121 arch/powerpc/configs/ppc64_defconfig | 3 +-
10122 arch/powerpc/configs/pseries_defconfig | 3 +-
10123 arch/powerpc/kernel/prom_init.c | 4 +-
10124 arch/s390/crypto/aes_s390.c | 5 -
10125 arch/s390/crypto/des_s390.c | 10 -
10126 arch/s390/crypto/ghash_s390.c | 1 -
10127 arch/x86/crypto/Makefile | 4 +
10128 arch/x86/crypto/aes_glue.c | 1 -
10129 arch/x86/crypto/aesni-intel_glue.c | 258 +-
10130 arch/x86/crypto/blowfish_glue.c | 4 -
10131 arch/x86/crypto/camellia_glue.c | 1382 ++++---
10132 arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 376 ++
10133 arch/x86/crypto/cast5_avx_glue.c | 530 +++
10134 arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 383 ++
10135 arch/x86/crypto/cast6_avx_glue.c | 648 ++++
10136 arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 -
10137 arch/x86/crypto/salsa20_glue.c | 1 -
10138 arch/x86/crypto/serpent_avx_glue.c | 10 -
10139 arch/x86/crypto/serpent_sse2_glue.c | 10 -
10140 arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 227 +-
10141 arch/x86/crypto/twofish_avx_glue.c | 10 -
10142 arch/x86/crypto/twofish_glue.c | 1 -
10143 arch/x86/crypto/twofish_glue_3way.c | 5 -
10144 crypto/842.c | 182 +
10145 crypto/Kconfig | 75 +
10146 crypto/Makefile | 5 +-
10147 crypto/aes_generic.c | 1 -
10148 crypto/ansi_cprng.c | 63 +-
10149 crypto/anubis.c | 1 -
10150 crypto/blowfish_generic.c | 1 -
10151 crypto/camellia_generic.c | 1 -
10152 crypto/{cast5.c => cast5_generic.c} | 80 +-
10153 crypto/{cast6.c => cast6_generic.c} | 73 +-
10154 crypto/crypto_null.c | 57 +-
10155 crypto/crypto_user.c | 2 +-
10156 crypto/deflate.c | 1 -
10157 crypto/des_generic.c | 25 +-
10158 crypto/fcrypt.c | 1 -
10159 crypto/ghash-generic.c | 1 -
10160 crypto/khazad.c | 1 -
10161 crypto/krng.c | 1 -
10163 crypto/salsa20_generic.c | 1 -
10164 crypto/seed.c | 1 -
10165 crypto/serpent_generic.c | 53 +-
10166 crypto/sha256_generic.c | 25 +-
10167 crypto/sha512_generic.c | 20 +-
10168 crypto/shash.c | 36 +
10169 crypto/tcrypt.c | 95 +-
10170 crypto/tcrypt.h | 1 +
10171 crypto/tea.c | 41 +-
10172 crypto/testmgr.c | 472 ++-
10173 crypto/testmgr.h | 5165 ++++++++++++++++++++++-----
10174 crypto/tgr192.c | 38 +-
10175 crypto/twofish_generic.c | 1 -
10176 crypto/vmac.c | 10 +-
10177 crypto/wp512.c | 39 +-
10178 drivers/char/hw_random/mxc-rnga.c | 108 +-
10179 drivers/char/hw_random/octeon-rng.c | 17 +-
10180 drivers/crypto/Kconfig | 22 +-
10181 drivers/crypto/amcc/crypto4xx_core.c | 1 +
10182 drivers/crypto/atmel-aes.c | 7 -
10183 drivers/crypto/atmel-sha.c | 5 -
10184 drivers/crypto/atmel-tdes.c | 6 -
10185 drivers/crypto/caam/caamalg.c | 51 +-
10186 drivers/crypto/caam/caamhash.c | 22 +-
10187 drivers/crypto/caam/caamrng.c | 9 +-
10188 drivers/crypto/caam/compat.h | 1 +
10189 drivers/crypto/caam/ctrl.c | 6 +-
10190 drivers/crypto/caam/error.c | 2 -
10191 drivers/crypto/caam/key_gen.c | 4 +
10192 drivers/crypto/geode-aes.c | 18 +-
10193 drivers/crypto/hifn_795x.c | 5 +-
10194 drivers/crypto/nx/Kconfig | 26 +
10195 drivers/crypto/nx/Makefile | 5 +-
10196 drivers/crypto/nx/nx-842.c | 1617 +++++++++
10197 drivers/crypto/nx/nx-aes-cbc.c | 1 -
10198 drivers/crypto/nx/nx-aes-ccm.c | 2 -
10199 drivers/crypto/nx/nx-aes-ctr.c | 2 -
10200 drivers/crypto/nx/nx-aes-ecb.c | 1 -
10201 drivers/crypto/nx/nx-aes-gcm.c | 2 -
10202 drivers/crypto/omap-aes.c | 1 -
10203 drivers/crypto/padlock-aes.c | 3 -
10204 drivers/crypto/s5p-sss.c | 1 -
10205 drivers/crypto/talitos.c | 442 +--
10206 drivers/crypto/tegra-aes.c | 3 +-
10207 drivers/crypto/ux500/cryp/cryp_core.c | 1 +
10208 drivers/crypto/ux500/hash/hash_core.c | 1 -
10209 include/crypto/cast5.h | 27 +
10210 include/crypto/cast6.h | 28 +
10211 include/crypto/internal/hash.h | 2 +
10212 include/linux/nx842.h | 11 +
10213 99 files changed, 12276 insertions(+), 2556 deletions(-)
10214 create mode 100644 arch/arm/crypto/Makefile
10215 create mode 100644 arch/arm/crypto/aes-armv4.S
10216 create mode 100644 arch/arm/crypto/aes_glue.c
10217 create mode 100644 arch/arm/crypto/sha1-armv4-large.S
10218 create mode 100644 arch/arm/crypto/sha1_glue.c
10219 create mode 100644 arch/x86/crypto/cast5-avx-x86_64-asm_64.S
10220 create mode 100644 arch/x86/crypto/cast5_avx_glue.c
10221 create mode 100644 arch/x86/crypto/cast6-avx-x86_64-asm_64.S
10222 create mode 100644 arch/x86/crypto/cast6_avx_glue.c
10223 create mode 100644 crypto/842.c
10224 rename crypto/{cast5.c => cast5_generic.c} (95%)
10225 rename crypto/{cast6.c => cast6_generic.c} (93%)
10226 create mode 100644 drivers/crypto/nx/Kconfig
10227 create mode 100644 drivers/crypto/nx/nx-842.c
10228 create mode 100644 include/crypto/cast5.h
10229 create mode 100644 include/crypto/cast6.h
10230 create mode 100644 include/linux/nx842.h
10231 Merging drm/drm-next (8fe681d5 drm: change ioctl permissions)
10232 $ git merge drm/drm-next
10233 Auto-merging drivers/gpu/drm/udl/udl_connector.c
10234 Removing drivers/gpu/drm/gma500/gem_glue.h
10235 Removing drivers/gpu/drm/gma500/gem_glue.c
10236 Merge made by the 'recursive' strategy.
10237 Documentation/DocBook/drm.tmpl | 2835 +++++++++++++++++++-----
10238 drivers/char/agp/intel-gtt.c | 62 +-
10239 drivers/gpu/drm/Kconfig | 19 +-
10240 drivers/gpu/drm/Makefile | 3 +
10241 drivers/gpu/drm/ast/ast_drv.h | 1 -
10242 drivers/gpu/drm/ast/ast_mode.c | 1 +
10243 drivers/gpu/drm/cirrus/cirrus_drv.h | 1 -
10244 drivers/gpu/drm/drm_cache.c | 28 +-
10245 drivers/gpu/drm/drm_crtc.c | 139 +-
10246 drivers/gpu/drm/drm_drv.c | 22 +-
10247 drivers/gpu/drm/drm_edid.c | 208 +-
10248 drivers/gpu/drm/drm_edid_load.c | 29 +-
10249 drivers/gpu/drm/drm_edid_modes.h | 42 +-
10250 drivers/gpu/drm/drm_fb_cma_helper.c | 406 ++++
10251 drivers/gpu/drm/drm_fb_helper.c | 10 +-
10252 drivers/gpu/drm/drm_gem_cma_helper.c | 251 +++
10253 drivers/gpu/drm/drm_irq.c | 2 +-
10254 drivers/gpu/drm/drm_vm.c | 11 +-
10255 drivers/gpu/drm/exynos/exynos_drm_connector.c | 4 +-
10256 drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +-
10257 drivers/gpu/drm/exynos/exynos_drm_vidi.c | 13 -
10258 drivers/gpu/drm/gma500/Makefile | 5 +-
10259 drivers/gpu/drm/gma500/backlight.c | 45 +
10260 drivers/gpu/drm/gma500/cdv_device.c | 72 +-
10261 drivers/gpu/drm/gma500/cdv_intel_display.c | 236 +-
10262 drivers/gpu/drm/gma500/cdv_intel_dp.c | 1951 ++++++++++++++++
10263 drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 6 +-
10264 drivers/gpu/drm/gma500/cdv_intel_lvds.c | 12 +-
10265 drivers/gpu/drm/gma500/framebuffer.c | 7 +
10266 drivers/gpu/drm/gma500/gem.c | 9 +-
10267 drivers/gpu/drm/gma500/gem_glue.c | 90 -
10268 drivers/gpu/drm/gma500/gem_glue.h | 2 -
10269 drivers/gpu/drm/gma500/intel_bios.c | 101 +
10270 drivers/gpu/drm/gma500/intel_bios.h | 46 +
10271 drivers/gpu/drm/gma500/mdfld_dsi_output.c | 13 +-
10272 drivers/gpu/drm/gma500/mid_bios.c | 8 +-
10273 drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 -
10274 drivers/gpu/drm/gma500/opregion.c | 3 +-
10275 drivers/gpu/drm/gma500/psb_device.c | 1 +
10276 drivers/gpu/drm/gma500/psb_drv.h | 20 +-
10277 drivers/gpu/drm/gma500/psb_intel_drv.h | 28 +-
10278 drivers/gpu/drm/gma500/psb_intel_lvds.c | 13 +-
10279 drivers/gpu/drm/gma500/psb_intel_reg.h | 197 +-
10280 drivers/gpu/drm/gma500/psb_intel_sdvo.c | 4 -
10281 drivers/gpu/drm/i2c/ch7006_drv.c | 16 +-
10282 drivers/gpu/drm/i915/Makefile | 1 +
10283 drivers/gpu/drm/i915/dvo.h | 16 +-
10284 drivers/gpu/drm/i915/dvo_ch7017.c | 21 +-
10285 drivers/gpu/drm/i915/dvo_ch7xxx.c | 17 +-
10286 drivers/gpu/drm/i915/dvo_ivch.c | 23 +-
10287 drivers/gpu/drm/i915/dvo_ns2501.c | 588 +++++
10288 drivers/gpu/drm/i915/dvo_sil164.c | 20 +-
10289 drivers/gpu/drm/i915/dvo_tfp410.c | 18 +-
10290 drivers/gpu/drm/i915/i915_debugfs.c | 251 ++-
10291 drivers/gpu/drm/i915/i915_dma.c | 73 +-
10292 drivers/gpu/drm/i915/i915_drv.c | 61 +-
10293 drivers/gpu/drm/i915/i915_drv.h | 239 +-
10294 drivers/gpu/drm/i915/i915_gem.c | 1548 +++++++------
10295 drivers/gpu/drm/i915/i915_gem_context.c | 65 +-
10296 drivers/gpu/drm/i915/i915_gem_dmabuf.c | 174 +-
10297 drivers/gpu/drm/i915/i915_gem_evict.c | 44 +-
10298 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 391 +---
10299 drivers/gpu/drm/i915/i915_gem_gtt.c | 144 +-
10300 drivers/gpu/drm/i915/i915_gem_tiling.c | 16 +-
10301 drivers/gpu/drm/i915/i915_irq.c | 194 +-
10302 drivers/gpu/drm/i915/i915_reg.h | 328 ++-
10303 drivers/gpu/drm/i915/i915_sysfs.c | 220 +-
10304 drivers/gpu/drm/i915/i915_trace.h | 25 +-
10305 drivers/gpu/drm/i915/intel_crt.c | 165 +-
10306 drivers/gpu/drm/i915/intel_ddi.c | 144 +-
10307 drivers/gpu/drm/i915/intel_display.c | 2173 +++++++++++++-----
10308 drivers/gpu/drm/i915/intel_dp.c | 401 ++--
10309 drivers/gpu/drm/i915/intel_drv.h | 147 +-
10310 drivers/gpu/drm/i915/intel_dvo.c | 115 +-
10311 drivers/gpu/drm/i915/intel_hdmi.c | 221 +-
10312 drivers/gpu/drm/i915/intel_lvds.c | 99 +-
10313 drivers/gpu/drm/i915/intel_modes.c | 1 -
10314 drivers/gpu/drm/i915/intel_opregion.c | 23 +-
10315 drivers/gpu/drm/i915/intel_overlay.c | 60 +-
10316 drivers/gpu/drm/i915/intel_pm.c | 420 ++--
10317 drivers/gpu/drm/i915/intel_ringbuffer.c | 152 +-
10318 drivers/gpu/drm/i915/intel_ringbuffer.h | 20 +-
10319 drivers/gpu/drm/i915/intel_sdvo.c | 210 +-
10320 drivers/gpu/drm/i915/intel_tv.c | 70 +-
10321 drivers/gpu/drm/mgag200/mgag200_drv.h | 1 -
10322 drivers/gpu/drm/mgag200/mgag200_mode.c | 1 -
10323 drivers/gpu/drm/nouveau/nouveau_dp.c | 4 +-
10324 drivers/gpu/drm/radeon/atombios_dp.c | 4 +-
10325 drivers/gpu/drm/shmobile/Kconfig | 10 +
10326 drivers/gpu/drm/shmobile/Makefile | 7 +
10327 drivers/gpu/drm/shmobile/shmob_drm_backlight.c | 90 +
10328 drivers/gpu/drm/shmobile/shmob_drm_backlight.h | 23 +
10329 drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 763 +++++++
10330 drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 60 +
10331 drivers/gpu/drm/shmobile/shmob_drm_drv.c | 361 +++
10332 drivers/gpu/drm/shmobile/shmob_drm_drv.h | 47 +
10333 drivers/gpu/drm/shmobile/shmob_drm_kms.c | 160 ++
10334 drivers/gpu/drm/shmobile/shmob_drm_kms.h | 34 +
10335 drivers/gpu/drm/shmobile/shmob_drm_plane.c | 268 +++
10336 drivers/gpu/drm/shmobile/shmob_drm_plane.h | 22 +
10337 drivers/gpu/drm/shmobile/shmob_drm_regs.h | 311 +++
10338 drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +-
10339 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 5 +-
10340 drivers/gpu/drm/ttm/ttm_tt.c | 16 +-
10341 drivers/gpu/drm/udl/udl_connector.c | 3 -
10342 drivers/gpu/drm/udl/udl_encoder.c | 2 +-
10343 drivers/gpu/drm/udl/udl_fb.c | 26 +-
10344 drivers/gpu/drm/udl/udl_gem.c | 7 -
10345 drivers/gpu/drm/udl/udl_main.c | 7 +-
10346 drivers/gpu/drm/udl/udl_modeset.c | 2 +-
10347 drivers/gpu/drm/udl/udl_transfer.c | 8 +-
10348 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 -
10349 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 1 -
10350 drivers/staging/omapdrm/omap_connector.c | 5 +-
10351 drivers/staging/omapdrm/omap_fbdev.c | 4 +-
10352 include/drm/drmP.h | 1 +
10353 include/drm/drm_crtc.h | 21 +-
10354 include/drm/drm_fb_cma_helper.h | 27 +
10355 include/drm/drm_fourcc.h | 2 +
10356 include/drm/drm_gem_cma_helper.h | 44 +
10357 include/drm/drm_sarea.h | 2 +
10358 include/drm/i915_drm.h | 36 +-
10359 include/drm/intel-gtt.h | 10 +-
10360 include/linux/platform_data/shmob_drm.h | 99 +
10361 124 files changed, 14143 insertions(+), 4229 deletions(-)
10362 create mode 100644 drivers/gpu/drm/drm_fb_cma_helper.c
10363 create mode 100644 drivers/gpu/drm/drm_gem_cma_helper.c
10364 create mode 100644 drivers/gpu/drm/gma500/cdv_intel_dp.c
10365 delete mode 100644 drivers/gpu/drm/gma500/gem_glue.c
10366 delete mode 100644 drivers/gpu/drm/gma500/gem_glue.h
10367 create mode 100644 drivers/gpu/drm/i915/dvo_ns2501.c
10368 create mode 100644 drivers/gpu/drm/shmobile/Kconfig
10369 create mode 100644 drivers/gpu/drm/shmobile/Makefile
10370 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_backlight.c
10371 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_backlight.h
10372 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_crtc.c
10373 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_crtc.h
10374 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_drv.c
10375 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_drv.h
10376 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_kms.c
10377 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_kms.h
10378 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_plane.c
10379 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_plane.h
10380 create mode 100644 drivers/gpu/drm/shmobile/shmob_drm_regs.h
10381 create mode 100644 include/drm/drm_fb_cma_helper.h
10382 create mode 100644 include/drm/drm_gem_cma_helper.h
10383 create mode 100644 include/linux/platform_data/shmob_drm.h
10384 Merging sound/for-next (b7ef37d ARM: SAMSUNG: dma-ops: Fix dmaengine_prep_dma_cyclic() parameter list)
10385 $ git merge sound/for-next
10386 Resolved 'arch/arm/mach-imx/mach-imx27_visstrim_m10.c' using previous resolution.
10387 Auto-merging sound/usb/endpoint.c
10388 Removing sound/soc/omap/overo.c
10389 Removing sound/soc/omap/omap3evm.c
10390 Removing sound/soc/omap/omap3beagle.c
10391 Removing sound/soc/omap/igep0020.c
10392 Auto-merging sound/soc/codecs/wm2000.c
10393 Removing include/sound/version.h
10394 Auto-merging include/sound/tegra_wm8903.h
10395 Auto-merging include/linux/platform_data/davinci_asp.h
10396 Auto-merging drivers/dma/tegra20-apb-dma.c
10397 Auto-merging drivers/dma/ste_dma40.c
10398 Auto-merging drivers/dma/sirf-dma.c
10399 Auto-merging drivers/dma/pl330.c
10400 Auto-merging drivers/dma/mxs-dma.c
10401 Auto-merging drivers/dma/mmp_tdma.c
10402 Auto-merging drivers/dma/imx-dma.c
10403 Auto-merging drivers/dma/ep93xx_dma.c
10404 Auto-merging drivers/dma/at_hdmac.c
10405 Auto-merging arch/arm/mach-omap2/twl-common.c
10406 Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
10407 Auto-merging arch/arm/mach-omap2/board-omap3evm.c
10408 Auto-merging arch/arm/mach-imx/mach-imx27_visstrim_m10.c
10409 CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
10410 Automatic merge failed; fix conflicts and then commit the result.
10412 [master d2c43ec] Merge remote-tracking branch 'sound/for-next'
10413 $ git diff -M --stat --summary HEAD^..
10414 .../devicetree/bindings/mfd/twl4030-audio.txt | 46 +
10415 Documentation/devicetree/bindings/sound/cs4270.txt | 21 +
10416 .../bindings/sound/davinci-mcasp-audio.txt | 45 +
10417 .../devicetree/bindings/sound/omap-abe-twl6040.txt | 91 ++
10418 .../devicetree/bindings/sound/omap-mcbsp.txt | 37 +
10419 .../devicetree/bindings/sound/omap-twl4030.txt | 17 +
10420 .../devicetree/bindings/sound/tlv320aic3x.txt | 20 +
10421 Documentation/sound/alsa/ALSA-Configuration.txt | 10 +-
10422 Documentation/sound/alsa/Channel-Mapping-API.txt | 153 ++++
10423 Documentation/sound/alsa/HD-Audio-Models.txt | 3 +-
10424 arch/arm/mach-davinci/asp.h | 49 +
10425 arch/arm/mach-davinci/davinci.h | 3 +-
10426 arch/arm/mach-davinci/devices-da8xx.c | 8 +-
10427 arch/arm/mach-davinci/devices.c | 11 -
10428 arch/arm/mach-davinci/dm355.c | 2 +-
10429 arch/arm/mach-davinci/dm365.c | 2 +-
10430 arch/arm/mach-davinci/dm644x.c | 2 +-
10431 arch/arm/mach-davinci/dm646x.c | 2 +-
10432 arch/arm/mach-davinci/include/mach/da8xx.h | 2 +-
10433 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 42 +-
10434 arch/arm/mach-omap2/board-am3517evm.c | 13 +
10435 arch/arm/mach-omap2/board-cm-t35.c | 1 +
10436 arch/arm/mach-omap2/board-devkit8000.c | 1 +
10437 arch/arm/mach-omap2/board-igep0020.c | 1 +
10438 arch/arm/mach-omap2/board-omap3beagle.c | 1 +
10439 arch/arm/mach-omap2/board-omap3evm.c | 1 +
10440 arch/arm/mach-omap2/board-overo.c | 1 +
10441 arch/arm/mach-omap2/board-zoom-peripherals.c | 9 +-
10442 arch/arm/mach-omap2/include/mach/board-zoom.h | 2 -
10443 arch/arm/mach-omap2/mcbsp.c | 126 +--
10444 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +
10445 arch/arm/mach-omap2/twl-common.c | 27 +
10446 arch/arm/mach-omap2/twl-common.h | 2 +
10447 arch/arm/plat-omap/include/plat/mcbsp.h | 2 -
10448 arch/arm/plat-samsung/dma-ops.c | 3 +-
10449 arch/blackfin/mach-bf527/boards/ezkit.c | 20 +
10450 arch/blackfin/mach-bf533/boards/stamp.c | 20 +
10451 arch/blackfin/mach-bf537/boards/stamp.c | 20 +
10452 arch/blackfin/mach-bf561/boards/ezkit.c | 20 +
10453 arch/blackfin/mach-bf609/boards/ezkit.c | 19 +
10454 drivers/dma/at_hdmac.c | 3 +-
10455 drivers/dma/ep93xx_dma.c | 4 +-
10456 drivers/dma/imx-dma.c | 2 +-
10457 drivers/dma/imx-sdma.c | 2 +-
10458 drivers/dma/mmp_tdma.c | 2 +-
10459 drivers/dma/mxs-dma.c | 2 +-
10460 drivers/dma/omap-dma.c | 45 +-
10461 drivers/dma/pl330.c | 2 +-
10462 drivers/dma/sa11x0-dma.c | 2 +-
10463 drivers/dma/sirf-dma.c | 2 +-
10464 drivers/dma/ste_dma40.c | 3 +-
10465 drivers/dma/tegra20-apb-dma.c | 2 +-
10466 drivers/input/misc/twl4030-vibra.c | 18 +-
10467 drivers/mfd/twl-core.c | 32 +
10468 drivers/mfd/twl4030-audio.c | 105 ++-
10469 include/linux/dmaengine.h | 7 +-
10470 include/linux/i2c/twl.h | 3 +-
10471 include/linux/mfd/wm8994/pdata.h | 4 +
10472 include/linux/of.h | 6 +
10473 include/linux/platform_data/asoc-mx27vis.h | 11 +
10474 .../linux/platform_data/davinci_asp.h | 74 +-
10475 include/linux/platform_data/omap-twl4030.h | 32 +
10476 include/sound/ac97_codec.h | 3 +
10477 include/sound/ad1816a.h | 9 +-
10478 include/sound/asound.h | 39 +
10479 include/sound/compress_driver.h | 1 +
10480 include/sound/compress_params.h | 1 +
10481 include/sound/emu10k1.h | 4 +-
10482 include/sound/initval.h | 14 +
10483 include/sound/memalloc.h | 27 +-
10484 include/sound/pcm.h | 87 +-
10485 include/sound/soc-dai.h | 3 +
10486 include/sound/soc-dapm.h | 7 +-
10487 include/sound/soc.h | 20 +-
10488 .../sound/tegra_wm8903.h | 7 +-
10489 include/sound/tlv.h | 8 +
10490 include/sound/version.h | 3 -
10491 include/sound/wm0010.h | 27 +
10492 include/sound/wm8960.h | 2 +-
10493 include/sound/wm8993.h | 4 +
10494 sound/core/compress_offload.c | 26 +
10495 sound/core/control.c | 1 +
10496 sound/core/info.c | 7 +-
10497 sound/core/info_oss.c | 3 +-
10498 sound/core/oss/mixer_oss.c | 2 +
10499 sound/core/pcm.c | 4 +
10500 sound/core/pcm_lib.c | 214 +++++
10501 sound/core/pcm_memory.c | 26 -
10502 sound/core/seq/seq_device.c | 2 +
10503 sound/core/sgbuf.c | 27 +
10504 sound/core/sound.c | 3 +-
10505 sound/drivers/opl4/opl4_synth.c | 9 +-
10506 sound/isa/Kconfig | 12 +
10507 sound/isa/Makefile | 2 +
10508 sound/isa/ad1816a/ad1816a.c | 64 +-
10509 sound/isa/ad1816a/ad1816a_lib.c | 38 +-
10510 sound/isa/cmi8328.c | 483 ++++++++++
10511 sound/isa/gus/interwave.c | 5 +-
10512 sound/isa/opti9xx/miro.c | 15 +-
10513 sound/isa/opti9xx/opti92x-ad1848.c | 14 +-
10514 sound/isa/sb/emu8000.c | 15 +-
10516 sound/pci/ac97/ac97_patch.c | 24 +-
10517 sound/pci/ali5451/ali5451.c | 10 +-
10518 sound/pci/als300.c | 2 +-
10519 sound/pci/als4000.c | 4 +-
10520 sound/pci/asihpi/asihpi.c | 2 +-
10521 sound/pci/atiixp.c | 15 +-
10522 sound/pci/atiixp_modem.c | 6 +-
10523 sound/pci/azt3328.c | 6 +-
10524 sound/pci/ca0106/ca0106.h | 4 +-
10525 sound/pci/ca0106/ca0106_main.c | 30 +-
10526 sound/pci/ca0106/ca0106_mixer.c | 4 +-
10527 sound/pci/cmipci.c | 12 +-
10528 sound/pci/cs4281.c | 6 +-
10529 sound/pci/cs46xx/cs46xx.c | 2 +-
10530 sound/pci/cs46xx/cs46xx.h | 2 +-
10531 sound/pci/cs46xx/cs46xx_lib.c | 8 +-
10532 sound/pci/cs46xx/cs46xx_lib.h | 2 +-
10533 sound/pci/cs46xx/dsp_spos.c | 8 +-
10534 sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +-
10535 sound/pci/cs5530.c | 3 +-
10536 sound/pci/cs5535audio/Makefile | 2 +-
10537 sound/pci/cs5535audio/cs5535audio.c | 2 +-
10538 sound/pci/ctxfi/ctatc.c | 4 +-
10539 sound/pci/ctxfi/ctatc.h | 2 +-
10540 sound/pci/ctxfi/cthardware.h | 2 +-
10541 sound/pci/ctxfi/cthw20k1.c | 4 +-
10542 sound/pci/ctxfi/cthw20k2.c | 4 +-
10543 sound/pci/ctxfi/ctmixer.c | 4 +-
10544 sound/pci/ctxfi/ctmixer.h | 2 +-
10545 sound/pci/ctxfi/ctpcm.c | 52 +-
10546 sound/pci/ctxfi/xfi.c | 2 +-
10547 sound/pci/echoaudio/echoaudio.c | 12 +-
10548 sound/pci/echoaudio/echoaudio.h | 2 +-
10549 sound/pci/emu10k1/emu10k1.c | 4 +-
10550 sound/pci/emu10k1/emu10k1_main.c | 8 +-
10551 sound/pci/emu10k1/emu10k1x.c | 21 +
10552 sound/pci/emu10k1/emufx.c | 2 +-
10553 sound/pci/emu10k1/memory.c | 4 +-
10554 sound/pci/emu10k1/p16v.c | 2 +-
10555 sound/pci/ens1370.c | 70 +-
10556 sound/pci/es1938.c | 6 +-
10557 sound/pci/es1968.c | 12 +-
10558 sound/pci/fm801.c | 13 +-
10559 sound/pci/hda/Kconfig | 10 +-
10560 sound/pci/hda/hda_auto_parser.c | 7 +-
10561 sound/pci/hda/hda_codec.c | 270 +++---
10562 sound/pci/hda/hda_codec.h | 82 +-
10563 sound/pci/hda/hda_generic.c | 8 +-
10564 sound/pci/hda/hda_hwdep.c | 43 +-
10565 sound/pci/hda/hda_intel.c | 306 +++++--
10566 sound/pci/hda/hda_jack.c | 5 +-
10567 sound/pci/hda/hda_local.h | 2 +-
10568 sound/pci/hda/hda_proc.c | 9 +-
10569 sound/pci/hda/hda_trace.h | 26 +
10570 sound/pci/hda/patch_analog.c | 90 +-
10571 sound/pci/hda/patch_cirrus.c | 225 +++--
10572 sound/pci/hda/patch_conexant.c | 31 +-
10573 sound/pci/hda/patch_hdmi.c | 407 ++++++++-
10574 sound/pci/hda/patch_realtek.c | 19 +-
10575 sound/pci/hda/patch_sigmatel.c | 95 +-
10576 sound/pci/hda/patch_via.c | 37 +-
10577 sound/pci/ice1712/aureon.c | 4 +-
10578 sound/pci/ice1712/ice1712.h | 2 +-
10579 sound/pci/ice1712/ice1724.c | 4 +-
10580 sound/pci/ice1712/juli.c | 4 +-
10581 sound/pci/ice1712/prodigy_hifi.c | 4 +-
10582 sound/pci/intel8x0.c | 24 +-
10583 sound/pci/intel8x0m.c | 4 +-
10584 sound/pci/korg1212/korg1212.c | 4 +-
10585 sound/pci/maestro3.c | 10 +-
10586 sound/pci/nm256/nm256.c | 4 +-
10587 sound/pci/oxygen/oxygen.c | 2 +-
10588 sound/pci/oxygen/oxygen.h | 2 +-
10589 sound/pci/oxygen/oxygen_lib.c | 4 +-
10590 sound/pci/oxygen/virtuoso.c | 2 +-
10591 sound/pci/pcxhr/pcxhr.c | 24 +
10592 sound/pci/pcxhr/pcxhr_hwdep.c | 6 +-
10593 sound/pci/riptide/riptide.c | 6 +-
10594 sound/pci/sis7019.c | 6 +-
10595 sound/pci/trident/trident.c | 2 +-
10596 sound/pci/trident/trident_main.c | 4 +-
10597 sound/pci/via82xx.c | 33 +-
10598 sound/pci/via82xx_modem.c | 4 +-
10599 sound/pci/vx222/vx222.c | 2 +-
10600 sound/pci/ymfpci/ymfpci.c | 2 +-
10601 sound/pci/ymfpci/ymfpci.h | 2 +-
10602 sound/pci/ymfpci/ymfpci_main.c | 26 +-
10603 sound/soc/Kconfig | 3 +-
10604 sound/soc/Makefile | 4 +-
10605 sound/soc/blackfin/bf5xx-ad1836.c | 73 +-
10606 sound/soc/{ep93xx => cirrus}/Kconfig | 0
10607 sound/soc/{ep93xx => cirrus}/Makefile | 0
10608 sound/soc/{ep93xx => cirrus}/edb93xx.c | 0
10609 sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c | 0
10610 sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c | 0
10611 sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c | 0
10612 sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h | 0
10613 sound/soc/{ep93xx => cirrus}/simone.c | 0
10614 sound/soc/{ep93xx => cirrus}/snappercl15.c | 0
10615 sound/soc/codecs/Kconfig | 4 +
10616 sound/soc/codecs/Makefile | 2 +
10617 sound/soc/codecs/ab8500-codec.c | 13 +-
10618 sound/soc/codecs/ad1836.c | 88 +-
10619 sound/soc/codecs/ad193x.c | 50 +-
10620 sound/soc/codecs/ad1980.c | 1 -
10621 sound/soc/codecs/adau1373.c | 12 +-
10622 sound/soc/codecs/adau1701.c | 12 +-
10623 sound/soc/codecs/ak4671.c | 12 +-
10624 sound/soc/codecs/arizona.c | 68 +-
10625 sound/soc/codecs/arizona.h | 6 +-
10626 sound/soc/codecs/cs4270.c | 152 ++--
10627 sound/soc/codecs/cs42l51.c | 19 +-
10628 sound/soc/codecs/cs42l52.c | 1 -
10629 sound/soc/codecs/isabelle.c | 1 -
10630 sound/soc/codecs/lm4857.c | 12 +-
10631 sound/soc/codecs/max98088.c | 18 +-
10632 sound/soc/codecs/max98095.c | 18 +-
10633 sound/soc/codecs/max9850.c | 12 +-
10634 sound/soc/codecs/max9877.c | 12 +-
10635 sound/soc/codecs/mc13783.c | 60 +-
10636 sound/soc/codecs/sta32x.c | 151 ++--
10637 sound/soc/codecs/sta529.c | 2 +-
10638 sound/soc/codecs/stac9766.c | 1 -
10639 sound/soc/codecs/tlv320aic26.c | 12 +-
10640 sound/soc/codecs/tlv320aic32x4.c | 19 +-
10641 sound/soc/codecs/tlv320aic3x.c | 49 +-
10642 sound/soc/codecs/tlv320dac33.c | 19 +-
10643 sound/soc/codecs/tpa6130a2.c | 13 +-
10644 sound/soc/codecs/twl4030.c | 157 +++-
10645 sound/soc/codecs/twl6040.c | 43 +-
10646 sound/soc/codecs/wm0010.c | 944 ++++++++++++++++++++
10647 sound/soc/codecs/wm2000.c | 12 +-
10648 sound/soc/codecs/wm2200.c | 16 +-
10649 sound/soc/codecs/wm5100.c | 6 +-
10650 sound/soc/codecs/wm5102.c | 52 +-
10651 sound/soc/codecs/wm5110.c | 18 +-
10652 sound/soc/codecs/wm8510.c | 129 ++-
10653 sound/soc/codecs/wm8523.c | 184 ++--
10654 sound/soc/codecs/wm8580.c | 149 ++-
10655 sound/soc/codecs/wm8711.c | 65 +-
10656 sound/soc/codecs/wm8728.c | 60 +-
10657 sound/soc/codecs/wm8737.c | 132 +--
10658 sound/soc/codecs/wm8741.c | 115 ++-
10659 sound/soc/codecs/wm8770.c | 19 +-
10660 sound/soc/codecs/wm8776.c | 75 +-
10661 sound/soc/codecs/wm8900.c | 166 ++--
10662 sound/soc/codecs/wm8903.c | 18 +-
10663 sound/soc/codecs/wm8904.c | 2 -
10664 sound/soc/codecs/wm8940.c | 18 +-
10665 sound/soc/codecs/wm8955.c | 18 +-
10666 sound/soc/codecs/wm8958-dsp2.c | 28 +-
10667 sound/soc/codecs/wm8960.c | 150 +++-
10668 sound/soc/codecs/wm8961.c | 492 ++++------
10669 sound/soc/codecs/wm8971.c | 18 +-
10670 sound/soc/codecs/wm8974.c | 18 +-
10671 sound/soc/codecs/wm8978.c | 18 +-
10672 sound/soc/codecs/wm8983.c | 162 ++--
10673 sound/soc/codecs/wm8990.c | 8 +-
10674 sound/soc/codecs/wm8991.c | 25 +-
10675 sound/soc/codecs/wm8993.c | 2 +
10676 sound/soc/codecs/wm8994.c | 132 ++-
10677 sound/soc/codecs/wm8994.h | 12 +-
10678 sound/soc/codecs/wm8996.c | 2 +-
10679 sound/soc/codecs/wm9090.c | 12 +-
10680 sound/soc/codecs/wm9712.c | 12 +-
10681 sound/soc/codecs/wm9713.c | 1 -
10682 sound/soc/codecs/wm_hubs.c | 114 ++-
10683 sound/soc/codecs/wm_hubs.h | 6 +
10684 sound/soc/davinci/davinci-evm.c | 19 +-
10685 sound/soc/davinci/davinci-i2s.c | 13 +-
10686 sound/soc/davinci/davinci-mcasp.c | 260 +++++-
10687 sound/soc/davinci/davinci-mcasp.h | 6 +-
10688 sound/soc/davinci/davinci-pcm.c | 24 +-
10689 sound/soc/davinci/davinci-pcm.h | 6 +-
10690 sound/soc/davinci/davinci-sffsdr.c | 2 +-
10691 sound/soc/davinci/davinci-vcif.c | 8 +
10692 sound/soc/fsl/Kconfig | 2 +-
10693 sound/soc/fsl/fsl_dma.c | 6 -
10694 sound/soc/fsl/imx-audmux.c | 3 -
10695 sound/soc/fsl/imx-pcm-dma.c | 5 +-
10696 sound/soc/fsl/imx-ssi.c | 30 +-
10697 sound/soc/fsl/mpc5200_dma.c | 24 +-
10698 sound/soc/fsl/mpc5200_dma.h | 3 +
10699 sound/soc/fsl/mpc5200_psc_ac97.c | 10 +
10700 sound/soc/fsl/mpc5200_psc_i2s.c | 8 +
10701 sound/soc/fsl/mpc8610_hpcd.c | 32 +-
10702 sound/soc/fsl/mx27vis-aic32x4.c | 42 +-
10703 sound/soc/fsl/p1022_ds.c | 31 +-
10704 sound/soc/fsl/pcm030-audio-fabric.c | 100 ++-
10705 sound/soc/mid-x86/mfld_machine.c | 9 +
10706 sound/soc/mid-x86/sst_dsp.h | 134 +++
10707 sound/soc/mid-x86/sst_platform.c | 204 ++++-
10708 sound/soc/mid-x86/sst_platform.h | 26 +-
10709 sound/soc/mxs/mxs-saif.c | 20 +-
10710 sound/soc/omap/Kconfig | 51 +-
10711 sound/soc/omap/Makefile | 10 +-
10712 sound/soc/omap/am3517evm.c | 21 +-
10713 sound/soc/omap/igep0020.c | 120 ---
10714 sound/soc/omap/mcbsp.c | 54 +-
10715 sound/soc/omap/mcbsp.h | 3 -
10716 sound/soc/omap/omap-abe-twl6040.c | 145 ++-
10717 sound/soc/omap/omap-dmic.c | 9 +-
10718 sound/soc/omap/omap-hdmi.c | 17 +-
10719 sound/soc/omap/omap-mcbsp.c | 230 ++---
10720 sound/soc/omap/omap-mcbsp.h | 20 -
10721 sound/soc/omap/omap-mcpdm.c | 92 +-
10722 sound/soc/omap/omap-pcm.c | 236 ++---
10723 sound/soc/omap/omap-pcm.h | 4 +-
10724 sound/soc/omap/omap-twl4030.c | 188 ++++
10725 sound/soc/omap/omap3beagle.c | 150 ----
10726 sound/soc/omap/omap3evm.c | 118 ---
10727 sound/soc/omap/overo.c | 122 ---
10728 sound/soc/omap/zoom2.c | 4 -
10729 sound/soc/samsung/Kconfig | 11 +-
10730 sound/soc/samsung/Makefile | 2 +
10731 sound/soc/samsung/bells.c | 346 +++++++
10732 sound/soc/samsung/speyside.c | 42 +-
10733 sound/soc/sh/fsi.c | 28 +-
10734 sound/soc/soc-compress.c | 294 ++++++
10735 sound/soc/soc-core.c | 100 ++-
10736 sound/soc/soc-dapm.c | 44 +-
10737 sound/soc/soc-dmaengine-pcm.c | 6 +-
10738 sound/soc/soc-jack.c | 6 -
10739 sound/soc/tegra/tegra_wm8903.c | 3 +-
10740 sound/soc/ux500/ux500_msp_dai.c | 3 +
10741 sound/soc/ux500/ux500_msp_i2s.c | 2 +
10742 sound/usb/6fire/firmware.c | 5 +-
10743 sound/usb/card.c | 2 +
10744 sound/usb/card.h | 7 +-
10745 sound/usb/endpoint.c | 39 +-
10746 sound/usb/endpoint.h | 5 +-
10747 sound/usb/helper.c | 5 +
10748 sound/usb/mixer.c | 7 +
10749 sound/usb/pcm.c | 126 ++-
10750 sound/usb/quirks-table.h | 53 ++
10751 sound/usb/quirks.c | 24 +
10752 sound/usb/quirks.h | 10 +
10753 339 files changed, 8984 insertions(+), 4046 deletions(-)
10754 create mode 100644 Documentation/devicetree/bindings/mfd/twl4030-audio.txt
10755 create mode 100644 Documentation/devicetree/bindings/sound/cs4270.txt
10756 create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
10757 create mode 100644 Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
10758 create mode 100644 Documentation/devicetree/bindings/sound/omap-mcbsp.txt
10759 create mode 100644 Documentation/devicetree/bindings/sound/omap-twl4030.txt
10760 create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt
10761 create mode 100644 Documentation/sound/alsa/Channel-Mapping-API.txt
10762 create mode 100644 arch/arm/mach-davinci/asp.h
10763 create mode 100644 include/linux/platform_data/asoc-mx27vis.h
10764 rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/davinci_asp.h (56%)
10765 create mode 100644 include/linux/platform_data/omap-twl4030.h
10766 rename arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h => include/sound/tegra_wm8903.h (89%)
10767 delete mode 100644 include/sound/version.h
10768 create mode 100644 include/sound/wm0010.h
10769 create mode 100644 sound/isa/cmi8328.c
10770 rename sound/soc/{ep93xx => cirrus}/Kconfig (100%)
10771 rename sound/soc/{ep93xx => cirrus}/Makefile (100%)
10772 rename sound/soc/{ep93xx => cirrus}/edb93xx.c (100%)
10773 rename sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c (100%)
10774 rename sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c (100%)
10775 rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c (100%)
10776 rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h (100%)
10777 rename sound/soc/{ep93xx => cirrus}/simone.c (100%)
10778 rename sound/soc/{ep93xx => cirrus}/snappercl15.c (100%)
10779 create mode 100644 sound/soc/codecs/wm0010.c
10780 create mode 100644 sound/soc/mid-x86/sst_dsp.h
10781 delete mode 100644 sound/soc/omap/igep0020.c
10782 create mode 100644 sound/soc/omap/omap-twl4030.c
10783 delete mode 100644 sound/soc/omap/omap3beagle.c
10784 delete mode 100644 sound/soc/omap/omap3evm.c
10785 delete mode 100644 sound/soc/omap/overo.c
10786 create mode 100644 sound/soc/samsung/bells.c
10787 create mode 100644 sound/soc/soc-compress.c
10788 Merging sound-asoc/for-next (fbe18b4 Merge branch 'for-3.7' into asoc-next)
10789 $ git merge sound-asoc/for-next
10790 Merge made by the 'recursive' strategy.
10791 Documentation/devicetree/bindings/sound/cs4271.txt | 36 +
10792 .../devicetree/bindings/sound/ux500-mop500.txt | 39 +
10793 .../devicetree/bindings/sound/ux500-msp.txt | 43 +
10794 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 1 +
10795 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 1 +
10796 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 1 +
10797 arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 1 +
10798 arch/arm/mach-ux500/board-mop500-msp.c | 79 +-
10799 arch/arm/mach-ux500/include/mach/msp.h | 2 -
10800 include/linux/mfd/abx500/ab8500-codec.h | 6 +-
10801 include/sound/da9055.h | 33 +
10802 include/sound/soc-dapm.h | 3 +
10803 sound/soc/codecs/Kconfig | 4 +
10804 sound/soc/codecs/Makefile | 2 +
10805 sound/soc/codecs/ab8500-codec.c | 81 ++
10806 sound/soc/codecs/arizona.c | 42 +
10807 sound/soc/codecs/arizona.h | 2 +-
10808 sound/soc/codecs/cs4270.c | 4 +-
10809 sound/soc/codecs/cs4271.c | 24 +-
10810 sound/soc/codecs/da9055.c | 1510 ++++++++++++++++++++
10811 sound/soc/codecs/wm0010.c | 18 +-
10812 sound/soc/codecs/wm2000.c | 60 +-
10813 sound/soc/codecs/wm5102.c | 2 +-
10814 sound/soc/codecs/wm5110.c | 79 +-
10815 sound/soc/codecs/wm_hubs.c | 5 +
10816 sound/soc/fsl/eukrea-tlv320.c | 37 +-
10817 sound/soc/soc-dapm.c | 23 +-
10818 sound/soc/ux500/mop500.c | 47 +-
10819 sound/soc/ux500/ux500_msp_dai.c | 6 +
10820 sound/soc/ux500/ux500_msp_i2s.c | 89 +-
10821 sound/soc/ux500/ux500_msp_i2s.h | 8 +-
10822 31 files changed, 2114 insertions(+), 174 deletions(-)
10823 create mode 100644 Documentation/devicetree/bindings/sound/cs4271.txt
10824 create mode 100644 Documentation/devicetree/bindings/sound/ux500-mop500.txt
10825 create mode 100644 Documentation/devicetree/bindings/sound/ux500-msp.txt
10826 create mode 100644 include/sound/da9055.h
10827 create mode 100644 sound/soc/codecs/da9055.c
10828 Merging quilt/rr (1cd1027 virtio-blk: Disable callback in virtblk_done())
10829 $ git merge quilt/rr
10830 Resolved 'arch/Kconfig' using previous resolution.
10831 Resolved 'arch/x86/Kconfig' using previous resolution.
10832 Resolved 'arch/x86/um/Kconfig' using previous resolution.
10833 Resolved 'arch/xtensa/Kconfig' using previous resolution.
10834 Auto-merging kernel/trace/trace.c
10835 Auto-merging drivers/char/virtio_console.c
10836 Auto-merging arch/xtensa/Kconfig
10837 CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
10838 Auto-merging arch/x86/um/Kconfig
10839 CONFLICT (content): Merge conflict in arch/x86/um/Kconfig
10840 Auto-merging arch/x86/Kconfig
10841 CONFLICT (content): Merge conflict in arch/x86/Kconfig
10842 Auto-merging arch/unicore32/Kconfig
10843 Auto-merging arch/tile/Kconfig
10844 Removing arch/sparc/include/asm/module.h
10845 Auto-merging arch/s390/Kconfig
10846 Auto-merging arch/powerpc/Kconfig
10847 Auto-merging arch/mips/Kconfig
10848 Removing arch/m32r/include/asm/module.h
10849 Auto-merging arch/ia64/Kconfig
10850 Removing arch/h8300/include/asm/module.h
10851 Removing arch/cris/include/asm/module.h
10852 Auto-merging arch/cris/Kconfig
10853 Auto-merging arch/arm/Kconfig
10854 Auto-merging arch/Kconfig
10855 CONFLICT (content): Merge conflict in arch/Kconfig
10856 Automatic merge failed; fix conflicts and then commit the result.
10858 [master 750bd52] Merge branch 'quilt/rr'
10859 $ git diff -M --stat --summary HEAD^..
10860 arch/Kconfig | 19 ++
10861 arch/alpha/Kconfig | 2 +
10862 arch/alpha/include/asm/module.h | 10 +-
10863 arch/arm/Kconfig | 2 +
10864 arch/arm/include/asm/module.h | 8 +-
10865 arch/avr32/Kconfig | 2 +
10866 arch/avr32/include/asm/module.h | 6 +-
10867 arch/blackfin/Kconfig | 2 +
10868 arch/blackfin/include/asm/module.h | 4 +-
10869 arch/c6x/Kconfig | 1 +
10870 arch/c6x/include/asm/module.h | 12 +-
10871 arch/cris/Kconfig | 1 +
10872 arch/cris/include/asm/Kbuild | 2 +
10873 arch/cris/include/asm/module.h | 9 -
10874 arch/frv/include/asm/module.h | 8 +-
10875 arch/h8300/Kconfig | 1 +
10876 arch/h8300/include/asm/Kbuild | 2 +
10877 arch/h8300/include/asm/module.h | 11 -
10878 arch/hexagon/Kconfig | 1 +
10879 arch/ia64/Kconfig | 2 +
10880 arch/ia64/include/asm/module.h | 6 +-
10881 arch/m32r/Kconfig | 1 +
10882 arch/m32r/include/asm/Kbuild | 2 +
10883 arch/m32r/include/asm/module.h | 10 -
10884 arch/m32r/kernel/module.c | 15 --
10885 arch/m68k/Kconfig | 3 +
10886 arch/m68k/include/asm/module.h | 6 +-
10887 arch/microblaze/Kconfig | 1 +
10888 arch/mips/Kconfig | 3 +
10889 arch/mips/include/asm/module.h | 10 +-
10890 arch/mips/kernel/Makefile | 1 +
10891 arch/mips/kernel/module-rela.c | 145 +++++++++++++
10892 arch/mips/kernel/module.c | 121 +----------
10893 arch/mn10300/Kconfig | 1 +
10894 arch/mn10300/include/asm/module.h | 7 +-
10895 arch/openrisc/Kconfig | 1 +
10896 arch/parisc/Kconfig | 2 +
10897 arch/parisc/include/asm/module.h | 16 +-
10898 arch/powerpc/Kconfig | 2 +
10899 arch/powerpc/include/asm/module.h | 7 +-
10900 arch/s390/Kconfig | 3 +-
10901 arch/s390/include/asm/module.h | 18 +-
10902 arch/score/Kconfig | 2 +
10903 arch/score/include/asm/module.h | 6 +-
10904 arch/score/kernel/module.c | 10 -
10905 arch/sh/Kconfig | 2 +
10906 arch/sh/include/asm/module.h | 14 +-
10907 arch/sparc/Kconfig | 1 +
10908 arch/sparc/include/asm/Kbuild | 1 +
10909 arch/sparc/include/asm/module.h | 24 ---
10910 arch/tile/Kconfig | 1 +
10911 arch/unicore32/Kconfig | 1 +
10912 arch/x86/Kconfig | 2 +
10913 arch/x86/lguest/Kconfig | 1 -
10914 arch/x86/um/Kconfig | 2 +
10915 arch/xtensa/include/asm/module.h | 9 +-
10916 drivers/block/virtio_blk.c | 306 +++++++++++++++++++++++----
10917 drivers/char/virtio_console.c | 198 +++++++++++++++--
10918 drivers/lguest/lguest_device.c | 5 +-
10919 drivers/remoteproc/remoteproc_virtio.c | 5 +-
10920 drivers/rpmsg/Kconfig | 1 -
10921 drivers/s390/kvm/kvm_virtio.c | 5 +-
10922 drivers/virtio/Kconfig | 17 +-
10923 drivers/virtio/Makefile | 3 +-
10924 drivers/virtio/virtio.c | 2 +-
10925 drivers/virtio/virtio_mmio.c | 29 ++-
10926 drivers/virtio/virtio_pci.c | 68 +++++-
10927 drivers/virtio/virtio_ring.c | 14 +-
10928 include/asm-generic/module.h | 40 +++-
10929 include/linux/moduleloader.h | 36 +++-
10930 include/linux/virtio.h | 2 +
10931 include/linux/virtio_config.h | 23 ++
10932 include/linux/virtio_ring.h | 3 +-
10933 kernel/module.c | 60 +++---
10934 kernel/trace/trace.c | 8 +-
10935 tools/virtio/virtio-trace/Makefile | 13 ++
10936 tools/virtio/virtio-trace/README | 118 +++++++++++
10937 tools/virtio/virtio-trace/trace-agent-ctl.c | 137 ++++++++++++
10938 tools/virtio/virtio-trace/trace-agent-rw.c | 192 +++++++++++++++++
10939 tools/virtio/virtio-trace/trace-agent.c | 270 +++++++++++++++++++++++
10940 tools/virtio/virtio-trace/trace-agent.h | 75 +++++++
10941 81 files changed, 1737 insertions(+), 455 deletions(-)
10942 delete mode 100644 arch/cris/include/asm/module.h
10943 delete mode 100644 arch/h8300/include/asm/module.h
10944 delete mode 100644 arch/m32r/include/asm/module.h
10945 create mode 100644 arch/mips/kernel/module-rela.c
10946 delete mode 100644 arch/sparc/include/asm/module.h
10947 create mode 100644 tools/virtio/virtio-trace/Makefile
10948 create mode 100644 tools/virtio/virtio-trace/README
10949 create mode 100644 tools/virtio/virtio-trace/trace-agent-ctl.c
10950 create mode 100644 tools/virtio/virtio-trace/trace-agent-rw.c
10951 create mode 100644 tools/virtio/virtio-trace/trace-agent.c
10952 create mode 100644 tools/virtio/virtio-trace/trace-agent.h
10953 Merging input/next (7774036 Merge branch 'for-next' of git://github.com/rydberg/linux into next)
10954 $ git merge input/next
10955 Already up-to-date!
10956 Merge made by the 'recursive' strategy.
10957 Merging input-mt/for-next (51c80b7 Input: bcm5974 - Convert to MT-B)
10958 $ git merge input-mt/for-next
10959 Already up-to-date.
10960 Merging cgroup/for-next (c0a93e2 Merge branch 'for-3.7-hierarchy' into for-next)
10961 $ git merge cgroup/for-next
10962 Auto-merging net/sched/cls_cgroup.c
10963 Auto-merging net/core/sock.c
10964 Auto-merging net/core/netprio_cgroup.c
10965 Auto-merging kernel/events/core.c
10966 Auto-merging include/net/sock.h
10967 Auto-merging fs/xattr.c
10968 Auto-merging drivers/net/tun.c
10969 Merge made by the 'recursive' strategy.
10970 Documentation/cgroups/cgroups.txt | 92 ++++++----
10971 block/blk-cgroup.c | 8 +
10972 drivers/net/tun.c | 1 +
10973 fs/xattr.c | 180 ++++++++++++++++++++
10974 include/linux/cgroup.h | 40 +++--
10975 include/linux/cgroup_subsys.h | 24 +--
10976 include/linux/shmem_fs.h | 3 +-
10977 include/linux/xattr.h | 48 ++++++
10978 include/net/cls_cgroup.h | 27 +--
10979 include/net/netprio_cgroup.h | 30 ++--
10980 include/net/sock.h | 8 -
10981 kernel/cgroup.c | 332 +++++++++++++++++++++++++------------
10982 kernel/cgroup_freezer.c | 8 +
10983 kernel/events/core.c | 7 +
10984 mm/memcontrol.c | 7 +
10985 mm/shmem.c | 171 ++-----------------
10986 net/core/netprio_cgroup.c | 23 ++-
10987 net/core/sock.c | 15 +-
10988 net/sched/cls_cgroup.c | 22 +--
10989 security/device_cgroup.c | 9 +
10990 20 files changed, 660 insertions(+), 395 deletions(-)
10991 Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
10992 $ git merge block/for-next
10993 Auto-merging init/Kconfig
10994 Auto-merging include/linux/fs.h
10995 Auto-merging drivers/target/target_core_iblock.c
10996 Auto-merging drivers/md/md.c
10997 Auto-merging drivers/md/dm.c
10998 Auto-merging drivers/block/mtip32xx/mtip32xx.h
10999 Auto-merging drivers/block/mtip32xx/mtip32xx.c
11000 Auto-merging drivers/block/Kconfig
11001 Auto-merging block/ioctl.c
11002 Auto-merging block/blk-core.c
11003 Auto-merging MAINTAINERS
11004 Merge made by the 'recursive' strategy.
11005 Documentation/ABI/testing/sysfs-block | 14 +
11006 Documentation/block/biodoc.txt | 5 -
11007 Documentation/percpu-rw-semaphore.txt | 27 +
11009 block/blk-core.c | 51 +-
11010 block/blk-lib.c | 104 +-
11011 block/blk-merge.c | 53 +-
11012 block/blk-settings.c | 16 +
11013 block/blk-sysfs.c | 44 +-
11014 block/blk-tag.c | 6 +-
11016 block/elevator.c | 6 +-
11017 block/genhd.c | 6 +-
11018 block/ioctl.c | 27 +
11019 drivers/block/Kconfig | 1 +
11020 drivers/block/cciss.c | 1 -
11021 drivers/block/drbd/drbd_main.c | 13 +-
11022 drivers/block/floppy.c | 97 +-
11023 drivers/block/loop.c | 21 +-
11024 drivers/block/mtip32xx/mtip32xx.c | 19 +-
11025 drivers/block/mtip32xx/mtip32xx.h | 3 +
11026 drivers/block/osdblk.c | 3 +-
11027 drivers/block/pktcdvd.c | 52 +-
11028 drivers/block/xen-blkback/common.h | 4 +-
11029 drivers/block/xen-blkback/xenbus.c | 9 +-
11030 drivers/char/raw.c | 2 +-
11031 drivers/md/dm-crypt.c | 16 +-
11032 drivers/md/dm-io.c | 11 -
11033 drivers/md/dm.c | 74 +-
11034 drivers/md/md.c | 44 +-
11035 drivers/md/raid0.c | 1 +
11036 drivers/memstick/core/Kconfig | 12 +
11037 drivers/memstick/core/Makefile | 2 +-
11038 drivers/memstick/core/ms_block.c | 2395 +++++++++++++++++++++++++++++++++
11039 drivers/memstick/core/ms_block.h | 293 ++++
11040 drivers/target/target_core_iblock.c | 9 -
11041 fs/bio-integrity.c | 44 +-
11042 fs/bio.c | 231 ++--
11043 fs/block_dev.c | 69 +-
11044 fs/exofs/ore.c | 5 +-
11045 include/linux/bio.h | 70 +-
11046 include/linux/blk_types.h | 36 +-
11047 include/linux/blkdev.h | 82 +-
11048 include/linux/fs.h | 6 +
11049 include/linux/loop.h | 2 +-
11050 include/linux/percpu-rwsem.h | 89 ++
11051 include/linux/scatterlist.h | 1 +
11053 lib/scatterlist.c | 19 +
11054 49 files changed, 3571 insertions(+), 537 deletions(-)
11055 create mode 100644 Documentation/percpu-rw-semaphore.txt
11056 create mode 100644 drivers/memstick/core/ms_block.c
11057 create mode 100644 drivers/memstick/core/ms_block.h
11058 create mode 100644 include/linux/percpu-rwsem.h
11059 Merging quilt/device-mapper (9101313 Use the recently-added bio front_pad field to allocate struct dm_target_io.)
11060 $ git merge quilt/device-mapper
11061 Recorded preimage for 'drivers/md/dm-thin.c'
11062 Recorded preimage for 'drivers/md/dm.c'
11063 Auto-merging drivers/md/dm.c
11064 CONFLICT (content): Merge conflict in drivers/md/dm.c
11065 Auto-merging drivers/md/dm-verity.c
11066 Auto-merging drivers/md/dm-thin.c
11067 CONFLICT (content): Merge conflict in drivers/md/dm-thin.c
11068 Auto-merging drivers/md/dm-mpath.c
11069 Automatic merge failed; fix conflicts and then commit the result.
11071 Recorded resolution for 'drivers/md/dm-thin.c'.
11072 Recorded resolution for 'drivers/md/dm.c'.
11073 [master 9ae30f7] Merge branch 'quilt/device-mapper'
11074 $ git diff -M --stat --summary HEAD^..
11075 drivers/md/Kconfig | 7 +
11076 drivers/md/Makefile | 1 +
11077 drivers/md/dm-bio-prison.c | 413 +++++++++++++++++
11078 drivers/md/dm-bio-prison.h | 72 +++
11079 drivers/md/dm-bufio.c | 13 +-
11080 drivers/md/dm-mpath.c | 3 +-
11081 drivers/md/dm-thin.c | 514 ++++------------------
11082 drivers/md/dm-verity.c | 2 +-
11083 drivers/md/dm.c | 80 ++--
11084 drivers/md/persistent-data/dm-space-map-common.c | 4 +-
11085 10 files changed, 616 insertions(+), 493 deletions(-)
11086 create mode 100644 drivers/md/dm-bio-prison.c
11087 create mode 100644 drivers/md/dm-bio-prison.h
11088 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
11089 $ git merge embedded/master
11090 Already up-to-date.
11091 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
11092 $ git merge firmware/master
11093 Already up-to-date.
11094 Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
11095 $ git merge pcmcia/master
11096 Already up-to-date.
11097 Merging mmc/mmc-next (0f59ede mmc: sdhci-spear: Add clk_{un}prepare() support)
11098 $ git merge mmc/mmc-next
11099 Auto-merging drivers/mmc/host/vub300.c
11100 Auto-merging drivers/mmc/host/omap_hsmmc.c
11101 Auto-merging drivers/mmc/host/atmel-mci.c
11102 Auto-merging MAINTAINERS
11103 Merge made by the 'recursive' strategy.
11104 .../devicetree/bindings/mmc/atmel-hsmci.txt | 68 +
11105 .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 87 ++
11106 Documentation/devicetree/bindings/mmc/mmc.txt | 9 +-
11107 Documentation/devicetree/bindings/mmc/pxa-mmc.txt | 25 +
11108 .../devicetree/bindings/mmc/samsung-sdhci.txt | 53 +
11109 .../devicetree/bindings/mmc/sdhci-dove.txt | 14 +
11110 .../devicetree/bindings/mmc/sdhci-spear.txt | 18 +
11111 .../devicetree/bindings/mmc/synposis-dw-mshc.txt | 79 ++
11113 arch/arm/boot/dts/spear300-evb.dts | 3 +-
11114 arch/arm/boot/dts/spear320-evb.dts | 2 -
11115 drivers/mmc/core/core.c | 178 ++-
11116 drivers/mmc/core/debugfs.c | 2 +-
11117 drivers/mmc/core/mmc.c | 11 +
11118 drivers/mmc/core/mmc_ops.c | 84 +-
11119 drivers/mmc/core/sdio_bus.c | 7 -
11120 drivers/mmc/core/slot-gpio.c | 8 +-
11121 drivers/mmc/host/Kconfig | 16 +
11122 drivers/mmc/host/Makefile | 2 +
11123 drivers/mmc/host/atmel-mci-regs.h | 7 +
11124 drivers/mmc/host/atmel-mci.c | 113 +-
11125 drivers/mmc/host/bfin_sdh.c | 210 +--
11126 drivers/mmc/host/dw_mmc-exynos.c | 253 ++++
11127 drivers/mmc/host/dw_mmc-pci.c | 15 +-
11128 drivers/mmc/host/dw_mmc-pltfm.c | 62 +-
11129 drivers/mmc/host/dw_mmc-pltfm.h | 20 +
11130 drivers/mmc/host/dw_mmc.c | 321 ++++-
11131 drivers/mmc/host/dw_mmc.h | 24 +
11132 drivers/mmc/host/mmc_spi.c | 15 +-
11133 drivers/mmc/host/mmci.c | 13 +-
11134 drivers/mmc/host/mxcmmc.c | 76 +-
11135 drivers/mmc/host/omap.c | 39 +-
11136 drivers/mmc/host/omap_hsmmc.c | 125 +-
11137 drivers/mmc/host/pxamci.c | 52 +
11138 drivers/mmc/host/rtsx_pci_sdmmc.c | 1332 ++++++++++++++++++++
11139 drivers/mmc/host/sdhci-dove.c | 8 +
11140 drivers/mmc/host/sdhci-of-esdhc.c | 36 +-
11141 drivers/mmc/host/sdhci-pci.c | 19 +-
11142 drivers/mmc/host/sdhci-pltfm.c | 3 +
11143 drivers/mmc/host/sdhci-pxav2.c | 6 +-
11144 drivers/mmc/host/sdhci-pxav3.c | 35 +-
11145 drivers/mmc/host/sdhci-s3c.c | 216 +++-
11146 drivers/mmc/host/sdhci-spear.c | 67 +-
11147 drivers/mmc/host/sdhci-tegra.c | 7 +-
11148 drivers/mmc/host/sdhci.c | 196 ++-
11149 drivers/mmc/host/sh_mmcif.c | 8 +-
11150 drivers/mmc/host/via-sdmmc.c | 16 +-
11151 drivers/mmc/host/vub300.c | 4 +-
11152 include/linux/mmc/card.h | 8 +
11153 include/linux/mmc/core.h | 4 +
11154 include/linux/mmc/dw_mmc.h | 15 +-
11155 include/linux/mmc/host.h | 1 +
11156 include/linux/mmc/mmc.h | 19 +
11157 include/linux/mmc/sdhci.h | 3 +-
11158 include/linux/platform_data/pxa_sdhci.h | 1 +
11159 55 files changed, 3499 insertions(+), 522 deletions(-)
11160 create mode 100644 Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
11161 create mode 100644 Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
11162 create mode 100644 Documentation/devicetree/bindings/mmc/pxa-mmc.txt
11163 create mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt
11164 create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt
11165 create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-spear.txt
11166 create mode 100644 Documentation/devicetree/bindings/mmc/synposis-dw-mshc.txt
11167 create mode 100644 drivers/mmc/host/dw_mmc-exynos.c
11168 create mode 100644 drivers/mmc/host/dw_mmc-pltfm.h
11169 create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
11170 Merging kgdb/kgdb-next (08f9553 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
11171 $ git merge kgdb/kgdb-next
11172 Auto-merging drivers/tty/serial/kgdboc.c
11173 Merge made by the 'recursive' strategy.
11174 arch/mips/kernel/kgdb.c | 9 +++++++++
11175 arch/x86/kernel/kgdb.c | 2 ++
11176 drivers/tty/serial/kgdboc.c | 3 ++-
11177 include/linux/console.h | 10 ++++++++--
11178 4 files changed, 21 insertions(+), 3 deletions(-)
11179 Merging slab/for-next (2f5f5d8 Merge branch 'slab/tracing' into for-next)
11180 $ git merge slab/for-next
11181 Auto-merging mm/slub.c
11182 Auto-merging mm/slab.c
11183 Merge made by the 'recursive' strategy.
11184 include/linux/slab.h | 6 +-
11185 include/linux/slab_def.h | 27 ++--
11186 include/linux/slob_def.h | 6 +-
11187 mm/slab.c | 343 +++++++++++++++++++---------------------------
11189 mm/slab_common.c | 159 +++++++++++++++------
11190 mm/slob.c | 91 +++++++-----
11191 mm/slub.c | 204 +++++++++++++--------------
11192 mm/util.c | 35 +++--
11193 9 files changed, 458 insertions(+), 432 deletions(-)
11194 Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
11195 $ git merge uclinux/for-next
11196 Already up-to-date.
11197 Merging md/for-next (c0c6d3f md: writing to sync_action should clear the read-auto state.)
11198 $ git merge md/for-next
11199 Resolved 'drivers/md/raid0.c' using previous resolution.
11200 Resolved 'fs/bio.c' using previous resolution.
11201 Auto-merging fs/bio.c
11202 CONFLICT (content): Merge conflict in fs/bio.c
11203 Auto-merging drivers/md/raid0.c
11204 CONFLICT (content): Merge conflict in drivers/md/raid0.c
11205 Auto-merging drivers/md/md.c
11206 Auto-merging block/blk-core.c
11207 Automatic merge failed; fix conflicts and then commit the result.
11209 [master 71cc1a5] Merge remote-tracking branch 'md/for-next'
11210 $ git diff -M --stat --summary HEAD^..
11211 Documentation/device-mapper/dm-raid.txt | 9 +
11212 block/blk-core.c | 1 +
11213 crypto/xor.c | 4 +-
11214 drivers/md/bitmap.c | 17 +-
11215 drivers/md/dm-raid.c | 124 ++++--
11216 drivers/md/linear.c | 25 +-
11217 drivers/md/md.c | 148 +++++--
11218 drivers/md/md.h | 17 +-
11219 drivers/md/multipath.c | 3 +-
11220 drivers/md/raid0.c | 19 +-
11221 drivers/md/raid1.c | 34 +-
11222 drivers/md/raid10.c | 91 ++++-
11223 drivers/md/raid5.c | 664 ++++++++++++++++++++++++++++---
11224 drivers/md/raid5.h | 20 +
11225 14 files changed, 1022 insertions(+), 154 deletions(-)
11226 Merging mfd/for-next (8284328 mfd: smsc: Add support for smsc gpio io/keypad driver)
11227 $ git merge mfd/for-next
11228 Recorded preimage for 'Documentation/devicetree/bindings/regulator/tps6586x.txt'
11229 Resolved 'drivers/mfd/88pm860x-core.c' using previous resolution.
11230 Resolved 'drivers/mfd/db8500-prcmu.c' using previous resolution.
11231 Resolved 'drivers/mfd/max8925-core.c' using previous resolution.
11232 Resolved 'drivers/mfd/tc3589x.c' using previous resolution.
11233 Resolved 'drivers/mfd/tps65217.c' using previous resolution.
11234 Resolved 'drivers/regulator/anatop-regulator.c' using previous resolution.
11235 Resolved 'drivers/video/backlight/88pm860x_bl.c' using previous resolution.
11236 Auto-merging include/linux/mfd/tps6586x.h
11237 Auto-merging include/linux/mfd/tps65217.h
11238 Removing include/linux/mfd/anatop.h
11239 Auto-merging drivers/video/backlight/88pm860x_bl.c
11240 CONFLICT (content): Merge conflict in drivers/video/backlight/88pm860x_bl.c
11241 Auto-merging drivers/regulator/wm831x-ldo.c
11242 Auto-merging drivers/regulator/wm831x-dcdc.c
11243 Auto-merging drivers/regulator/palmas-regulator.c
11244 Auto-merging drivers/regulator/anatop-regulator.c
11245 CONFLICT (content): Merge conflict in drivers/regulator/anatop-regulator.c
11246 Auto-merging drivers/regulator/ab3100.c
11247 Auto-merging drivers/regulator/Kconfig
11248 Auto-merging drivers/pwm/pwm-twl6030.c
11249 Auto-merging drivers/pwm/Kconfig
11250 Auto-merging drivers/mfd/wm8994-core.c
11251 Auto-merging drivers/mfd/wm831x-core.c
11252 Auto-merging drivers/mfd/twl6040-core.c
11253 Auto-merging drivers/mfd/twl-core.c
11254 Auto-merging drivers/mfd/tps65910.c
11255 Auto-merging drivers/mfd/tps6586x.c
11256 Auto-merging drivers/mfd/tps65217.c
11257 CONFLICT (content): Merge conflict in drivers/mfd/tps65217.c
11258 Auto-merging drivers/mfd/tps65090.c
11259 Auto-merging drivers/mfd/tc3589x.c
11260 CONFLICT (content): Merge conflict in drivers/mfd/tc3589x.c
11261 Auto-merging drivers/mfd/rc5t583.c
11262 Auto-merging drivers/mfd/palmas.c
11263 Auto-merging drivers/mfd/mc13xxx-core.c
11264 Auto-merging drivers/mfd/max8925-core.c
11265 CONFLICT (content): Merge conflict in drivers/mfd/max8925-core.c
11266 Auto-merging drivers/mfd/lpc_ich.c
11267 Auto-merging drivers/mfd/db8500-prcmu.c
11268 CONFLICT (content): Merge conflict in drivers/mfd/db8500-prcmu.c
11269 Removing drivers/mfd/anatop-mfd.c
11270 Auto-merging drivers/mfd/ab8500-core.c
11271 Auto-merging drivers/mfd/ab3100-core.c
11272 Auto-merging drivers/mfd/Kconfig
11273 Auto-merging drivers/mfd/88pm860x-core.c
11274 CONFLICT (content): Merge conflict in drivers/mfd/88pm860x-core.c
11275 Auto-merging drivers/gpio/Kconfig
11276 Auto-merging arch/arm/mach-imx/mach-imx6q.c
11277 Auto-merging Documentation/devicetree/bindings/regulator/tps6586x.txt
11278 CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/regulator/tps6586x.txt
11279 Automatic merge failed; fix conflicts and then commit the result.
11281 Recorded resolution for 'Documentation/devicetree/bindings/regulator/tps6586x.txt'.
11282 [master ea29f72] Merge remote-tracking branch 'mfd/for-next'
11283 $ git diff -M --stat --summary HEAD^..
11284 Documentation/devicetree/bindings/mfd/syscon.txt | 20 +
11285 Documentation/devicetree/bindings/mfd/tps65910.txt | 4 +
11286 Documentation/devicetree/bindings/mfd/twl6040.txt | 9 +-
11287 .../devicetree/bindings/regulator/max8907.txt | 69 ++
11288 .../devicetree/bindings/regulator/tps6586x.txt | 6 +
11289 Documentation/smsc_ece1099.txt | 56 ++
11290 arch/arm/boot/dts/imx6q.dtsi | 9 +-
11291 arch/arm/mach-imx/Kconfig | 2 +-
11292 arch/arm/mach-imx/mach-imx6q.c | 47 +-
11293 arch/arm/mach-omap2/usb-host.c | 31 +-
11294 arch/arm/mach-u300/i2c.c | 2 +-
11295 arch/arm/plat-omap/include/plat/usb.h | 7 +
11296 drivers/gpio/Kconfig | 7 +
11297 drivers/gpio/Makefile | 1 +
11298 drivers/gpio/gpio-ich.c | 79 ++-
11299 drivers/gpio/gpio-twl6040.c | 137 ++++
11300 drivers/leds/leds-88pm860x.c | 176 ++---
11301 drivers/mfd/88pm860x-core.c | 651 +++++++++++++-----
11302 drivers/mfd/88pm860x-i2c.c | 174 +----
11303 drivers/mfd/Kconfig | 75 ++-
11304 drivers/mfd/Makefile | 12 +-
11305 drivers/mfd/ab3100-core.c | 1 +
11306 drivers/mfd/ab8500-core.c | 37 +-
11307 drivers/mfd/anatop-mfd.c | 124 ----
11308 drivers/mfd/arizona-irq.c | 56 +-
11309 drivers/mfd/da9055-core.c | 423 ++++++++++++
11310 drivers/mfd/da9055-i2c.c | 93 +++
11311 drivers/mfd/db8500-prcmu.c | 48 +-
11312 drivers/mfd/lp8788-irq.c | 198 ++++++
11313 drivers/mfd/lp8788.c | 245 +++++++
11314 drivers/mfd/lpc_ich.c | 43 +-
11315 drivers/mfd/max8907.c | 351 ++++++++++
11316 drivers/mfd/max8925-core.c | 427 +++++++++---
11317 drivers/mfd/mc13xxx-core.c | 1 -
11318 drivers/mfd/omap-usb-host.c | 238 +------
11319 drivers/mfd/omap-usb-tll.c | 471 +++++++++++++
11320 drivers/mfd/palmas.c | 149 +++--
11321 drivers/mfd/rc5t583-irq.c | 2 +-
11322 drivers/mfd/rc5t583.c | 2 +-
11323 drivers/mfd/smsc-ece1099.c | 113 ++++
11324 drivers/mfd/syscon.c | 176 +++++
11325 drivers/mfd/tc3589x.c | 112 +++-
11326 drivers/mfd/tps65090.c | 2 +-
11327 drivers/mfd/tps65217.c | 3 +
11328 drivers/mfd/tps6586x.c | 19 +
11329 drivers/mfd/tps65910.c | 32 +
11330 drivers/mfd/twl-core.c | 124 +---
11331 drivers/mfd/twl6040-core.c | 17 +-
11332 drivers/mfd/wm5110-tables.c | 96 ++-
11333 drivers/mfd/wm831x-core.c | 66 +-
11334 drivers/mfd/wm8994-core.c | 2 +-
11335 drivers/mfd/wm8994-regmap.c | 2 +-
11336 drivers/pwm/Kconfig | 9 +
11337 drivers/pwm/Makefile | 1 +
11338 drivers/{mfd/twl6030-pwm.c => pwm/pwm-twl6030.c} | 119 ++--
11339 drivers/regulator/88pm8607.c | 101 ++-
11340 drivers/regulator/Kconfig | 2 +-
11341 drivers/regulator/ab3100.c | 1 +
11342 drivers/regulator/anatop-regulator.c | 31 +-
11343 drivers/regulator/max8925-regulator.c | 35 +-
11344 drivers/regulator/palmas-regulator.c | 127 +++-
11345 drivers/regulator/wm831x-dcdc.c | 12 +-
11346 drivers/regulator/wm831x-isink.c | 4 +-
11347 drivers/regulator/wm831x-ldo.c | 12 +-
11348 drivers/video/backlight/88pm860x_bl.c | 113 ++--
11349 drivers/video/backlight/Kconfig | 7 +
11350 drivers/video/backlight/Makefile | 1 +
11351 drivers/video/backlight/max8925_bl.c | 79 +--
11352 drivers/video/backlight/tps65217_bl.c | 342 ++++++++++
11353 drivers/watchdog/iTCO_wdt.c | 1 +
11354 include/linux/ioport.h | 3 +-
11355 include/linux/mfd/88pm860x.h | 42 +-
11356 include/linux/mfd/ab3100.h | 129 ++++
11357 include/linux/mfd/abx500.h | 117 +---
11358 include/linux/mfd/abx500/ab8500.h | 2 -
11359 include/linux/mfd/anatop.h | 40 --
11360 include/linux/mfd/da9055/core.h | 94 +++
11361 include/linux/mfd/da9055/pdata.h | 32 +
11362 include/linux/mfd/da9055/reg.h | 699 ++++++++++++++++++++
11363 include/linux/mfd/lp8788-isink.h | 52 ++
11364 include/linux/mfd/lp8788.h | 364 ++++++++++
11365 include/linux/mfd/lpc_ich.h | 1 +
11366 include/linux/mfd/max8907.h | 252 +++++++
11367 include/linux/mfd/max8925.h | 26 +-
11368 include/linux/mfd/palmas.h | 232 ++++++-
11369 include/linux/mfd/smsc.h | 109 +++
11370 include/linux/mfd/syscon.h | 23 +
11371 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 319 +++++++++
11372 include/linux/mfd/tc3589x.h | 1 +
11373 include/linux/mfd/tps65217.h | 18 +
11374 include/linux/mfd/tps6586x.h | 1 +
11375 include/linux/mfd/tps65910.h | 3 +
11376 include/linux/mfd/twl6040.h | 11 +-
11377 93 files changed, 7137 insertions(+), 1677 deletions(-)
11378 create mode 100644 Documentation/devicetree/bindings/mfd/syscon.txt
11379 create mode 100644 Documentation/devicetree/bindings/regulator/max8907.txt
11380 create mode 100644 Documentation/smsc_ece1099.txt
11381 create mode 100644 drivers/gpio/gpio-twl6040.c
11382 delete mode 100644 drivers/mfd/anatop-mfd.c
11383 create mode 100644 drivers/mfd/da9055-core.c
11384 create mode 100644 drivers/mfd/da9055-i2c.c
11385 create mode 100644 drivers/mfd/lp8788-irq.c
11386 create mode 100644 drivers/mfd/lp8788.c
11387 create mode 100644 drivers/mfd/max8907.c
11388 create mode 100644 drivers/mfd/omap-usb-tll.c
11389 create mode 100644 drivers/mfd/smsc-ece1099.c
11390 create mode 100644 drivers/mfd/syscon.c
11391 rename drivers/{mfd/twl6030-pwm.c => pwm/pwm-twl6030.c} (55%)
11392 create mode 100644 drivers/video/backlight/tps65217_bl.c
11393 create mode 100644 include/linux/mfd/ab3100.h
11394 delete mode 100644 include/linux/mfd/anatop.h
11395 create mode 100644 include/linux/mfd/da9055/core.h
11396 create mode 100644 include/linux/mfd/da9055/pdata.h
11397 create mode 100644 include/linux/mfd/da9055/reg.h
11398 create mode 100644 include/linux/mfd/lp8788-isink.h
11399 create mode 100644 include/linux/mfd/lp8788.h
11400 create mode 100644 include/linux/mfd/max8907.h
11401 create mode 100644 include/linux/mfd/smsc.h
11402 create mode 100644 include/linux/mfd/syscon.h
11403 create mode 100644 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
11404 Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
11405 $ git merge battery/master
11406 Resolved 'include/linux/mfd/88pm860x.h' using previous resolution.
11407 Auto-merging include/linux/mfd/88pm860x.h
11408 CONFLICT (content): Merge conflict in include/linux/mfd/88pm860x.h
11409 Auto-merging drivers/power/Makefile
11410 Auto-merging drivers/power/Kconfig
11411 Auto-merging drivers/mfd/88pm860x-core.c
11412 Automatic merge failed; fix conflicts and then commit the result.
11414 [master 3c42c9d] Merge remote-tracking branch 'battery/master'
11415 $ git diff -M --stat --summary HEAD^..
11416 Documentation/power/power_supply_class.txt | 7 +
11417 drivers/mfd/88pm860x-core.c | 22 +-
11418 drivers/power/88pm860x_battery.c | 1041 ++++++++++++++++++++++++++++
11419 drivers/power/88pm860x_charger.c | 746 ++++++++++++++++++++
11420 drivers/power/Kconfig | 20 +-
11421 drivers/power/Makefile | 3 +
11422 drivers/power/ab8500_btemp.c | 1 +
11423 drivers/power/ab8500_charger.c | 1 +
11424 drivers/power/ab8500_fg.c | 1 +
11425 drivers/power/bq27x00_battery.c | 3 +-
11426 drivers/power/charger-manager.c | 434 ++++++++++--
11427 drivers/power/da9030_battery.c | 4 +-
11428 drivers/power/da9052-battery.c | 11 +-
11429 drivers/power/ds2781_battery.c | 28 +-
11430 drivers/power/lp8727_charger.c | 360 ++++++----
11431 drivers/power/lp8788-charger.c | 795 +++++++++++++++++++++
11432 drivers/power/pda_power.c | 13 +-
11433 drivers/power/power_supply_sysfs.c | 3 +
11434 drivers/power/sbs-battery.c | 10 +
11435 drivers/power/smb347-charger.c | 97 ++-
11436 drivers/power/twl4030_charger.c | 25 +-
11437 drivers/power/wm97xx_battery.c | 4 +-
11438 include/linux/mfd/88pm860x.h | 84 ++-
11439 include/linux/platform_data/lp8727.h | 51 +-
11440 include/linux/power/charger-manager.h | 47 +-
11441 include/linux/power_supply.h | 5 +
11442 26 files changed, 3519 insertions(+), 297 deletions(-)
11443 create mode 100644 drivers/power/88pm860x_battery.c
11444 create mode 100644 drivers/power/88pm860x_charger.c
11445 create mode 100644 drivers/power/lp8788-charger.c
11446 Merging fbdev/fbdev-next (ebe9f7b video: exynos_mipi_dsi: Remove unnecessary NULL check)
11447 $ git merge fbdev/fbdev-next
11448 Auto-merging include/video/samsung_fimd.h
11449 Auto-merging drivers/video/ps3fb.c
11450 Removing drivers/video/pnx4008/sdum.h
11451 Removing drivers/video/pnx4008/sdum.c
11452 Removing drivers/video/pnx4008/pnxrgbfb.c
11453 Removing drivers/video/pnx4008/fbcommon.h
11454 Removing drivers/video/pnx4008/dum.h
11455 Removing drivers/video/pnx4008/Makefile
11456 Auto-merging drivers/video/msm/mdp.c
11457 Auto-merging drivers/video/exynos/exynos_mipi_dsi.c
11458 Auto-merging drivers/gpu/drm/exynos/exynos_drm_fimd.c
11459 Removing arch/arm/plat-samsung/include/plat/regs-fb-v4.h
11460 Auto-merging arch/arm/mach-exynos/mach-smdkv310.c
11461 Auto-merging arch/arm/mach-exynos/mach-origen.c
11462 Merge made by the 'recursive' strategy.
11463 arch/arm/mach-exynos/mach-nuri.c | 2 +-
11464 arch/arm/mach-exynos/mach-origen.c | 2 +-
11465 arch/arm/mach-exynos/mach-smdk4x12.c | 2 +-
11466 arch/arm/mach-exynos/mach-smdkv310.c | 2 +-
11467 arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
11468 arch/arm/mach-exynos/setup-fimd0.c | 2 +-
11469 arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 +-
11470 arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
11471 arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
11472 arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
11473 arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
11474 arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
11475 arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
11476 arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
11477 arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
11478 arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
11479 arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +-
11480 arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +-
11481 arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +-
11482 arch/arm/mach-s5pv210/mach-aquila.c | 2 +-
11483 arch/arm/mach-s5pv210/mach-goni.c | 2 +-
11484 arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +-
11485 arch/arm/plat-samsung/include/plat/regs-fb-v4.h | 159 ----
11486 drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +-
11487 drivers/video/Kconfig | 15 -
11488 drivers/video/Makefile | 2 -
11489 drivers/video/amifb.c | 2 -
11490 drivers/video/arcfb.c | 1 +
11491 drivers/video/atmel_lcdfb.c | 5 +-
11492 drivers/video/bf537-lq035.c | 12 +-
11493 drivers/video/bf54x-lq043fb.c | 9 +-
11494 drivers/video/bfin-lq035q1-fb.c | 13 +-
11495 drivers/video/bfin-t350mcqb-fb.c | 1 +
11496 drivers/video/bw2.c | 4 +-
11497 drivers/video/cg3.c | 3 +-
11498 drivers/video/cobalt_lcdfb.c | 5 +-
11499 drivers/video/console/font_mini_4x6.c | 2 +-
11500 drivers/video/console/font_sun8x16.c | 2 +-
11501 drivers/video/cyber2000fb.c | 4 +-
11502 drivers/video/da8xx-fb.c | 191 +++--
11503 drivers/video/ep93xx-fb.c | 17 +-
11504 drivers/video/epson1355fb.c | 16 +-
11505 drivers/video/exynos/exynos_dp_core.c | 314 ++++---
11506 drivers/video/exynos/exynos_dp_core.h | 6 +-
11507 drivers/video/exynos/exynos_dp_reg.c | 58 +-
11508 drivers/video/exynos/exynos_dp_reg.h | 3 +-
11509 drivers/video/exynos/exynos_mipi_dsi.c | 6 +-
11510 drivers/video/exynos/exynos_mipi_dsi_common.c | 8 -
11511 drivers/video/fsl-diu-fb.c | 10 +-
11512 drivers/video/gbefb.c | 15 +-
11513 drivers/video/hpfb.c | 28 +-
11514 drivers/video/imxfb.c | 1 +
11515 drivers/video/jz4740_fb.c | 44 +-
11516 drivers/video/mb862xx/mb862xxfbdrv.c | 10 +-
11517 drivers/video/mbx/mbxfb.c | 25 +-
11518 drivers/video/msm/mddi.c | 3 -
11519 drivers/video/msm/mddi_client_nt35399.c | 6 +-
11520 drivers/video/msm/mdp.c | 1 -
11521 drivers/video/msm/mdp_hw.h | 1 -
11522 drivers/video/pnx4008/Makefile | 7 -
11523 drivers/video/pnx4008/dum.h | 211 -----
11524 drivers/video/pnx4008/fbcommon.h | 43 -
11525 drivers/video/pnx4008/pnxrgbfb.c | 198 -----
11526 drivers/video/pnx4008/sdum.c | 861 --------------------
11527 drivers/video/pnx4008/sdum.h | 136 ----
11528 drivers/video/ps3fb.c | 7 +-
11529 drivers/video/s3c-fb.c | 26 +-
11530 drivers/video/s3c2410fb.c | 34 +-
11531 drivers/video/sis/initextlfb.c | 2 +-
11532 drivers/video/sunxvr1000.c | 4 +-
11533 drivers/video/sunxvr2500.c | 4 +-
11534 drivers/video/sunxvr500.c | 8 +-
11535 drivers/video/uvesafb.c | 2 +
11536 drivers/video/vermilion/vermilion.c | 3 +-
11537 drivers/video/via/via_clock.c | 19 +
11538 .../plat/regs-fb.h => include/video/samsung_fimd.h | 152 +++-
11539 76 files changed, 673 insertions(+), 2092 deletions(-)
11540 delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb-v4.h
11541 delete mode 100644 drivers/video/pnx4008/Makefile
11542 delete mode 100644 drivers/video/pnx4008/dum.h
11543 delete mode 100644 drivers/video/pnx4008/fbcommon.h
11544 delete mode 100644 drivers/video/pnx4008/pnxrgbfb.c
11545 delete mode 100644 drivers/video/pnx4008/sdum.c
11546 delete mode 100644 drivers/video/pnx4008/sdum.h
11547 rename arch/arm/plat-samsung/include/plat/regs-fb.h => include/video/samsung_fimd.h (73%)
11548 Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
11549 $ git merge viafb/viafb-next
11550 Already up-to-date.
11551 Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
11552 $ git merge omap_dss2/for-next
11553 Auto-merging drivers/staging/omapdrm/omap_drv.c
11554 Auto-merging drivers/media/platform/omap/omap_vout.c
11555 Auto-merging arch/arm/mach-omap2/twl-common.c
11556 Merge made by the 'recursive' strategy.
11557 arch/arm/mach-omap2/board-4430sdp.c | 73 +-
11558 arch/arm/mach-omap2/board-omap4panda.c | 27 +-
11559 arch/arm/mach-omap2/display.c | 1 -
11560 arch/arm/mach-omap2/twl-common.c | 6 +
11561 drivers/media/platform/omap/omap_vout.c | 75 +-
11562 drivers/staging/omapdrm/omap_drv.c | 5 +-
11563 drivers/video/omap/hwa742.c | 1 -
11564 drivers/video/omap/lcd_ams_delta.c | 1 -
11565 drivers/video/omap/lcd_palmte.c | 1 -
11566 drivers/video/omap/omapfb_main.c | 9 -
11567 drivers/video/omap2/displays/panel-acx565akm.c | 14 +-
11568 drivers/video/omap2/displays/panel-generic-dpi.c | 76 +-
11569 .../omap2/displays/panel-lgphilips-lb035q02.c | 3 +
11570 drivers/video/omap2/displays/panel-n8x0.c | 31 +-
11571 .../omap2/displays/panel-nec-nl8048hl11-01b.c | 3 +
11572 drivers/video/omap2/displays/panel-picodlp.c | 4 +
11573 .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 3 +
11574 drivers/video/omap2/displays/panel-taal.c | 239 ++---
11575 drivers/video/omap2/displays/panel-tfp410.c | 20 +-
11576 .../video/omap2/displays/panel-tpo-td043mtea1.c | 7 +-
11577 drivers/video/omap2/dss/Kconfig | 2 +-
11578 drivers/video/omap2/dss/Makefile | 4 +-
11579 drivers/video/omap2/dss/apply.c | 330 ++-----
11580 drivers/video/omap2/dss/core.c | 91 +-
11581 drivers/video/omap2/dss/dispc.c | 1019 ++++++++++++++------
11582 drivers/video/omap2/dss/dispc.h | 37 +
11583 drivers/video/omap2/dss/display.c | 108 ++-
11584 drivers/video/omap2/dss/dpi.c | 181 +++-
11585 drivers/video/omap2/dss/dsi.c | 675 ++++++++++---
11586 drivers/video/omap2/dss/dss.c | 257 +++--
11587 drivers/video/omap2/dss/dss.h | 79 +-
11588 drivers/video/omap2/dss/dss_features.c | 278 +++++-
11589 drivers/video/omap2/dss/dss_features.h | 7 +
11590 drivers/video/omap2/dss/hdmi.c | 247 +++--
11591 drivers/video/omap2/dss/hdmi_panel.c | 31 +-
11592 drivers/video/omap2/dss/manager-sysfs.c | 512 ++++++++++
11593 drivers/video/omap2/dss/manager.c | 473 +--------
11594 drivers/video/omap2/dss/output.c | 148 +++
11595 drivers/video/omap2/dss/overlay-sysfs.c | 456 +++++++++
11596 drivers/video/omap2/dss/overlay.c | 492 +---------
11597 drivers/video/omap2/dss/rfbi.c | 222 +++--
11598 drivers/video/omap2/dss/sdi.c | 126 ++-
11599 drivers/video/omap2/dss/venc.c | 337 +++----
11600 drivers/video/omap2/dss/venc_panel.c | 251 +++++
11601 drivers/video/omap2/omapfb/omapfb-ioctl.c | 7 +-
11602 drivers/video/omap2/omapfb/omapfb-main.c | 32 +-
11603 drivers/video/omap2/omapfb/omapfb.h | 5 +-
11604 drivers/video/omap2/vram.c | 56 --
11605 include/video/omapdss.h | 112 ++-
11606 49 files changed, 4575 insertions(+), 2599 deletions(-)
11607 create mode 100644 drivers/video/omap2/dss/manager-sysfs.c
11608 create mode 100644 drivers/video/omap2/dss/output.c
11609 create mode 100644 drivers/video/omap2/dss/overlay-sysfs.c
11610 create mode 100644 drivers/video/omap2/dss/venc_panel.c
11611 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)
11612 $ git merge regulator/for-next
11613 Already up-to-date.
11614 Merging security/next (bf53083 Merge tag 'v3.6-rc7' into next)
11615 $ git merge security/next
11616 Auto-merging include/linux/xattr.h
11617 Auto-merging include/linux/security.h
11618 Auto-merging include/linux/audit.h
11619 Auto-merging fs/xattr.c
11620 Auto-merging fs/file_table.c
11621 Auto-merging drivers/char/tpm/tpm_eventlog.c
11622 Auto-merging arch/powerpc/kernel/prom_init.c
11623 Auto-merging Documentation/kernel-parameters.txt
11624 Merge made by the 'recursive' strategy.
11625 Documentation/ABI/testing/ima_policy | 25 +-
11626 Documentation/ABI/testing/sysfs-driver-ppi | 70 +++
11627 Documentation/kernel-parameters.txt | 8 +
11628 Documentation/security/Smack.txt | 10 +-
11629 arch/powerpc/kernel/prom_init.c | 62 ++
11630 drivers/char/hw_random/Kconfig | 13 +
11631 drivers/char/hw_random/Makefile | 1 +
11632 drivers/char/hw_random/tpm-rng.c | 50 ++
11633 drivers/char/tpm/Kconfig | 19 +
11634 drivers/char/tpm/Makefile | 8 +
11635 drivers/char/tpm/tpm.c | 74 ++-
11636 drivers/char/tpm/tpm.h | 35 +-
11637 drivers/char/tpm/tpm_acpi.c | 109 ++++
11638 drivers/char/tpm/{tpm_bios.c => tpm_eventlog.c} | 147 +----
11639 drivers/char/tpm/tpm_eventlog.h | 86 +++
11640 drivers/char/tpm/tpm_i2c_infineon.c | 695 +++++++++++++++++++++
11641 drivers/char/tpm/tpm_ibmvtpm.c | 749 +++++++++++++++++++++++
11642 drivers/char/tpm/tpm_ibmvtpm.h | 77 +++
11643 drivers/char/tpm/tpm_of.c | 73 +++
11644 drivers/char/tpm/tpm_ppi.c | 461 ++++++++++++++
11645 drivers/char/tpm/tpm_tis.c | 3 +-
11647 fs/file_table.c | 2 +-
11649 include/linux/audit.h | 2 +
11650 include/linux/ima.h | 27 +
11651 include/linux/integrity.h | 7 +-
11652 include/linux/ptrace.h | 2 -
11653 include/linux/security.h | 31 +
11654 include/linux/tpm.h | 4 +
11655 include/linux/xattr.h | 3 +
11656 kernel/auditsc.c | 74 +--
11657 kernel/ptrace.c | 3 +-
11658 samples/seccomp/Makefile | 24 +-
11659 samples/seccomp/bpf-helper.h | 15 +-
11660 security/integrity/evm/evm_main.c | 3 +
11661 security/integrity/iint.c | 64 +-
11662 security/integrity/ima/Kconfig | 16 +
11663 security/integrity/ima/Makefile | 1 +
11664 security/integrity/ima/ima.h | 39 +-
11665 security/integrity/ima/ima_api.c | 86 ++-
11666 security/integrity/ima/ima_appraise.c | 263 ++++++++
11667 security/integrity/ima/ima_crypto.c | 8 +-
11668 security/integrity/ima/ima_main.c | 93 ++-
11669 security/integrity/ima/ima_policy.c | 195 ++++--
11670 security/integrity/integrity.h | 22 +-
11671 security/keys/trusted.c | 54 +-
11672 security/security.c | 27 +
11673 security/smack/smack_lsm.c | 51 +-
11674 security/smack/smackfs.c | 75 +++
11675 security/yama/Kconfig | 8 +
11676 security/yama/yama_lsm.c | 16 +-
11677 52 files changed, 3540 insertions(+), 458 deletions(-)
11678 create mode 100644 Documentation/ABI/testing/sysfs-driver-ppi
11679 create mode 100644 drivers/char/hw_random/tpm-rng.c
11680 create mode 100644 drivers/char/tpm/tpm_acpi.c
11681 rename drivers/char/tpm/{tpm_bios.c => tpm_eventlog.c} (75%)
11682 create mode 100644 drivers/char/tpm/tpm_eventlog.h
11683 create mode 100644 drivers/char/tpm/tpm_i2c_infineon.c
11684 create mode 100644 drivers/char/tpm/tpm_ibmvtpm.c
11685 create mode 100644 drivers/char/tpm/tpm_ibmvtpm.h
11686 create mode 100644 drivers/char/tpm/tpm_of.c
11687 create mode 100644 drivers/char/tpm/tpm_ppi.c
11688 create mode 100644 security/integrity/ima/ima_appraise.c
11689 Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
11690 $ git merge selinux/master
11691 Already up-to-date!
11692 Merge made by the 'recursive' strategy.
11693 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
11694 $ git merge lblnet/master
11695 Already up-to-date.
11696 Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
11697 $ git merge watchdog/master
11698 Merge made by the 'recursive' strategy.
11699 drivers/watchdog/davinci_wdt.c | 4 ++--
11700 1 file changed, 2 insertions(+), 2 deletions(-)
11701 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
11702 $ git merge dwmw2-iommu/master
11703 Already up-to-date.
11704 Merging iommu/next (f119536 Merge branches 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next)
11705 $ git merge iommu/next
11706 Auto-merging drivers/iommu/intel-iommu.c
11707 Removing arch/arm/mach-tegra/include/mach/smmu.h
11708 Merge made by the 'recursive' strategy.
11709 arch/arm/mach-tegra/include/mach/smmu.h | 63 ----
11710 drivers/iommu/Kconfig | 2 +-
11711 drivers/iommu/amd_iommu.c | 514 ++++++++++++++++++++++++++++++-
11712 drivers/iommu/amd_iommu_init.c | 253 +++++++++++++--
11713 drivers/iommu/amd_iommu_proto.h | 8 +
11714 drivers/iommu/amd_iommu_types.h | 59 +++-
11715 drivers/iommu/exynos-iommu.c | 3 +-
11716 drivers/iommu/intel-iommu.c | 4 +-
11717 drivers/iommu/irq_remapping.c | 5 +
11718 drivers/iommu/irq_remapping.h | 6 +
11719 drivers/iommu/tegra-smmu.c | 261 +++++++++++++++-
11720 11 files changed, 1071 insertions(+), 107 deletions(-)
11721 delete mode 100644 arch/arm/mach-tegra/include/mach/smmu.h
11722 Merging vfio/next (b68e7fa vfio: Fix virqfd release race)
11723 $ git merge vfio/next
11724 Already up-to-date.
11725 Merging osd/linux-next (b8017d2 exofs: check for allocation failure in uri_store())
11726 $ git merge osd/linux-next
11727 Merge made by the 'recursive' strategy.
11728 fs/exofs/sys.c | 7 ++++++-
11729 1 file changed, 6 insertions(+), 1 deletion(-)
11730 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
11731 $ git merge jc_docs/docs-next
11732 Already up-to-date.
11733 Merging trivial/for-next (9c33c51 doc: fix old config name of kprobetrace)
11734 $ git merge trivial/for-next
11735 Already up-to-date.
11736 Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
11737 $ git merge audit/for-next
11738 Already up-to-date.
11739 Merging pm/linux-next (1ac9af7 Merge branch 'master' into linux-next)
11740 $ git merge pm/linux-next
11741 Auto-merging include/linux/pm.h
11742 Auto-merging include/linux/device.h
11743 Auto-merging drivers/pci/pci-driver.c
11744 Auto-merging drivers/base/power/main.c
11745 Auto-merging drivers/base/platform.c
11746 Removing arch/arm/mach-shmobile/common.c
11747 Auto-merging arch/arm/kernel/smp.c
11748 Merge made by the 'recursive' strategy.
11749 Documentation/ABI/testing/sysfs-devices-system-cpu | 11 +
11750 Documentation/cpu-freq/boost.txt | 93 +++++
11751 Documentation/cpuidle/sysfs.txt | 10 +-
11752 .../devicetree/bindings/cpufreq/cpufreq-cpu0.txt | 55 +++
11753 Documentation/devicetree/bindings/power/opp.txt | 25 ++
11754 arch/arm/kernel/smp.c | 54 +++
11755 arch/arm/mach-shmobile/Makefile | 2 +-
11756 arch/arm/mach-shmobile/board-ap4evb.c | 21 +-
11757 arch/arm/mach-shmobile/board-armadillo800eva.c | 6 +-
11758 arch/arm/mach-shmobile/board-mackerel.c | 34 +-
11759 arch/arm/mach-shmobile/common.c | 24 --
11760 arch/arm/mach-shmobile/cpuidle.c | 39 +-
11761 arch/arm/mach-shmobile/include/mach/common.h | 14 +-
11762 arch/arm/mach-shmobile/include/mach/pm-rmobile.h | 35 +-
11763 arch/arm/mach-shmobile/include/mach/r8a7740.h | 6 +-
11764 arch/arm/mach-shmobile/include/mach/r8a7779.h | 12 +-
11765 arch/arm/mach-shmobile/include/mach/sh7372.h | 20 +-
11766 arch/arm/mach-shmobile/pm-r8a7740.c | 42 +-
11767 arch/arm/mach-shmobile/pm-r8a7779.c | 71 ++--
11768 arch/arm/mach-shmobile/pm-rmobile.c | 33 +-
11769 arch/arm/mach-shmobile/pm-sh7372.c | 283 +++++++++-----
11770 arch/arm/mach-shmobile/setup-r8a7740.c | 27 +-
11771 arch/arm/mach-shmobile/setup-r8a7779.c | 5 +-
11772 arch/arm/mach-shmobile/setup-sh7372.c | 69 ++--
11773 arch/x86/include/asm/msr-index.h | 3 +
11774 drivers/acpi/processor_driver.c | 8 +-
11775 drivers/acpi/processor_idle.c | 40 +-
11776 drivers/acpi/processor_perflib.c | 30 ++
11777 drivers/base/platform.c | 2 +
11778 drivers/base/power/domain.c | 244 ++++++++++--
11779 drivers/base/power/main.c | 66 +++-
11780 drivers/base/power/opp.c | 47 +++
11781 drivers/base/power/power.h | 36 +-
11782 drivers/base/power/runtime.c | 3 +
11783 drivers/base/power/wakeup.c | 46 ++-
11784 drivers/clocksource/sh_cmt.c | 71 +++-
11785 drivers/clocksource/sh_mtu2.c | 41 +-
11786 drivers/clocksource/sh_tmu.c | 112 +++++-
11787 drivers/cpufreq/Kconfig | 11 +
11788 drivers/cpufreq/Kconfig.x86 | 18 +-
11789 drivers/cpufreq/Makefile | 4 +-
11790 drivers/cpufreq/acpi-cpufreq.c | 272 ++++++++++++-
11791 drivers/cpufreq/cpufreq-cpu0.c | 269 +++++++++++++
11792 drivers/cpufreq/cpufreq_conservative.c | 2 +
11793 drivers/cpufreq/cpufreq_ondemand.c | 1 +
11794 drivers/cpufreq/longhaul.h | 26 +-
11795 drivers/cpufreq/omap-cpufreq.c | 39 +-
11796 drivers/cpufreq/powernow-k8.c | 406 ++------------------
11797 drivers/cpufreq/powernow-k8.h | 32 --
11798 drivers/cpuidle/driver.c | 18 +-
11799 drivers/cpuidle/governors/ladder.c | 6 +-
11800 drivers/pci/pci-driver.c | 17 -
11801 drivers/xen/xen-acpi-processor.c | 1 -
11802 include/acpi/processor.h | 9 +-
11803 include/linux/clockchips.h | 8 +
11804 include/linux/device.h | 7 +
11805 include/linux/opp.h | 8 +
11806 include/linux/pm.h | 2 +
11807 include/linux/pm_domain.h | 92 ++++-
11808 kernel/power/Kconfig | 4 +
11809 kernel/power/poweroff.c | 2 +-
11810 kernel/power/process.c | 2 +-
11811 kernel/power/qos.c | 1 +
11812 kernel/time/clockevents.c | 24 ++
11813 kernel/time/timekeeping.c | 2 +
11814 65 files changed, 2061 insertions(+), 962 deletions(-)
11815 create mode 100644 Documentation/cpu-freq/boost.txt
11816 create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
11817 create mode 100644 Documentation/devicetree/bindings/power/opp.txt
11818 delete mode 100644 arch/arm/mach-shmobile/common.c
11819 create mode 100644 drivers/cpufreq/cpufreq-cpu0.c
11820 Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
11821 $ git merge apm/for-next
11822 Already up-to-date.
11823 Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
11824 $ git merge fsnotify/for-next
11825 Resolved 'kernel/audit_tree.c' using previous resolution.
11826 Auto-merging kernel/audit_watch.c
11827 Auto-merging kernel/audit_tree.c
11828 CONFLICT (content): Merge conflict in kernel/audit_tree.c
11829 Auto-merging include/linux/fsnotify_backend.h
11830 Auto-merging fs/notify/notification.c
11831 Auto-merging fs/notify/inotify/inotify_user.c
11832 Auto-merging fs/notify/fanotify/fanotify_user.c
11833 Automatic merge failed; fix conflicts and then commit the result.
11835 [master 1e50a54] Merge remote-tracking branch 'fsnotify/for-next'
11836 $ git diff -M --stat --summary HEAD^..
11837 fs/notify/dnotify/dnotify.c | 4 +-
11838 fs/notify/fanotify/fanotify.c | 6 +++
11839 fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
11840 fs/notify/group.c | 47 ++++++++++--------
11841 fs/notify/inode_mark.c | 14 ++++--
11842 fs/notify/inotify/inotify_fsnotify.c | 4 +-
11843 fs/notify/inotify/inotify_user.c | 34 ++++++-------
11844 fs/notify/mark.c | 91 +++++++++++++++++++---------------
11845 fs/notify/notification.c | 1 +
11846 fs/notify/vfsmount_mark.c | 14 ++++--
11847 include/linux/fsnotify_backend.h | 31 ++++++++----
11848 kernel/audit_tree.c | 10 ++--
11849 kernel/audit_watch.c | 4 +-
11850 13 files changed, 178 insertions(+), 119 deletions(-)
11851 Merging edac/linux_next (cfe5031 edac: edac_mc no longer deals with kobjects directly)
11852 $ git merge edac/linux_next
11853 Merge made by the 'recursive' strategy.
11854 drivers/edac/edac_mc.c | 7 -------
11855 include/linux/edac.h | 1 -
11856 2 files changed, 8 deletions(-)
11857 Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
11858 $ git merge edac-amd/for-next
11859 Resolved 'Documentation/edac.txt' using previous resolution.
11860 Resolved 'drivers/edac/amd64_edac.c' using previous resolution.
11861 Auto-merging drivers/edac/amd64_edac.c
11862 CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
11863 Auto-merging Documentation/edac.txt
11864 CONFLICT (content): Merge conflict in Documentation/edac.txt
11865 Automatic merge failed; fix conflicts and then commit the result.
11867 [master d794c8c] Merge remote-tracking branch 'edac-amd/for-next'
11868 $ git diff -M --stat --summary HEAD^..
11869 Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
11870 $ git merge devicetree/devicetree/next
11871 Already up-to-date.
11872 Merging dt-rh/for-next (b967573 MAINTAINERS: add scripts/dtc under Devicetree maintainers)
11873 $ git merge dt-rh/for-next
11874 Recorded preimage for 'drivers/of/base.c'
11875 Recorded preimage for 'include/linux/of.h'
11876 Auto-merging include/linux/of.h
11877 CONFLICT (content): Merge conflict in include/linux/of.h
11878 Auto-merging drivers/spi/spi-s3c64xx.c
11879 Auto-merging drivers/of/base.c
11880 CONFLICT (content): Merge conflict in drivers/of/base.c
11881 Auto-merging MAINTAINERS
11882 Automatic merge failed; fix conflicts and then commit the result.
11884 Recorded resolution for 'drivers/of/base.c'.
11885 Recorded resolution for 'include/linux/of.h'.
11886 [master f04d8ba] Merge remote-tracking branch 'dt-rh/for-next'
11887 $ git diff -M --stat --summary HEAD^..
11888 .../bindings/interrupt-controller/interrupts.txt | 95 +++
11889 Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 2 +-
11890 .../devicetree/bindings/serial/fsl-imx-uart.txt | 35 +
11892 drivers/of/address.c | 35 +-
11893 drivers/of/base.c | 23 +
11894 drivers/of/irq.c | 1 +
11895 drivers/of/of_i2c.c | 3 +
11896 drivers/of/platform.c | 16 +-
11897 drivers/spi/spi-s3c64xx.c | 7 +-
11898 include/linux/of.h | 2 +
11899 include/linux/of_address.h | 1 +
11900 scripts/dtc/Makefile.dtc | 13 +-
11901 scripts/dtc/checks.c | 203 +++--
11902 scripts/dtc/data.c | 124 +---
11903 scripts/dtc/dtc-lexer.l | 65 +-
11904 scripts/dtc/dtc-lexer.lex.c_shipped | 503 +++++++++----
11905 scripts/dtc/dtc-parser.tab.c_shipped | 780 ++++++++++++++++----
11906 scripts/dtc/dtc-parser.tab.h_shipped | 47 +-
11907 scripts/dtc/dtc-parser.y | 255 ++++++-
11908 scripts/dtc/dtc.c | 21 +-
11909 scripts/dtc/dtc.h | 51 +-
11910 scripts/dtc/fdtdump.c | 162 ++++
11911 scripts/dtc/fdtget.c | 366 +++++++++
11912 scripts/dtc/fdtput.c | 362 +++++++++
11913 scripts/dtc/flattree.c | 3 +
11914 scripts/dtc/libfdt/Makefile.libfdt | 6 +-
11915 scripts/dtc/libfdt/fdt.c | 61 +-
11916 scripts/dtc/libfdt/fdt_empty_tree.c | 84 +++
11917 scripts/dtc/libfdt/fdt_ro.c | 275 ++++---
11918 scripts/dtc/libfdt/fdt_rw.c | 29 +
11919 scripts/dtc/libfdt/fdt_sw.c | 11 +-
11920 scripts/dtc/libfdt/fdt_wip.c | 41 +-
11921 scripts/dtc/libfdt/libfdt.h | 440 ++++++++++-
11922 scripts/dtc/libfdt/libfdt_env.h | 16 +-
11923 scripts/dtc/libfdt/libfdt_internal.h | 2 +-
11924 scripts/dtc/livetree.c | 128 +++-
11925 scripts/dtc/srcpos.c | 98 ++-
11926 scripts/dtc/srcpos.h | 31 +
11927 scripts/dtc/treesource.c | 2 +
11928 scripts/dtc/util.c | 272 +++++++
11929 scripts/dtc/util.h | 97 +++
11930 42 files changed, 4057 insertions(+), 712 deletions(-)
11931 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
11932 create mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
11933 create mode 100644 scripts/dtc/fdtdump.c
11934 create mode 100644 scripts/dtc/fdtget.c
11935 create mode 100644 scripts/dtc/fdtput.c
11936 create mode 100644 scripts/dtc/libfdt/fdt_empty_tree.c
11937 Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
11938 $ git merge spi/spi/next
11939 Already up-to-date.
11940 Merging spi-mb/spi-next (536a53a spi: remove completely broken Tegra driver)
11941 $ git merge spi-mb/spi-next
11942 Auto-merging drivers/spi/spi-topcliff-pch.c
11943 Removing drivers/spi/spi-tegra.c
11944 Auto-merging drivers/spi/spi-s3c64xx.c
11945 Auto-merging drivers/spi/Kconfig
11946 Merge made by the 'recursive' strategy.
11947 Documentation/devicetree/bindings/spi/mxs-spi.txt | 22 +
11948 Documentation/devicetree/bindings/spi/spi-bus.txt | 3 +
11949 Documentation/devicetree/bindings/spi/spi-gpio.txt | 29 +
11950 .../devicetree/bindings/spi/spi-sc18is602.txt | 23 +
11951 .../devicetree/bindings/spi/spi_pl022.txt | 22 +
11952 Documentation/spi/spi-sc18is602 | 36 +
11953 arch/arm/mach-u300/core.c | 3 -
11954 drivers/clk/mxs/Makefile | 2 +-
11955 drivers/clk/mxs/clk-ssp.c | 62 ++
11956 drivers/mmc/host/mxs-mmc.c | 323 +++------
11957 drivers/spi/Kconfig | 15 +-
11958 drivers/spi/Makefile | 3 +-
11959 drivers/spi/spi-altera.c | 4 +-
11960 drivers/spi/spi-gpio.c | 131 +++-
11961 drivers/spi/spi-imx.c | 6 +-
11962 drivers/spi/spi-mpc512x-psc.c | 3 +-
11963 drivers/spi/spi-mpc52xx-psc.c | 3 +-
11964 drivers/spi/spi-mpc52xx.c | 9 +-
11965 drivers/spi/spi-mxs.c | 674 +++++++++++++++++++
11966 drivers/spi/spi-omap2-mcspi.c | 321 +++++----
11967 drivers/spi/spi-orion.c | 209 ++----
11968 drivers/spi/spi-pl022.c | 251 +++++--
11969 drivers/spi/spi-s3c24xx.c | 1 +
11970 drivers/spi/spi-s3c64xx.c | 11 +-
11971 drivers/spi/spi-sc18is602.c | 364 ++++++++++
11972 drivers/spi/spi-sh-hspi.c | 5 +-
11973 drivers/spi/spi-stmp.c | 6 +-
11974 drivers/spi/spi-tegra.c | 700 --------------------
11975 drivers/spi/spi-tle62x0.c | 13 +-
11976 drivers/spi/spi-topcliff-pch.c | 2 -
11977 include/linux/amba/pl022.h | 2 +
11978 include/linux/platform_data/sc18is602.h | 19 +
11979 include/linux/spi/mxs-spi.h | 150 +++++
11980 33 files changed, 2114 insertions(+), 1313 deletions(-)
11981 create mode 100644 Documentation/devicetree/bindings/spi/mxs-spi.txt
11982 create mode 100644 Documentation/devicetree/bindings/spi/spi-gpio.txt
11983 create mode 100644 Documentation/devicetree/bindings/spi/spi-sc18is602.txt
11984 create mode 100644 Documentation/spi/spi-sc18is602
11985 create mode 100644 drivers/clk/mxs/clk-ssp.c
11986 create mode 100644 drivers/spi/spi-mxs.c
11987 create mode 100644 drivers/spi/spi-sc18is602.c
11988 delete mode 100644 drivers/spi/spi-tegra.c
11989 create mode 100644 include/linux/platform_data/sc18is602.h
11990 create mode 100644 include/linux/spi/mxs-spi.h
11991 Merging tip/auto-latest (3d66e19 manual merge of x86/smap)
11992 $ git merge tip/auto-latest
11993 Auto-merging scripts/kconfig/Makefile
11994 Auto-merging kernel/sysctl.c
11995 Auto-merging init/Kconfig
11996 Auto-merging include/linux/sched.h
11997 Auto-merging arch/x86/Kconfig
11998 Auto-merging MAINTAINERS
11999 Merge made by the 'recursive' strategy.
12001 arch/sh/mm/Kconfig | 1 +
12002 arch/x86/Kconfig | 31 +
12003 arch/x86/include/asm/pgtable.h | 1 +
12004 drivers/base/node.c | 2 +-
12005 include/linux/huge_mm.h | 19 +
12006 include/linux/init_task.h | 9 +
12007 include/linux/mempolicy.h | 30 +-
12008 include/linux/migrate.h | 7 +
12009 include/linux/migrate_mode.h | 3 +
12010 include/linux/mm.h | 115 +-
12011 include/linux/mm_types.h | 34 +
12012 include/linux/mmzone.h | 15 +-
12013 include/linux/page-flags-layout.h | 83 ++
12014 include/linux/sched.h | 27 +-
12015 init/Kconfig | 11 +
12016 kernel/sched/core.c | 73 +-
12017 kernel/sched/debug.c | 3 +
12018 kernel/sched/fair.c | 545 ++++++++-
12019 kernel/sched/features.h | 10 +
12020 kernel/sched/sched.h | 37 +
12021 kernel/sysctl.c | 13 +-
12022 mm/huge_memory.c | 176 ++-
12023 mm/memory.c | 105 +-
12024 mm/mempolicy.c | 295 +++--
12025 mm/migrate.c | 85 +-
12026 mm/mprotect.c | 31 +-
12028 scripts/kconfig/Makefile | 7 +-
12029 tools/kvm/.gitignore | 12 +
12030 tools/kvm/CREDITS-Git | 30 +
12031 tools/kvm/Documentation/kernel-debugging.txt | 15 +
12032 tools/kvm/Documentation/kvm-balloon.txt | 24 +
12033 tools/kvm/Documentation/kvm-debug.txt | 16 +
12034 tools/kvm/Documentation/kvm-list.txt | 16 +
12035 tools/kvm/Documentation/kvm-pause.txt | 16 +
12036 tools/kvm/Documentation/kvm-resume.txt | 16 +
12037 tools/kvm/Documentation/kvm-run.txt | 62 ++
12038 tools/kvm/Documentation/kvm-sandbox.txt | 16 +
12039 tools/kvm/Documentation/kvm-setup.txt | 15 +
12040 tools/kvm/Documentation/kvm-stat.txt | 19 +
12041 tools/kvm/Documentation/kvm-stop.txt | 16 +
12042 tools/kvm/Documentation/kvm-version.txt | 21 +
12043 tools/kvm/Documentation/virtio-console.txt | 41 +
12044 tools/kvm/Makefile | 440 ++++++++
12045 tools/kvm/README | 112 ++
12046 tools/kvm/builtin-balloon.c | 80 ++
12047 tools/kvm/builtin-debug.c | 110 ++
12048 tools/kvm/builtin-help.c | 63 ++
12049 tools/kvm/builtin-list.c | 149 +++
12050 tools/kvm/builtin-pause.c | 88 ++
12051 tools/kvm/builtin-resume.c | 88 ++
12052 tools/kvm/builtin-run.c | 1426 ++++++++++++++++++++++++
12053 tools/kvm/builtin-sandbox.c | 9 +
12054 tools/kvm/builtin-setup.c | 262 +++++
12055 tools/kvm/builtin-stat.c | 127 +++
12056 tools/kvm/builtin-stop.c | 70 ++
12057 tools/kvm/builtin-version.c | 15 +
12058 tools/kvm/code16gcc.h | 15 +
12059 tools/kvm/command-list.txt | 15 +
12060 tools/kvm/config/feature-tests.mak | 177 +++
12061 tools/kvm/config/utilities.mak | 196 ++++
12062 tools/kvm/disk/blk.c | 76 ++
12063 tools/kvm/disk/core.c | 289 +++++
12064 tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++++++++
12065 tools/kvm/disk/raw.c | 141 +++
12066 tools/kvm/framebuffer.c | 75 ++
12067 tools/kvm/guest/init.c | 72 ++
12068 tools/kvm/guest_compat.c | 99 ++
12069 tools/kvm/hw/i8042.c | 348 ++++++
12070 tools/kvm/hw/pci-shmem.c | 268 +++++
12071 tools/kvm/hw/rtc.c | 137 +++
12072 tools/kvm/hw/serial.c | 446 ++++++++
12073 tools/kvm/hw/vesa.c | 85 ++
12074 tools/kvm/include/asm/hweight.h | 8 +
12075 tools/kvm/include/bios/memcpy.h | 9 +
12076 tools/kvm/include/kvm/8250-serial.h | 11 +
12077 tools/kvm/include/kvm/apic.h | 17 +
12078 tools/kvm/include/kvm/brlock.h | 41 +
12079 tools/kvm/include/kvm/builtin-balloon.h | 9 +
12080 tools/kvm/include/kvm/builtin-debug.h | 20 +
12081 tools/kvm/include/kvm/builtin-help.h | 6 +
12082 tools/kvm/include/kvm/builtin-list.h | 10 +
12083 tools/kvm/include/kvm/builtin-pause.h | 9 +
12084 tools/kvm/include/kvm/builtin-resume.h | 9 +
12085 tools/kvm/include/kvm/builtin-run.h | 11 +
12086 tools/kvm/include/kvm/builtin-sandbox.h | 6 +
12087 tools/kvm/include/kvm/builtin-setup.h | 11 +
12088 tools/kvm/include/kvm/builtin-stat.h | 9 +
12089 tools/kvm/include/kvm/builtin-stop.h | 9 +
12090 tools/kvm/include/kvm/builtin-version.h | 6 +
12091 tools/kvm/include/kvm/compiler.h | 10 +
12092 tools/kvm/include/kvm/disk-image.h | 95 ++
12093 tools/kvm/include/kvm/e820.h | 13 +
12094 tools/kvm/include/kvm/framebuffer.h | 35 +
12095 tools/kvm/include/kvm/guest_compat.h | 9 +
12096 tools/kvm/include/kvm/i8042.h | 12 +
12097 tools/kvm/include/kvm/ioeventfd.h | 28 +
12098 tools/kvm/include/kvm/ioport.h | 69 ++
12099 tools/kvm/include/kvm/irq.h | 33 +
12100 tools/kvm/include/kvm/kvm-cmd.h | 17 +
12101 tools/kvm/include/kvm/kvm-cpu.h | 24 +
12102 tools/kvm/include/kvm/kvm-ipc.h | 24 +
12103 tools/kvm/include/kvm/kvm.h | 93 ++
12104 tools/kvm/include/kvm/msi.h | 10 +
12105 tools/kvm/include/kvm/mutex.h | 33 +
12106 tools/kvm/include/kvm/parse-options.h | 214 ++++
12107 tools/kvm/include/kvm/pci-shmem.h | 28 +
12108 tools/kvm/include/kvm/pci.h | 95 ++
12109 tools/kvm/include/kvm/qcow.h | 133 +++
12110 tools/kvm/include/kvm/rbtree-interval.h | 28 +
12111 tools/kvm/include/kvm/read-write.h | 43 +
12112 tools/kvm/include/kvm/rtc.h | 9 +
12113 tools/kvm/include/kvm/rwsem.h | 39 +
12114 tools/kvm/include/kvm/sdl.h | 22 +
12115 tools/kvm/include/kvm/segment.h | 21 +
12116 tools/kvm/include/kvm/strbuf.h | 20 +
12117 tools/kvm/include/kvm/symbol.h | 30 +
12118 tools/kvm/include/kvm/term.h | 20 +
12119 tools/kvm/include/kvm/threadpool.h | 37 +
12120 tools/kvm/include/kvm/types.h | 7 +
12121 tools/kvm/include/kvm/uip.h | 360 ++++++
12122 tools/kvm/include/kvm/util.h | 97 ++
12123 tools/kvm/include/kvm/vesa.h | 18 +
12124 tools/kvm/include/kvm/virtio-9p.h | 73 ++
12125 tools/kvm/include/kvm/virtio-balloon.h | 8 +
12126 tools/kvm/include/kvm/virtio-blk.h | 12 +
12127 tools/kvm/include/kvm/virtio-console.h | 9 +
12128 tools/kvm/include/kvm/virtio-mmio.h | 58 +
12129 tools/kvm/include/kvm/virtio-net.h | 26 +
12130 tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
12131 tools/kvm/include/kvm/virtio-pci.h | 49 +
12132 tools/kvm/include/kvm/virtio-rng.h | 9 +
12133 tools/kvm/include/kvm/virtio-scsi.h | 26 +
12134 tools/kvm/include/kvm/virtio.h | 102 ++
12135 tools/kvm/include/kvm/vnc.h | 20 +
12136 tools/kvm/include/linux/bitops.h | 33 +
12137 tools/kvm/include/linux/byteorder.h | 7 +
12138 tools/kvm/include/linux/compiler.h | 20 +
12139 tools/kvm/include/linux/kernel.h | 39 +
12140 tools/kvm/include/linux/module.h | 6 +
12141 tools/kvm/include/linux/prefetch.h | 6 +
12142 tools/kvm/include/linux/stddef.h | 16 +
12143 tools/kvm/include/linux/types.h | 51 +
12144 tools/kvm/ioeventfd.c | 214 ++++
12145 tools/kvm/ioport.c | 195 ++++
12146 tools/kvm/kvm-cmd.c | 91 ++
12147 tools/kvm/kvm-cpu.c | 175 +++
12148 tools/kvm/kvm-ipc.c | 231 ++++
12149 tools/kvm/kvm.c | 593 ++++++++++
12150 tools/kvm/main.c | 19 +
12151 tools/kvm/mmio.c | 140 +++
12152 tools/kvm/net/uip/arp.c | 30 +
12153 tools/kvm/net/uip/buf.c | 114 ++
12154 tools/kvm/net/uip/core.c | 190 ++++
12155 tools/kvm/net/uip/csum.c | 92 ++
12156 tools/kvm/net/uip/dhcp.c | 202 ++++
12157 tools/kvm/net/uip/icmp.c | 29 +
12158 tools/kvm/net/uip/ipv4.c | 29 +
12159 tools/kvm/net/uip/tcp.c | 345 ++++++
12160 tools/kvm/net/uip/udp.c | 236 ++++
12161 tools/kvm/pci.c | 213 ++++
12162 tools/kvm/powerpc/boot.c | 8 +
12163 tools/kvm/powerpc/cpu_info.c | 195 ++++
12164 tools/kvm/powerpc/cpu_info.h | 42 +
12165 tools/kvm/powerpc/include/kvm/barrier.h | 6 +
12166 tools/kvm/powerpc/include/kvm/kvm-arch.h | 90 ++
12167 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 ++
12168 tools/kvm/powerpc/ioport.c | 18 +
12169 tools/kvm/powerpc/irq.c | 75 ++
12170 tools/kvm/powerpc/kvm-cpu.c | 293 +++++
12171 tools/kvm/powerpc/kvm.c | 529 +++++++++
12172 tools/kvm/powerpc/spapr.h | 93 ++
12173 tools/kvm/powerpc/spapr_hcall.c | 134 +++
12174 tools/kvm/powerpc/spapr_hvcons.c | 102 ++
12175 tools/kvm/powerpc/spapr_hvcons.h | 19 +
12176 tools/kvm/powerpc/spapr_pci.c | 423 +++++++
12177 tools/kvm/powerpc/spapr_pci.h | 57 +
12178 tools/kvm/powerpc/spapr_rtas.c | 229 ++++
12179 tools/kvm/powerpc/xics.c | 514 +++++++++
12180 tools/kvm/powerpc/xics.h | 23 +
12181 tools/kvm/symbol.c | 131 +++
12182 tools/kvm/term.c | 166 +++
12183 tools/kvm/tests/Makefile | 19 +
12184 tools/kvm/tests/boot/Makefile | 13 +
12185 tools/kvm/tests/boot/init.c | 11 +
12186 tools/kvm/tests/kernel/.gitignore | 2 +
12187 tools/kvm/tests/kernel/Makefile | 20 +
12188 tools/kvm/tests/kernel/README | 16 +
12189 tools/kvm/tests/kernel/kernel.S | 8 +
12190 tools/kvm/tests/pit/.gitignore | 2 +
12191 tools/kvm/tests/pit/Makefile | 20 +
12192 tools/kvm/tests/pit/README | 16 +
12193 tools/kvm/tests/pit/tick.S | 109 ++
12194 tools/kvm/ui/sdl.c | 303 +++++
12195 tools/kvm/ui/vnc.c | 230 ++++
12196 tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
12197 tools/kvm/util/generate-cmdlist.sh | 23 +
12198 tools/kvm/util/kvm-ifup-vbr0 | 6 +
12199 tools/kvm/util/parse-options.c | 577 ++++++++++
12200 tools/kvm/util/rbtree-interval.c | 89 ++
12201 tools/kvm/util/read-write.c | 354 ++++++
12202 tools/kvm/util/set_private_br.sh | 51 +
12203 tools/kvm/util/strbuf.c | 62 ++
12204 tools/kvm/util/threadpool.c | 145 +++
12205 tools/kvm/util/util.c | 133 +++
12206 tools/kvm/virtio/9p-pdu.c | 287 +++++
12207 tools/kvm/virtio/9p.c | 1379 +++++++++++++++++++++++
12208 tools/kvm/virtio/balloon.c | 259 +++++
12209 tools/kvm/virtio/blk.c | 313 ++++++
12210 tools/kvm/virtio/console.c | 185 ++++
12211 tools/kvm/virtio/core.c | 233 ++++
12212 tools/kvm/virtio/mmio.c | 264 +++++
12213 tools/kvm/virtio/net.c | 546 +++++++++
12214 tools/kvm/virtio/pci.c | 398 +++++++
12215 tools/kvm/virtio/rng.c | 188 ++++
12216 tools/kvm/virtio/scsi.c | 307 ++++++
12217 tools/kvm/x86/bios.c | 174 +++
12218 tools/kvm/x86/bios/.gitignore | 3 +
12219 tools/kvm/x86/bios/bios-rom.S | 12 +
12220 tools/kvm/x86/bios/e820.c | 72 ++
12221 tools/kvm/x86/bios/entry.S | 92 ++
12222 tools/kvm/x86/bios/gen-offsets.sh | 14 +
12223 tools/kvm/x86/bios/int10.c | 110 ++
12224 tools/kvm/x86/bios/int15.c | 18 +
12225 tools/kvm/x86/bios/local.S | 7 +
12226 tools/kvm/x86/bios/macro.S | 25 +
12227 tools/kvm/x86/bios/memcpy.c | 23 +
12228 tools/kvm/x86/bios/rom.ld.S | 16 +
12229 tools/kvm/x86/boot.c | 41 +
12230 tools/kvm/x86/cpuid.c | 60 +
12231 tools/kvm/x86/include/kvm/assembly.h | 24 +
12232 tools/kvm/x86/include/kvm/barrier.h | 20 +
12233 tools/kvm/x86/include/kvm/bios-export.h | 13 +
12234 tools/kvm/x86/include/kvm/bios.h | 93 ++
12235 tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
12236 tools/kvm/x86/include/kvm/cpufeature.h | 41 +
12237 tools/kvm/x86/include/kvm/interrupt.h | 26 +
12238 tools/kvm/x86/include/kvm/kvm-arch.h | 67 ++
12239 tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
12240 tools/kvm/x86/include/kvm/mptable.h | 9 +
12241 tools/kvm/x86/interrupt.c | 28 +
12242 tools/kvm/x86/ioport.c | 77 ++
12243 tools/kvm/x86/irq.c | 222 ++++
12244 tools/kvm/x86/kvm-cpu.c | 425 +++++++
12245 tools/kvm/x86/kvm.c | 372 +++++++
12246 tools/kvm/x86/mptable.c | 287 +++++
12247 247 files changed, 26812 insertions(+), 247 deletions(-)
12248 create mode 100644 include/linux/page-flags-layout.h
12249 create mode 100644 tools/kvm/.gitignore
12250 create mode 100644 tools/kvm/CREDITS-Git
12251 create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
12252 create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
12253 create mode 100644 tools/kvm/Documentation/kvm-debug.txt
12254 create mode 100644 tools/kvm/Documentation/kvm-list.txt
12255 create mode 100644 tools/kvm/Documentation/kvm-pause.txt
12256 create mode 100644 tools/kvm/Documentation/kvm-resume.txt
12257 create mode 100644 tools/kvm/Documentation/kvm-run.txt
12258 create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
12259 create mode 100644 tools/kvm/Documentation/kvm-setup.txt
12260 create mode 100644 tools/kvm/Documentation/kvm-stat.txt
12261 create mode 100644 tools/kvm/Documentation/kvm-stop.txt
12262 create mode 100644 tools/kvm/Documentation/kvm-version.txt
12263 create mode 100644 tools/kvm/Documentation/virtio-console.txt
12264 create mode 100644 tools/kvm/Makefile
12265 create mode 100644 tools/kvm/README
12266 create mode 100644 tools/kvm/builtin-balloon.c
12267 create mode 100644 tools/kvm/builtin-debug.c
12268 create mode 100644 tools/kvm/builtin-help.c
12269 create mode 100644 tools/kvm/builtin-list.c
12270 create mode 100644 tools/kvm/builtin-pause.c
12271 create mode 100644 tools/kvm/builtin-resume.c
12272 create mode 100644 tools/kvm/builtin-run.c
12273 create mode 100644 tools/kvm/builtin-sandbox.c
12274 create mode 100644 tools/kvm/builtin-setup.c
12275 create mode 100644 tools/kvm/builtin-stat.c
12276 create mode 100644 tools/kvm/builtin-stop.c
12277 create mode 100644 tools/kvm/builtin-version.c
12278 create mode 100644 tools/kvm/code16gcc.h
12279 create mode 100644 tools/kvm/command-list.txt
12280 create mode 100644 tools/kvm/config/feature-tests.mak
12281 create mode 100644 tools/kvm/config/utilities.mak
12282 create mode 100644 tools/kvm/disk/blk.c
12283 create mode 100644 tools/kvm/disk/core.c
12284 create mode 100644 tools/kvm/disk/qcow.c
12285 create mode 100644 tools/kvm/disk/raw.c
12286 create mode 100644 tools/kvm/framebuffer.c
12287 create mode 100644 tools/kvm/guest/init.c
12288 create mode 100644 tools/kvm/guest_compat.c
12289 create mode 100644 tools/kvm/hw/i8042.c
12290 create mode 100644 tools/kvm/hw/pci-shmem.c
12291 create mode 100644 tools/kvm/hw/rtc.c
12292 create mode 100644 tools/kvm/hw/serial.c
12293 create mode 100644 tools/kvm/hw/vesa.c
12294 create mode 100644 tools/kvm/include/asm/hweight.h
12295 create mode 100644 tools/kvm/include/bios/memcpy.h
12296 create mode 100644 tools/kvm/include/kvm/8250-serial.h
12297 create mode 100644 tools/kvm/include/kvm/apic.h
12298 create mode 100644 tools/kvm/include/kvm/brlock.h
12299 create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
12300 create mode 100644 tools/kvm/include/kvm/builtin-debug.h
12301 create mode 100644 tools/kvm/include/kvm/builtin-help.h
12302 create mode 100644 tools/kvm/include/kvm/builtin-list.h
12303 create mode 100644 tools/kvm/include/kvm/builtin-pause.h
12304 create mode 100644 tools/kvm/include/kvm/builtin-resume.h
12305 create mode 100644 tools/kvm/include/kvm/builtin-run.h
12306 create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
12307 create mode 100644 tools/kvm/include/kvm/builtin-setup.h
12308 create mode 100644 tools/kvm/include/kvm/builtin-stat.h
12309 create mode 100644 tools/kvm/include/kvm/builtin-stop.h
12310 create mode 100644 tools/kvm/include/kvm/builtin-version.h
12311 create mode 100644 tools/kvm/include/kvm/compiler.h
12312 create mode 100644 tools/kvm/include/kvm/disk-image.h
12313 create mode 100644 tools/kvm/include/kvm/e820.h
12314 create mode 100644 tools/kvm/include/kvm/framebuffer.h
12315 create mode 100644 tools/kvm/include/kvm/guest_compat.h
12316 create mode 100644 tools/kvm/include/kvm/i8042.h
12317 create mode 100644 tools/kvm/include/kvm/ioeventfd.h
12318 create mode 100644 tools/kvm/include/kvm/ioport.h
12319 create mode 100644 tools/kvm/include/kvm/irq.h
12320 create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
12321 create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
12322 create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
12323 create mode 100644 tools/kvm/include/kvm/kvm.h
12324 create mode 100644 tools/kvm/include/kvm/msi.h
12325 create mode 100644 tools/kvm/include/kvm/mutex.h
12326 create mode 100644 tools/kvm/include/kvm/parse-options.h
12327 create mode 100644 tools/kvm/include/kvm/pci-shmem.h
12328 create mode 100644 tools/kvm/include/kvm/pci.h
12329 create mode 100644 tools/kvm/include/kvm/qcow.h
12330 create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
12331 create mode 100644 tools/kvm/include/kvm/read-write.h
12332 create mode 100644 tools/kvm/include/kvm/rtc.h
12333 create mode 100644 tools/kvm/include/kvm/rwsem.h
12334 create mode 100644 tools/kvm/include/kvm/sdl.h
12335 create mode 100644 tools/kvm/include/kvm/segment.h
12336 create mode 100644 tools/kvm/include/kvm/strbuf.h
12337 create mode 100644 tools/kvm/include/kvm/symbol.h
12338 create mode 100644 tools/kvm/include/kvm/term.h
12339 create mode 100644 tools/kvm/include/kvm/threadpool.h
12340 create mode 100644 tools/kvm/include/kvm/types.h
12341 create mode 100644 tools/kvm/include/kvm/uip.h
12342 create mode 100644 tools/kvm/include/kvm/util.h
12343 create mode 100644 tools/kvm/include/kvm/vesa.h
12344 create mode 100644 tools/kvm/include/kvm/virtio-9p.h
12345 create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
12346 create mode 100644 tools/kvm/include/kvm/virtio-blk.h
12347 create mode 100644 tools/kvm/include/kvm/virtio-console.h
12348 create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
12349 create mode 100644 tools/kvm/include/kvm/virtio-net.h
12350 create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
12351 create mode 100644 tools/kvm/include/kvm/virtio-pci.h
12352 create mode 100644 tools/kvm/include/kvm/virtio-rng.h
12353 create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
12354 create mode 100644 tools/kvm/include/kvm/virtio.h
12355 create mode 100644 tools/kvm/include/kvm/vnc.h
12356 create mode 100644 tools/kvm/include/linux/bitops.h
12357 create mode 100644 tools/kvm/include/linux/byteorder.h
12358 create mode 100644 tools/kvm/include/linux/compiler.h
12359 create mode 100644 tools/kvm/include/linux/kernel.h
12360 create mode 100644 tools/kvm/include/linux/module.h
12361 create mode 100644 tools/kvm/include/linux/prefetch.h
12362 create mode 100644 tools/kvm/include/linux/stddef.h
12363 create mode 100644 tools/kvm/include/linux/types.h
12364 create mode 100644 tools/kvm/ioeventfd.c
12365 create mode 100644 tools/kvm/ioport.c
12366 create mode 100644 tools/kvm/kvm-cmd.c
12367 create mode 100644 tools/kvm/kvm-cpu.c
12368 create mode 100644 tools/kvm/kvm-ipc.c
12369 create mode 100644 tools/kvm/kvm.c
12370 create mode 100644 tools/kvm/main.c
12371 create mode 100644 tools/kvm/mmio.c
12372 create mode 100644 tools/kvm/net/uip/arp.c
12373 create mode 100644 tools/kvm/net/uip/buf.c
12374 create mode 100644 tools/kvm/net/uip/core.c
12375 create mode 100644 tools/kvm/net/uip/csum.c
12376 create mode 100644 tools/kvm/net/uip/dhcp.c
12377 create mode 100644 tools/kvm/net/uip/icmp.c
12378 create mode 100644 tools/kvm/net/uip/ipv4.c
12379 create mode 100644 tools/kvm/net/uip/tcp.c
12380 create mode 100644 tools/kvm/net/uip/udp.c
12381 create mode 100644 tools/kvm/pci.c
12382 create mode 100644 tools/kvm/powerpc/boot.c
12383 create mode 100644 tools/kvm/powerpc/cpu_info.c
12384 create mode 100644 tools/kvm/powerpc/cpu_info.h
12385 create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
12386 create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
12387 create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
12388 create mode 100644 tools/kvm/powerpc/ioport.c
12389 create mode 100644 tools/kvm/powerpc/irq.c
12390 create mode 100644 tools/kvm/powerpc/kvm-cpu.c
12391 create mode 100644 tools/kvm/powerpc/kvm.c
12392 create mode 100644 tools/kvm/powerpc/spapr.h
12393 create mode 100644 tools/kvm/powerpc/spapr_hcall.c
12394 create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
12395 create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
12396 create mode 100644 tools/kvm/powerpc/spapr_pci.c
12397 create mode 100644 tools/kvm/powerpc/spapr_pci.h
12398 create mode 100644 tools/kvm/powerpc/spapr_rtas.c
12399 create mode 100644 tools/kvm/powerpc/xics.c
12400 create mode 100644 tools/kvm/powerpc/xics.h
12401 create mode 100644 tools/kvm/symbol.c
12402 create mode 100644 tools/kvm/term.c
12403 create mode 100644 tools/kvm/tests/Makefile
12404 create mode 100644 tools/kvm/tests/boot/Makefile
12405 create mode 100644 tools/kvm/tests/boot/init.c
12406 create mode 100644 tools/kvm/tests/kernel/.gitignore
12407 create mode 100644 tools/kvm/tests/kernel/Makefile
12408 create mode 100644 tools/kvm/tests/kernel/README
12409 create mode 100644 tools/kvm/tests/kernel/kernel.S
12410 create mode 100644 tools/kvm/tests/pit/.gitignore
12411 create mode 100644 tools/kvm/tests/pit/Makefile
12412 create mode 100644 tools/kvm/tests/pit/README
12413 create mode 100644 tools/kvm/tests/pit/tick.S
12414 create mode 100644 tools/kvm/ui/sdl.c
12415 create mode 100644 tools/kvm/ui/vnc.c
12416 create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
12417 create mode 100755 tools/kvm/util/generate-cmdlist.sh
12418 create mode 100755 tools/kvm/util/kvm-ifup-vbr0
12419 create mode 100644 tools/kvm/util/parse-options.c
12420 create mode 100644 tools/kvm/util/rbtree-interval.c
12421 create mode 100644 tools/kvm/util/read-write.c
12422 create mode 100755 tools/kvm/util/set_private_br.sh
12423 create mode 100644 tools/kvm/util/strbuf.c
12424 create mode 100644 tools/kvm/util/threadpool.c
12425 create mode 100644 tools/kvm/util/util.c
12426 create mode 100644 tools/kvm/virtio/9p-pdu.c
12427 create mode 100644 tools/kvm/virtio/9p.c
12428 create mode 100644 tools/kvm/virtio/balloon.c
12429 create mode 100644 tools/kvm/virtio/blk.c
12430 create mode 100644 tools/kvm/virtio/console.c
12431 create mode 100644 tools/kvm/virtio/core.c
12432 create mode 100644 tools/kvm/virtio/mmio.c
12433 create mode 100644 tools/kvm/virtio/net.c
12434 create mode 100644 tools/kvm/virtio/pci.c
12435 create mode 100644 tools/kvm/virtio/rng.c
12436 create mode 100644 tools/kvm/virtio/scsi.c
12437 create mode 100644 tools/kvm/x86/bios.c
12438 create mode 100644 tools/kvm/x86/bios/.gitignore
12439 create mode 100644 tools/kvm/x86/bios/bios-rom.S
12440 create mode 100644 tools/kvm/x86/bios/e820.c
12441 create mode 100644 tools/kvm/x86/bios/entry.S
12442 create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
12443 create mode 100644 tools/kvm/x86/bios/int10.c
12444 create mode 100644 tools/kvm/x86/bios/int15.c
12445 create mode 100644 tools/kvm/x86/bios/local.S
12446 create mode 100644 tools/kvm/x86/bios/macro.S
12447 create mode 100644 tools/kvm/x86/bios/memcpy.c
12448 create mode 100644 tools/kvm/x86/bios/rom.ld.S
12449 create mode 100644 tools/kvm/x86/boot.c
12450 create mode 100644 tools/kvm/x86/cpuid.c
12451 create mode 100644 tools/kvm/x86/include/kvm/assembly.h
12452 create mode 100644 tools/kvm/x86/include/kvm/barrier.h
12453 create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
12454 create mode 100644 tools/kvm/x86/include/kvm/bios.h
12455 create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
12456 create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
12457 create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
12458 create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
12459 create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
12460 create mode 100644 tools/kvm/x86/include/kvm/mptable.h
12461 create mode 100644 tools/kvm/x86/interrupt.c
12462 create mode 100644 tools/kvm/x86/ioport.c
12463 create mode 100644 tools/kvm/x86/irq.c
12464 create mode 100644 tools/kvm/x86/kvm-cpu.c
12465 create mode 100644 tools/kvm/x86/kvm.c
12466 create mode 100644 tools/kvm/x86/mptable.c
12467 Merging rcu/rcu/next (593d100 Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b)
12468 $ git merge rcu/rcu/next
12469 Already up-to-date.
12470 Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
12471 $ git merge cputime/cputime
12472 Already up-to-date.
12473 Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
12474 $ git merge uprobes/for-next
12475 Already up-to-date.
12476 Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
12477 $ git merge kmemleak/kmemleak
12478 Auto-merging mm/kmemleak.c
12479 Merge made by the 'recursive' strategy.
12480 mm/kmemleak.c | 1 +
12481 1 file changed, 1 insertion(+)
12482 Merging kvm/linux-next (1e08ec4 KVM: optimize apic interrupt delivery)
12483 $ git merge kvm/linux-next
12484 Resolved 'arch/s390/include/asm/processor.h' using previous resolution.
12485 Resolved 'arch/x86/kvm/i8259.c' using previous resolution.
12486 Auto-merging virt/kvm/kvm_main.c
12487 Auto-merging include/linux/kvm_host.h
12488 Auto-merging arch/x86/kvm/x86.c
12489 Auto-merging arch/x86/kvm/vmx.c
12490 Removing arch/x86/kvm/timer.c
12491 Removing arch/x86/kvm/kvm_timer.h
12492 Auto-merging arch/x86/kvm/i8259.c
12493 CONFLICT (content): Merge conflict in arch/x86/kvm/i8259.c
12494 Auto-merging arch/x86/kernel/setup.c
12495 Auto-merging arch/x86/kernel/Makefile
12496 Auto-merging arch/x86/include/asm/kvm_host.h
12497 Auto-merging arch/x86/include/asm/kvm.h
12498 Auto-merging arch/x86/Kconfig
12499 Auto-merging arch/s390/kvm/priv.c
12500 Auto-merging arch/s390/kvm/Kconfig
12501 Auto-merging arch/s390/kernel/dis.c
12502 Auto-merging arch/s390/include/asm/processor.h
12503 CONFLICT (content): Merge conflict in arch/s390/include/asm/processor.h
12504 Automatic merge failed; fix conflicts and then commit the result.
12506 [master c9d0a7b] Merge remote-tracking branch 'kvm/linux-next'
12507 $ git diff -M --stat --summary HEAD^..
12508 Documentation/virtual/kvm/api.txt | 22 +-
12509 Documentation/virtual/kvm/hypercalls.txt | 66 ++++
12510 Documentation/virtual/kvm/msr.txt | 32 +-
12511 Documentation/virtual/kvm/ppc-pv.txt | 22 ++
12512 arch/ia64/kvm/kvm-ia64.c | 41 +--
12513 arch/powerpc/include/asm/kvm_host.h | 3 +
12514 arch/powerpc/kvm/44x_tlb.c | 1 -
12515 arch/powerpc/kvm/book3s_64_mmu_hv.c | 51 ++-
12516 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 +-
12517 arch/powerpc/kvm/book3s_pr.c | 4 +-
12518 arch/powerpc/kvm/e500_tlb.c | 3 +-
12519 arch/powerpc/kvm/powerpc.c | 14 +-
12520 arch/s390/include/asm/processor.h | 1 +
12521 arch/s390/kernel/dis.c | 27 ++
12522 arch/s390/kvm/Kconfig | 1 +
12523 arch/s390/kvm/diag.c | 4 +
12524 arch/s390/kvm/intercept.c | 11 +
12525 arch/s390/kvm/interrupt.c | 23 ++
12526 arch/s390/kvm/kvm-s390.c | 17 +-
12527 arch/s390/kvm/priv.c | 9 +-
12528 arch/s390/kvm/sigp.c | 2 +
12529 arch/s390/kvm/trace-s390.h | 210 ++++++++++++
12530 arch/s390/kvm/trace.h | 341 +++++++++++++++++++
12531 arch/x86/Kconfig | 21 +-
12532 arch/x86/include/asm/kvm.h | 1 +
12533 arch/x86/include/asm/kvm_emulate.h | 48 ++-
12534 arch/x86/include/asm/kvm_host.h | 32 +-
12535 arch/x86/include/asm/kvm_para.h | 6 +-
12536 arch/x86/kernel/Makefile | 3 +-
12537 arch/x86/kernel/kvm.c | 3 +-
12538 arch/x86/kernel/setup.c | 2 +-
12539 arch/x86/kvm/Kconfig | 2 +
12540 arch/x86/kvm/Makefile | 2 +-
12541 arch/x86/kvm/cpuid.c | 14 +-
12542 arch/x86/kvm/emulate.c | 538 ++++++++++++++++-------------
12543 arch/x86/kvm/i8254.c | 64 ++--
12544 arch/x86/kvm/i8254.h | 6 +-
12545 arch/x86/kvm/i8259.c | 70 ++--
12546 arch/x86/kvm/irq.h | 2 +-
12547 arch/x86/kvm/kvm_timer.h | 18 -
12548 arch/x86/kvm/lapic.c | 484 ++++++++++++++++++--------
12549 arch/x86/kvm/lapic.h | 61 +++-
12550 arch/x86/kvm/mmu.c | 240 +++++++++----
12551 arch/x86/kvm/mmu.h | 25 +-
12552 arch/x86/kvm/mmu_audit.c | 8 +-
12553 arch/x86/kvm/paging_tmpl.h | 199 +++++------
12554 arch/x86/kvm/pmu.c | 2 +-
12555 arch/x86/kvm/svm.c | 59 ++--
12556 arch/x86/kvm/timer.c | 47 ---
12557 arch/x86/kvm/vmx.c | 219 ++++++------
12558 arch/x86/kvm/x86.c | 354 ++++++++++---------
12559 arch/x86/kvm/x86.h | 1 +
12560 include/linux/kvm.h | 13 +-
12561 include/linux/kvm_host.h | 140 ++++++--
12562 kernel/jump_label.c | 1 +
12563 virt/kvm/Kconfig | 3 +
12564 virt/kvm/async_pf.c | 11 +-
12565 virt/kvm/ioapic.c | 37 +-
12566 virt/kvm/iommu.c | 16 +-
12567 virt/kvm/irq_comm.c | 11 +-
12568 virt/kvm/kvm_main.c | 541 ++++++++++++++++++------------
12569 61 files changed, 2799 insertions(+), 1416 deletions(-)
12570 create mode 100644 Documentation/virtual/kvm/hypercalls.txt
12571 create mode 100644 arch/s390/kvm/trace-s390.h
12572 create mode 100644 arch/s390/kvm/trace.h
12573 delete mode 100644 arch/x86/kvm/kvm_timer.h
12574 delete mode 100644 arch/x86/kvm/timer.c
12575 Merging kvm-ppc/kvm-ppc-next (96e82b6 KVM: PPC: Book3S HV: Provide a way for userspace to get/set per-vCPU areas)
12576 $ git merge kvm-ppc/kvm-ppc-next
12577 Auto-merging include/linux/kvm_host.h
12578 Auto-merging drivers/tty/Kconfig
12579 Auto-merging arch/powerpc/kvm/trace.h
12580 Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c
12581 Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c
12582 Auto-merging arch/powerpc/include/asm/kvm_book3s.h
12583 Merge made by the 'recursive' strategy.
12584 Documentation/virtual/kvm/api.txt | 49 +++-
12585 arch/powerpc/include/asm/Kbuild | 1 +
12586 arch/powerpc/include/asm/epapr_hcalls.h | 36 +--
12587 arch/powerpc/include/asm/fsl_hcalls.h | 36 +--
12588 arch/powerpc/include/asm/kvm.h | 59 +++++
12589 arch/powerpc/include/asm/kvm_book3s.h | 2 +-
12590 arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 +-
12591 arch/powerpc/include/asm/kvm_host.h | 38 ++-
12592 arch/powerpc/include/asm/kvm_para.h | 21 +-
12593 arch/powerpc/include/asm/kvm_ppc.h | 64 ++++-
12594 arch/powerpc/include/asm/reg_booke.h | 7 +
12595 arch/powerpc/kernel/epapr_hcalls.S | 28 +++
12596 arch/powerpc/kernel/epapr_paravirt.c | 11 +-
12597 arch/powerpc/kernel/kvm.c | 2 +-
12598 arch/powerpc/kernel/ppc_ksyms.c | 5 +
12599 arch/powerpc/kvm/44x.c | 1 +
12600 arch/powerpc/kvm/44x_emulate.c | 110 +++++----
12601 arch/powerpc/kvm/Kconfig | 3 +
12602 arch/powerpc/kvm/book3s.c | 125 ++++++++++
12603 arch/powerpc/kvm/book3s_32_mmu_host.c | 1 +
12604 arch/powerpc/kvm/book3s_64_mmu_host.c | 1 +
12605 arch/powerpc/kvm/book3s_64_mmu_hv.c | 65 ++++--
12606 arch/powerpc/kvm/book3s_hv.c | 337 +++++++++++++++++++++------
12607 arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-
12608 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 +-
12609 arch/powerpc/kvm/book3s_mmu_hpte.c | 5 -
12610 arch/powerpc/kvm/book3s_pr.c | 180 ++++++++++----
12611 arch/powerpc/kvm/book3s_rmhandlers.S | 15 +-
12612 arch/powerpc/kvm/booke.c | 310 ++++++++++++++++++++----
12613 arch/powerpc/kvm/booke_emulate.c | 22 +-
12614 arch/powerpc/kvm/e500.h | 3 +-
12615 arch/powerpc/kvm/e500_tlb.c | 73 +++++-
12616 arch/powerpc/kvm/powerpc.c | 150 ++++++++++--
12617 arch/powerpc/kvm/trace.h | 200 +++++++++++++---
12618 arch/powerpc/platforms/Kconfig | 1 +
12619 arch/powerpc/sysdev/fsl_msi.c | 9 +-
12620 arch/powerpc/sysdev/fsl_soc.c | 2 +
12621 drivers/tty/Kconfig | 1 +
12622 drivers/virt/Kconfig | 1 +
12623 include/linux/kvm.h | 10 +-
12624 include/linux/kvm_host.h | 1 +
12625 41 files changed, 1622 insertions(+), 375 deletions(-)
12626 Merging oprofile/for-next (61bccf1 oprofile: Remove 'WQ on CPUx, prefer CPUy' warning)
12627 $ git merge oprofile/for-next
12628 Already up-to-date.
12629 Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
12630 $ git merge xen/upstream/xen
12631 Already up-to-date.
12632 Merging xen-two/linux-next (aafef47 Merge branch 'stable/for-linus-3.7' into linux-next)
12633 $ git merge xen-two/linux-next
12634 Recorded preimage for 'arch/arm/Kconfig'
12635 Recorded preimage for 'drivers/xen/Makefile'
12636 Auto-merging include/xen/interface/physdev.h
12637 Auto-merging drivers/xen/xen-pciback/pci_stub.c
12638 Auto-merging drivers/xen/Makefile
12639 CONFLICT (content): Merge conflict in drivers/xen/Makefile
12640 Auto-merging drivers/pci/xen-pcifront.c
12641 Auto-merging drivers/net/xen-netfront.c
12642 Auto-merging arch/arm/Makefile
12643 Auto-merging arch/arm/Kconfig
12644 CONFLICT (content): Merge conflict in arch/arm/Kconfig
12645 Auto-merging MAINTAINERS
12646 Automatic merge failed; fix conflicts and then commit the result.
12648 Recorded resolution for 'arch/arm/Kconfig'.
12649 Recorded resolution for 'drivers/xen/Makefile'.
12650 [master 8ad6d482] Merge remote-tracking branch 'xen-two/linux-next'
12651 $ git diff -M --stat --summary HEAD^..
12652 Documentation/devicetree/bindings/arm/xen.txt | 25 ++++
12654 arch/arm/Kconfig | 10 ++
12655 arch/arm/Makefile | 1 +
12656 arch/arm/boot/dts/xenvm-4.2.dts | 68 +++++++++
12657 arch/arm/include/asm/hypervisor.h | 6 +
12658 arch/arm/include/asm/sync_bitops.h | 27 ++++
12659 arch/arm/include/asm/xen/events.h | 18 +++
12660 arch/arm/include/asm/xen/hypercall.h | 69 +++++++++
12661 arch/arm/include/asm/xen/hypervisor.h | 19 +++
12662 arch/arm/include/asm/xen/interface.h | 73 ++++++++++
12663 arch/arm/include/asm/xen/page.h | 82 +++++++++++
12664 arch/arm/mach-vexpress/Makefile.boot | 3 +-
12665 arch/arm/mach-vexpress/v2m.c | 1 +
12666 arch/arm/xen/Makefile | 1 +
12667 arch/arm/xen/enlighten.c | 168 ++++++++++++++++++++++
12668 arch/arm/xen/grant-table.c | 53 +++++++
12669 arch/arm/xen/hypercall.S | 106 ++++++++++++++
12670 arch/ia64/include/asm/xen/interface.h | 8 +-
12671 arch/x86/include/asm/xen/interface.h | 8 ++
12672 arch/x86/include/asm/xen/swiotlb-xen.h | 2 +
12673 arch/x86/xen/apic.c | 3 +-
12674 arch/x86/xen/enlighten.c | 16 ++-
12675 arch/x86/xen/irq.c | 1 +
12676 arch/x86/xen/mmu.c | 190 ++++++++++++++++++++-----
12677 arch/x86/xen/p2m.c | 92 +++++++++++-
12678 arch/x86/xen/pci-swiotlb-xen.c | 52 ++++++-
12679 arch/x86/xen/platform-pci-unplug.c | 1 +
12680 arch/x86/xen/setup.c | 18 +++
12681 arch/x86/xen/vga.c | 7 +
12682 arch/x86/xen/xen-head.S | 56 +++++++-
12683 arch/x86/xen/xen-ops.h | 4 +-
12684 drivers/block/xen-blkback/blkback.c | 1 +
12685 drivers/net/xen-netback/netback.c | 1 +
12686 drivers/net/xen-netfront.c | 1 +
12687 drivers/pci/xen-pcifront.c | 15 +-
12688 drivers/tty/hvc/hvc_xen.c | 2 +
12689 drivers/xen/Makefile | 14 +-
12690 drivers/xen/events.c | 35 ++++-
12691 drivers/xen/gntdev.c | 2 +-
12692 drivers/xen/grant-table.c | 14 +-
12693 drivers/xen/privcmd.c | 135 +++++++++++++-----
12694 drivers/xen/swiotlb-xen.c | 119 ++++++++++------
12695 drivers/xen/sys-hypervisor.c | 13 +-
12696 drivers/xen/tmem.c | 1 +
12697 drivers/xen/xen-pciback/pci_stub.c | 136 ++++++++++++++----
12698 drivers/xen/xenbus/xenbus_comms.c | 2 +-
12699 drivers/xen/xenbus/xenbus_dev_backend.c | 2 +-
12700 drivers/xen/xenbus/xenbus_probe.c | 56 +++++---
12701 drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
12702 drivers/xen/xenbus/xenbus_xs.c | 3 +-
12703 include/linux/swiotlb.h | 1 +
12704 include/xen/events.h | 2 +
12705 include/xen/interface/features.h | 3 +
12706 include/xen/interface/grant_table.h | 12 +-
12707 include/xen/interface/io/protocols.h | 3 +
12708 include/xen/interface/memory.h | 21 +--
12709 include/xen/interface/physdev.h | 2 +-
12710 include/xen/interface/platform.h | 7 +-
12711 include/xen/interface/version.h | 5 +-
12712 include/xen/interface/xen.h | 8 +-
12713 include/xen/privcmd.h | 27 +++-
12714 include/xen/swiotlb-xen.h | 11 +-
12715 include/xen/xen.h | 2 +-
12716 lib/swiotlb.c | 33 +++--
12717 65 files changed, 1630 insertions(+), 255 deletions(-)
12718 create mode 100644 Documentation/devicetree/bindings/arm/xen.txt
12719 create mode 100644 arch/arm/boot/dts/xenvm-4.2.dts
12720 create mode 100644 arch/arm/include/asm/hypervisor.h
12721 create mode 100644 arch/arm/include/asm/sync_bitops.h
12722 create mode 100644 arch/arm/include/asm/xen/events.h
12723 create mode 100644 arch/arm/include/asm/xen/hypercall.h
12724 create mode 100644 arch/arm/include/asm/xen/hypervisor.h
12725 create mode 100644 arch/arm/include/asm/xen/interface.h
12726 create mode 100644 arch/arm/include/asm/xen/page.h
12727 create mode 100644 arch/arm/xen/Makefile
12728 create mode 100644 arch/arm/xen/enlighten.c
12729 create mode 100644 arch/arm/xen/grant-table.c
12730 create mode 100644 arch/arm/xen/hypercall.S
12731 $ git reset --hard HEAD^
12732 HEAD is now at c3324f1 Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
12733 Merging refs/next/20121001/xen-two
12734 $ git merge refs/next/20121001/xen-two
12735 Auto-merging drivers/xen/xen-pciback/pci_stub.c
12736 Auto-merging drivers/pci/xen-pcifront.c
12737 Merge made by the 'recursive' strategy.
12738 arch/ia64/include/asm/xen/interface.h | 7 +-
12739 arch/x86/include/asm/xen/interface.h | 7 +
12740 arch/x86/include/asm/xen/swiotlb-xen.h | 2 +
12741 arch/x86/xen/apic.c | 3 +-
12742 arch/x86/xen/enlighten.c | 15 ++-
12743 arch/x86/xen/mmu.c | 190 ++++++++++++++++++++++------
12744 arch/x86/xen/p2m.c | 92 +++++++++++++-
12745 arch/x86/xen/pci-swiotlb-xen.c | 52 +++++++-
12746 arch/x86/xen/platform-pci-unplug.c | 1 +
12747 arch/x86/xen/setup.c | 18 +++
12748 arch/x86/xen/vga.c | 7 +
12749 arch/x86/xen/xen-head.S | 56 +++++++-
12750 arch/x86/xen/xen-ops.h | 3 +-
12751 drivers/pci/xen-pcifront.c | 15 ++-
12752 drivers/tty/hvc/hvc_xen.c | 2 +
12753 drivers/xen/events.c | 18 ++-
12754 drivers/xen/gntdev.c | 2 +-
12755 drivers/xen/grant-table.c | 14 +-
12756 drivers/xen/privcmd.c | 135 +++++++++++++++-----
12757 drivers/xen/swiotlb-xen.c | 119 ++++++++++-------
12758 drivers/xen/sys-hypervisor.c | 13 +-
12759 drivers/xen/tmem.c | 1 +
12760 drivers/xen/xen-pciback/pci_stub.c | 136 +++++++++++++++-----
12761 drivers/xen/xenbus/xenbus_comms.c | 2 +-
12762 drivers/xen/xenbus/xenbus_dev_backend.c | 2 +-
12763 drivers/xen/xenbus/xenbus_probe.c | 56 +++++---
12764 drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
12765 drivers/xen/xenbus/xenbus_xs.c | 3 +-
12766 include/linux/swiotlb.h | 1 +
12767 include/xen/interface/grant_table.h | 12 +-
12768 include/xen/interface/memory.h | 9 +-
12769 include/xen/interface/platform.h | 7 +-
12770 include/xen/interface/version.h | 3 +
12771 include/xen/interface/xen.h | 8 +-
12772 include/xen/privcmd.h | 27 +++-
12773 include/xen/swiotlb-xen.h | 11 +-
12774 lib/swiotlb.c | 33 +++--
12775 37 files changed, 846 insertions(+), 237 deletions(-)
12776 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
12777 $ git merge xen-pvhvm/linux-next
12778 Already up-to-date.
12779 Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
12780 $ git merge percpu/for-next
12781 Already up-to-date.
12782 Merging workqueues/for-next (2b0f620 Merge branch 'for-3.7' into for-next)
12783 $ git merge workqueues/for-next
12784 Resolved 'drivers/isdn/mISDN/hwchannel.c' using previous resolution.
12785 Resolved 'drivers/thermal/thermal_sys.c' using previous resolution.
12786 Resolved 'drivers/tty/serial/omap-serial.c' using previous resolution.
12787 Resolved 'drivers/video/omap2/displays/panel-taal.c' using previous resolution.
12788 Auto-merging sound/soc/soc-core.c
12789 Auto-merging sound/pci/oxygen/oxygen_lib.c
12790 Auto-merging net/ipv4/inetpeer.c
12791 Auto-merging net/core/neighbour.c
12792 Auto-merging net/core/link_watch.c
12793 Auto-merging net/core/dst.c
12794 Auto-merging net/9p/trans_fd.c
12795 Auto-merging mm/vmstat.c
12796 Auto-merging mm/slab.c
12797 Auto-merging fs/xfs/xfs_super.c
12798 Auto-merging fs/ncpfs/inode.c
12799 Auto-merging fs/gfs2/super.c
12800 Auto-merging fs/affs/super.c
12801 Auto-merging drivers/video/omap2/dss/dsi.c
12802 Auto-merging drivers/video/omap2/displays/panel-taal.c
12803 CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-taal.c
12804 Auto-merging drivers/usb/gadget/u_ether.c
12805 Auto-merging drivers/usb/atm/ueagle-atm.c
12806 Auto-merging drivers/tty/tty_ldisc.c
12807 Auto-merging drivers/tty/serial/omap-serial.c
12808 CONFLICT (content): Merge conflict in drivers/tty/serial/omap-serial.c
12809 Auto-merging drivers/tty/serial/kgdboc.c
12810 Auto-merging drivers/tty/ipwireless/network.c
12811 Auto-merging drivers/tty/hvc/hvsi.c
12812 Auto-merging drivers/thermal/thermal_sys.c
12813 CONFLICT (content): Merge conflict in drivers/thermal/thermal_sys.c
12814 Auto-merging drivers/scsi/qla2xxx/qla_target.c
12815 Auto-merging drivers/scsi/ipr.c
12816 Auto-merging drivers/regulator/core.c
12817 Auto-merging drivers/power/wm97xx_battery.c
12818 Auto-merging drivers/power/charger-manager.c
12819 Auto-merging drivers/power/ab8500_fg.c
12820 Auto-merging drivers/power/ab8500_charger.c
12821 Auto-merging drivers/power/ab8500_btemp.c
12822 Auto-merging drivers/platform/x86/thinkpad_acpi.c
12823 Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c
12824 Auto-merging drivers/net/virtio_net.c
12825 Auto-merging drivers/net/ethernet/sun/niu.c
12826 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
12827 Auto-merging drivers/net/ethernet/mellanox/mlx4/sense.c
12828 Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
12829 Auto-merging drivers/mtd/mtdoops.c
12830 Auto-merging drivers/media/usb/tm6000/tm6000-cards.c
12831 Auto-merging drivers/media/usb/em28xx/em28xx-cards.c
12832 Auto-merging drivers/media/usb/cx231xx/cx231xx-cards.c
12833 Auto-merging drivers/media/platform/omap24xxcam.c
12834 Auto-merging drivers/media/pci/saa7134/saa7134-empress.c
12835 Auto-merging drivers/media/pci/saa7134/saa7134-core.c
12836 Auto-merging drivers/media/pci/mantis/mantis_uart.c
12837 Auto-merging drivers/media/pci/mantis/mantis_evm.c
12838 Auto-merging drivers/media/pci/cx88/cx88-mpeg.c
12839 Auto-merging drivers/media/pci/cx23885/cx23885-input.c
12840 Auto-merging drivers/media/pci/cx18/cx18-driver.c
12841 Auto-merging drivers/media/pci/bt8xx/bttv-driver.c
12842 Auto-merging drivers/media/dvb-core/dvb_net.c
12843 Auto-merging drivers/md/dm-mpath.c
12844 Auto-merging drivers/leds/leds-lp8788.c
12845 Auto-merging drivers/isdn/mISDN/hwchannel.c
12846 CONFLICT (content): Merge conflict in drivers/isdn/mISDN/hwchannel.c
12847 Auto-merging drivers/infiniband/hw/nes/nes_nic.c
12848 Auto-merging drivers/infiniband/hw/nes/nes_hw.c
12849 Auto-merging drivers/hid/hid-wiimote-ext.c
12850 CONFLICT (modify/delete): drivers/hid/hid-picolcd.c deleted in HEAD and modified in workqueues/for-next. Version workqueues/for-next of drivers/hid/hid-picolcd.c left in tree.
12851 Auto-merging drivers/gpu/drm/exynos/exynos_drm_g2d.c
12852 Auto-merging drivers/edac/edac_mc.c
12853 Auto-merging drivers/cpufreq/cpufreq_ondemand.c
12854 Auto-merging drivers/cpufreq/cpufreq_conservative.c
12855 Auto-merging drivers/char/tpm/tpm.c
12856 Auto-merging drivers/block/floppy.c
12857 Auto-merging block/genhd.c
12858 Auto-merging block/blk-core.c
12859 Automatic merge failed; fix conflicts and then commit the result.
12860 $ git rm -f drivers/hid/hid-picolcd.c
12861 drivers/hid/hid-picolcd.c: needs merge
12862 rm 'drivers/hid/hid-picolcd.c'
12864 [master c776518] Merge remote-tracking branch 'workqueues/for-next'
12865 $ git diff -M --stat --summary HEAD^..
12866 arch/arm/mach-pxa/sharpsl_pm.c | 4 +-
12867 arch/arm/plat-omap/mailbox.c | 2 +-
12868 arch/powerpc/platforms/cell/cpufreq_spudemand.c | 2 +-
12869 arch/sh/drivers/push-switch.c | 2 +-
12870 block/blk-core.c | 8 +-
12871 block/blk-throttle.c | 14 +-
12872 block/genhd.c | 14 +-
12873 drivers/block/floppy.c | 5 +-
12874 drivers/block/xen-blkfront.c | 4 +-
12875 drivers/cdrom/gdrom.c | 2 +-
12876 drivers/char/sonypi.c | 2 +-
12877 drivers/char/tpm/tpm.c | 4 +-
12878 drivers/cpufreq/cpufreq_conservative.c | 2 +-
12879 drivers/cpufreq/cpufreq_ondemand.c | 2 +-
12880 drivers/devfreq/devfreq.c | 2 +-
12881 drivers/edac/edac_mc.c | 17 +-
12882 drivers/gpu/drm/drm_crtc_helper.c | 6 +-
12883 drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +-
12884 drivers/gpu/drm/nouveau/nouveau_gpio.c | 2 +-
12885 drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +-
12886 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +-
12887 drivers/hid/hid-wiimote-ext.c | 2 +-
12888 drivers/infiniband/core/addr.c | 4 +-
12889 drivers/infiniband/core/mad.c | 16 +-
12890 drivers/infiniband/hw/nes/nes_hw.c | 6 +-
12891 drivers/infiniband/hw/nes/nes_nic.c | 5 +-
12892 drivers/input/keyboard/qt2160.c | 3 +-
12893 drivers/input/mouse/synaptics_i2c.c | 7 +-
12894 drivers/input/touchscreen/wm831x-ts.c | 2 +-
12895 drivers/isdn/mISDN/hwchannel.c | 2 +-
12896 drivers/leds/leds-lm3533.c | 6 +-
12897 drivers/leds/leds-lp8788.c | 2 +-
12898 drivers/leds/leds-wm8350.c | 2 +-
12899 drivers/macintosh/ams/ams-core.c | 2 +-
12900 drivers/md/dm-mpath.c | 2 +-
12901 drivers/md/dm-raid1.c | 2 +-
12902 drivers/md/dm-stripe.c | 2 +-
12903 drivers/media/dvb-core/dvb_net.c | 4 +-
12904 drivers/media/pci/bt8xx/bttv-driver.c | 2 +-
12905 drivers/media/pci/cx18/cx18-driver.c | 2 +-
12906 drivers/media/pci/cx23885/cx23885-input.c | 6 +-
12907 drivers/media/pci/cx88/cx88-mpeg.c | 2 +-
12908 drivers/media/pci/mantis/mantis_evm.c | 2 +-
12909 drivers/media/pci/mantis/mantis_uart.c | 2 +-
12910 drivers/media/pci/saa7134/saa7134-core.c | 2 +-
12911 drivers/media/pci/saa7134/saa7134-empress.c | 2 +-
12912 drivers/media/platform/omap24xxcam.c | 6 +-
12913 drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +-
12914 drivers/media/usb/em28xx/em28xx-cards.c | 2 +-
12915 drivers/media/usb/tm6000/tm6000-cards.c | 2 +-
12916 drivers/mfd/menelaus.c | 4 +-
12917 drivers/misc/ioc4.c | 2 +-
12918 drivers/mmc/core/host.c | 4 +-
12919 drivers/mtd/mtdoops.c | 4 +-
12920 drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +-
12921 drivers/net/ethernet/mellanox/mlx4/sense.c | 2 +-
12922 drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +-
12923 drivers/net/ethernet/sun/cassini.c | 2 +-
12924 drivers/net/ethernet/sun/niu.c | 2 +-
12925 drivers/net/virtio_net.c | 12 +-
12926 drivers/net/wireless/hostap/hostap_ap.c | 4 +-
12927 drivers/net/wireless/hostap/hostap_hw.c | 10 +-
12928 drivers/net/wireless/ipw2x00/ipw2100.c | 8 +-
12929 drivers/net/wireless/zd1211rw/zd_usb.c | 3 +-
12930 drivers/platform/x86/thinkpad_acpi.c | 20 +-
12931 drivers/power/ab8500_btemp.c | 2 +-
12932 drivers/power/ab8500_charger.c | 8 +-
12933 drivers/power/ab8500_fg.c | 8 +-
12934 drivers/power/abx500_chargalg.c | 4 +-
12935 drivers/power/charger-manager.c | 9 +-
12936 drivers/power/collie_battery.c | 2 +-
12937 drivers/power/ds2760_battery.c | 9 +-
12938 drivers/power/jz4740-battery.c | 6 +-
12939 drivers/power/max17040_battery.c | 2 +-
12940 drivers/power/tosa_battery.c | 2 +-
12941 drivers/power/wm97xx_battery.c | 2 +-
12942 drivers/power/z2_battery.c | 2 +-
12943 drivers/regulator/core.c | 2 +-
12944 drivers/scsi/arcmsr/arcmsr_hba.c | 4 +-
12945 drivers/scsi/ipr.c | 2 +-
12946 drivers/scsi/pmcraid.c | 2 +-
12947 drivers/scsi/qla2xxx/qla_target.c | 2 +-
12948 drivers/thermal/thermal_sys.c | 15 +-
12949 drivers/tty/hvc/hvsi.c | 2 +-
12950 drivers/tty/ipwireless/hardware.c | 2 +-
12951 drivers/tty/ipwireless/network.c | 4 +-
12952 drivers/tty/serial/kgdboc.c | 2 +-
12953 drivers/tty/serial/omap-serial.c | 2 +-
12954 drivers/tty/tty_ldisc.c | 6 +-
12955 drivers/usb/atm/speedtch.c | 2 +-
12956 drivers/usb/atm/ueagle-atm.c | 2 +-
12957 drivers/usb/gadget/u_ether.c | 2 +-
12958 drivers/usb/host/ohci-hcd.c | 2 +-
12959 drivers/usb/otg/isp1301_omap.c | 2 +-
12960 drivers/video/omap2/displays/panel-taal.c | 4 +-
12961 drivers/video/omap2/dss/dsi.c | 6 +-
12962 fs/affs/super.c | 2 +-
12963 fs/afs/callback.c | 4 +-
12964 fs/afs/server.c | 10 +-
12965 fs/afs/vlocation.c | 14 +-
12966 fs/gfs2/lock_dlm.c | 2 +-
12967 fs/gfs2/super.c | 2 +-
12968 fs/hfs/inode.c | 2 +-
12969 fs/ncpfs/inode.c | 6 +-
12970 fs/nfs/nfs4renewd.c | 3 +-
12971 fs/ocfs2/cluster/quorum.c | 2 +-
12972 fs/xfs/xfs_super.c | 2 +-
12973 fs/xfs/xfs_sync.c | 2 +-
12974 include/linux/workqueue.h | 220 ++--
12975 kernel/srcu.c | 4 +-
12976 kernel/workqueue.c | 1335 ++++++++++++-----------
12979 net/9p/trans_fd.c | 2 +-
12980 net/core/dst.c | 4 +-
12981 net/core/link_watch.c | 21 +-
12982 net/core/neighbour.c | 2 +-
12983 net/dsa/dsa.c | 2 +-
12984 net/ipv4/inetpeer.c | 2 +-
12985 net/rfkill/input.c | 3 +-
12986 net/sunrpc/cache.c | 2 +-
12987 security/keys/gc.c | 8 +-
12988 security/keys/key.c | 2 +-
12989 sound/i2c/other/ak4113.c | 2 +-
12990 sound/i2c/other/ak4114.c | 2 +-
12991 sound/pci/oxygen/oxygen_lib.c | 8 +-
12992 sound/soc/codecs/wm8350.c | 2 +-
12993 sound/soc/codecs/wm8753.c | 2 +-
12994 sound/soc/soc-core.c | 6 +-
12995 virt/kvm/eventfd.c | 2 +-
12996 130 files changed, 1041 insertions(+), 1048 deletions(-)
12997 $ git am -3 ../patches/0001-extcon-adc_jack-update-for-INIT_DELAYED_WORK_DEFERRA.patch
12998 Applying: extcon: adc_jack: update for INIT_DELAYED_WORK_DEFERRABLE name change
13000 Unstaged changes after reset:
13001 M drivers/extcon/extcon-adc-jack.c
13003 $ git commit -v -a --amend
13004 [master 7b6f2dd] Merge remote-tracking branch 'workqueues/for-next'
13005 Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
13006 $ git merge drivers-x86/linux-next
13007 Auto-merging drivers/platform/x86/asus-wmi.c
13008 Merge made by the 'recursive' strategy.
13009 drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
13010 1 file changed, 76 insertions(+)
13011 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
13012 $ git merge hwpoison/hwpoison
13013 Already up-to-date.
13014 Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
13015 $ git merge sysctl/master
13016 Already up-to-date.
13017 Merging regmap/for-next (613dac3 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/irq' into regmap-next)
13018 $ git merge regmap/for-next
13019 Already up-to-date.
13020 Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
13021 $ git merge hsi/for-next
13022 Already up-to-date.
13023 Merging leds/for-next (2f73c39 leds: add output driver configuration for pca9633 led driver)
13024 $ git merge leds/for-next
13025 Removing include/linux/platform_data/leds-lm3556.h
13026 Auto-merging drivers/leds/leds-wm8350.c
13027 Removing drivers/leds/leds-lm3556.c
13028 Merge made by the 'recursive' strategy.
13029 Documentation/leds/leds-lp5523.txt | 21 +-
13030 drivers/leds/Kconfig | 26 +-
13031 drivers/leds/Makefile | 3 +-
13032 drivers/leds/led-class.c | 15 +
13033 drivers/leds/led-core.c | 16 +-
13034 drivers/leds/led-triggers.c | 17 +-
13035 drivers/leds/leds-clevo-mail.c | 10 +-
13036 drivers/leds/leds-gpio.c | 19 +-
13037 drivers/leds/leds-lm3530.c | 16 +-
13038 drivers/leds/leds-lm3556.c | 512 -------------------------
13039 drivers/leds/leds-lm355x.c | 572 ++++++++++++++++++++++++++++
13040 drivers/leds/leds-lm3642.c | 462 ++++++++++++++++++++++
13041 drivers/leds/leds-lp5523.c | 75 ++--
13042 drivers/leds/leds-pca9633.c | 19 +-
13043 drivers/leds/leds-wm8350.c | 29 +-
13044 drivers/leds/leds.h | 2 +
13045 include/linux/leds-lp5523.h | 1 +
13046 include/linux/leds.h | 4 +
13047 include/linux/platform_data/leds-lm3556.h | 50 ---
13048 include/linux/platform_data/leds-lm355x.h | 66 ++++
13049 include/linux/platform_data/leds-lm3642.h | 38 ++
13050 include/linux/platform_data/leds-pca9633.h | 35 ++
13051 22 files changed, 1350 insertions(+), 658 deletions(-)
13052 delete mode 100644 drivers/leds/leds-lm3556.c
13053 create mode 100644 drivers/leds/leds-lm355x.c
13054 create mode 100644 drivers/leds/leds-lm3642.c
13055 delete mode 100644 include/linux/platform_data/leds-lm3556.h
13056 create mode 100644 include/linux/platform_data/leds-lm355x.h
13057 create mode 100644 include/linux/platform_data/leds-lm3642.h
13058 create mode 100644 include/linux/platform_data/leds-pca9633.h
13059 Merging driver-core/driver-core-next (e0f21e6 memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl())
13060 $ git merge driver-core/driver-core-next
13061 Already up-to-date.
13062 Merging tty/tty-next (0c57dfc tty/serial: Add kgdb_nmi driver)
13063 $ git merge tty/tty-next
13064 Already up-to-date.
13065 Merging usb/usb-next (70c048a USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc)
13066 $ git merge usb/usb-next
13067 Already up-to-date.
13068 Merging staging/staging-next (e187895 staging: comedi: jr3_pci: fix iomem dereference)
13069 $ git merge staging/staging-next
13070 Already up-to-date.
13071 Merging char-misc/char-misc-next (5dc2db0 drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init)
13072 $ git merge char-misc/char-misc-next
13073 Already up-to-date.
13074 Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
13075 $ git merge tmem/linux-next
13076 Auto-merging include/xen/interface/xen.h
13077 Auto-merging arch/x86/xen/smp.c
13078 Auto-merging arch/x86/xen/setup.c
13079 Auto-merging arch/x86/include/asm/xen/page.h
13080 Auto-merging arch/x86/include/asm/xen/interface.h
13081 Merge made by the 'recursive' strategy.
13082 arch/x86/include/asm/xen/interface.h | 3 ++-
13083 arch/x86/include/asm/xen/page.h | 3 +++
13084 arch/x86/xen/setup.c | 13 +++++++++---
13085 arch/x86/xen/smp.c | 39 ++++++++++++++++++----------------
13086 drivers/xen/cpu_hotplug.c | 3 ++-
13087 include/linux/frontswap.h | 2 ++
13088 include/xen/interface/xen.h | 1 +
13089 include/xen/xen.h | 4 ++++
13090 mm/frontswap.c | 34 +++++++++++++++++++++++++----
13091 9 files changed, 75 insertions(+), 27 deletions(-)
13092 Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
13093 $ git merge writeback/writeback-for-next
13094 Auto-merging fs/fs-writeback.c
13095 Merge made by the 'recursive' strategy.
13096 fs/fs-writeback.c | 2 +-
13097 mm/backing-dev.c | 50 ++++++++++++++++++++++++++------------------------
13098 mm/page-writeback.c | 14 +++++++++++---
13099 3 files changed, 38 insertions(+), 28 deletions(-)
13100 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
13101 $ git merge arm-dt/devicetree/arm-next
13102 Already up-to-date.
13103 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
13104 $ git merge hwspinlock/linux-next
13105 Already up-to-date.
13106 Merging pinctrl/for-next (e1b2dc7 pinctrl: add bcm2835 driver)
13107 $ git merge pinctrl/for-next
13108 Auto-merging drivers/pinctrl/Makefile
13109 Auto-merging drivers/pinctrl/Kconfig
13110 Auto-merging arch/arm/Kconfig
13111 Merge made by the 'recursive' strategy.
13112 .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 74 +
13113 .../bindings/pinctrl/fsl,imx35-pinctrl.txt | 984 ++++++++++++
13114 .../devicetree/bindings/pinctrl/pinctrl-single.txt | 41 +-
13115 Documentation/pinctrl.txt | 60 +-
13116 arch/arm/Kconfig | 1 +
13117 arch/arm/mach-nomadik/board-nhk8815.c | 36 +
13118 arch/arm/mach-nomadik/cpu-8815.c | 13 +
13119 arch/arm/mach-ux500/board-mop500-pins.c | 83 +-
13120 drivers/pinctrl/Kconfig | 21 +
13121 drivers/pinctrl/Makefile | 4 +
13122 drivers/pinctrl/core.c | 4 +-
13123 drivers/pinctrl/pinctrl-bcm2835.c | 1075 +++++++++++++
13124 drivers/pinctrl/pinctrl-imx.c | 2 +-
13125 drivers/pinctrl/pinctrl-imx35.c | 1595 ++++++++++++++++++++
13126 drivers/pinctrl/pinctrl-imx51.c | 490 +++---
13127 drivers/pinctrl/pinctrl-imx53.c | 402 ++---
13128 drivers/pinctrl/pinctrl-nomadik-db8500.c | 5 +-
13129 drivers/pinctrl/pinctrl-nomadik-db8540.c | 999 ++++++++++++
13130 drivers/pinctrl/pinctrl-nomadik-stn8815.c | 357 +++++
13131 drivers/pinctrl/pinctrl-nomadik.c | 10 +-
13132 drivers/pinctrl/pinctrl-nomadik.h | 27 +
13133 drivers/pinctrl/pinctrl-single.c | 56 +-
13134 drivers/pinctrl/pinctrl-sirf.c | 23 +-
13135 drivers/pinctrl/pinmux.c | 5 +-
13136 include/linux/pinctrl/consumer.h | 2 +-
13137 include/linux/pinctrl/pinctrl-state.h | 15 +-
13138 26 files changed, 5868 insertions(+), 516 deletions(-)
13139 create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt
13140 create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx35-pinctrl.txt
13141 create mode 100644 drivers/pinctrl/pinctrl-bcm2835.c
13142 create mode 100644 drivers/pinctrl/pinctrl-imx35.c
13143 create mode 100644 drivers/pinctrl/pinctrl-nomadik-db8540.c
13144 create mode 100644 drivers/pinctrl/pinctrl-nomadik-stn8815.c
13145 Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
13146 $ git merge vhost/linux-next
13147 Resolved 'drivers/net/tun.c' using previous resolution.
13148 Auto-merging drivers/net/tun.c
13149 CONFLICT (content): Merge conflict in drivers/net/tun.c
13150 Automatic merge failed; fix conflicts and then commit the result.
13152 [master a155409] Merge remote-tracking branch 'vhost/linux-next'
13153 $ git diff -M --stat --summary HEAD^..
13154 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
13155 $ git merge memblock/memblock-kill-early_node_map
13156 Already up-to-date.
13157 Merging remoteproc/for-next (bec109a remoteproc: return -EFAULT on copy_from_user failure)
13158 $ git merge remoteproc/for-next
13159 Merge made by the 'recursive' strategy.
13160 Documentation/remoteproc.txt | 7 +
13161 arch/arm/plat-omap/include/plat/remoteproc.h | 2 +
13162 drivers/remoteproc/Kconfig | 13 ++
13163 drivers/remoteproc/Makefile | 1 +
13164 drivers/remoteproc/omap_remoteproc.c | 3 +
13165 drivers/remoteproc/remoteproc_core.c | 177 ++++++++++++--
13166 drivers/remoteproc/remoteproc_debugfs.c | 85 ++++++-
13167 drivers/remoteproc/remoteproc_internal.h | 1 +
13168 drivers/remoteproc/ste_modem_rproc.c | 322 ++++++++++++++++++++++++++
13169 include/linux/remoteproc.h | 24 ++
13170 include/linux/ste_modem_shm.h | 56 +++++
13171 11 files changed, 664 insertions(+), 27 deletions(-)
13172 create mode 100644 drivers/remoteproc/ste_modem_rproc.c
13173 create mode 100644 include/linux/ste_modem_shm.h
13174 Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
13175 $ git merge irqdomain/irqdomain/next
13176 Already up-to-date.
13177 Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
13178 $ git merge gpio/gpio/next
13179 Already up-to-date.
13180 Merging gpio-lw/for-next (790b520 gpio: adnp: dt: Reference generic interrupt binding)
13181 $ git merge gpio-lw/for-next
13182 Auto-merging drivers/gpio/gpio-em.c
13183 Auto-merging drivers/gpio/gpio-bt8xx.c
13184 Auto-merging drivers/gpio/Makefile
13185 Auto-merging drivers/gpio/Kconfig
13186 Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
13187 Merge made by the 'recursive' strategy.
13188 .../devicetree/bindings/gpio/gpio-74x164.txt | 22 +
13189 .../devicetree/bindings/gpio/gpio-adnp.txt | 34 ++
13190 Documentation/devicetree/bindings/gpio/led.txt | 2 +-
13191 arch/arm/configs/kzm9g_defconfig | 2 +-
13192 arch/arm/mach-shmobile/board-kzm9g.c | 5 +-
13193 drivers/gpio/Kconfig | 13 +-
13194 drivers/gpio/Makefile | 1 +
13195 drivers/gpio/gpio-74x164.c | 103 +++-
13196 drivers/gpio/gpio-adnp.c | 611 ++++++++++++++++++++
13197 drivers/gpio/gpio-adp5588.c | 14 +-
13198 drivers/gpio/gpio-bt8xx.c | 2 +-
13199 drivers/gpio/gpio-da9052.c | 15 +-
13200 drivers/gpio/gpio-davinci.c | 2 +-
13201 drivers/gpio/gpio-em.c | 12 +-
13202 drivers/gpio/gpio-mc9s08dz60.c | 21 +-
13203 drivers/gpio/gpio-ml-ioh.c | 20 +-
13204 drivers/gpio/gpio-msm-v2.c | 4 +-
13205 drivers/gpio/gpio-pcf857x.c | 122 ++++
13206 drivers/gpio/gpio-pch.c | 22 +-
13207 drivers/gpio/gpio-pxa.c | 13 +-
13208 drivers/gpio/gpio-sodaville.c | 2 +-
13209 drivers/gpio/gpio-sx150x.c | 24 +-
13210 drivers/gpio/gpio-tc3589x.c | 120 ++--
13211 drivers/gpio/gpio-tps65912.c | 17 +-
13212 drivers/gpio/gpio-wm831x.c | 19 +-
13213 drivers/gpio/gpio-wm8350.c | 19 +-
13214 drivers/gpio/gpiolib.c | 102 +++-
13215 include/linux/i2c/pcf857x.h | 3 +
13216 28 files changed, 1099 insertions(+), 247 deletions(-)
13217 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-74x164.txt
13218 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-adnp.txt
13219 create mode 100644 drivers/gpio/gpio-adnp.c
13220 Merging arm-soc/for-next (492e2fd added draft of branch descriptions)
13221 $ git merge arm-soc/for-next
13222 Auto-merging sound/soc/omap/zoom2.c
13223 CONFLICT (modify/delete): sound/soc/omap/overo.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of sound/soc/omap/overo.c left in tree.
13224 CONFLICT (modify/delete): sound/soc/omap/omap3evm.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of sound/soc/omap/omap3evm.c left in tree.
13225 CONFLICT (modify/delete): sound/soc/omap/omap3beagle.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of sound/soc/omap/omap3beagle.c left in tree.
13226 Auto-merging sound/soc/omap/omap-pcm.c
13227 CONFLICT (content): Merge conflict in sound/soc/omap/omap-pcm.c
13228 Auto-merging sound/soc/omap/omap-mcpdm.c
13229 Auto-merging sound/soc/omap/omap-mcbsp.c
13230 CONFLICT (content): Merge conflict in sound/soc/omap/omap-mcbsp.c
13231 Auto-merging sound/soc/omap/omap-abe-twl6040.c
13232 Auto-merging sound/soc/omap/mcbsp.c
13233 CONFLICT (modify/delete): sound/soc/omap/igep0020.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of sound/soc/omap/igep0020.c left in tree.
13234 Auto-merging sound/soc/omap/am3517evm.c
13235 Auto-merging sound/soc/fsl/imx-ssi.c
13236 Auto-merging sound/soc/fsl/imx-pcm-dma.c
13237 Auto-merging sound/soc/cirrus/ep93xx-pcm.c
13238 Auto-merging sound/soc/cirrus/ep93xx-i2s.c
13239 Auto-merging sound/soc/cirrus/ep93xx-ac97.c
13240 Removing include/video/epson1355.h
13241 Auto-merging include/linux/platform_data/pinctrl-coh901.h
13242 Auto-merging include/linux/platform_data/mtd-nand-omap2.h
13243 Auto-merging include/linux/platform_data/mmc-sdhci-tegra.h
13244 Auto-merging include/linux/platform_data/gpio-omap.h
13245 Auto-merging include/linux/platform_data/camera-mx2.h
13246 Auto-merging include/linux/mod_devicetable.h
13247 Auto-merging include/linux/mfd/twl6040.h
13248 Auto-merging include/linux/leds.h
13249 Auto-merging include/linux/irqchip/bcm2835.h
13250 Auto-merging include/linux/i2c/twl.h
13251 Auto-merging include/linux/clk/bcm2835.h
13252 Auto-merging include/linux/bcm2835_timer.h
13253 Auto-merging drivers/w1/masters/omap_hdq.c
13254 CONFLICT (content): Merge conflict in drivers/w1/masters/omap_hdq.c
13255 Auto-merging drivers/video/omap2/omapfb/omapfb-main.c
13256 Auto-merging drivers/video/omap2/dss/dispc.c
13257 CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c
13258 Auto-merging drivers/video/omap/lcd_ams_delta.c
13259 CONFLICT (content): Merge conflict in drivers/video/omap/lcd_ams_delta.c
13260 Auto-merging drivers/video/msm/mdp_hw.h
13261 CONFLICT (content): Merge conflict in drivers/video/msm/mdp_hw.h
13262 Auto-merging drivers/video/msm/mdp.c
13263 CONFLICT (content): Merge conflict in drivers/video/msm/mdp.c
13264 Auto-merging drivers/video/msm/mddi_client_nt35399.c
13265 Auto-merging drivers/video/msm/mddi.c
13266 CONFLICT (content): Merge conflict in drivers/video/msm/mddi.c
13267 Auto-merging drivers/video/imxfb.c
13268 CONFLICT (modify/delete): drivers/video/epson1355fb.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/video/epson1355fb.c left in tree.
13269 Auto-merging drivers/video/ep93xx-fb.c
13270 Auto-merging drivers/video/da8xx-fb.c
13271 Auto-merging drivers/video/Makefile
13272 Auto-merging drivers/video/Kconfig
13273 Auto-merging drivers/usb/otg/isp1301_omap.c
13274 Auto-merging drivers/usb/musb/ux500_dma.c
13275 Auto-merging drivers/usb/musb/tusb6010_omap.c
13276 Auto-merging drivers/usb/musb/da8xx.c
13277 Auto-merging drivers/usb/host/ohci-pxa27x.c
13278 Auto-merging drivers/usb/host/ohci-nxp.c
13279 Auto-merging drivers/usb/host/ohci-hcd.c
13280 Auto-merging drivers/usb/host/ehci-s5p.c
13281 Auto-merging drivers/usb/host/ehci-mxc.c
13282 Auto-merging drivers/usb/host/Kconfig
13283 CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig
13284 Auto-merging drivers/usb/gadget/s3c2410_udc.c
13285 Auto-merging drivers/usb/gadget/pxa27x_udc.c
13286 Auto-merging drivers/usb/Kconfig
13287 Auto-merging drivers/tty/serial/imx.c
13288 Auto-merging drivers/staging/tidspbridge/rmgr/drv_interface.c
13289 Auto-merging drivers/staging/tidspbridge/core/wdt.c
13290 CONFLICT (content): Merge conflict in drivers/staging/tidspbridge/core/wdt.c
13291 Auto-merging drivers/staging/tidspbridge/core/tiomap3430_pwr.c
13292 Auto-merging drivers/staging/tidspbridge/core/tiomap3430.c
13293 Auto-merging drivers/staging/tidspbridge/core/dsp-clock.c
13294 CONFLICT (modify/delete): drivers/spi/spi-tegra.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of drivers/spi/spi-tegra.c left in tree.
13295 Auto-merging drivers/spi/spi-s3c64xx.c
13296 Auto-merging drivers/spi/spi-omap2-mcspi.c
13297 Auto-merging drivers/spi/spi-imx.c
13298 Auto-merging drivers/spi/spi-davinci.c
13299 CONFLICT (content): Merge conflict in drivers/spi/spi-davinci.c
13300 Auto-merging drivers/spi/Kconfig
13301 CONFLICT (content): Merge conflict in drivers/spi/Kconfig
13302 Auto-merging drivers/remoteproc/omap_remoteproc.c
13303 Auto-merging drivers/pinctrl/pinctrl-sirf.c
13304 Auto-merging drivers/pinctrl/Makefile
13305 CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile
13306 Auto-merging drivers/pinctrl/Kconfig
13307 Auto-merging drivers/net/can/mscan/mpc5xxx_can.c
13308 Auto-merging drivers/mtd/nand/s3c2410.c
13309 Auto-merging drivers/mtd/nand/pxa3xx_nand.c
13310 Auto-merging drivers/mtd/nand/orion_nand.c
13311 CONFLICT (content): Merge conflict in drivers/mtd/nand/orion_nand.c
13312 Auto-merging drivers/mtd/nand/omap2.c
13313 CONFLICT (modify/delete): drivers/mtd/nand/nand_bcm_umi.h deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of drivers/mtd/nand/nand_bcm_umi.h left in tree.
13314 Auto-merging drivers/mtd/nand/mxc_nand.c
13315 Auto-merging drivers/mtd/nand/davinci_nand.c
13316 CONFLICT (modify/delete): drivers/mtd/nand/bcm_umi_nand.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of drivers/mtd/nand/bcm_umi_nand.c left in tree.
13317 Auto-merging drivers/mtd/nand/ams-delta.c
13318 Auto-merging drivers/mtd/nand/Kconfig
13319 CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig
13320 Auto-merging drivers/mmc/host/sdhci-tegra.c
13321 Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
13322 Auto-merging drivers/mmc/host/pxamci.c
13323 Auto-merging drivers/mmc/host/omap_hsmmc.c
13324 Auto-merging drivers/mmc/host/omap.c
13325 CONFLICT (content): Merge conflict in drivers/mmc/host/omap.c
13326 Auto-merging drivers/mmc/host/mxcmmc.c
13327 Auto-merging drivers/mmc/host/davinci_mmc.c
13328 CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
13329 Auto-merging drivers/mfd/twl-core.c
13330 Auto-merging drivers/media/platform/soc_camera/pxa_camera.c
13331 Auto-merging drivers/media/platform/soc_camera/mx3_camera.c
13332 Auto-merging drivers/media/platform/soc_camera/mx2_camera.c
13333 Auto-merging drivers/media/platform/soc_camera/mx1_camera.c
13334 Auto-merging drivers/media/platform/s5p-fimc/mipi-csis.c
13335 Auto-merging drivers/media/platform/omap3isp/isp.c
13336 Auto-merging drivers/media/platform/omap/omap_vout.c
13337 Auto-merging drivers/media/platform/davinci/vpbe_venc.c
13338 Auto-merging drivers/leds/Makefile
13339 Auto-merging drivers/leds/Kconfig
13340 Auto-merging drivers/input/touchscreen/s3c2410_ts.c
13341 Auto-merging drivers/input/keyboard/omap-keypad.c
13342 CONFLICT (content): Merge conflict in drivers/input/keyboard/omap-keypad.c
13343 Auto-merging drivers/i2c/busses/i2c-omap.c
13344 CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
13345 Auto-merging drivers/i2c/busses/i2c-imx.c
13346 Auto-merging drivers/i2c/busses/i2c-davinci.c
13347 Auto-merging drivers/i2c/busses/Kconfig
13348 Auto-merging drivers/gpio/gpio-pxa.c
13349 Auto-merging drivers/gpio/Makefile
13350 Auto-merging drivers/gpio/Kconfig
13351 Auto-merging drivers/dma/tegra20-apb-dma.c
13352 Auto-merging drivers/dma/omap-dma.c
13353 Auto-merging drivers/dma/mmp_tdma.c
13354 CONFLICT (content): Merge conflict in drivers/dma/mmp_tdma.c
13355 Auto-merging drivers/dma/imx-sdma.c
13356 Auto-merging drivers/dma/imx-dma.c
13357 Auto-merging drivers/dma/ep93xx_dma.c
13358 Auto-merging drivers/crypto/ux500/hash/hash_core.c
13359 Auto-merging drivers/crypto/ux500/cryp/cryp_core.c
13360 Auto-merging drivers/clocksource/Makefile
13361 CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
13362 Auto-merging drivers/clk/Makefile
13363 Auto-merging drivers/bus/omap_l3_noc.c
13364 Auto-merging drivers/Makefile
13365 Auto-merging arch/powerpc/sysdev/fsl_msi.c
13366 Removing arch/arm/plat-spear/include/plat/gpio.h
13367 Auto-merging arch/arm/plat-samsung/devs.c
13368 Auto-merging arch/arm/plat-samsung/clock.c
13369 Auto-merging arch/arm/plat-orion/include/plat/orion-gpio.h
13370 Removing arch/arm/plat-omap/mux.c
13371 Auto-merging arch/arm/plat-omap/include/plat/usb.h
13372 Removing arch/arm/plat-omap/include/plat/param.h
13373 Removing arch/arm/plat-omap/include/plat/irqs.h
13374 Removing arch/arm/plat-omap/include/plat/irqs-44xx.h
13375 Removing arch/arm/plat-omap/include/plat/hardware.h
13376 Removing arch/arm/plat-omap/include/plat/gpio-switch.h
13377 Removing arch/arm/plat-omap/include/plat/board.h
13378 Removing arch/arm/plat-omap/devices.c
13379 Removing arch/arm/plat-mxc/include/mach/iomux-mx53.h
13380 Removing arch/arm/plat-mxc/include/mach/gpio.h
13381 Auto-merging arch/arm/plat-mxc/include/mach/devices-common.h
13382 Removing arch/arm/plat-mxc/include/mach/clock.h
13383 Removing arch/arm/plat-mxc/clock.c
13384 Auto-merging arch/arm/mm/ioremap.c
13385 Auto-merging arch/arm/mm/cache-l2x0.c
13386 CONFLICT (modify/delete): arch/arm/mach-vt8500/wm8505_7in.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/wm8505_7in.c left in tree.
13387 Removing arch/arm/mach-vt8500/restart.c
13388 Removing arch/arm/mach-vt8500/include/mach/wm8505_regs.h
13389 Removing arch/arm/mach-vt8500/include/mach/wm8505_irqs.h
13390 Removing arch/arm/mach-vt8500/include/mach/vt8500_regs.h
13391 Removing arch/arm/mach-vt8500/include/mach/vt8500_irqs.h
13392 Removing arch/arm/mach-vt8500/include/mach/gpio.h
13393 Removing arch/arm/mach-vt8500/gpio.c
13394 CONFLICT (modify/delete): arch/arm/mach-vt8500/devices.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/devices.h left in tree.
13395 CONFLICT (modify/delete): arch/arm/mach-vt8500/devices.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/devices.c left in tree.
13396 CONFLICT (modify/delete): arch/arm/mach-vt8500/devices-wm8505.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/devices-wm8505.c left in tree.
13397 CONFLICT (modify/delete): arch/arm/mach-vt8500/devices-vt8500.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/devices-vt8500.c left in tree.
13398 Auto-merging arch/arm/mach-vt8500/common.h
13399 CONFLICT (modify/delete): arch/arm/mach-vt8500/bv07.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vt8500/bv07.c left in tree.
13400 Removing arch/arm/mach-vt8500/Kconfig
13401 Removing arch/arm/mach-vexpress/include/mach/uncompress.h
13402 Removing arch/arm/mach-vexpress/include/mach/timex.h
13403 Removing arch/arm/mach-vexpress/include/mach/gpio.h
13404 Auto-merging arch/arm/mach-vexpress/ct-ca9x4.c
13405 Removing arch/arm/mach-vexpress/Makefile.boot
13406 Removing arch/arm/mach-versatile/include/mach/gpio.h
13407 Removing arch/arm/mach-ux500/include/mach/gpio.h
13408 Auto-merging arch/arm/mach-ux500/cpu-db8500.c
13409 CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
13410 Removing arch/arm/mach-ux500/board-mop500-msp.h
13411 Auto-merging arch/arm/mach-ux500/board-mop500-audio.c
13412 Removing arch/arm/mach-u300/u300.c
13413 Removing arch/arm/mach-u300/include/mach/platform.h
13414 Removing arch/arm/mach-u300/include/mach/gpio.h
13415 Removing arch/arm/mach-u300/include/mach/clkdev.h
13416 Auto-merging arch/arm/mach-u300/i2c.c
13417 Auto-merging arch/arm/mach-u300/dma_channels.h
13418 Auto-merging arch/arm/mach-u300/core.c
13419 Removing arch/arm/mach-tegra/tegra2_clocks.c
13420 Auto-merging arch/arm/mach-tegra/pcie.c
13421 Removing arch/arm/mach-tegra/include/mach/suspend.h
13422 Removing arch/arm/mach-tegra/include/mach/pinconf-tegra.h
13423 Removing arch/arm/mach-tegra/include/mach/io.h
13424 Removing arch/arm/mach-tegra/include/mach/gpio.h
13425 Removing arch/arm/mach-tegra/dma.c
13426 Removing arch/arm/mach-tegra/devices.h
13427 CONFLICT (modify/delete): arch/arm/mach-tegra/devices.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-tegra/devices.c left in tree.
13428 Removing arch/arm/mach-tegra/board-trimslice.h
13429 Removing arch/arm/mach-tegra/board-trimslice.c
13430 Removing arch/arm/mach-tegra/board-trimslice-pinmux.c
13431 Removing arch/arm/mach-tegra/board-pinmux.h
13432 Removing arch/arm/mach-tegra/board-pinmux.c
13433 Removing arch/arm/mach-tegra/board-paz00-pinmux.c
13434 Removing arch/arm/mach-tegra/board-harmony.h
13435 Removing arch/arm/mach-tegra/board-harmony.c
13436 Removing arch/arm/mach-tegra/board-harmony-power.c
13437 Removing arch/arm/mach-tegra/board-harmony-pinmux.c
13438 Removing arch/arm/mach-spear6xx/include/mach/gpio.h
13439 Removing arch/arm/mach-spear3xx/include/mach/gpio.h
13440 Auto-merging arch/arm/mach-spear13xx/spear13xx.c
13441 Removing arch/arm/mach-spear13xx/include/mach/gpio.h
13442 Removing arch/arm/mach-socfpga/include/mach/uncompress.h
13443 Removing arch/arm/mach-socfpga/Makefile.boot
13444 Auto-merging arch/arm/mach-shmobile/smp-emev2.c
13445 Auto-merging arch/arm/mach-shmobile/sh-gpio.h
13446 Auto-merging arch/arm/mach-shmobile/pm-sh7372.c
13447 Auto-merging arch/arm/mach-shmobile/pm-rmobile.c
13448 Auto-merging arch/arm/mach-shmobile/include/mach/r8a7779.h
13449 Auto-merging arch/arm/mach-shmobile/include/mach/common.h
13450 CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/common.h
13451 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
13452 Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
13453 Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
13454 Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
13455 Removing arch/arm/mach-shark/include/mach/io.h
13456 Removing arch/arm/mach-sa1100/leds.h
13457 Removing arch/arm/mach-sa1100/leds.c
13458 Removing arch/arm/mach-sa1100/leds-lart.c
13459 Removing arch/arm/mach-sa1100/leds-hackkit.c
13460 Removing arch/arm/mach-sa1100/leds-cerf.c
13461 Removing arch/arm/mach-sa1100/leds-badge4.c
13462 Removing arch/arm/mach-sa1100/leds-assabet.c
13463 Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c
13464 Auto-merging arch/arm/mach-s5pv210/mach-goni.c
13465 Auto-merging arch/arm/mach-s5pc100/mach-smdkc100.c
13466 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
13467 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
13468 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
13469 Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
13470 CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-real6410.c
13471 Auto-merging arch/arm/mach-s3c64xx/mach-ncp.c
13472 Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
13473 CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-mini6410.c
13474 Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c
13475 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
13476 Auto-merging arch/arm/mach-s3c64xx/mach-anw6410.c
13477 Auto-merging arch/arm/mach-s3c24xx/mach-smdk2416.c
13478 Auto-merging arch/arm/mach-realview/realview_pbx.c
13479 Auto-merging arch/arm/mach-realview/realview_pba8.c
13480 Auto-merging arch/arm/mach-realview/realview_pb11mp.c
13481 Auto-merging arch/arm/mach-realview/realview_pb1176.c
13482 Auto-merging arch/arm/mach-realview/realview_eb.c
13483 Removing arch/arm/mach-realview/include/mach/gpio.h
13484 Auto-merging arch/arm/mach-pxa/stargate2.c
13485 Auto-merging arch/arm/mach-pxa/sharpsl_pm.c
13486 Removing arch/arm/mach-pxa/leds.h
13487 Removing arch/arm/mach-pxa/leds.c
13488 Removing arch/arm/mach-pxa/leds-mainstone.c
13489 Removing arch/arm/mach-pxa/leds-lubbock.c
13490 Removing arch/arm/mach-pxa/leds-idp.c
13491 Auto-merging arch/arm/mach-pxa/devices.c
13492 Auto-merging arch/arm/mach-prima2/common.c
13493 Removing arch/arm/mach-pnx4008/time.h
13494 Removing arch/arm/mach-pnx4008/time.c
13495 Removing arch/arm/mach-pnx4008/sleep.S
13496 Removing arch/arm/mach-pnx4008/serial.c
13497 Removing arch/arm/mach-pnx4008/pm.c
13498 Removing arch/arm/mach-pnx4008/irq.c
13499 Removing arch/arm/mach-pnx4008/include/mach/uncompress.h
13500 Removing arch/arm/mach-pnx4008/include/mach/timex.h
13501 Removing arch/arm/mach-pnx4008/include/mach/pm.h
13502 Removing arch/arm/mach-pnx4008/include/mach/platform.h
13503 Removing arch/arm/mach-pnx4008/include/mach/irqs.h
13504 Removing arch/arm/mach-pnx4008/include/mach/irq.h
13505 Removing arch/arm/mach-pnx4008/include/mach/hardware.h
13506 Removing arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
13507 Removing arch/arm/mach-pnx4008/include/mach/entry-macro.S
13508 Removing arch/arm/mach-pnx4008/include/mach/dma.h
13509 Removing arch/arm/mach-pnx4008/include/mach/debug-macro.S
13510 Removing arch/arm/mach-pnx4008/include/mach/clock.h
13511 Removing arch/arm/mach-pnx4008/i2c.c
13512 Removing arch/arm/mach-pnx4008/gpio.c
13513 Removing arch/arm/mach-pnx4008/dma.c
13514 Removing arch/arm/mach-pnx4008/core.c
13515 Removing arch/arm/mach-pnx4008/clock.h
13516 Removing arch/arm/mach-pnx4008/clock.c
13517 Removing arch/arm/mach-pnx4008/Makefile.boot
13518 Removing arch/arm/mach-pnx4008/Makefile
13519 Removing arch/arm/mach-picoxcell/include/mach/uncompress.h
13520 Removing arch/arm/mach-picoxcell/include/mach/timex.h
13521 Removing arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h
13522 Removing arch/arm/mach-picoxcell/include/mach/gpio.h
13523 Removing arch/arm/mach-picoxcell/Makefile.boot
13524 Removing arch/arm/mach-orion5x/include/mach/io.h
13525 Removing arch/arm/mach-orion5x/include/mach/gpio.h
13526 Auto-merging arch/arm/mach-orion5x/common.c
13527 Auto-merging arch/arm/mach-omap2/usb-host.c
13528 Auto-merging arch/arm/mach-omap2/twl-common.h
13529 Auto-merging arch/arm/mach-omap2/twl-common.c
13530 Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
13531 Auto-merging arch/arm/mach-omap2/omap44xx.h
13532 Auto-merging arch/arm/mach-omap2/omap4-keypad.h
13533 Auto-merging arch/arm/mach-omap2/omap34xx.h
13534 Auto-merging arch/arm/mach-omap2/omap24xx.h
13535 Auto-merging arch/arm/mach-omap2/mcbsp.c
13536 Removing arch/arm/mach-omap2/include/mach/smp.h
13537 Auto-merging arch/arm/mach-omap2/display.c
13538 Auto-merging arch/arm/mach-omap2/devices.c
13539 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
13540 Auto-merging arch/arm/mach-omap2/board-zoom-peripherals.c
13541 Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
13542 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51-peripherals.c
13543 Auto-merging arch/arm/mach-omap2/board-overo.c
13544 Auto-merging arch/arm/mach-omap2/board-omap4panda.c
13545 Auto-merging arch/arm/mach-omap2/board-omap3evm.c
13546 Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
13547 Auto-merging arch/arm/mach-omap2/board-igep0020.c
13548 Auto-merging arch/arm/mach-omap2/board-devkit8000.c
13549 Auto-merging arch/arm/mach-omap2/board-cm-t35.c
13550 Auto-merging arch/arm/mach-omap2/board-am3517evm.c
13551 Auto-merging arch/arm/mach-omap2/board-4430sdp.c
13552 Removing arch/arm/mach-omap1/leds.h
13553 Removing arch/arm/mach-omap1/leds.c
13554 Removing arch/arm/mach-omap1/leds-osk.c
13555 Removing arch/arm/mach-omap1/leds-innovator.c
13556 Removing arch/arm/mach-omap1/leds-h2p2-debug.c
13557 Removing arch/arm/mach-omap1/include/mach/smp.h
13558 Auto-merging arch/arm/mach-omap1/include/mach/omap7xx.h
13559 Auto-merging arch/arm/mach-omap1/include/mach/omap16xx.h
13560 Auto-merging arch/arm/mach-omap1/include/mach/omap1510.h
13561 Removing arch/arm/mach-nomadik/include/mach/gpio.h
13562 Auto-merging arch/arm/mach-nomadik/board-nhk8815.c
13563 Removing arch/arm/mach-mxs/module-tx28.h
13564 Removing arch/arm/mach-mxs/module-tx28.c
13565 Removing arch/arm/mach-mxs/mach-tx28.c
13566 Removing arch/arm/mach-mxs/mach-stmp378x_devb.c
13567 Auto-merging arch/arm/mach-mxs/mach-mxs.c
13568 Removing arch/arm/mach-mxs/mach-mx28evk.c
13569 Removing arch/arm/mach-mxs/mach-mx23evk.c
13570 Removing arch/arm/mach-mxs/mach-m28evk.c
13571 Removing arch/arm/mach-mxs/mach-apx4devkit.c
13572 Removing arch/arm/mach-mxs/iomux.c
13573 Removing arch/arm/mach-mxs/include/mach/irqs.h
13574 Removing arch/arm/mach-mxs/include/mach/iomux.h
13575 Removing arch/arm/mach-mxs/include/mach/iomux-mx28.h
13576 Removing arch/arm/mach-mxs/include/mach/iomux-mx23.h
13577 Removing arch/arm/mach-mxs/include/mach/gpio.h
13578 Removing arch/arm/mach-mxs/include/mach/entry-macro.S
13579 Removing arch/arm/mach-mxs/include/mach/devices-common.h
13580 Removing arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
13581 Removing arch/arm/mach-mxs/devices/platform-mxsfb.c
13582 Removing arch/arm/mach-mxs/devices/platform-mxs-saif.c
13583 Removing arch/arm/mach-mxs/devices/platform-mxs-pwm.c
13584 Removing arch/arm/mach-mxs/devices/platform-mxs-mmc.c
13585 Removing arch/arm/mach-mxs/devices/platform-mxs-i2c.c
13586 Removing arch/arm/mach-mxs/devices/platform-gpmi-nand.c
13587 Removing arch/arm/mach-mxs/devices/platform-gpio-mxs.c
13588 Removing arch/arm/mach-mxs/devices/platform-flexcan.c
13589 Removing arch/arm/mach-mxs/devices/platform-fec.c
13590 Removing arch/arm/mach-mxs/devices/platform-dma.c
13591 Removing arch/arm/mach-mxs/devices/platform-auart.c
13592 Removing arch/arm/mach-mxs/devices/Makefile
13593 Removing arch/arm/mach-mxs/devices/Kconfig
13594 Removing arch/arm/mach-mxs/devices.c
13595 Removing arch/arm/mach-mxs/devices-mx28.h
13596 Removing arch/arm/mach-mxs/devices-mx23.h
13597 Removing arch/arm/mach-mvebu/include/mach/uncompress.h
13598 Removing arch/arm/mach-mvebu/include/mach/timex.h
13599 Auto-merging arch/arm/mach-mvebu/armada-370-xp.h
13600 Removing arch/arm/mach-mvebu/Makefile.boot
13601 Removing arch/arm/mach-mv78xx0/include/mach/io.h
13602 Removing arch/arm/mach-msm/include/mach/system.h
13603 Removing arch/arm/mach-msm/include/mach/gpio.h
13604 Removing arch/arm/mach-msm/idle.c
13605 Removing arch/arm/mach-msm/devices-msm8960.c
13606 Removing arch/arm/mach-msm/board-msm8x60.c
13607 Removing arch/arm/mach-msm/board-msm8960.c
13608 Removing arch/arm/mach-msm/board-msm7x27.c
13609 Removing arch/arm/mach-msm/acpuclock.h
13610 Removing arch/arm/mach-msm/acpuclock-arm11.c
13611 Removing arch/arm/mach-ks8695/leds.c
13612 Removing arch/arm/mach-ks8695/include/mach/regs-timer.h
13613 Removing arch/arm/mach-kirkwood/include/mach/io.h
13614 Removing arch/arm/mach-kirkwood/include/mach/gpio.h
13615 Removing arch/arm/mach-ixp4xx/include/mach/gpio.h
13616 Removing arch/arm/mach-iop33x/include/mach/io.h
13617 Removing arch/arm/mach-iop32x/include/mach/io.h
13618 Removing arch/arm/mach-iop13xx/include/mach/io.h
13619 Auto-merging arch/arm/mach-integrator/integrator_cp.c
13620 CONFLICT (content): Merge conflict in arch/arm/mach-integrator/integrator_cp.c
13621 Auto-merging arch/arm/mach-integrator/integrator_ap.c
13622 Removing arch/arm/mach-integrator/include/mach/io.h
13623 Auto-merging arch/arm/mach-integrator/core.c
13624 Removing arch/arm/mach-imx/mx51_efika.c
13625 Removing arch/arm/mach-imx/mach-mx53_smd.c
13626 Removing arch/arm/mach-imx/mach-mx53_loco.c
13627 Removing arch/arm/mach-imx/mach-mx53_evk.c
13628 Removing arch/arm/mach-imx/mach-mx53_ard.c
13629 Removing arch/arm/mach-imx/mach-mx51_efikasb.c
13630 Removing arch/arm/mach-imx/mach-mx51_efikamx.c
13631 Auto-merging arch/arm/mach-imx/mach-imx6q.c
13632 Auto-merging arch/arm/mach-imx/mach-imx53.c
13633 Removing arch/arm/mach-imx/efika.h
13634 Removing arch/arm/mach-imx/devices-imx53.h
13635 Auto-merging arch/arm/mach-imx/clk-imx51-imx53.c
13636 CONFLICT (content): Merge conflict in arch/arm/mach-imx/clk-imx51-imx53.c
13637 Auto-merging arch/arm/mach-imx/Kconfig
13638 Removing arch/arm/mach-highbank/include/mach/uncompress.h
13639 Removing arch/arm/mach-highbank/include/mach/timex.h
13640 Removing arch/arm/mach-highbank/include/mach/gpio.h
13641 Removing arch/arm/mach-highbank/Makefile.boot
13642 Removing arch/arm/mach-footbridge/netwinder-leds.c
13643 Removing arch/arm/mach-footbridge/ebsa285-leds.c
13644 Auto-merging arch/arm/mach-exynos/platsmp.c
13645 Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
13646 Auto-merging arch/arm/mach-exynos/mach-smdkv310.c
13647 Auto-merging arch/arm/mach-exynos/mach-smdk4x12.c
13648 Auto-merging arch/arm/mach-exynos/mach-origen.c
13649 Auto-merging arch/arm/mach-exynos/mach-nuri.c
13650 Auto-merging arch/arm/mach-ep93xx/ts72xx.h
13651 Removing arch/arm/mach-dove/include/mach/io.h
13652 Removing arch/arm/mach-dove/include/mach/gpio.h
13653 Auto-merging arch/arm/mach-davinci/include/mach/da8xx.h
13654 CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/da8xx.h
13655 Auto-merging arch/arm/mach-davinci/dm365.c
13656 CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm365.c
13657 Auto-merging arch/arm/mach-davinci/dm355.c
13658 CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
13659 Auto-merging arch/arm/mach-davinci/devices.c
13660 Auto-merging arch/arm/mach-davinci/davinci.h
13661 CONFLICT (content): Merge conflict in arch/arm/mach-davinci/davinci.h
13662 Removing arch/arm/mach-clps711x/p720t-leds.c
13663 Removing arch/arm/mach-clps711x/ceiva.c
13664 Removing arch/arm/mach-bcmring/timer.c
13665 Removing arch/arm/mach-bcmring/mm.c
13666 Removing arch/arm/mach-bcmring/irq.c
13667 Removing arch/arm/mach-bcmring/include/mach/uncompress.h
13668 Removing arch/arm/mach-bcmring/include/mach/timex.h
13669 Removing arch/arm/mach-bcmring/include/mach/timer.h
13670 Removing arch/arm/mach-bcmring/include/mach/reg_umi.h
13671 Removing arch/arm/mach-bcmring/include/mach/reg_nand.h
13672 Removing arch/arm/mach-bcmring/include/mach/memory_settings.h
13673 Removing arch/arm/mach-bcmring/include/mach/irqs.h
13674 Removing arch/arm/mach-bcmring/include/mach/hardware.h
13675 Removing arch/arm/mach-bcmring/include/mach/entry-macro.S
13676 Removing arch/arm/mach-bcmring/include/mach/dma.h
13677 Removing arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h
13678 Removing arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h
13679 Removing arch/arm/mach-bcmring/include/mach/csp/secHw_def.h
13680 Removing arch/arm/mach-bcmring/include/mach/csp/mm_io.h
13681 Removing arch/arm/mach-bcmring/include/mach/csp/mm_addr.h
13682 Removing arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h
13683 Removing arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h
13684 Removing arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h
13685 Removing arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h
13686 Removing arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h
13687 Removing arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h
13688 Removing arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h
13689 Removing arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h
13690 Removing arch/arm/mach-bcmring/incRecorded preimage for 'drivers/spi/Kconfig'
13691 Resolved 'Documentation/devicetree/bindings/usb/platform-uhci.txt' using previous resolution.
13692 Resolved 'MAINTAINERS' using previous resolution.
13693 Resolved 'arch/arm/include/asm/timex.h' using previous resolution.
13694 Resolved 'arch/arm/kernel/smp.c' using previous resolution.
13695 Resolved 'arch/arm/mach-davinci/davinci.h' using previous resolution.
13696 Resolved 'arch/arm/mach-davinci/dm355.c' using previous resolution.
13697 Resolved 'arch/arm/mach-davinci/dm365.c' using previous resolution.
13698 Resolved 'arch/arm/mach-davinci/include/mach/da8xx.h' using previous resolution.
13699 Resolved 'arch/arm/mach-imx/clk-imx51-imx53.c' using previous resolution.
13700 Resolved 'arch/arm/mach-integrator/integrator_cp.c' using previous resolution.
13701 Resolved 'arch/arm/mach-omap2/board-rx51-peripherals.c' using previous resolution.
13702 Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution.
13703 Resolved 'arch/arm/mach-s3c64xx/mach-mini6410.c' using previous resolution.
13704 Resolved 'arch/arm/mach-s3c64xx/mach-real6410.c' using previous resolution.
13705 Resolved 'arch/arm/mach-shmobile/include/mach/common.h' using previous resolution.
13706 Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution.
13707 Resolved 'drivers/clocksource/Makefile' using previous resolution.
13708 Resolved 'drivers/dma/mmp_tdma.c' using previous resolution.
13709 Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution.
13710 Resolved 'drivers/input/keyboard/omap-keypad.c' using previous resolution.
13711 Resolved 'drivers/mmc/host/davinci_mmc.c' using previous resolution.
13712 Resolved 'drivers/mmc/host/omap.c' using previous resolution.
13713 Resolved 'drivers/mtd/nand/Kconfig' using previous resolution.
13714 Resolved 'drivers/mtd/nand/orion_nand.c' using previous resolution.
13715 Resolved 'drivers/pinctrl/Makefile' using previous resolution.
13716 Resolved 'drivers/spi/spi-davinci.c' using previous resolution.
13717 Resolved 'drivers/staging/tidspbridge/core/wdt.c' using previous resolution.
13718 Resolved 'drivers/usb/host/Kconfig' using previous resolution.
13719 Resolved 'drivers/video/msm/mddi.c' using previous resolution.
13720 Resolved 'drivers/video/msm/mdp.c' using previous resolution.
13721 Resolved 'drivers/video/omap/lcd_ams_delta.c' using previous resolution.
13722 Resolved 'drivers/video/omap2/dss/dispc.c' using previous resolution.
13723 Resolved 'drivers/w1/masters/omap_hdq.c' using previous resolution.
13724 Resolved 'sound/soc/omap/omap-mcbsp.c' using previous resolution.
13725 Resolved 'sound/soc/omap/omap-pcm.c' using previous resolution.
13726 lude/mach/csp/cap_inline.h
13727 Removing arch/arm/mach-bcmring/include/mach/csp/cap.h
13728 Removing arch/arm/mach-bcmring/include/csp/tmrHw.h
13729 Removing arch/arm/mach-bcmring/include/csp/string.h
13730 Removing arch/arm/mach-bcmring/include/csp/stdint.h
13731 Removing arch/arm/mach-bcmring/include/csp/secHw.h
13732 Removing arch/arm/mach-bcmring/include/csp/reg.h
13733 Removing arch/arm/mach-bcmring/include/csp/module.h
13734 Removing arch/arm/mach-bcmring/include/csp/intcHw.h
13735 Removing arch/arm/mach-bcmring/include/csp/errno.h
13736 Removing arch/arm/mach-bcmring/include/csp/dmacHw.h
13737 Removing arch/arm/mach-bcmring/include/csp/delay.h
13738 Removing arch/arm/mach-bcmring/include/csp/cache.h
13739 Removing arch/arm/mach-bcmring/include/cfg_global_defines.h
13740 Removing arch/arm/mach-bcmring/include/cfg_global.h
13741 Removing arch/arm/mach-bcmring/dma_device.c
13742 Removing arch/arm/mach-bcmring/dma.c
13743 Removing arch/arm/mach-bcmring/csp/tmr/tmrHw.c
13744 Removing arch/arm/mach-bcmring/csp/tmr/Makefile
13745 Removing arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
13746 Removing arch/arm/mach-bcmring/csp/dmac/dmacHw.c
13747 Removing arch/arm/mach-bcmring/csp/dmac/Makefile
13748 Removing arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c
13749 Removing arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c
13750 Removing arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c
13751 Removing arch/arm/mach-bcmring/csp/chipc/chipcHw.c
13752 Removing arch/arm/mach-bcmring/csp/chipc/Makefile
13753 Removing arch/arm/mach-bcmring/csp/Makefile
13754 Removing arch/arm/mach-bcmring/core.h
13755 Removing arch/arm/mach-bcmring/core.c
13756 Removing arch/arm/mach-bcmring/clock.h
13757 Removing arch/arm/mach-bcmring/clock.c
13758 CONFLICT (modify/delete): arch/arm/mach-bcmring/arch.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-bcmring/arch.c left in tree.
13759 Removing arch/arm/mach-bcmring/Makefile.boot
13760 Removing arch/arm/mach-bcmring/Makefile
13761 Removing arch/arm/mach-bcmring/Kconfig
13762 Auto-merging arch/arm/mach-bcm2835/include/mach/timex.h
13763 Auto-merging arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h
13764 Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
13765 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
13766 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
13767 Auto-merging arch/arm/mach-at91/at91sam9263.c
13768 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
13769 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
13770 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
13771 Auto-merging arch/arm/kernel/smp.c
13772 CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
13773 Auto-merging arch/arm/kernel/setup.c
13774 Removing arch/arm/kernel/leds.c
13775 Auto-merging arch/arm/kernel/head.S
13776 Auto-merging arch/arm/kernel/bios32.c
13777 Auto-merging arch/arm/kernel/Makefile
13778 Auto-merging arch/arm/include/debug/picoxcell.S
13779 Auto-merging arch/arm/include/debug/mvebu.S
13780 Auto-merging arch/arm/include/debug/highbank.S
13781 Auto-merging arch/arm/include/asm/timex.h
13782 CONFLICT (content): Merge conflict in arch/arm/include/asm/timex.h
13783 Removing arch/arm/include/asm/leds.h
13784 Auto-merging arch/arm/include/asm/io.h
13785 Removing arch/arm/configs/pnx4008_defconfig
13786 Auto-merging arch/arm/configs/kzm9g_defconfig
13787 CONFLICT (modify/delete): arch/arm/configs/bcmring_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/bcmring_defconfig left in tree.
13788 Removing arch/arm/boot/dts/tegra30-cardhu.dts
13789 Removing arch/arm/boot/dts/prima2-cb.dts
13790 Auto-merging arch/arm/boot/dts/omap3-beagle-xm.dts
13791 Auto-merging arch/arm/boot/dts/imx6q.dtsi
13792 Auto-merging arch/arm/boot/dts/imx53.dtsi
13793 Auto-merging arch/arm/boot/dts/imx51.dtsi
13794 Auto-merging arch/arm/boot/dts/dbx5x0.dtsi
13795 Auto-merging arch/arm/Makefile
13796 Auto-merging arch/arm/Kconfig
13797 Auto-merging MAINTAINERS
13798 CONFLICT (content): Merge conflict in MAINTAINERS
13799 Auto-merging Documentation/devicetree/bindings/usb/platform-uhci.txt
13800 CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/usb/platform-uhci.txt
13801 Automatic merge failed; fix conflicts and then commit the result.
13802 $ git rm -f sound/soc/omap/igep0020.c sound/soc/omap/omap3beagle.c sound/soc/omap/omap3evm.c sound/soc/omap/overo.c
13803 sound/soc/omap/igep0020.c: needs merge
13804 sound/soc/omap/omap3beagle.c: needs merge
13805 sound/soc/omap/omap3evm.c: needs merge
13806 sound/soc/omap/overo.c: needs merge
13807 rm 'sound/soc/omap/igep0020.c'
13808 rm 'sound/soc/omap/omap3beagle.c'
13809 rm 'sound/soc/omap/omap3evm.c'
13810 rm 'sound/soc/omap/overo.c'
13811 $ git rm -f arch/arm/mach-tegra/devices.c
13812 arch/arm/mach-tegra/devices.c: needs merge
13813 rm 'arch/arm/mach-tegra/devices.c'
13814 $ git rm -f drivers/mtd/nand/bcm_umi_nand.c drivers/mtd/nand/nand_bcm_umi.h
13815 drivers/mtd/nand/bcm_umi_nand.c: needs merge
13816 drivers/mtd/nand/nand_bcm_umi.h: needs merge
13817 rm 'drivers/mtd/nand/bcm_umi_nand.c'
13818 rm 'drivers/mtd/nand/nand_bcm_umi.h'
13819 $ git rm -f arch/arm/mach-vt8500/bv07.c arch/arm/mach-vt8500/devices-vt8500.c arch/arm/mach-vt8500/devices-wm8505.c arch/arm/mach-vt8500/devices.c arch/arm/mach-vt8500/devices.h arch/arm/mach-vt8500/wm8505_7in.c
13820 arch/arm/mach-vt8500/bv07.c: needs merge
13821 arch/arm/mach-vt8500/devices-vt8500.c: needs merge
13822 arch/arm/mach-vt8500/devices-wm8505.c: needs merge
13823 arch/arm/mach-vt8500/devices.c: needs merge
13824 arch/arm/mach-vt8500/devices.h: needs merge
13825 arch/arm/mach-vt8500/wm8505_7in.c: needs merge
13826 rm 'arch/arm/mach-vt8500/bv07.c'
13827 rm 'arch/arm/mach-vt8500/devices-vt8500.c'
13828 rm 'arch/arm/mach-vt8500/devices-wm8505.c'
13829 rm 'arch/arm/mach-vt8500/devices.c'
13830 rm 'arch/arm/mach-vt8500/devices.h'
13831 rm 'arch/arm/mach-vt8500/wm8505_7in.c'
13832 $ git rm -f arch/arm/configs/bcmring_defconfig arch/arm/mach-bcmring/arch.c
13833 arch/arm/configs/bcmring_defconfig: needs merge
13834 arch/arm/mach-bcmring/arch.c: needs merge
13835 rm 'arch/arm/configs/bcmring_defconfig'
13836 rm 'arch/arm/mach-bcmring/arch.c'
13837 $ git rm -f drivers/video/epson1355fb.c
13838 drivers/video/epson1355fb.c: needs merge
13839 rm 'drivers/video/epson1355fb.c'
13840 $ git rm -f drivers/spi/spi-tegra.c
13841 drivers/spi/spi-tegra.c: needs merge
13842 rm 'drivers/spi/spi-tegra.c'
13844 Recorded resolution for 'drivers/spi/Kconfig'.
13845 Recorded resolution for 'drivers/video/msm/mdp_hw.h'.
13846 [master ec402bd] Merge remote-tracking branch 'arm-soc/for-next'
13847 $ git diff -M --stat --summary HEAD^..
13848 Documentation/arm/Marvell/README | 232 ++
13849 Documentation/arm/Samsung-S3C24XX/GPIO.txt | 82 +-
13850 Documentation/arm/Samsung/GPIO.txt | 8 +-
13851 Documentation/arm/memory.txt | 3 +
13852 Documentation/devicetree/bindings/arm/bcm2835.txt | 8 +
13853 .../devicetree/bindings/arm/mrvl/tauros2.txt | 17 +
13854 .../devicetree/bindings/arm/msm/timer.txt | 38 +
13855 .../devicetree/bindings/arm/omap/omap.txt | 3 +
13856 Documentation/devicetree/bindings/arm/vt8500.txt | 14 +
13857 .../bindings/arm/vt8500/via,vt8500-intc.txt | 16 +
13858 .../bindings/arm/vt8500/via,vt8500-pmc.txt | 13 +
13859 .../bindings/arm/vt8500/via,vt8500-timer.txt | 15 +
13860 .../devicetree/bindings/bus/omap-ocp2scp.txt | 10 +
13861 .../devicetree/bindings/clock/imx23-clock.txt | 76 +
13862 .../devicetree/bindings/clock/imx28-clock.txt | 99 +
13863 .../devicetree/bindings/clock/imx6q-clock.txt | 222 ++
13864 Documentation/devicetree/bindings/clock/vt8500.txt | 72 +
13865 .../devicetree/bindings/crypto/mv_cesa.txt | 20 +
13866 Documentation/devicetree/bindings/dma/mmp-dma.txt | 74 +
13867 .../devicetree/bindings/gpio/gpio-fan.txt | 25 +
13868 .../devicetree/bindings/gpio/gpio-mvebu.txt | 53 +
13869 .../devicetree/bindings/gpio/gpio-samsung.txt | 43 +
13870 .../devicetree/bindings/gpio/gpio-twl4030.txt | 6 +
13871 .../devicetree/bindings/gpio/gpio-vt8500.txt | 24 +
13872 .../devicetree/bindings/i2c/trivial-devices.txt | 1 +
13873 .../brcm,bcm2835-armctrl-ic.txt | 110 +
13874 .../devicetree/bindings/lpddr2/lpddr2-timings.txt | 52 +
13875 .../devicetree/bindings/lpddr2/lpddr2.txt | 102 +
13876 .../devicetree/bindings/media/exynos5-gsc.txt | 30 +
13877 .../bindings/memory-controllers/ti/emif.txt | 55 +
13878 Documentation/devicetree/bindings/mfd/ab8500.txt | 15 +
13879 .../devicetree/bindings/mtd/pxa3xx-nand.txt | 31 +
13880 .../pinctrl/marvell,armada-370-pinctrl.txt | 95 +
13881 .../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 100 +
13882 .../bindings/pinctrl/marvell,dove-pinctrl.txt | 72 +
13883 .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 279 ++
13884 .../bindings/pinctrl/marvell,mvebu-pinctrl.txt | 46 +
13885 .../bindings/pinctrl/samsung-pinctrl.txt | 196 ++
13886 Documentation/devicetree/bindings/rtc/pxa-rtc.txt | 14 +
13887 .../devicetree/bindings/rtc/via,vt8500-rtc.txt | 15 +
13888 .../bindings/timer/brcm,bcm2835-system-timer.txt | 22 +
13889 .../bindings/tty/serial/via,vt8500-uart.txt | 17 +
13890 .../devicetree/bindings/usb/platform-uhci.txt | 21 +-
13891 .../devicetree/bindings/usb/via,vt8500-ehci.txt | 15 +
13892 .../devicetree/bindings/vendor-prefixes.txt | 3 +
13893 .../devicetree/bindings/video/via,vt8500-fb.txt | 62 +
13894 .../devicetree/bindings/video/wm,prizm-ge-rops.txt | 13 +
13895 .../devicetree/bindings/video/wm,wm8505-fb.txt | 23 +
13896 Documentation/spi/ep93xx_spi | 2 +-
13897 MAINTAINERS | 27 +-
13898 arch/arm/Kconfig | 291 +-
13899 arch/arm/Kconfig.debug | 47 +
13900 arch/arm/Makefile | 149 +-
13901 arch/arm/arm-soc-for-next-contents.txt | 339 ++
13902 arch/arm/boot/Makefile | 2 +
13903 arch/arm/boot/compressed/misc.c | 6 +
13904 arch/arm/boot/dts/Makefile | 107 +
13905 arch/arm/boot/dts/am335x-bone.dts | 60 +
13906 arch/arm/boot/dts/am335x-evm.dts | 100 +
13907 arch/arm/boot/dts/am33xx.dtsi | 71 +-
13908 arch/arm/boot/dts/armada-370-xp.dtsi | 5 +
13909 arch/arm/boot/dts/armada-370.dtsi | 44 +
13910 arch/arm/boot/dts/armada-xp-db.dts | 4 +-
13911 arch/arm/boot/dts/armada-xp-mv78230.dtsi | 57 +
13912 arch/arm/boot/dts/armada-xp-mv78260.dtsi | 70 +
13913 arch/arm/boot/dts/armada-xp-mv78460.dtsi | 70 +
13914 arch/arm/boot/dts/bcm2835-rpi-b.dts | 12 +
13915 arch/arm/boot/dts/bcm2835.dtsi | 39 +
13916 arch/arm/boot/dts/{db8500.dtsi => dbx5x0.dtsi} | 71 +-
13917 arch/arm/boot/dts/dove-cm-a510.dts | 38 +
13918 arch/arm/boot/dts/dove-cubox.dts | 42 +
13919 arch/arm/boot/dts/dove-dove-db.dts | 38 +
13920 arch/arm/boot/dts/dove.dtsi | 143 +
13921 arch/arm/boot/dts/ea3250.dts | 109 +-
13922 arch/arm/boot/dts/elpida_ecb240abacn.dtsi | 67 +
13923 arch/arm/boot/dts/exynos4.dtsi | 248 ++
13924 arch/arm/boot/dts/exynos4210-origen.dts | 77 +-
13925 arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 457 +++
13926 arch/arm/boot/dts/exynos4210-smdkv310.dts | 54 +-
13927 arch/arm/boot/dts/exynos4210-trats.dts | 237 ++
13928 arch/arm/boot/dts/exynos4210.dtsi | 201 +-
13929 arch/arm/boot/dts/exynos5250-smdk5250.dts | 59 +-
13930 arch/arm/boot/dts/exynos5250.dtsi | 60 +
13931 arch/arm/boot/dts/hrefv60plus.dts | 95 +
13932 arch/arm/boot/dts/imx23-evk.dts | 3 +-
13933 arch/arm/boot/dts/imx23-olinuxino.dts | 57 +
13934 arch/arm/boot/dts/imx23-stmp378x_devb.dts | 2 +-
13935 arch/arm/boot/dts/imx23.dtsi | 43 +-
13936 arch/arm/boot/dts/imx27-phytec-phycore.dts | 6 +-
13937 arch/arm/boot/dts/imx27.dtsi | 1 -
13938 arch/arm/boot/dts/imx28-apx4devkit.dts | 2 +-
13939 arch/arm/boot/dts/imx28-cfa10049.dts | 99 +
13940 arch/arm/boot/dts/imx28-evk.dts | 29 +-
13941 arch/arm/boot/dts/imx28-m28evk.dts | 83 +-
13942 arch/arm/boot/dts/imx28-tx28.dts | 23 +-
13943 arch/arm/boot/dts/imx28.dtsi | 128 +-
13944 arch/arm/boot/dts/imx51-babbage.dts | 44 +-
13945 arch/arm/boot/dts/imx51.dtsi | 146 +-
13946 arch/arm/boot/dts/imx53-ard.dts | 59 +-
13947 arch/arm/boot/dts/imx53-evk.dts | 39 +-
13948 arch/arm/boot/dts/imx53-qsb.dts | 42 +-
13949 arch/arm/boot/dts/imx53-smd.dts | 46 +-
13950 arch/arm/boot/dts/imx53.dtsi | 199 +-
13951 arch/arm/boot/dts/imx6q-arm2.dts | 21 +
13952 arch/arm/boot/dts/imx6q-sabrelite.dts | 31 +-
13953 arch/arm/boot/dts/imx6q-sabresd.dts | 25 +-
13954 arch/arm/boot/dts/imx6q.dtsi | 316 +-
13955 arch/arm/boot/dts/kirkwood-dnskw.dtsi | 10 +
13956 arch/arm/boot/dts/kirkwood-dockstar.dts | 57 +
13957 arch/arm/boot/dts/kirkwood-iconnect.dts | 50 +-
13958 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 105 +
13959 arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 29 +
13960 arch/arm/boot/dts/kirkwood.dtsi | 12 +-
13961 arch/arm/boot/dts/mmp2.dtsi | 5 +
13962 arch/arm/boot/dts/msm8660-surf.dts | 19 +-
13963 arch/arm/boot/dts/msm8960-cdp.dts | 41 +
13964 arch/arm/boot/dts/omap2420-h4.dts | 2 +-
13965 arch/arm/boot/dts/omap2420.dtsi | 48 +
13966 arch/arm/boot/dts/omap2430.dtsi | 92 +
13967 .../dts/{omap3-beagle.dts => omap3-beagle-xm.dts} | 54 +-
13968 arch/arm/boot/dts/omap3-evm.dts | 13 +
13969 arch/arm/boot/dts/omap3-overo.dtsi | 57 +
13970 arch/arm/boot/dts/omap3-tobi.dts | 35 +
13971 arch/arm/boot/dts/omap3.dtsi | 94 +-
13972 arch/arm/boot/dts/omap36xx.dtsi | 25 +
13973 arch/arm/boot/dts/omap4-panda.dts | 11 +
13974 arch/arm/boot/dts/omap4-sdp.dts | 127 +-
13975 arch/arm/boot/dts/omap4.dtsi | 203 +-
13976 arch/arm/boot/dts/omap5-evm.dts | 64 +
13977 arch/arm/boot/dts/omap5.dtsi | 139 +
13978 arch/arm/boot/dts/phy3250.dts | 16 +-
13979 arch/arm/boot/dts/prima2-cb.dts | 424 ---
13980 arch/arm/boot/dts/prima2-evb.dts | 37 +
13981 arch/arm/boot/dts/prima2.dtsi | 640 ++++
13982 arch/arm/boot/dts/pxa27x.dtsi | 14 +
13983 arch/arm/boot/dts/pxa2xx.dtsi | 132 +
13984 arch/arm/boot/dts/pxa3xx.dtsi | 32 +
13985 arch/arm/boot/dts/pxa910.dtsi | 5 +
13986 arch/arm/boot/dts/snowball.dts | 19 +-
13987 arch/arm/boot/dts/tegra20-harmony.dts | 220 ++
13988 arch/arm/boot/dts/tegra20-medcom-wide.dts | 58 +
13989 arch/arm/boot/dts/tegra20-paz00.dts | 173 +
13990 arch/arm/boot/dts/tegra20-plutux.dts | 50 +
13991 arch/arm/boot/dts/tegra20-seaboard.dts | 186 ++
13992 arch/arm/boot/dts/tegra20-tamonten.dtsi | 449 +++
13993 arch/arm/boot/dts/tegra20-tec.dts | 53 +
13994 arch/arm/boot/dts/tegra20-ventana.dts | 206 ++
13995 arch/arm/boot/dts/tegra20-whistler.dts | 295 ++
13996 arch/arm/boot/dts/tegra20.dtsi | 2 +-
13997 arch/arm/boot/dts/tegra30-cardhu-a02.dts | 87 +
13998 arch/arm/boot/dts/tegra30-cardhu-a04.dts | 98 +
13999 arch/arm/boot/dts/tegra30-cardhu.dts | 171 -
14000 arch/arm/boot/dts/tegra30-cardhu.dtsi | 475 +++
14001 arch/arm/boot/dts/tegra30.dtsi | 2 +-
14002 arch/arm/boot/dts/tps65217.dtsi | 56 +
14003 arch/arm/boot/dts/tps65910.dtsi | 86 +
14004 arch/arm/boot/dts/twl4030.dtsi | 6 +-
14005 arch/arm/boot/dts/twl6030.dtsi | 26 +-
14006 arch/arm/boot/dts/vt8500-bv07.dts | 36 +
14007 arch/arm/boot/dts/vt8500.dtsi | 116 +
14008 arch/arm/boot/dts/wm8505-ref.dts | 36 +
14009 arch/arm/boot/dts/wm8505.dtsi | 143 +
14010 arch/arm/boot/dts/wm8650-mid.dts | 36 +
14011 arch/arm/boot/dts/wm8650.dtsi | 147 +
14012 arch/arm/configs/afeb9260_defconfig | 1 -
14013 arch/arm/configs/armadillo800eva_defconfig | 3 +
14014 arch/arm/configs/at91rm9200_defconfig | 2 +-
14015 arch/arm/configs/at91sam9261_defconfig | 2 +-
14016 arch/arm/configs/at91sam9263_defconfig | 3 +-
14017 arch/arm/configs/at91sam9g20_defconfig | 2 +-
14018 arch/arm/configs/at91sam9rl_defconfig | 2 +-
14019 arch/arm/configs/bcm2835_defconfig | 95 +
14020 arch/arm/configs/bcmring_defconfig | 78 -
14021 arch/arm/configs/cpu9260_defconfig | 2 +-
14022 arch/arm/configs/cpu9g20_defconfig | 2 +-
14023 arch/arm/configs/imx_v6_v7_defconfig | 8 +-
14024 arch/arm/configs/kirkwood_defconfig | 38 +-
14025 arch/arm/configs/kzm9d_defconfig | 1 +
14026 arch/arm/configs/kzm9g_defconfig | 1 +
14027 arch/arm/configs/lpc32xx_defconfig | 7 +-
14028 arch/arm/configs/marzen_defconfig | 17 +-
14029 arch/arm/configs/mmp2_defconfig | 5 +-
14030 arch/arm/configs/multi_v7_defconfig | 57 +
14031 arch/arm/configs/mvebu_defconfig | 2 +
14032 arch/arm/configs/mxs_defconfig | 42 +-
14033 arch/arm/configs/omap2plus_defconfig | 1 +
14034 arch/arm/configs/pnx4008_defconfig | 472 ---
14035 arch/arm/configs/prima2_defconfig | 7 +-
14036 arch/arm/configs/pxa910_defconfig | 4 +-
14037 arch/arm/configs/qil-a9260_defconfig | 3 +-
14038 arch/arm/configs/s3c6400_defconfig | 3 +
14039 arch/arm/configs/stamp9g20_defconfig | 1 -
14040 arch/arm/configs/tegra_defconfig | 53 +-
14041 arch/arm/configs/usb-a9260_defconfig | 1 -
14042 arch/arm/include/asm/gpio.h | 2 +
14043 arch/arm/include/asm/hardware/cache-tauros2.h | 5 +-
14044 arch/arm/include/asm/hardware/iop3xx.h | 12 +-
14045 arch/arm/include/asm/io.h | 8 +
14046 arch/arm/include/asm/leds.h | 50 -
14047 arch/arm/include/asm/mach/arch.h | 7 +
14048 arch/arm/include/asm/mach/map.h | 8 +
14049 arch/arm/include/asm/mach/pci.h | 13 +
14050 arch/arm/include/asm/smp.h | 48 +-
14051 arch/arm/include/asm/timex.h | 4 +
14052 .../debug-macro.S => include/debug/highbank.S} | 6 +-
14053 arch/arm/include/debug/icedcc.S | 90 +
14054 .../mach/debug-macro.S => include/debug/mvebu.S} | 3 +-
14055 .../debug-macro.S => include/debug/picoxcell.S} | 4 +-
14056 .../mach/debug-macro.S => include/debug/socfpga.S} | 0
14057 .../debug-macro.S => include/debug/vexpress.S} | 0
14058 arch/arm/kernel/Makefile | 1 -
14059 arch/arm/kernel/bios32.c | 54 +-
14060 arch/arm/kernel/debug.S | 87 +-
14061 arch/arm/kernel/head.S | 4 +-
14062 arch/arm/kernel/leds.c | 121 -
14063 arch/arm/kernel/process.c | 6 +-
14064 arch/arm/kernel/setup.c | 4 +-
14065 arch/arm/kernel/smp.c | 72 +-
14066 arch/arm/kernel/time.c | 17 -
14067 arch/arm/mach-at91/Makefile.boot | 24 -
14068 arch/arm/mach-at91/at91rm9200_devices.c | 92 +-
14069 arch/arm/mach-at91/at91sam9260_devices.c | 84 +-
14070 arch/arm/mach-at91/at91sam9261_devices.c | 60 +-
14071 arch/arm/mach-at91/at91sam9263.c | 4 +-
14072 arch/arm/mach-at91/at91sam9263_devices.c | 161 +-
14073 arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
14074 arch/arm/mach-at91/at91sam9rl_devices.c | 62 +-
14075 arch/arm/mach-at91/at91x40.c | 2 +-
14076 arch/arm/mach-at91/at91x40_time.c | 4 +-
14077 arch/arm/mach-at91/board-afeb-9260v1.c | 14 +-
14078 arch/arm/mach-at91/board-carmeva.c | 14 +-
14079 arch/arm/mach-at91/board-cpu9krea.c | 17 +-
14080 arch/arm/mach-at91/board-cpuat91.c | 13 +-
14081 arch/arm/mach-at91/board-csb337.c | 16 +-
14082 arch/arm/mach-at91/board-eb9200.c | 14 +-
14083 arch/arm/mach-at91/board-ecbat91.c | 32 +-
14084 arch/arm/mach-at91/board-eco920.c | 36 +-
14085 arch/arm/mach-at91/board-flexibity.c | 14 +-
14086 arch/arm/mach-at91/board-foxg20.c | 16 +-
14087 arch/arm/mach-at91/board-kafa.c | 17 +-
14088 arch/arm/mach-at91/board-kb9202.c | 37 +-
14089 arch/arm/mach-at91/board-neocore926.c | 13 +-
14090 arch/arm/mach-at91/board-picotux200.c | 14 +-
14091 arch/arm/mach-at91/board-qil-a9260.c | 14 +-
14092 arch/arm/mach-at91/board-rm9200dk.c | 17 +-
14093 arch/arm/mach-at91/board-rm9200ek.c | 17 +-
14094 arch/arm/mach-at91/board-rsi-ews.c | 16 +-
14095 arch/arm/mach-at91/board-sam9-l9260.c | 39 +-
14096 arch/arm/mach-at91/board-sam9260ek.c | 16 +-
14097 arch/arm/mach-at91/board-sam9261ek.c | 16 +-
14098 arch/arm/mach-at91/board-sam9263ek.c | 13 +-
14099 arch/arm/mach-at91/board-sam9g20ek.c | 16 +-
14100 arch/arm/mach-at91/board-sam9rlek.c | 13 +-
14101 arch/arm/mach-at91/board-stamp9g20.c | 14 -
14102 arch/arm/mach-at91/board-usb-a926x.c | 2 -
14103 arch/arm/mach-at91/board-yl-9200.c | 16 +-
14104 arch/arm/mach-at91/include/mach/atmel-mci.h | 2 +-
14105 arch/arm/mach-at91/include/mach/board.h | 1 -
14106 arch/arm/mach-at91/include/mach/hardware.h | 4 +-
14107 arch/arm/mach-at91/include/mach/uncompress.h | 6 +-
14108 arch/arm/mach-at91/leds.c | 105 -
14109 arch/arm/mach-at91/setup.c | 4 +-
14110 arch/arm/mach-bcm2835/Makefile | 1 +
14111 arch/arm/mach-bcm2835/Makefile.boot | 3 +
14112 arch/arm/mach-bcm2835/bcm2835.c | 64 +
14113 .../include/mach/bcm2835_soc.h} | 24 +-
14114 arch/arm/mach-bcm2835/include/mach/debug-macro.S | 21 +
14115 .../param.h => mach-bcm2835/include/mach/timex.h} | 11 +-
14116 arch/arm/mach-bcm2835/include/mach/uncompress.h | 45 +
14117 arch/arm/mach-bcmring/Kconfig | 19 -
14118 arch/arm/mach-bcmring/Makefile | 8 -
14119 arch/arm/mach-bcmring/Makefile.boot | 6 -
14120 arch/arm/mach-bcmring/arch.c | 198 --
14121 arch/arm/mach-bcmring/clock.c | 223 --
14122 arch/arm/mach-bcmring/clock.h | 33 -
14123 arch/arm/mach-bcmring/core.c | 228 --
14124 arch/arm/mach-bcmring/core.h | 31 -
14125 arch/arm/mach-bcmring/csp/Makefile | 3 -
14126 arch/arm/mach-bcmring/csp/chipc/Makefile | 1 -
14127 arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 776 -----
14128 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c | 293 --
14129 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c | 124 -
14130 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c | 64 -
14131 arch/arm/mach-bcmring/csp/dmac/Makefile | 1 -
14132 arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 917 ------
14133 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 1017 ------
14134 arch/arm/mach-bcmring/csp/tmr/Makefile | 1 -
14135 arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 576 ----
14136 arch/arm/mach-bcmring/dma.c | 1518 ---------
14137 arch/arm/mach-bcmring/dma_device.c | 593 ----
14138 arch/arm/mach-bcmring/include/cfg_global.h | 13 -
14139 arch/arm/mach-bcmring/include/cfg_global_defines.h | 40 -
14140 arch/arm/mach-bcmring/include/csp/cache.h | 35 -
14141 arch/arm/mach-bcmring/include/csp/delay.h | 36 -
14142 arch/arm/mach-bcmring/include/csp/dmacHw.h | 596 ----
14143 arch/arm/mach-bcmring/include/csp/errno.h | 32 -
14144 arch/arm/mach-bcmring/include/csp/intcHw.h | 40 -
14145 arch/arm/mach-bcmring/include/csp/module.h | 32 -
14146 arch/arm/mach-bcmring/include/csp/reg.h | 114 -
14147 arch/arm/mach-bcmring/include/csp/secHw.h | 65 -
14148 arch/arm/mach-bcmring/include/csp/stdint.h | 30 -
14149 arch/arm/mach-bcmring/include/csp/string.h | 34 -
14150 arch/arm/mach-bcmring/include/csp/tmrHw.h | 263 --
14151 arch/arm/mach-bcmring/include/mach/csp/cap.h | 63 -
14152 .../arm/mach-bcmring/include/mach/csp/cap_inline.h | 409 ---
14153 .../mach-bcmring/include/mach/csp/chipcHw_def.h | 1123 -------
14154 .../mach-bcmring/include/mach/csp/chipcHw_inline.h | 1673 ----------
14155 .../mach-bcmring/include/mach/csp/chipcHw_reg.h | 530 ---
14156 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h | 872 -----
14157 .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 145 -
14158 .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 406 ---
14159 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h | 73 -
14160 .../arm/mach-bcmring/include/mach/csp/intcHw_reg.h | 246 --
14161 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h | 101 -
14162 arch/arm/mach-bcmring/include/mach/csp/mm_io.h | 147 -
14163 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h | 100 -
14164 .../mach-bcmring/include/mach/csp/secHw_inline.h | 79 -
14165 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h | 82 -
14166 arch/arm/mach-bcmring/include/mach/dma.h | 630 ----
14167 arch/arm/mach-bcmring/include/mach/entry-macro.S | 76 -
14168 arch/arm/mach-bcmring/include/mach/hardware.h | 57 -
14169 arch/arm/mach-bcmring/include/mach/irqs.h | 132 -
14170 .../mach-bcmring/include/mach/memory_settings.h | 67 -
14171 arch/arm/mach-bcmring/include/mach/reg_nand.h | 66 -
14172 arch/arm/mach-bcmring/include/mach/reg_umi.h | 237 --
14173 arch/arm/mach-bcmring/include/mach/timer.h | 77 -
14174 arch/arm/mach-bcmring/include/mach/timex.h | 25 -
14175 arch/arm/mach-bcmring/include/mach/uncompress.h | 43 -
14176 arch/arm/mach-bcmring/irq.c | 126 -
14177 arch/arm/mach-bcmring/mm.c | 60 -
14178 arch/arm/mach-bcmring/timer.c | 61 -
14179 arch/arm/mach-clps711x/Kconfig | 6 -
14180 arch/arm/mach-clps711x/Makefile | 3 -
14181 arch/arm/mach-clps711x/ceiva.c | 64 -
14182 arch/arm/mach-clps711x/common.c | 89 +-
14183 arch/arm/mach-clps711x/include/mach/clps711x.h | 9 +-
14184 arch/arm/mach-clps711x/include/mach/debug-macro.S | 8 +-
14185 arch/arm/mach-clps711x/include/mach/hardware.h | 48 -
14186 arch/arm/mach-clps711x/include/mach/timex.h | 23 +-
14187 arch/arm/mach-clps711x/p720t-leds.c | 63 -
14188 arch/arm/mach-clps711x/p720t.c | 62 +
14189 arch/arm/mach-davinci/aemif.c | 2 +-
14190 arch/arm/mach-davinci/board-da830-evm.c | 8 +-
14191 arch/arm/mach-davinci/board-da850-evm.c | 6 +-
14192 arch/arm/mach-davinci/board-dm355-evm.c | 8 +-
14193 arch/arm/mach-davinci/board-dm355-leopard.c | 8 +-
14194 arch/arm/mach-davinci/board-dm365-evm.c | 8 +-
14195 arch/arm/mach-davinci/board-dm644x-evm.c | 10 +-
14196 arch/arm/mach-davinci/board-dm646x-evm.c | 6 +-
14197 arch/arm/mach-davinci/board-mityomapl138.c | 4 +-
14198 arch/arm/mach-davinci/board-neuros-osd2.c | 8 +-
14199 arch/arm/mach-davinci/board-sffsdr.c | 4 +-
14200 arch/arm/mach-davinci/davinci.h | 2 +-
14201 arch/arm/mach-davinci/devices.c | 4 +-
14202 arch/arm/mach-davinci/dm355.c | 2 +-
14203 arch/arm/mach-davinci/dm365.c | 4 +-
14204 arch/arm/mach-davinci/include/mach/da8xx.h | 8 +-
14205 arch/arm/mach-davinci/include/mach/tnetv107x.h | 4 +-
14206 arch/arm/mach-davinci/usb.c | 2 +-
14207 arch/arm/mach-dove/Kconfig | 7 +
14208 arch/arm/mach-dove/Makefile | 4 +-
14209 arch/arm/mach-dove/common.c | 171 +-
14210 arch/arm/mach-dove/common.h | 4 +
14211 arch/arm/mach-dove/include/mach/bridge-regs.h | 16 +-
14212 arch/arm/mach-dove/include/mach/dove.h | 134 +-
14213 arch/arm/mach-dove/include/mach/gpio.h | 9 -
14214 arch/arm/mach-dove/include/mach/io.h | 19 -
14215 arch/arm/mach-dove/include/mach/pm.h | 54 +-
14216 arch/arm/mach-dove/irq.c | 11 +-
14217 arch/arm/mach-dove/mpp.c | 1 +
14218 arch/arm/mach-dove/pcie.c | 49 +-
14219 arch/arm/mach-ebsa110/Makefile | 4 +-
14220 arch/arm/mach-ebsa110/core.c | 8 +-
14221 arch/arm/mach-ebsa110/core.h | 12 +-
14222 arch/arm/mach-ebsa110/leds.c | 81 +-
14223 arch/arm/mach-ep93xx/adssphere.c | 1 +
14224 arch/arm/mach-ep93xx/core.c | 6 +-
14225 arch/arm/mach-ep93xx/dma.c | 2 +-
14226 arch/arm/mach-ep93xx/edb93xx.c | 4 +-
14227 arch/arm/mach-ep93xx/gesbc9312.c | 1 +
14228 arch/arm/mach-ep93xx/simone.c | 2 +-
14229 arch/arm/mach-ep93xx/snappercl15.c | 2 +-
14230 arch/arm/mach-ep93xx/ts72xx.c | 12 +-
14231 arch/arm/mach-ep93xx/{include/mach => }/ts72xx.h | 10 +-
14232 arch/arm/mach-ep93xx/vision_ep9307.c | 4 +-
14233 arch/arm/mach-exynos/Kconfig | 9 +-
14234 arch/arm/mach-exynos/Makefile.boot | 3 -
14235 arch/arm/mach-exynos/clock-exynos4.c | 31 +
14236 arch/arm/mach-exynos/clock-exynos5.c | 172 +-
14237 arch/arm/mach-exynos/common.c | 26 +
14238 arch/arm/mach-exynos/common.h | 5 +
14239 arch/arm/mach-exynos/dev-audio.c | 2 +-
14240 arch/arm/mach-exynos/dev-ohci.c | 2 +-
14241 arch/arm/mach-exynos/hotplug.c | 18 +-
14242 arch/arm/mach-exynos/include/mach/map.h | 12 +-
14243 arch/arm/mach-exynos/include/mach/sysmmu.h | 2 +-
14244 arch/arm/mach-exynos/mach-armlex4210.c | 1 +
14245 arch/arm/mach-exynos/mach-exynos4-dt.c | 32 +-
14246 arch/arm/mach-exynos/mach-exynos5-dt.c | 17 +
14247 arch/arm/mach-exynos/mach-nuri.c | 7 +-
14248 arch/arm/mach-exynos/mach-origen.c | 13 +-
14249 arch/arm/mach-exynos/mach-smdk4x12.c | 10 +-
14250 arch/arm/mach-exynos/mach-smdkv310.c | 15 +-
14251 arch/arm/mach-exynos/mach-universal_c210.c | 5 +-
14252 arch/arm/mach-exynos/platsmp.c | 27 +-
14253 arch/arm/mach-exynos/setup-i2c0.c | 2 +-
14254 arch/arm/mach-exynos/setup-i2c1.c | 2 +-
14255 arch/arm/mach-exynos/setup-i2c2.c | 2 +-
14256 arch/arm/mach-exynos/setup-i2c3.c | 2 +-
14257 arch/arm/mach-exynos/setup-i2c4.c | 2 +-
14258 arch/arm/mach-exynos/setup-i2c5.c | 2 +-
14259 arch/arm/mach-exynos/setup-i2c6.c | 2 +-
14260 arch/arm/mach-exynos/setup-i2c7.c | 2 +-
14261 arch/arm/mach-footbridge/Makefile | 4 -
14262 arch/arm/mach-footbridge/common.c | 12 +-
14263 arch/arm/mach-footbridge/dc21285.c | 16 +-
14264 arch/arm/mach-footbridge/ebsa285-leds.c | 138 -
14265 arch/arm/mach-footbridge/ebsa285.c | 81 +
14266 .../arm/mach-footbridge/include/mach/debug-macro.S | 3 +-
14267 arch/arm/mach-footbridge/include/mach/io.h | 12 +-
14268 arch/arm/mach-footbridge/netwinder-hw.c | 112 +-
14269 arch/arm/mach-footbridge/netwinder-leds.c | 138 -
14270 arch/arm/mach-highbank/Kconfig | 15 +
14271 arch/arm/mach-highbank/Makefile.boot | 1 -
14272 arch/arm/mach-highbank/core.h | 9 +
14273 arch/arm/mach-highbank/highbank.c | 2 +
14274 arch/arm/mach-highbank/hotplug.c | 16 +-
14275 arch/arm/mach-highbank/include/mach/gpio.h | 1 -
14276 arch/arm/mach-highbank/include/mach/timex.h | 6 -
14277 arch/arm/mach-highbank/include/mach/uncompress.h | 9 -
14278 arch/arm/mach-highbank/platsmp.c | 18 +-
14279 arch/arm/mach-highbank/pm.c | 4 +-
14280 arch/arm/mach-imx/Kconfig | 107 +-
14281 arch/arm/mach-imx/Makefile | 11 +-
14282 arch/arm/mach-imx/Makefile.boot | 7 -
14283 arch/arm/mach-imx/clk-imx21.c | 1 -
14284 arch/arm/mach-imx/clk-imx35.c | 11 +-
14285 arch/arm/mach-imx/clk-imx51-imx53.c | 18 +-
14286 arch/arm/mach-imx/clk-imx6q.c | 51 +-
14287 arch/arm/mach-imx/clk-pllv1.c | 49 +-
14288 arch/arm/mach-imx/clk.c | 3 +
14289 arch/arm/mach-imx/clk.h | 3 +-
14290 arch/arm/mach-imx/devices-imx53.h | 48 -
14291 arch/arm/mach-imx/efika.h | 10 -
14292 arch/arm/mach-imx/ehci-imx25.c | 2 +-
14293 arch/arm/mach-imx/ehci-imx27.c | 2 +-
14294 arch/arm/mach-imx/ehci-imx31.c | 2 +-
14295 arch/arm/mach-imx/ehci-imx35.c | 2 +-
14296 arch/arm/mach-imx/ehci-imx5.c | 2 +-
14297 arch/arm/mach-imx/hotplug.c | 16 +-
14298 arch/arm/mach-imx/imx51-dt.c | 21 -
14299 arch/arm/mach-imx/{imx53-dt.c => mach-imx53.c} | 27 -
14300 arch/arm/mach-imx/mach-imx6q.c | 12 +-
14301 arch/arm/mach-imx/mach-kzm_arm11_01.c | 5 +-
14302 arch/arm/mach-imx/mach-mx27_3ds.c | 21 +-
14303 arch/arm/mach-imx/mach-mx31ads.c | 2 +-
14304 arch/arm/mach-imx/mach-mx31lite.c | 2 +-
14305 arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
14306 arch/arm/mach-imx/mach-mx51_efikamx.c | 300 --
14307 arch/arm/mach-imx/mach-mx51_efikasb.c | 296 --
14308 arch/arm/mach-imx/mach-mx53_ard.c | 272 --
14309 arch/arm/mach-imx/mach-mx53_evk.c | 179 --
14310 arch/arm/mach-imx/mach-mx53_loco.c | 321 --
14311 arch/arm/mach-imx/mach-mx53_smd.c | 168 -
14312 arch/arm/mach-imx/mm-imx5.c | 47 -
14313 arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 2 +-
14314 arch/arm/mach-imx/mx51_efika.c | 633 ----
14315 arch/arm/mach-imx/platsmp.c | 18 +-
14316 arch/arm/mach-integrator/Makefile | 3 +-
14317 arch/arm/mach-integrator/core.c | 7 +-
14318 arch/arm/mach-integrator/cpu.c | 8 +-
14319 arch/arm/mach-integrator/include/mach/cm.h | 2 +
14320 arch/arm/mach-integrator/include/mach/io.h | 33 -
14321 arch/arm/mach-integrator/include/mach/platform.h | 4 +
14322 arch/arm/mach-integrator/integrator_ap.c | 21 +-
14323 arch/arm/mach-integrator/integrator_cp.c | 6 +-
14324 arch/arm/mach-integrator/leds.c | 161 +-
14325 arch/arm/mach-integrator/pci_v3.c | 62 +-
14326 arch/arm/mach-iop13xx/include/mach/io.h | 28 -
14327 arch/arm/mach-iop13xx/include/mach/iop13xx.h | 48 +-
14328 arch/arm/mach-iop13xx/include/mach/memory.h | 14 +-
14329 arch/arm/mach-iop13xx/io.c | 35 +-
14330 arch/arm/mach-iop13xx/pci.c | 53 +-
14331 arch/arm/mach-iop13xx/pci.h | 4 +-
14332 arch/arm/mach-iop13xx/setup.c | 20 +-
14333 arch/arm/mach-iop32x/glantank.c | 2 +-
14334 arch/arm/mach-iop32x/include/mach/io.h | 19 -
14335 arch/arm/mach-iop33x/include/mach/io.h | 19 -
14336 arch/arm/mach-ixp4xx/common.c | 8 +-
14337 arch/arm/mach-ixp4xx/include/mach/cpu.h | 5 +-
14338 arch/arm/mach-ixp4xx/include/mach/gpio.h | 2 -
14339 arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 10 +-
14340 arch/arm/mach-kirkwood/Kconfig | 21 +
14341 arch/arm/mach-kirkwood/Makefile | 3 +
14342 arch/arm/mach-kirkwood/Makefile.boot | 11 -
14343 arch/arm/mach-kirkwood/addr-map.c | 3 +-
14344 arch/arm/mach-kirkwood/board-dnskw.c | 35 -
14345 arch/arm/mach-kirkwood/board-dockstar.c | 61 +
14346 arch/arm/mach-kirkwood/board-dreamplug.c | 2 +-
14347 arch/arm/mach-kirkwood/board-dt.c | 14 +-
14348 arch/arm/mach-kirkwood/board-goflexnet.c | 2 +-
14349 arch/arm/mach-kirkwood/board-iconnect.c | 48 -
14350 arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 57 +
14351 arch/arm/mach-kirkwood/board-km_kirkwood.c | 57 +
14352 arch/arm/mach-kirkwood/common.c | 28 +-
14353 arch/arm/mach-kirkwood/common.h | 18 +
14354 arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
14355 arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +-
14356 arch/arm/mach-kirkwood/dockstar-setup.c | 2 +-
14357 arch/arm/mach-kirkwood/guruplug-setup.c | 2 +-
14358 arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 20 +-
14359 arch/arm/mach-kirkwood/include/mach/gpio.h | 9 -
14360 arch/arm/mach-kirkwood/include/mach/io.h | 24 -
14361 arch/arm/mach-kirkwood/include/mach/kirkwood.h | 120 +-
14362 arch/arm/mach-kirkwood/irq.c | 10 +-
14363 arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +-
14364 arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +-
14365 arch/arm/mach-kirkwood/openrd-setup.c | 2 +-
14366 arch/arm/mach-kirkwood/pcie.c | 56 +-
14367 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 1 +
14368 arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +-
14369 arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 +-
14370 arch/arm/mach-kirkwood/ts41x-setup.c | 3 +-
14371 arch/arm/mach-ks8695/Kconfig | 61 +
14372 arch/arm/mach-ks8695/Makefile | 11 +-
14373 arch/arm/mach-ks8695/board-og.c | 199 ++
14374 arch/arm/mach-ks8695/board-sg.c | 121 +
14375 arch/arm/mach-ks8695/cpu.c | 2 +-
14376 arch/arm/mach-ks8695/devices.c | 21 -
14377 arch/arm/mach-ks8695/include/mach/devices.h | 5 -
14378 arch/arm/mach-ks8695/include/mach/hardware.h | 2 +-
14379 arch/arm/mach-ks8695/include/mach/regs-timer.h | 40 -
14380 arch/arm/mach-ks8695/include/mach/uncompress.h | 6 +-
14381 arch/arm/mach-ks8695/leds.c | 92 -
14382 arch/arm/mach-ks8695/time.c | 133 +-
14383 arch/arm/mach-lpc32xx/Makefile.boot | 2 -
14384 arch/arm/mach-lpc32xx/common.c | 8 +-
14385 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h | 2 +-
14386 arch/arm/mach-lpc32xx/include/mach/hardware.h | 2 +-
14387 arch/arm/mach-lpc32xx/irq.c | 7 +-
14388 arch/arm/mach-lpc32xx/phy3250.c | 42 +-
14389 arch/arm/mach-mmp/Makefile | 8 +-
14390 arch/arm/mach-mmp/aspenite.c | 2 +-
14391 arch/arm/mach-mmp/clock-mmp2.c | 111 +
14392 arch/arm/mach-mmp/clock-pxa168.c | 91 +
14393 arch/arm/mach-mmp/clock-pxa910.c | 67 +
14394 arch/arm/mach-mmp/common.h | 3 +
14395 arch/arm/mach-mmp/include/mach/debug-macro.S | 12 +-
14396 arch/arm/mach-mmp/include/mach/mmp2.h | 2 +-
14397 arch/arm/mach-mmp/include/mach/pxa168.h | 4 +-
14398 arch/arm/mach-mmp/include/mach/pxa910.h | 2 +-
14399 arch/arm/mach-mmp/include/mach/regs-apbc.h | 95 -
14400 arch/arm/mach-mmp/include/mach/regs-apmu.h | 15 -
14401 arch/arm/mach-mmp/irq.c | 4 +-
14402 arch/arm/mach-mmp/mmp2.c | 73 +-
14403 arch/arm/mach-mmp/pxa168.c | 58 +-
14404 arch/arm/mach-mmp/pxa910.c | 44 +-
14405 arch/arm/mach-mmp/sram.c | 2 +-
14406 arch/arm/mach-mmp/teton_bga.c | 2 +-
14407 arch/arm/mach-mmp/ttc_dkb.c | 10 +
14408 arch/arm/mach-msm/Kconfig | 49 +-
14409 arch/arm/mach-msm/Makefile | 8 +-
14410 arch/arm/mach-msm/acpuclock-arm11.c | 525 ---
14411 arch/arm/mach-msm/acpuclock.h | 32 -
14412 arch/arm/mach-msm/board-dt-8660.c | 64 +
14413 arch/arm/mach-msm/board-dt-8960.c | 50 +
14414 arch/arm/mach-msm/board-halibut.c | 5 +-
14415 arch/arm/mach-msm/board-mahimahi.c | 1 -
14416 arch/arm/mach-msm/board-msm7x27.c | 170 -
14417 arch/arm/mach-msm/board-msm7x30.c | 9 +-
14418 arch/arm/mach-msm/board-msm8960.c | 122 -
14419 arch/arm/mach-msm/board-msm8x60.c | 166 -
14420 arch/arm/mach-msm/board-qsd8x50.c | 9 +-
14421 arch/arm/mach-msm/board-sapphire.c | 1 -
14422 arch/arm/mach-msm/board-trout-mmc.c | 2 +-
14423 arch/arm/mach-msm/board-trout-panel.c | 2 +-
14424 arch/arm/mach-msm/board-trout.c | 5 +-
14425 arch/arm/mach-msm/clock-pcom.c | 18 +-
14426 arch/arm/mach-msm/common.h | 32 +
14427 arch/arm/mach-msm/core.h | 2 +
14428 arch/arm/mach-msm/devices-msm7x00.c | 2 +-
14429 arch/arm/mach-msm/devices-msm7x30.c | 2 +-
14430 arch/arm/mach-msm/devices-msm8960.c | 85 -
14431 arch/arm/mach-msm/devices-qsd8x50.c | 2 +-
14432 arch/arm/mach-msm/dma.c | 3 +-
14433 arch/arm/mach-msm/hotplug.c | 18 +-
14434 arch/arm/mach-msm/idle.c | 49 -
14435 arch/arm/mach-msm/include/mach/board.h | 15 +-
14436 arch/arm/mach-msm/include/mach/gpio.h | 1 -
14437 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 7 -
14438 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 -
14439 arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 6 +-
14440 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 -
14441 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 17 +-
14442 arch/arm/mach-msm/include/mach/msm_iomap.h | 3 +-
14443 arch/arm/mach-msm/include/mach/system.h | 19 -
14444 arch/arm/mach-msm/io.c | 32 +-
14445 arch/arm/mach-msm/platsmp.c | 32 +-
14446 arch/arm/mach-msm/proc_comm.c | 1 -
14447 arch/arm/mach-msm/smd.c | 26 +-
14448 arch/arm/mach-msm/timer.c | 188 +-
14449 arch/arm/mach-mv78xx0/addr-map.c | 9 +-
14450 arch/arm/mach-mv78xx0/common.c | 13 +-
14451 arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | 12 +-
14452 arch/arm/mach-mv78xx0/include/mach/io.h | 24 -
14453 arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 105 +-
14454 arch/arm/mach-mv78xx0/irq.c | 10 +-
14455 arch/arm/mach-mv78xx0/pcie.c | 122 +-
14456 arch/arm/mach-mvebu/Kconfig | 30 +-
14457 arch/arm/mach-mvebu/Makefile | 5 +-
14458 arch/arm/mach-mvebu/Makefile.boot | 3 -
14459 arch/arm/mach-mvebu/addr-map.c | 134 +
14460 arch/arm/mach-mvebu/armada-370-xp.c | 4 +-
14461 .../mach-mvebu/{include/mach => }/armada-370-xp.h | 2 +-
14462 .../include/mach/gpio.h | 0
14463 arch/arm/mach-mvebu/include/mach/timex.h | 13 -
14464 arch/arm/mach-mvebu/include/mach/uncompress.h | 43 -
14465 arch/arm/mach-mxs/Kconfig | 89 -
14466 arch/arm/mach-mxs/Makefile | 11 +-
14467 arch/arm/mach-mxs/Makefile.boot | 9 -
14468 arch/arm/mach-mxs/devices-mx23.h | 43 -
14469 arch/arm/mach-mxs/devices-mx28.h | 63 -
14470 arch/arm/mach-mxs/devices.c | 87 -
14471 arch/arm/mach-mxs/devices/Kconfig | 33 -
14472 arch/arm/mach-mxs/devices/Makefile | 12 -
14473 arch/arm/mach-mxs/devices/platform-auart.c | 65 -
14474 arch/arm/mach-mxs/devices/platform-dma.c | 31 -
14475 arch/arm/mach-mxs/devices/platform-fec.c | 52 -
14476 arch/arm/mach-mxs/devices/platform-flexcan.c | 51 -
14477 arch/arm/mach-mxs/devices/platform-gpio-mxs.c | 33 -
14478 arch/arm/mach-mxs/devices/platform-gpmi-nand.c | 81 -
14479 arch/arm/mach-mxs/devices/platform-mxs-i2c.c | 52 -
14480 arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 76 -
14481 arch/arm/mach-mxs/devices/platform-mxs-pwm.c | 22 -
14482 arch/arm/mach-mxs/devices/platform-mxs-saif.c | 61 -
14483 arch/arm/mach-mxs/devices/platform-mxsfb.c | 47 -
14484 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 -
14485 arch/arm/mach-mxs/icoll.c | 63 +-
14486 arch/arm/mach-mxs/include/mach/common.h | 12 +-
14487 arch/arm/mach-mxs/include/mach/devices-common.h | 114 -
14488 arch/arm/mach-mxs/include/mach/entry-macro.S | 35 -
14489 arch/arm/mach-mxs/include/mach/gpio.h | 1 -
14490 arch/arm/mach-mxs/include/mach/iomux-mx23.h | 355 --
14491 arch/arm/mach-mxs/include/mach/iomux-mx28.h | 537 ----
14492 arch/arm/mach-mxs/include/mach/iomux.h | 168 -
14493 arch/arm/mach-mxs/include/mach/irqs.h | 32 -
14494 arch/arm/mach-mxs/iomux.c | 101 -
14495 arch/arm/mach-mxs/mach-apx4devkit.c | 273 --
14496 arch/arm/mach-mxs/mach-m28evk.c | 366 ---
14497 arch/arm/mach-mxs/mach-mx23evk.c | 190 --
14498 arch/arm/mach-mxs/mach-mx28evk.c | 477 ---
14499 arch/arm/mach-mxs/mach-mxs.c | 169 +-
14500 arch/arm/mach-mxs/mach-stmp378x_devb.c | 123 -
14501 arch/arm/mach-mxs/mach-tx28.c | 184 --
14502 arch/arm/mach-mxs/mm.c | 39 -
14503 arch/arm/mach-mxs/module-tx28.c | 160 -
14504 arch/arm/mach-mxs/module-tx28.h | 10 -
14505 arch/arm/mach-mxs/timer.c | 13 +-
14506 arch/arm/mach-netx/nxdb500.c | 2 +-
14507 arch/arm/mach-netx/nxdkn.c | 2 +-
14508 arch/arm/mach-netx/nxeb500hmi.c | 2 +-
14509 arch/arm/mach-nomadik/board-nhk8815.c | 5 +-
14510 arch/arm/mach-nomadik/include/mach/gpio.h | 4 -
14511 arch/arm/mach-nomadik/include/mach/hardware.h | 2 +-
14512 arch/arm/mach-nomadik/include/mach/uncompress.h | 8 +-
14513 arch/arm/mach-omap1/Makefile | 8 -
14514 arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +-
14515 arch/arm/mach-omap1/ams-delta-fiq.c | 2 +-
14516 arch/arm/mach-omap1/board-ams-delta.c | 8 +-
14517 arch/arm/mach-omap1/board-fsample.c | 7 +-
14518 arch/arm/mach-omap1/board-generic.c | 8 +-
14519 arch/arm/mach-omap1/board-h2.c | 41 +-
14520 arch/arm/mach-omap1/board-h3.c | 39 +-
14521 arch/arm/mach-omap1/board-htcherald.c | 8 +-
14522 arch/arm/mach-omap1/board-innovator.c | 6 +-
14523 arch/arm/mach-omap1/board-nokia770.c | 8 +-
14524 arch/arm/mach-omap1/board-osk.c | 41 +-
14525 arch/arm/mach-omap1/board-palmte.c | 10 +-
14526 arch/arm/mach-omap1/board-palmtt.c | 10 +-
14527 arch/arm/mach-omap1/board-palmz71.c | 10 +-
14528 arch/arm/mach-omap1/board-perseus2.c | 7 +-
14529 arch/arm/mach-omap1/board-sx1-mmc.c | 2 +-
14530 arch/arm/mach-omap1/board-sx1.c | 11 +-
14531 arch/arm/mach-omap1/board-voiceblue.c | 12 +-
14532 arch/arm/mach-omap1/clock.c | 4 +-
14533 arch/arm/mach-omap1/clock_data.c | 21 +-
14534 arch/arm/mach-omap1/devices.c | 33 +-
14535 arch/arm/mach-omap1/dma.c | 8 +-
14536 arch/arm/mach-omap1/flash.c | 2 +-
14537 arch/arm/mach-omap1/gpio15xx.c | 1 +
14538 arch/arm/mach-omap1/gpio16xx.c | 1 +
14539 arch/arm/mach-omap1/gpio7xx.c | 1 +
14540 arch/arm/mach-omap1/i2c.c | 2 +-
14541 arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | 2 -
14542 .../include/mach}/board-ams-delta.h | 0
14543 .../plat => mach-omap1/include/mach}/board-sx1.h | 0
14544 .../include/mach}/board-voiceblue.h | 0
14545 .../plat => mach-omap1/include/mach}/flash.h | 0
14546 arch/arm/mach-omap1/include/mach/gpio.h | 2 -
14547 arch/arm/mach-omap1/include/mach/hardware.h | 285 +-
14548 .../plat => mach-omap1/include/mach}/irda.h | 0
14549 arch/arm/mach-omap1/include/mach/irqs.h | 267 +-
14550 .../include/plat => mach-omap1/include/mach}/mux.h | 0
14551 .../plat => mach-omap1/include/mach}/omap1510.h | 3 +-
14552 .../plat => mach-omap1/include/mach}/omap16xx.h | 3 +-
14553 .../plat => mach-omap1/include/mach}/omap7xx.h | 3 +-
14554 arch/arm/mach-omap1/include/mach/smp.h | 5 -
14555 arch/arm/mach-omap1/io.c | 2 +-
14556 arch/arm/mach-omap1/lcd_dma.c | 6 +-
14557 arch/arm/mach-omap1/leds-h2p2-debug.c | 166 -
14558 arch/arm/mach-omap1/leds-innovator.c | 98 -
14559 arch/arm/mach-omap1/leds-osk.c | 113 -
14560 arch/arm/mach-omap1/leds.c | 69 -
14561 arch/arm/mach-omap1/leds.h | 3 -
14562 arch/arm/mach-omap1/mcbsp.c | 4 +-
14563 arch/arm/mach-omap1/mux.c | 58 +-
14564 arch/arm/mach-omap1/pm.c | 2 +-
14565 arch/arm/mach-omap1/serial.c | 3 +-
14566 arch/arm/mach-omap1/time.c | 1 -
14567 arch/arm/mach-omap1/timer.c | 2 +-
14568 arch/arm/mach-omap1/timer32k.c | 1 -
14569 arch/arm/mach-omap1/usb.c | 2 +-
14570 arch/arm/mach-omap2/Kconfig | 8 +
14571 arch/arm/mach-omap2/Makefile | 115 +-
14572 .../include/plat => mach-omap2}/am33xx.h | 0
14573 arch/arm/mach-omap2/am35xx-emac.c | 2 +-
14574 arch/arm/mach-omap2/{include/mach => }/am35xx.h | 0
14575 arch/arm/mach-omap2/board-2430sdp.c | 8 +-
14576 arch/arm/mach-omap2/board-3430sdp.c | 14 +-
14577 arch/arm/mach-omap2/board-3630sdp.c | 8 +-
14578 arch/arm/mach-omap2/board-4430sdp.c | 19 +-
14579 arch/arm/mach-omap2/board-am3517crane.c | 10 -
14580 arch/arm/mach-omap2/board-am3517evm.c | 13 +-
14581 arch/arm/mach-omap2/board-apollon.c | 6 +-
14582 arch/arm/mach-omap2/board-cm-t35.c | 16 +-
14583 arch/arm/mach-omap2/board-cm-t3517.c | 13 +-
14584 arch/arm/mach-omap2/board-devkit8000.c | 13 +-
14585 arch/arm/mach-omap2/board-flash.c | 8 +-
14586 arch/arm/mach-omap2/board-generic.c | 4 +-
14587 arch/arm/mach-omap2/board-h4.c | 11 +-
14588 arch/arm/mach-omap2/board-igep0020.c | 9 +-
14589 arch/arm/mach-omap2/board-ldp.c | 11 +-
14590 arch/arm/mach-omap2/board-n8x0.c | 16 +-
14591 arch/arm/mach-omap2/board-omap3beagle.c | 7 +-
14592 arch/arm/mach-omap2/board-omap3evm.c | 29 +-
14593 arch/arm/mach-omap2/board-omap3logic.c | 18 +-
14594 arch/arm/mach-omap2/board-omap3pandora.c | 9 +-
14595 arch/arm/mach-omap2/board-omap3stalker.c | 21 +-
14596 arch/arm/mach-omap2/board-omap3touchbook.c | 9 +-
14597 arch/arm/mach-omap2/board-omap4panda.c | 19 +-
14598 arch/arm/mach-omap2/board-overo.c | 19 +-
14599 arch/arm/mach-omap2/board-rm680.c | 8 +-
14600 arch/arm/mach-omap2/board-rx51-peripherals.c | 15 +-
14601 arch/arm/mach-omap2/board-rx51-video.c | 4 +-
14602 arch/arm/mach-omap2/board-rx51.c | 4 +-
14603 .../arm/mach-omap2/{include/mach => }/board-rx51.h | 0
14604 arch/arm/mach-omap2/board-ti8168evm.c | 8 -
14605 arch/arm/mach-omap2/board-zoom-debugboard.c | 12 +-
14606 arch/arm/mach-omap2/board-zoom-display.c | 4 +-
14607 arch/arm/mach-omap2/board-zoom-peripherals.c | 6 +-
14608 arch/arm/mach-omap2/board-zoom.c | 1 -
14609 arch/arm/mach-omap2/clkt2xxx_apll.c | 2 +-
14610 arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 12 +-
14611 arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 30 +-
14612 arch/arm/mach-omap2/clkt_clksel.c | 94 +-
14613 arch/arm/mach-omap2/clkt_dpll.c | 40 +-
14614 arch/arm/mach-omap2/clock.c | 35 +-
14615 arch/arm/mach-omap2/clock2420_data.c | 26 +-
14616 arch/arm/mach-omap2/clock2430.c | 2 +-
14617 arch/arm/mach-omap2/clock2430_data.c | 26 +-
14618 arch/arm/mach-omap2/clock2xxx.c | 2 +-
14619 arch/arm/mach-omap2/clock33xx_data.c | 5 +-
14620 arch/arm/mach-omap2/clock3xxx.c | 13 +-
14621 arch/arm/mach-omap2/clock3xxx_data.c | 40 +-
14622 arch/arm/mach-omap2/clock44xx_data.c | 23 +-
14623 arch/arm/mach-omap2/clockdomain.c | 91 +-
14624 arch/arm/mach-omap2/clockdomain.h | 20 +-
14625 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 49 +-
14626 arch/arm/mach-omap2/clockdomain44xx.c | 11 +
14627 arch/arm/mach-omap2/clockdomains3xxx_data.c | 7 +-
14628 arch/arm/mach-omap2/clockdomains44xx_data.c | 3 +-
14629 arch/arm/mach-omap2/cm-regbits-33xx.h | 158 +-
14630 arch/arm/mach-omap2/cm-regbits-34xx.h | 2 +
14631 arch/arm/mach-omap2/cm-regbits-44xx.h | 411 ++-
14632 arch/arm/mach-omap2/cm2xxx_3xxx.c | 5 +-
14633 arch/arm/mach-omap2/cm2xxx_3xxx.h | 1 +
14634 arch/arm/mach-omap2/common-board-devices.c | 8 +-
14635 arch/arm/mach-omap2/common.c | 4 +-
14636 arch/arm/mach-omap2/common.h | 14 +-
14637 arch/arm/mach-omap2/control.c | 2 +-
14638 arch/arm/mach-omap2/control.h | 11 +-
14639 arch/arm/mach-omap2/cpuidle34xx.c | 1 -
14640 .../{include/mach => }/ctrl_module_core_44xx.h | 0
14641 .../{include/mach => }/ctrl_module_pad_core_44xx.h | 0
14642 .../{include/mach => }/ctrl_module_pad_wkup_44xx.h | 0
14643 .../{include/mach => }/ctrl_module_wkup_44xx.h | 0
14644 arch/arm/mach-omap2/debug-devices.h | 9 +
14645 arch/arm/mach-omap2/devices.c | 63 +-
14646 arch/arm/mach-omap2/display.c | 4 +-
14647 arch/arm/mach-omap2/dpll3xxx.c | 61 +-
14648 arch/arm/mach-omap2/dpll44xx.c | 2 +-
14649 arch/arm/mach-omap2/dsp.c | 2 +-
14650 arch/arm/mach-omap2/emu.c | 3 +-
14651 arch/arm/mach-omap2/gpio.c | 3 +
14652 arch/arm/mach-omap2/gpmc-nand.c | 34 +-
14653 arch/arm/mach-omap2/gpmc-onenand.c | 29 +-
14654 arch/arm/mach-omap2/gpmc-smc91x.c | 5 +-
14655 .../include/plat => mach-omap2}/gpmc-smc91x.h | 0
14656 arch/arm/mach-omap2/gpmc-smsc911x.c | 3 +-
14657 .../include/plat => mach-omap2}/gpmc-smsc911x.h | 0
14658 arch/arm/mach-omap2/gpmc.c | 349 +-
14659 arch/arm/mach-omap2/hdq1w.c | 2 +-
14660 .../{plat-omap/include/plat => mach-omap2}/hdq1w.h | 0
14661 arch/arm/mach-omap2/hsmmc.c | 3 +-
14662 arch/arm/mach-omap2/i2c.c | 1 -
14663 arch/arm/mach-omap2/id.c | 9 +-
14664 arch/arm/mach-omap2/{include/mach => }/id.h | 0
14665 arch/arm/mach-omap2/include/mach/gpio.h | 2 -
14666 arch/arm/mach-omap2/include/mach/hardware.h | 2 -
14667 arch/arm/mach-omap2/include/mach/irqs.h | 2 -
14668 arch/arm/mach-omap2/include/mach/smp.h | 5 -
14669 arch/arm/mach-omap2/io.c | 3 +
14670 arch/arm/mach-omap2/irq.c | 10 +-
14671 .../include/plat => mach-omap2}/l3_2xxx.h | 0
14672 .../include/plat => mach-omap2}/l3_3xxx.h | 0
14673 .../include/plat => mach-omap2}/l4_2xxx.h | 0
14674 .../include/plat => mach-omap2}/l4_3xxx.h | 0
14675 arch/arm/mach-omap2/mailbox.c | 4 +-
14676 arch/arm/mach-omap2/mcbsp.c | 4 +-
14677 arch/arm/mach-omap2/msdi.c | 1 +
14678 arch/arm/mach-omap2/omap-hotplug.c | 18 +-
14679 arch/arm/mach-omap2/omap-iommu.c | 12 +-
14680 arch/arm/mach-omap2/omap-mpuss-lowpower.c | 3 +-
14681 arch/arm/mach-omap2/omap-secure.c | 2 +-
14682 .../mach-omap2/{include/mach => }/omap-secure.h | 0
14683 arch/arm/mach-omap2/omap-smp.c | 24 +-
14684 arch/arm/mach-omap2/omap-wakeupgen.c | 13 +-
14685 .../mach-omap2/{include/mach => }/omap-wakeupgen.h | 0
14686 .../include/plat => mach-omap2}/omap24xx.h | 2 -
14687 .../include/plat => mach-omap2}/omap34xx.h | 2 -
14688 arch/arm/mach-omap2/omap4-common.c | 16 +-
14689 .../include/plat => mach-omap2}/omap4-keypad.h | 2 +
14690 .../include/plat => mach-omap2}/omap44xx.h | 2 +-
14691 .../include/plat => mach-omap2}/omap54xx.h | 0
14692 arch/arm/mach-omap2/omap_hwmod.c | 363 ++-
14693 arch/arm/mach-omap2/omap_hwmod_2420_data.c | 51 +-
14694 arch/arm/mach-omap2/omap_hwmod_2430_data.c | 99 +-
14695 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 110 +-
14696 .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 21 +-
14697 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 120 +-
14698 arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 3381 ++++++++++++++++++++
14699 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 440 ++-
14700 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 250 +-
14701 arch/arm/mach-omap2/omap_hwmod_common_data.h | 7 +-
14702 arch/arm/mach-omap2/omap_phy_internal.c | 2 +
14703 arch/arm/mach-omap2/opp.c | 15 +-
14704 arch/arm/mach-omap2/opp2420_data.c | 2 +-
14705 arch/arm/mach-omap2/opp2430_data.c | 2 +-
14706 arch/arm/mach-omap2/opp3xxx_data.c | 2 -
14707 arch/arm/mach-omap2/opp4xxx_data.c | 3 +-
14708 arch/arm/mach-omap2/pm-debug.c | 1 -
14709 arch/arm/mach-omap2/pm.c | 9 +-
14710 arch/arm/mach-omap2/pm24xx.c | 14 +-
14711 arch/arm/mach-omap2/pm34xx.c | 10 +-
14712 arch/arm/mach-omap2/pm44xx.c | 8 +-
14713 arch/arm/mach-omap2/pmu.c | 95 +
14714 arch/arm/mach-omap2/powerdomain.c | 42 +-
14715 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 4 +-
14716 arch/arm/mach-omap2/powerdomain44xx.c | 65 +-
14717 arch/arm/mach-omap2/powerdomains3xxx_data.c | 4 +-
14718 arch/arm/mach-omap2/prcm-common.h | 2 +
14719 arch/arm/mach-omap2/prcm.c | 9 +-
14720 arch/arm/mach-omap2/prm2xxx_3xxx.c | 7 +-
14721 arch/arm/mach-omap2/prm44xx.c | 5 +-
14722 arch/arm/mach-omap2/prm_common.c | 1 -
14723 arch/arm/mach-omap2/sdrc2xxx.c | 2 +-
14724 arch/arm/mach-omap2/serial.c | 14 +-
14725 arch/arm/mach-omap2/sleep24xx.S | 3 +-
14726 arch/arm/mach-omap2/sleep34xx.S | 2 +-
14727 arch/arm/mach-omap2/sleep44xx.S | 4 +-
14728 arch/arm/mach-omap2/soc.h | 7 +
14729 arch/arm/mach-omap2/sr_device.c | 13 +-
14730 arch/arm/mach-omap2/sram242x.S | 3 +-
14731 arch/arm/mach-omap2/sram243x.S | 3 +-
14732 arch/arm/mach-omap2/sram34xx.S | 3 +-
14733 .../include/plat => mach-omap2}/ti81xx.h | 0
14734 arch/arm/mach-omap2/timer.c | 114 +-
14735 arch/arm/mach-omap2/twl-common.c | 38 +-
14736 arch/arm/mach-omap2/twl-common.h | 9 +-
14737 arch/arm/mach-omap2/usb-host.c | 2 -
14738 arch/arm/mach-omap2/usb-musb.c | 7 +-
14739 arch/arm/mach-omap2/vc.c | 8 +-
14740 arch/arm/mach-omap2/voltage.c | 12 +-
14741 arch/arm/mach-omap2/voltage.h | 2 +-
14742 arch/arm/mach-omap2/voltagedomains3xxx_data.c | 3 +-
14743 arch/arm/mach-omap2/vp.c | 16 +-
14744 arch/arm/mach-orion5x/addr-map.c | 3 +-
14745 arch/arm/mach-orion5x/common.c | 18 +-
14746 arch/arm/mach-orion5x/d2net-setup.c | 1 +
14747 arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-
14748 arch/arm/mach-orion5x/dns323-setup.c | 3 +-
14749 arch/arm/mach-orion5x/include/mach/bridge-regs.h | 20 +-
14750 arch/arm/mach-orion5x/include/mach/gpio.h | 9 -
14751 arch/arm/mach-orion5x/include/mach/io.h | 22 -
14752 arch/arm/mach-orion5x/include/mach/orion5x.h | 72 +-
14753 arch/arm/mach-orion5x/irq.c | 6 +-
14754 arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +-
14755 arch/arm/mach-orion5x/net2big-setup.c | 1 +
14756 arch/arm/mach-orion5x/pci.c | 62 +-
14757 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 1 -
14758 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 1 -
14759 arch/arm/mach-orion5x/rd88f5182-setup.c | 72 +-
14760 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 -
14761 arch/arm/mach-orion5x/ts78xx-setup.c | 12 +-
14762 arch/arm/mach-picoxcell/Kconfig | 14 +
14763 arch/arm/mach-picoxcell/Makefile.boot | 1 -
14764 arch/arm/mach-picoxcell/common.c | 13 +-
14765 arch/arm/mach-picoxcell/include/mach/gpio.h | 1 -
14766 .../mach-picoxcell/include/mach/picoxcell_soc.h | 25 -
14767 arch/arm/mach-picoxcell/include/mach/timex.h | 25 -
14768 arch/arm/mach-picoxcell/include/mach/uncompress.h | 21 -
14769 arch/arm/mach-pnx4008/Makefile | 12 -
14770 arch/arm/mach-pnx4008/Makefile.boot | 4 -
14771 arch/arm/mach-pnx4008/clock.c | 1001 ------
14772 arch/arm/mach-pnx4008/clock.h | 43 -
14773 arch/arm/mach-pnx4008/core.c | 290 --
14774 arch/arm/mach-pnx4008/dma.c | 1105 -------
14775 arch/arm/mach-pnx4008/gpio.c | 328 --
14776 arch/arm/mach-pnx4008/i2c.c | 86 -
14777 arch/arm/mach-pnx4008/include/mach/clock.h | 62 -
14778 arch/arm/mach-pnx4008/include/mach/debug-macro.S | 21 -
14779 arch/arm/mach-pnx4008/include/mach/dma.h | 160 -
14780 arch/arm/mach-pnx4008/include/mach/entry-macro.S | 116 -
14781 arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h | 241 --
14782 arch/arm/mach-pnx4008/include/mach/hardware.h | 32 -
14783 arch/arm/mach-pnx4008/include/mach/irq.h | 42 -
14784 arch/arm/mach-pnx4008/include/mach/irqs.h | 215 --
14785 arch/arm/mach-pnx4008/include/mach/platform.h | 69 -
14786 arch/arm/mach-pnx4008/include/mach/pm.h | 33 -
14787 arch/arm/mach-pnx4008/include/mach/timex.h | 19 -
14788 arch/arm/mach-pnx4008/include/mach/uncompress.h | 46 -
14789 arch/arm/mach-pnx4008/irq.c | 121 -
14790 arch/arm/mach-pnx4008/pm.c | 153 -
14791 arch/arm/mach-pnx4008/serial.c | 67 -
14792 arch/arm/mach-pnx4008/sleep.S | 195 --
14793 arch/arm/mach-pnx4008/time.c | 134 -
14794 arch/arm/mach-pnx4008/time.h | 70 -
14795 arch/arm/mach-prima2/Kconfig | 19 +
14796 arch/arm/mach-prima2/Makefile | 4 +-
14797 arch/arm/mach-prima2/{prima2.c => common.c} | 11 +-
14798 arch/arm/mach-prima2/include/mach/uncompress.h | 4 +-
14799 arch/arm/mach-prima2/irq.c | 2 +-
14800 arch/arm/mach-pxa/Kconfig | 12 +
14801 arch/arm/mach-pxa/Makefile | 11 +-
14802 arch/arm/mach-pxa/am200epd.c | 2 +-
14803 arch/arm/mach-pxa/am300epd.c | 2 +-
14804 arch/arm/mach-pxa/balloon3.c | 8 +-
14805 arch/arm/mach-pxa/clock-pxa3xx.c | 8 +-
14806 arch/arm/mach-pxa/cm-x270.c | 4 +-
14807 arch/arm/mach-pxa/cm-x2xx.c | 2 +-
14808 arch/arm/mach-pxa/cm-x300.c | 10 +-
14809 arch/arm/mach-pxa/colibri-evalboard.c | 4 +-
14810 arch/arm/mach-pxa/colibri-pxa270-income.c | 6 +-
14811 arch/arm/mach-pxa/colibri-pxa300.c | 4 +-
14812 arch/arm/mach-pxa/colibri-pxa320.c | 4 +-
14813 arch/arm/mach-pxa/colibri-pxa3xx.c | 6 +-
14814 arch/arm/mach-pxa/corgi.c | 4 +-
14815 arch/arm/mach-pxa/csb726.c | 4 +-
14816 arch/arm/mach-pxa/devices.c | 31 +-
14817 arch/arm/mach-pxa/em-x270.c | 10 +-
14818 arch/arm/mach-pxa/eseries.c | 4 +-
14819 arch/arm/mach-pxa/ezx.c | 8 +-
14820 arch/arm/mach-pxa/gumstix.c | 2 +-
14821 arch/arm/mach-pxa/hx4700.c | 2 +-
14822 arch/arm/mach-pxa/idp.c | 85 +-
14823 arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 1 +
14824 arch/arm/mach-pxa/irq.c | 131 +-
14825 arch/arm/mach-pxa/leds-idp.c | 115 -
14826 arch/arm/mach-pxa/leds-lubbock.c | 124 -
14827 arch/arm/mach-pxa/leds-mainstone.c | 119 -
14828 arch/arm/mach-pxa/leds.c | 32 -
14829 arch/arm/mach-pxa/leds.h | 13 -
14830 arch/arm/mach-pxa/littleton.c | 8 +-
14831 arch/arm/mach-pxa/lpd270.c | 8 +-
14832 arch/arm/mach-pxa/lubbock.c | 101 +-
14833 arch/arm/mach-pxa/magician.c | 8 +-
14834 arch/arm/mach-pxa/mainstone.c | 104 +-
14835 arch/arm/mach-pxa/mioa701.c | 8 +-
14836 arch/arm/mach-pxa/mxm8x10.c | 8 +-
14837 arch/arm/mach-pxa/palm27x.c | 8 +-
14838 arch/arm/mach-pxa/palmld.c | 10 +-
14839 arch/arm/mach-pxa/palmt5.c | 10 +-
14840 arch/arm/mach-pxa/palmtc.c | 6 +-
14841 arch/arm/mach-pxa/palmte2.c | 8 +-
14842 arch/arm/mach-pxa/palmtreo.c | 14 +-
14843 arch/arm/mach-pxa/palmtx.c | 10 +-
14844 arch/arm/mach-pxa/palmz72.c | 12 +-
14845 arch/arm/mach-pxa/pcm990-baseboard.c | 8 +-
14846 arch/arm/mach-pxa/poodle.c | 6 +-
14847 arch/arm/mach-pxa/pxa-dt.c | 63 +
14848 arch/arm/mach-pxa/pxa27x.c | 2 +-
14849 arch/arm/mach-pxa/pxa2xx.c | 2 +-
14850 arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 +-
14851 arch/arm/mach-pxa/pxa3xx.c | 25 +-
14852 arch/arm/mach-pxa/raumfeld.c | 8 +-
14853 arch/arm/mach-pxa/saar.c | 2 +-
14854 arch/arm/mach-pxa/sharpsl_pm.c | 30 +-
14855 arch/arm/mach-pxa/spitz.c | 8 +-
14856 arch/arm/mach-pxa/stargate2.c | 2 +-
14857 arch/arm/mach-pxa/tavorevb.c | 4 +-
14858 arch/arm/mach-pxa/tosa.c | 4 +-
14859 arch/arm/mach-pxa/trizeps4.c | 8 +-
14860 arch/arm/mach-pxa/viper.c | 4 +-
14861 arch/arm/mach-pxa/vpac270.c | 8 +-
14862 arch/arm/mach-pxa/z2.c | 6 +-
14863 arch/arm/mach-pxa/zeus.c | 8 +-
14864 arch/arm/mach-pxa/zylonite.c | 10 +-
14865 arch/arm/mach-realview/core.c | 39 -
14866 arch/arm/mach-realview/core.h | 5 +-
14867 arch/arm/mach-realview/hotplug.c | 18 +-
14868 arch/arm/mach-realview/include/mach/gpio.h | 1 -
14869 arch/arm/mach-realview/platsmp.c | 18 +-
14870 arch/arm/mach-realview/realview_eb.c | 5 -
14871 arch/arm/mach-realview/realview_pb1176.c | 5 -
14872 arch/arm/mach-realview/realview_pb11mp.c | 6 +-
14873 arch/arm/mach-realview/realview_pba8.c | 5 -
14874 arch/arm/mach-realview/realview_pbx.c | 6 +-
14875 arch/arm/mach-s3c24xx/clock-s3c2440.c | 14 +
14876 arch/arm/mach-s3c24xx/common-smdk.c | 4 +-
14877 arch/arm/mach-s3c24xx/h1940-bluetooth.c | 14 +-
14878 arch/arm/mach-s3c24xx/mach-amlm5900.c | 2 +-
14879 arch/arm/mach-s3c24xx/mach-anubis.c | 9 +-
14880 arch/arm/mach-s3c24xx/mach-at2440evb.c | 6 +-
14881 arch/arm/mach-s3c24xx/mach-bast.c | 8 +-
14882 arch/arm/mach-s3c24xx/mach-gta02.c | 10 +-
14883 arch/arm/mach-s3c24xx/mach-h1940.c | 12 +-
14884 arch/arm/mach-s3c24xx/mach-jive.c | 18 +-
14885 arch/arm/mach-s3c24xx/mach-mini2440.c | 14 +-
14886 arch/arm/mach-s3c24xx/mach-n30.c | 8 +-
14887 arch/arm/mach-s3c24xx/mach-nexcoder.c | 24 +-
14888 arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 13 +-
14889 arch/arm/mach-s3c24xx/mach-osiris.c | 11 +-
14890 arch/arm/mach-s3c24xx/mach-otom.c | 2 +-
14891 arch/arm/mach-s3c24xx/mach-qt2410.c | 8 +-
14892 arch/arm/mach-s3c24xx/mach-rx1950.c | 10 +-
14893 arch/arm/mach-s3c24xx/mach-rx3715.c | 2 +-
14894 arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 +-
14895 arch/arm/mach-s3c24xx/mach-smdk2413.c | 4 +-
14896 arch/arm/mach-s3c24xx/mach-smdk2416.c | 8 +-
14897 arch/arm/mach-s3c24xx/mach-smdk2440.c | 2 +-
14898 arch/arm/mach-s3c24xx/mach-smdk2443.c | 2 +-
14899 arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 +-
14900 arch/arm/mach-s3c24xx/mach-vr1000.c | 6 +-
14901 arch/arm/mach-s3c24xx/mach-vstms.c | 4 +-
14902 arch/arm/mach-s3c24xx/setup-i2c.c | 2 +-
14903 arch/arm/mach-s3c24xx/simtec-audio.c | 2 +-
14904 arch/arm/mach-s3c24xx/simtec-usb.c | 2 +-
14905 arch/arm/mach-s3c64xx/dev-audio.c | 2 +-
14906 arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
14907 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 38 +-
14908 arch/arm/mach-s3c64xx/mach-crag6410.c | 16 +-
14909 arch/arm/mach-s3c64xx/mach-hmt.c | 4 +-
14910 arch/arm/mach-s3c64xx/mach-mini6410.c | 4 +-
14911 arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
14912 arch/arm/mach-s3c64xx/mach-real6410.c | 4 +-
14913 arch/arm/mach-s3c64xx/mach-smartq.c | 8 +-
14914 arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
14915 arch/arm/mach-s3c64xx/mach-smdk6410.c | 6 +-
14916 arch/arm/mach-s3c64xx/setup-i2c0.c | 2 +-
14917 arch/arm/mach-s3c64xx/setup-i2c1.c | 2 +-
14918 arch/arm/mach-s3c64xx/setup-ide.c | 2 +-
14919 arch/arm/mach-s5p64x0/dev-audio.c | 2 +-
14920 arch/arm/mach-s5p64x0/mach-smdk6440.c | 4 +-
14921 arch/arm/mach-s5p64x0/mach-smdk6450.c | 4 +-
14922 arch/arm/mach-s5p64x0/setup-i2c0.c | 2 +-
14923 arch/arm/mach-s5p64x0/setup-i2c1.c | 2 +-
14924 arch/arm/mach-s5pc100/dev-audio.c | 2 +-
14925 arch/arm/mach-s5pc100/mach-smdkc100.c | 8 +-
14926 arch/arm/mach-s5pc100/setup-i2c0.c | 2 +-
14927 arch/arm/mach-s5pc100/setup-i2c1.c | 2 +-
14928 arch/arm/mach-s5pv210/dev-audio.c | 2 +-
14929 arch/arm/mach-s5pv210/mach-goni.c | 2 +-
14930 arch/arm/mach-s5pv210/mach-smdkc110.c | 4 +-
14931 arch/arm/mach-s5pv210/mach-smdkv210.c | 6 +-
14932 arch/arm/mach-s5pv210/mach-torbreck.c | 2 +-
14933 arch/arm/mach-s5pv210/setup-i2c0.c | 2 +-
14934 arch/arm/mach-s5pv210/setup-i2c1.c | 2 +-
14935 arch/arm/mach-s5pv210/setup-i2c2.c | 2 +-
14936 arch/arm/mach-sa1100/Makefile | 9 -
14937 arch/arm/mach-sa1100/assabet.c | 87 +-
14938 arch/arm/mach-sa1100/badge4.c | 30 +
14939 arch/arm/mach-sa1100/cerf.c | 44 +-
14940 arch/arm/mach-sa1100/collie.c | 2 +-
14941 arch/arm/mach-sa1100/hackkit.c | 32 +
14942 arch/arm/mach-sa1100/include/mach/simpad.h | 2 +-
14943 arch/arm/mach-sa1100/lart.c | 28 +-
14944 arch/arm/mach-sa1100/leds-assabet.c | 113 -
14945 arch/arm/mach-sa1100/leds-badge4.c | 110 -
14946 arch/arm/mach-sa1100/leds-cerf.c | 110 -
14947 arch/arm/mach-sa1100/leds-hackkit.c | 112 -
14948 arch/arm/mach-sa1100/leds-lart.c | 101 -
14949 arch/arm/mach-sa1100/leds.c | 50 -
14950 arch/arm/mach-sa1100/leds.h | 13 -
14951 arch/arm/mach-sa1100/shannon.c | 2 +-
14952 arch/arm/mach-sa1100/simpad.c | 4 +-
14953 arch/arm/mach-shark/Makefile | 4 +-
14954 arch/arm/mach-shark/core.c | 19 -
14955 arch/arm/mach-shark/include/mach/debug-macro.S | 7 +-
14956 arch/arm/mach-shark/include/mach/entry-macro.S | 3 +-
14957 arch/arm/mach-shark/include/mach/io.h | 18 -
14958 arch/arm/mach-shark/leds.c | 220 +-
14959 arch/arm/mach-shark/pci.c | 5 +
14960 arch/arm/mach-shmobile/board-ag5evm.c | 2 +-
14961 arch/arm/mach-shmobile/board-ap4evb.c | 14 +-
14962 arch/arm/mach-shmobile/board-armadillo800eva.c | 33 +-
14963 arch/arm/mach-shmobile/board-bonito.c | 8 +-
14964 arch/arm/mach-shmobile/board-g3evm.c | 12 +-
14965 arch/arm/mach-shmobile/board-g4evm.c | 32 +-
14966 arch/arm/mach-shmobile/board-kota2.c | 1 +
14967 arch/arm/mach-shmobile/board-kzm9d.c | 1 +
14968 arch/arm/mach-shmobile/board-kzm9g.c | 17 +-
14969 arch/arm/mach-shmobile/board-mackerel.c | 24 +-
14970 arch/arm/mach-shmobile/board-marzen.c | 69 +-
14971 arch/arm/mach-shmobile/clock-r8a7740.c | 46 +-
14972 arch/arm/mach-shmobile/clock-r8a7779.c | 11 +-
14973 arch/arm/mach-shmobile/clock-sh7367.c | 44 +-
14974 arch/arm/mach-shmobile/clock-sh7372.c | 60 +-
14975 arch/arm/mach-shmobile/clock-sh7377.c | 50 +-
14976 arch/arm/mach-shmobile/clock-sh73a0.c | 70 +-
14977 arch/arm/mach-shmobile/hotplug.c | 31 +-
14978 arch/arm/mach-shmobile/include/mach/common.h | 24 +-
14979 arch/arm/mach-shmobile/include/mach/emev2.h | 7 +-
14980 arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 +
14981 arch/arm/mach-shmobile/include/mach/sh73a0.h | 2 +
14982 arch/arm/mach-shmobile/intc-r8a7779.c | 14 +-
14983 arch/arm/mach-shmobile/intc-sh7372.c | 27 +-
14984 arch/arm/mach-shmobile/intc-sh73a0.c | 20 +-
14985 arch/arm/mach-shmobile/pfc-r8a7740.c | 2 +-
14986 arch/arm/mach-shmobile/pfc-r8a7779.c | 2 +-
14987 arch/arm/mach-shmobile/pfc-sh7367.c | 2 +-
14988 arch/arm/mach-shmobile/pfc-sh7372.c | 2 +-
14989 arch/arm/mach-shmobile/pfc-sh7377.c | 2 +-
14990 arch/arm/mach-shmobile/pfc-sh73a0.c | 2 +-
14991 arch/arm/mach-shmobile/platsmp.c | 96 +-
14992 arch/arm/mach-shmobile/pm-rmobile.c | 6 +-
14993 arch/arm/mach-shmobile/pm-sh7372.c | 57 +-
14994 arch/arm/mach-shmobile/setup-emev2.c | 22 +
14995 arch/arm/mach-shmobile/setup-sh7367.c | 2 +-
14996 arch/arm/mach-shmobile/setup-sh7377.c | 2 +-
14997 arch/arm/mach-shmobile/setup-sh73a0.c | 23 +-
14998 .../{include/mach/gpio.h => sh-gpio.h} | 20 +-
14999 arch/arm/mach-shmobile/smp-emev2.c | 47 +-
15000 arch/arm/mach-shmobile/smp-r8a7779.c | 48 +-
15001 arch/arm/mach-shmobile/smp-sh73a0.c | 48 +-
15002 arch/arm/mach-socfpga/Kconfig | 16 +
15003 arch/arm/mach-socfpga/Makefile.boot | 1 -
15004 arch/arm/mach-socfpga/include/mach/uncompress.h | 9 -
15005 arch/arm/mach-spear13xx/Makefile.boot | 3 -
15006 arch/arm/mach-spear13xx/hotplug.c | 22 +-
15007 arch/arm/mach-spear13xx/include/mach/generic.h | 3 +
15008 arch/arm/mach-spear13xx/include/mach/gpio.h | 19 -
15009 arch/arm/mach-spear13xx/include/mach/spear.h | 14 +-
15010 arch/arm/mach-spear13xx/platsmp.c | 25 +-
15011 arch/arm/mach-spear13xx/spear1310.c | 1 +
15012 arch/arm/mach-spear13xx/spear1340.c | 1 +
15013 arch/arm/mach-spear13xx/spear13xx.c | 6 +-
15014 arch/arm/mach-spear3xx/Makefile.boot | 4 -
15015 arch/arm/mach-spear3xx/include/mach/gpio.h | 19 -
15016 arch/arm/mach-spear6xx/Makefile.boot | 2 -
15017 arch/arm/mach-spear6xx/include/mach/gpio.h | 19 -
15018 arch/arm/mach-tegra/Kconfig | 27 -
15019 arch/arm/mach-tegra/Makefile | 20 +-
15020 arch/arm/mach-tegra/Makefile.boot | 8 -
15021 arch/arm/mach-tegra/apbio.c | 122 +-
15022 arch/arm/mach-tegra/board-dt-tegra20.c | 53 +-
15023 arch/arm/mach-tegra/board-dt-tegra30.c | 2 +
15024 arch/arm/mach-tegra/board-harmony-pcie.c | 49 +-
15025 arch/arm/mach-tegra/board-harmony-pinmux.c | 156 -
15026 arch/arm/mach-tegra/board-harmony-power.c | 156 -
15027 arch/arm/mach-tegra/board-harmony.c | 197 --
15028 arch/arm/mach-tegra/board-harmony.h | 41 -
15029 arch/arm/mach-tegra/board-paz00-pinmux.c | 156 -
15030 arch/arm/mach-tegra/board-paz00.c | 192 --
15031 arch/arm/mach-tegra/board-paz00.h | 17 +-
15032 arch/arm/mach-tegra/board-pinmux.c | 87 -
15033 arch/arm/mach-tegra/board-pinmux.h | 54 -
15034 arch/arm/mach-tegra/board-trimslice-pinmux.c | 155 -
15035 arch/arm/mach-tegra/board-trimslice.c | 183 --
15036 arch/arm/mach-tegra/board-trimslice.h | 30 -
15037 arch/arm/mach-tegra/clock.c | 574 +---
15038 arch/arm/mach-tegra/clock.h | 40 +-
15039 arch/arm/mach-tegra/common.c | 5 +-
15040 arch/arm/mach-tegra/common.h | 4 +
15041 arch/arm/mach-tegra/cpu-tegra.c | 48 +-
15042 arch/arm/mach-tegra/devices.c | 701 ----
15043 arch/arm/mach-tegra/devices.h | 60 -
15044 arch/arm/mach-tegra/dma.c | 823 -----
15045 arch/arm/mach-tegra/fuse.c | 4 +-
15046 arch/arm/mach-tegra/headsmp.S | 6 +-
15047 arch/arm/mach-tegra/hotplug.c | 127 +-
15048 arch/arm/mach-tegra/include/mach/clk.h | 3 +
15049 arch/arm/mach-tegra/include/mach/dma.h | 97 -
15050 arch/arm/mach-tegra/include/mach/gpio.h | 1 -
15051 arch/arm/mach-tegra/include/mach/io.h | 46 -
15052 arch/arm/mach-tegra/include/mach/iomap.h | 3 +
15053 arch/arm/mach-tegra/include/mach/pinconf-tegra.h | 63 -
15054 arch/arm/mach-tegra/include/mach/suspend.h | 38 -
15055 arch/arm/mach-tegra/pcie.c | 95 +-
15056 arch/arm/mach-tegra/platsmp.c | 52 +-
15057 arch/arm/mach-tegra/powergate.c | 43 +-
15058 arch/arm/mach-tegra/sleep-t20.S | 82 +
15059 arch/arm/mach-tegra/sleep-t30.S | 107 +
15060 arch/arm/mach-tegra/sleep.S | 33 +-
15061 arch/arm/mach-tegra/sleep.h | 85 +
15062 arch/arm/mach-tegra/tegra20_clocks.c | 1624 ++++++++++
15063 arch/arm/mach-tegra/tegra20_clocks.h | 42 +
15064 arch/arm/mach-tegra/tegra20_clocks_data.c | 1139 +++++++
15065 arch/arm/mach-tegra/tegra2_clocks.c | 2484 --------------
15066 arch/arm/mach-tegra/tegra30_clocks.c | 2593 ++++++---------
15067 arch/arm/mach-tegra/tegra30_clocks.h | 53 +
15068 arch/arm/mach-tegra/tegra30_clocks_data.c | 1377 ++++++++
15069 arch/arm/mach-tegra/tegra_cpu_car.h | 87 +
15070 arch/arm/mach-tegra/timer.c | 1 -
15071 arch/arm/mach-u300/Kconfig | 43 +-
15072 arch/arm/mach-u300/Makefile | 1 -
15073 arch/arm/mach-u300/core.c | 100 +-
15074 .../mach-u300/{include/mach => }/dma_channels.h | 11 +-
15075 arch/arm/mach-u300/i2c.c | 6 +-
15076 arch/arm/mach-u300/include/mach/clkdev.h | 7 -
15077 arch/arm/mach-u300/include/mach/gpio.h | 1 -
15078 arch/arm/mach-u300/include/mach/irqs.h | 36 +-
15079 arch/arm/mach-u300/include/mach/platform.h | 20 -
15080 arch/arm/mach-u300/include/mach/syscon.h | 32 +-
15081 arch/arm/mach-u300/include/mach/u300-regs.h | 19 +-
15082 arch/arm/mach-u300/spi.c | 2 +-
15083 arch/arm/mach-u300/timer.c | 5 +-
15084 arch/arm/mach-u300/timer.h | 1 +
15085 arch/arm/mach-u300/u300-gpio.h | 46 +-
15086 arch/arm/mach-u300/u300.c | 57 -
15087 arch/arm/mach-ux500/Kconfig | 1 +
15088 arch/arm/mach-ux500/Makefile | 2 +-
15089 arch/arm/mach-ux500/Makefile.boot | 2 -
15090 .../{board-mop500-msp.c => board-mop500-audio.c} | 27 +-
15091 arch/arm/mach-ux500/board-mop500-msp.h | 14 -
15092 arch/arm/mach-ux500/board-mop500-regulators.c | 15 +
15093 arch/arm/mach-ux500/board-mop500-regulators.h | 1 +
15094 arch/arm/mach-ux500/board-mop500-sdi.c | 4 +-
15095 arch/arm/mach-ux500/board-mop500.c | 64 +-
15096 arch/arm/mach-ux500/board-mop500.h | 11 +
15097 arch/arm/mach-ux500/cache-l2x0.c | 2 +-
15098 arch/arm/mach-ux500/cpu-db8500.c | 15 +-
15099 arch/arm/mach-ux500/cpu.c | 4 +-
15100 arch/arm/mach-ux500/devices-common.h | 2 +-
15101 arch/arm/mach-ux500/hotplug.c | 36 +-
15102 arch/arm/mach-ux500/include/mach/gpio.h | 5 -
15103 arch/arm/mach-ux500/include/mach/id.h | 44 +-
15104 arch/arm/mach-ux500/include/mach/setup.h | 3 +
15105 arch/arm/mach-ux500/include/mach/uncompress.h | 4 +-
15106 arch/arm/mach-ux500/platsmp.c | 28 +-
15107 arch/arm/mach-ux500/timer.c | 2 +-
15108 arch/arm/mach-ux500/usb.c | 2 +-
15109 arch/arm/mach-versatile/core.c | 10 -
15110 arch/arm/mach-versatile/include/mach/gpio.h | 1 -
15111 arch/arm/mach-versatile/include/mach/hardware.h | 1 -
15112 arch/arm/mach-versatile/pci.c | 22 +-
15113 arch/arm/mach-vexpress/Kconfig | 64 +-
15114 arch/arm/mach-vexpress/Makefile | 2 +
15115 arch/arm/mach-vexpress/Makefile.boot | 10 -
15116 arch/arm/mach-vexpress/core.h | 4 +
15117 arch/arm/mach-vexpress/ct-ca9x4.c | 1 +
15118 arch/arm/mach-vexpress/hotplug.c | 18 +-
15119 arch/arm/mach-vexpress/include/mach/gpio.h | 1 -
15120 arch/arm/mach-vexpress/include/mach/irqs.h | 2 +
15121 arch/arm/mach-vexpress/include/mach/timex.h | 23 -
15122 arch/arm/mach-vexpress/include/mach/uncompress.h | 86 -
15123 arch/arm/mach-vexpress/platsmp.c | 18 +-
15124 arch/arm/mach-vexpress/v2m.c | 8 +-
15125 arch/arm/mach-vt8500/Kconfig | 73 -
15126 arch/arm/mach-vt8500/Makefile | 8 +-
15127 arch/arm/mach-vt8500/bv07.c | 81 -
15128 .../mach/gpio-tegra.h => mach-vt8500/common.h} | 22 +-
15129 arch/arm/mach-vt8500/devices-vt8500.c | 96 -
15130 arch/arm/mach-vt8500/devices-wm8505.c | 103 -
15131 arch/arm/mach-vt8500/devices.c | 281 --
15132 arch/arm/mach-vt8500/devices.h | 89 -
15133 arch/arm/mach-vt8500/gpio.c | 240 --
15134 arch/arm/mach-vt8500/include/mach/gpio.h | 1 -
15135 arch/arm/mach-vt8500/include/mach/restart.h | 4 +-
15136 arch/arm/mach-vt8500/include/mach/vt8500_irqs.h | 88 -
15137 arch/arm/mach-vt8500/include/mach/vt8500_regs.h | 79 -
15138 arch/arm/mach-vt8500/include/mach/wm8505_irqs.h | 115 -
15139 arch/arm/mach-vt8500/include/mach/wm8505_regs.h | 78 -
15140 arch/arm/mach-vt8500/irq.c | 209 +-
15141 arch/arm/mach-vt8500/restart.c | 54 -
15142 arch/arm/mach-vt8500/timer.c | 67 +-
15143 arch/arm/mach-vt8500/vt8500.c | 195 ++
15144 arch/arm/mach-vt8500/wm8505_7in.c | 80 -
15145 arch/arm/mach-w90x900/dev.c | 6 +-
15146 arch/arm/mach-w90x900/mach-nuc950evb.c | 2 +-
15147 arch/arm/mm/cache-l2x0.c | 2 +-
15148 arch/arm/mm/cache-tauros2.c | 83 +-
15149 arch/arm/mm/ioremap.c | 14 +
15150 arch/arm/mm/mmu.c | 54 +-
15151 arch/arm/plat-iop/pci.c | 25 +-
15152 arch/arm/plat-iop/setup.c | 5 -
15153 arch/arm/plat-mxc/Makefile | 2 +-
15154 arch/arm/plat-mxc/clock.c | 257 --
15155 arch/arm/plat-mxc/cpufreq.c | 1 -
15156 arch/arm/plat-mxc/devices/platform-imx-uart.c | 2 +-
15157 .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 2 +-
15158 arch/arm/plat-mxc/include/mach/clock.h | 70 -
15159 arch/arm/plat-mxc/include/mach/common.h | 10 +-
15160 arch/arm/plat-mxc/include/mach/devices-common.h | 32 +-
15161 arch/arm/plat-mxc/include/mach/gpio.h | 1 -
15162 arch/arm/plat-mxc/include/mach/iomux-mx3.h | 5 +
15163 arch/arm/plat-mxc/include/mach/iomux-mx53.h | 1219 -------
15164 arch/arm/plat-mxc/include/mach/mx31.h | 6 +-
15165 arch/arm/plat-mxc/ssi-fiq-ksym.c | 2 +-
15166 arch/arm/plat-mxc/ssi-fiq.S | 89 +-
15167 arch/arm/plat-mxc/system.c | 4 -
15168 arch/arm/plat-omap/Kconfig | 4 +-
15169 arch/arm/plat-omap/Makefile | 3 +-
15170 arch/arm/plat-omap/clock.c | 27 -
15171 arch/arm/plat-omap/common.c | 42 +-
15172 arch/arm/plat-omap/counter_32k.c | 3 -
15173 arch/arm/plat-omap/debug-devices.c | 3 -
15174 arch/arm/plat-omap/debug-leds.c | 294 +-
15175 arch/arm/plat-omap/devices.c | 92 -
15176 arch/arm/plat-omap/dma.c | 54 +-
15177 arch/arm/plat-omap/fb.c | 2 -
15178 arch/arm/plat-omap/i2c.c | 4 +-
15179 arch/arm/plat-omap/include/plat/board.h | 138 -
15180 arch/arm/plat-omap/include/plat/clock.h | 5 +
15181 arch/arm/plat-omap/include/plat/cpu.h | 3 +
15182 arch/arm/plat-omap/include/plat/dma.h | 2 +
15183 arch/arm/plat-omap/include/plat/dmtimer.h | 1 +
15184 arch/arm/plat-omap/include/plat/gpio-switch.h | 54 -
15185 arch/arm/plat-omap/include/plat/gpmc.h | 19 +
15186 arch/arm/plat-omap/include/plat/hardware.h | 293 --
15187 arch/arm/plat-omap/include/plat/iommu.h | 15 +
15188 arch/arm/plat-omap/include/plat/irqs-44xx.h | 144 -
15189 arch/arm/plat-omap/include/plat/irqs.h | 453 ---
15190 arch/arm/plat-omap/include/plat/mmc.h | 1 -
15191 arch/arm/plat-omap/include/plat/omap-serial.h | 4 +-
15192 arch/arm/plat-omap/include/plat/omap_device.h | 6 +
15193 arch/arm/plat-omap/include/plat/omap_hwmod.h | 28 +-
15194 arch/arm/plat-omap/include/plat/param.h | 8 -
15195 arch/arm/plat-omap/include/plat/usb.h | 1 -
15196 arch/arm/plat-omap/mux.c | 90 -
15197 arch/arm/plat-omap/omap-pm-noop.c | 39 +-
15198 arch/arm/plat-omap/omap_device.c | 219 +-
15199 arch/arm/plat-omap/sram.c | 1 -
15200 arch/arm/plat-orion/Makefile | 10 +-
15201 arch/arm/plat-orion/addr-map.c | 11 +-
15202 arch/arm/plat-orion/common.c | 16 +-
15203 arch/arm/plat-orion/gpio.c | 2 +-
15204 arch/arm/plat-orion/include/plat/addr-map.h | 4 +-
15205 arch/arm/plat-orion/include/plat/common.h | 8 +-
15206 arch/arm/plat-orion/include/plat/mpp.h | 2 +-
15207 .../include/plat/{gpio.h => orion-gpio.h} | 2 +-
15208 arch/arm/plat-orion/include/plat/time.h | 4 +-
15209 arch/arm/plat-orion/irq.c | 2 +-
15210 arch/arm/plat-orion/mpp.c | 7 +-
15211 arch/arm/plat-orion/time.c | 8 +-
15212 arch/arm/plat-samsung/clock.c | 8 +-
15213 arch/arm/plat-samsung/devs.c | 25 +-
15214 arch/arm/plat-samsung/include/plat/gpio-fns.h | 97 -
15215 arch/arm/plat-samsung/s5p-irq-gpioint.c | 4 +-
15216 arch/arm/plat-samsung/time.c | 1 -
15217 arch/arm/plat-spear/include/plat/gpio.h | 1 -
15218 arch/arm/plat-versatile/Kconfig | 4 +-
15219 arch/arm/plat-versatile/Makefile | 2 +
15220 arch/arm/plat-versatile/include/plat/platsmp.h | 14 +
15221 arch/arm/plat-versatile/leds.c | 8 +-
15222 arch/arm/plat-versatile/platsmp.c | 10 +-
15223 arch/arm/tools/mach-types | 2 -
15224 arch/powerpc/platforms/83xx/suspend.c | 2 +-
15225 arch/powerpc/platforms/cell/celleb_pci.c | 2 +-
15226 arch/powerpc/sysdev/fsl_msi.c | 8 +-
15227 drivers/Kconfig | 4 +
15228 drivers/Makefile | 3 +
15229 drivers/ata/pata_ep93xx.c | 2 +-
15230 drivers/ata/pata_pxa.c | 2 +-
15231 drivers/ata/pata_samsung_cf.c | 2 +-
15232 drivers/bus/Kconfig | 21 +
15233 drivers/bus/Makefile | 8 +
15234 drivers/bus/omap-ocp2scp.c | 88 +
15235 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.c | 4 +-
15236 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.h | 0
15237 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.c | 0
15238 {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.h | 0
15239 drivers/char/hw_random/omap-rng.c | 121 +-
15240 drivers/char/nwflash.c | 34 -
15241 drivers/clk/Makefile | 2 +
15242 drivers/clk/clk-bcm2835.c | 59 +
15243 drivers/clk/clk-vt8500.c | 510 +++
15244 drivers/clk/mxs/clk-imx23.c | 57 +-
15245 drivers/clk/mxs/clk-imx28.c | 115 +-
15246 drivers/clocksource/Makefile | 1 +
15247 drivers/clocksource/bcm2835_timer.c | 161 +
15248 drivers/crypto/mv_cesa.c | 17 +-
15249 drivers/crypto/ux500/cryp/cryp_core.c | 2 +-
15250 drivers/crypto/ux500/hash/hash_core.c | 2 +-
15251 drivers/dma/at_hdmac_regs.h | 2 +-
15252 drivers/dma/ep93xx_dma.c | 2 +-
15253 drivers/dma/imx-dma.c | 2 +-
15254 drivers/dma/imx-sdma.c | 4 +-
15255 drivers/dma/mmp_tdma.c | 2 +-
15256 drivers/dma/mv_xor.c | 2 +-
15257 drivers/dma/omap-dma.c | 2 +
15258 drivers/dma/tegra20-apb-dma.c | 8 +-
15259 drivers/gpio/Kconfig | 12 +
15260 drivers/gpio/Makefile | 2 +
15261 drivers/gpio/gpio-mpc8xxx.c | 2 +-
15262 drivers/gpio/gpio-mvebu.c | 679 ++++
15263 drivers/gpio/gpio-mxs.c | 48 +-
15264 drivers/gpio/gpio-omap.c | 23 +-
15265 drivers/gpio/gpio-pxa.c | 77 +-
15266 drivers/gpio/gpio-samsung.c | 124 +-
15267 drivers/gpio/gpio-tegra.c | 3 -
15268 drivers/gpio/gpio-twl4030.c | 90 +-
15269 drivers/gpio/gpio-vt8500.c | 316 ++
15270 drivers/hwmon/gpio-fan.c | 120 +
15271 drivers/hwmon/s3c-hwmon.c | 2 +-
15272 drivers/i2c/busses/Kconfig | 2 +-
15273 drivers/i2c/busses/i2c-davinci.c | 2 +-
15274 drivers/i2c/busses/i2c-imx.c | 2 +-
15275 drivers/i2c/busses/i2c-iop3xx.c | 121 +-
15276 drivers/i2c/busses/i2c-mpc.c | 12 +-
15277 drivers/i2c/busses/i2c-nuc900.c | 2 +-
15278 drivers/i2c/busses/i2c-omap.c | 3 +-
15279 drivers/i2c/busses/i2c-s3c2410.c | 2 +-
15280 drivers/i2c/busses/i2c-tegra.c | 130 +-
15281 drivers/input/keyboard/Kconfig | 2 +-
15282 drivers/input/keyboard/davinci_keyscan.c | 2 +-
15283 drivers/input/keyboard/ep93xx_keypad.c | 2 +-
15284 drivers/input/keyboard/nomadik-ske-keypad.c | 2 +-
15285 drivers/input/keyboard/omap-keypad.c | 156 +-
15286 drivers/input/keyboard/pxa27x_keypad.c | 2 +-
15287 drivers/input/keyboard/pxa930_rotary.c | 2 +-
15288 drivers/input/keyboard/spear-keyboard.c | 2 +-
15289 drivers/input/keyboard/w90p910_keypad.c | 2 +-
15290 drivers/input/mouse/pxa930_trkball.c | 2 +-
15291 drivers/input/mouse/rpcmouse.c | 2 +-
15292 drivers/input/serio/ams_delta_serio.c | 2 +-
15293 drivers/input/touchscreen/s3c2410_ts.c | 2 +-
15294 drivers/irqchip/Kconfig | 1 +
15295 drivers/irqchip/Makefile | 1 +
15296 drivers/irqchip/irq-bcm2835.c | 223 ++
15297 drivers/leds/Kconfig | 10 +
15298 drivers/leds/Makefile | 1 +
15299 drivers/leds/leds-netxbig.c | 2 +-
15300 drivers/leds/leds-ns2.c | 2 +-
15301 drivers/leds/leds-s3c24xx.c | 2 +-
15302 drivers/leds/ledtrig-cpu.c | 163 +
15303 drivers/macintosh/mediabay.c | 8 +-
15304 drivers/media/platform/davinci/vpbe_venc.c | 2 +-
15305 drivers/media/platform/omap/omap_vout.c | 1 +
15306 drivers/media/platform/omap3isp/isp.c | 2 +
15307 drivers/media/platform/s5p-fimc/mipi-csis.c | 2 +-
15308 drivers/media/platform/soc_camera/mx1_camera.c | 2 +-
15309 drivers/media/platform/soc_camera/mx2_camera.c | 2 +-
15310 drivers/media/platform/soc_camera/mx3_camera.c | 4 +-
15311 drivers/media/platform/soc_camera/pxa_camera.c | 2 +-
15312 drivers/mfd/da9052-i2c.c | 4 +-
15313 drivers/mfd/mcp-sa11x0.c | 2 +-
15314 drivers/mfd/twl-core.c | 54 +-
15315 drivers/mmc/host/davinci_mmc.c | 2 +-
15316 drivers/mmc/host/msm_sdcc.c | 2 +-
15317 drivers/mmc/host/mvsdio.c | 2 +-
15318 drivers/mmc/host/mxcmmc.c | 4 +-
15319 drivers/mmc/host/omap_hsmmc.c | 3 +-
15320 drivers/mmc/host/pxamci.c | 2 +-
15321 drivers/mmc/host/s3cmci.c | 2 +-
15322 drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
15323 drivers/mmc/host/sdhci-tegra.c | 3 +-
15324 drivers/mtd/nand/ams-delta.c | 10 +-
15325 drivers/mtd/nand/davinci_nand.c | 4 +-
15326 drivers/mtd/nand/mxc_nand.c | 2 +-
15327 drivers/mtd/nand/nomadik_nand.c | 2 +-
15328 drivers/mtd/nand/omap2.c | 303 +-
15329 drivers/mtd/nand/orion_nand.c | 2 +-
15330 drivers/mtd/nand/pxa3xx_nand.c | 89 +-
15331 drivers/mtd/nand/s3c2410.c | 2 +-
15332 drivers/mtd/onenand/omap2.c | 34 +-
15333 drivers/net/can/mscan/mpc5xxx_can.c | 4 +-
15334 drivers/net/ethernet/netx-eth.c | 2 +-
15335 drivers/net/ethernet/seeq/ether3.c | 4 +-
15336 drivers/net/irda/pxaficp_ir.c | 30 +-
15337 drivers/pcmcia/omap_cf.c | 2 +-
15338 drivers/pcmcia/pxa2xx_base.c | 2 +-
15339 drivers/pcmcia/pxa2xx_viper.c | 2 +-
15340 drivers/pinctrl/Kconfig | 31 +
15341 drivers/pinctrl/Makefile | 7 +
15342 drivers/pinctrl/pinctrl-armada-370.c | 421 +++
15343 drivers/pinctrl/pinctrl-armada-xp.c | 468 +++
15344 drivers/pinctrl/pinctrl-coh901.c | 220 +-
15345 drivers/pinctrl/pinctrl-dove.c | 620 ++++
15346 drivers/pinctrl/pinctrl-exynos.c | 579 ++++
15347 drivers/pinctrl/pinctrl-exynos.h | 218 ++
15348 drivers/pinctrl/pinctrl-kirkwood.c | 472 +++
15349 drivers/pinctrl/pinctrl-mvebu.c | 754 +++++
15350 drivers/pinctrl/pinctrl-mvebu.h | 192 ++
15351 drivers/pinctrl/pinctrl-samsung.c | 888 +++++
15352 drivers/pinctrl/pinctrl-samsung.h | 239 ++
15353 drivers/pinctrl/pinctrl-sirf.c | 58 +-
15354 drivers/pinctrl/pinctrl-tegra.c | 2 -
15355 drivers/pinctrl/pinctrl-tegra.h | 44 +
15356 drivers/power/avs/smartreflex.c | 2 +
15357 drivers/remoteproc/omap_remoteproc.c | 2 +-
15358 drivers/rtc/rtc-ab8500.c | 6 -
15359 drivers/rtc/rtc-pxa.c | 11 +
15360 drivers/rtc/rtc-vt8500.c | 9 +-
15361 drivers/scsi/arm/eesox.c | 2 +-
15362 drivers/sh/pfc/gpio.c | 1 +
15363 drivers/spi/spi-davinci.c | 2 +-
15364 drivers/spi/spi-ep93xx.c | 4 +-
15365 drivers/spi/spi-imx.c | 4 +-
15366 drivers/spi/spi-nuc900.c | 2 +-
15367 drivers/spi/spi-omap-100k.c | 2 -
15368 drivers/spi/spi-omap-uwire.c | 5 +-
15369 drivers/spi/spi-omap2-mcspi.c | 5 +-
15370 drivers/spi/spi-s3c64xx.c | 2 +-
15371 .../staging/ste_rmi4/board-mop500-u8500uib-rmi4.c | 1 -
15372 drivers/staging/tidspbridge/core/dsp-clock.c | 2 +-
15373 drivers/staging/tidspbridge/core/tiomap3430.c | 2 +-
15374 drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 2 +-
15375 drivers/staging/tidspbridge/core/tiomap_io.c | 2 +-
15376 drivers/staging/tidspbridge/core/wdt.c | 2 +-
15377 drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 +-
15378 drivers/tty/serial/imx.c | 2 +-
15379 drivers/tty/serial/mpc52xx_uart.c | 2 +-
15380 drivers/tty/serial/serial_ks8695.c | 4 +-
15381 drivers/tty/serial/vt8500_serial.c | 58 +-
15382 drivers/usb/Kconfig | 1 -
15383 drivers/usb/gadget/imx_udc.c | 2 +-
15384 drivers/usb/gadget/pxa27x_udc.c | 2 +-
15385 drivers/usb/gadget/s3c2410_udc.c | 2 +-
15386 drivers/usb/host/Kconfig | 2 +-
15387 drivers/usb/host/ehci-mxc.c | 2 +-
15388 drivers/usb/host/ehci-orion.c | 2 +-
15389 drivers/usb/host/ehci-s5p.c | 2 +-
15390 drivers/usb/host/imx21-hcd.h | 2 +-
15391 drivers/usb/host/ohci-da8xx.c | 2 +-
15392 drivers/usb/host/ohci-exynos.c | 2 +-
15393 drivers/usb/host/ohci-hcd.c | 2 +-
15394 drivers/usb/host/ohci-nxp.c | 84 +-
15395 drivers/usb/host/ohci-omap.c | 2 +-
15396 drivers/usb/host/ohci-pxa27x.c | 4 +-
15397 drivers/usb/host/ohci-s3c2410.c | 2 +-
15398 drivers/usb/musb/da8xx.c | 2 +-
15399 drivers/usb/musb/tusb6010_omap.c | 1 -
15400 drivers/usb/musb/ux500_dma.c | 2 +-
15401 drivers/usb/otg/isp1301_omap.c | 2 +-
15402 drivers/usb/phy/tegra_usb_phy.c | 1 -
15403 drivers/video/Kconfig | 18 +-
15404 drivers/video/Makefile | 1 -
15405 drivers/video/backlight/omap1_bl.c | 4 +-
15406 drivers/video/da8xx-fb.c | 8 +-
15407 drivers/video/ep93xx-fb.c | 2 +-
15408 drivers/video/epson1355fb.c | 749 -----
15409 drivers/video/imxfb.c | 2 +-
15410 drivers/video/msm/mddi.c | 2 +-
15411 drivers/video/msm/mddi_client_dummy.c | 2 +-
15412 drivers/video/msm/mddi_client_nt35399.c | 2 +-
15413 drivers/video/msm/mddi_client_toshiba.c | 2 +-
15414 drivers/video/msm/mdp.c | 2 +-
15415 drivers/video/msm/mdp_hw.h | 2 +-
15416 drivers/video/msm/mdp_ppp.c | 2 +-
15417 drivers/video/msm/msm_fb.c | 2 +-
15418 drivers/video/mx3fb.c | 4 +-
15419 drivers/video/nuc900fb.c | 2 +-
15420 drivers/video/nuc900fb.h | 2 +-
15421 drivers/video/omap/lcd_ams_delta.c | 2 +-
15422 drivers/video/omap/lcd_mipid.c | 2 +-
15423 drivers/video/omap/lcd_osk.c | 2 +-
15424 drivers/video/omap2/dss/dispc.c | 2 +
15425 drivers/video/omap2/omapfb/omapfb-main.c | 1 +
15426 drivers/video/pxafb.c | 2 +-
15427 drivers/video/vt8500lcdfb.c | 81 +-
15428 drivers/video/wm8505fb.c | 99 +-
15429 drivers/video/wmt_ge_rops.c | 9 +-
15430 drivers/watchdog/Kconfig | 6 +-
15431 drivers/watchdog/ks8695_wdt.c | 14 +-
15432 drivers/watchdog/mpc8xxx_wdt.c | 2 +-
15433 drivers/watchdog/omap_wdt.c | 5 +
15434 include/linux/atmel_tc.h | 2 +-
15435 .../hardware.h => include/linux/bcm2835_timer.h | 13 +-
15436 .../mach/timex.h => include/linux/clk/bcm2835.h | 9 +-
15437 include/linux/i2c/twl.h | 3 -
15438 .../mach/io.h => include/linux/irqchip/bcm2835.h | 16 +-
15439 include/linux/leds.h | 16 +
15440 include/linux/mfd/twl6040.h | 1 -
15441 include/linux/mod_devicetable.h | 2 +-
15442 include/linux/of_irq.h | 5 +
15443 include/linux/omapfb.h | 7 +-
15444 .../linux/platform_data/asoc-imx-ssi.h | 0
15445 .../linux/platform_data/asoc-kirkwood.h | 0
15446 .../linux/platform_data/asoc-palm27x.h | 0
15447 .../linux/platform_data/asoc-s3c.h | 0
15448 .../linux/platform_data/asoc-s3c24xx_simtec.h | 0
15449 .../linux/platform_data/asoc-ti-mcbsp.h | 0
15450 .../linux/platform_data/ata-pxa.h | 0
15451 .../linux/platform_data/ata-samsung_cf.h | 0
15452 include/linux/platform_data/atmel-aes.h | 2 +-
15453 .../linux/platform_data/camera-mx1.h | 0
15454 .../linux/platform_data/camera-mx2.h | 2 -
15455 .../linux/platform_data/camera-mx3.h | 0
15456 .../linux/platform_data/camera-pxa.h | 0
15457 .../linux/platform_data}/crypto-ux500.h | 0
15458 .../linux/platform_data/dma-atmel.h | 0
15459 .../linux/platform_data/dma-ep93xx.h | 0
15460 .../linux/platform_data/dma-imx-sdma.h | 0
15461 .../dma.h => include/linux/platform_data/dma-imx.h | 0
15462 .../linux/platform_data/dma-mmp_tdma.h | 0
15463 .../linux/platform_data/dma-mv_xor.h | 0
15464 .../linux/platform_data/dsp-omap.h | 0
15465 .../linux/platform_data/eth-netx.h | 0
15466 .../linux/platform_data/gpio-omap.h | 15 +-
15467 .../linux/platform_data/hwmon-s3c.h | 0
15468 .../linux/platform_data/i2c-davinci.h | 0
15469 .../i2c.h => include/linux/platform_data/i2c-imx.h | 0
15470 .../linux/platform_data/i2c-nuc900.h | 0
15471 .../linux/platform_data/i2c-s3c2410.h | 0
15472 .../linux/platform_data/irda-pxaficp.h | 0
15473 .../linux/platform_data/keyboard-pxa930_rotary.h | 0
15474 .../linux/platform_data/keyboard-spear.h | 0
15475 .../linux/platform_data/keypad-ep93xx.h | 0
15476 .../linux/platform_data/keypad-nomadik-ske.h | 0
15477 .../linux/platform_data/keypad-omap.h | 0
15478 .../linux/platform_data/keypad-pxa27x.h | 0
15479 .../linux/platform_data/keypad-w90p910.h | 0
15480 .../linux/platform_data/keyscan-davinci.h | 0
15481 .../linux/platform_data/lcd-mipid.h | 0
15482 .../linux/platform_data/leds-kirkwood-netxbig.h | 0
15483 .../linux/platform_data/leds-kirkwood-ns2.h | 0
15484 .../linux/platform_data/leds-s3c24xx.h | 0
15485 .../linux/platform_data/mfd-mcp-sa11x0.h | 0
15486 .../linux/platform_data/mipi-csis.h | 0
15487 .../linux/platform_data/mmc-davinci.h | 0
15488 .../linux/platform_data/mmc-esdhc-imx.h | 0
15489 .../linux/platform_data/mmc-msm_sdcc.h | 0
15490 .../linux/platform_data/mmc-mvsdio.h | 0
15491 .../linux/platform_data/mmc-mxcmmc.h | 0
15492 .../linux/platform_data/mmc-pxamci.h | 0
15493 .../linux/platform_data/mmc-s3cmci.h | 0
15494 .../linux/platform_data/mmc-sdhci-tegra.h | 6 +-
15495 .../linux/platform_data/mouse-pxa930_trkball.h | 0
15496 .../linux/platform_data/mtd-davinci-aemif.h | 0
15497 .../linux/platform_data/mtd-davinci.h | 0
15498 .../linux/platform_data/mtd-mxc_nand.h | 0
15499 .../linux/platform_data/mtd-nand-omap2.h | 3 +-
15500 .../linux/platform_data/mtd-nand-pxa3xx.h | 0
15501 .../linux/platform_data/mtd-nand-s3c2410.h | 0
15502 .../linux/platform_data/mtd-nomadik-nand.h | 0
15503 .../linux/platform_data/mtd-onenand-omap2.h | 0
15504 .../linux/platform_data/mtd-orion_nand.h | 0
15505 include/linux/platform_data/omap1_bl.h | 11 +
15506 .../linux/platform_data/pcmcia-pxa2xx_viper.h | 0
15507 .../linux/platform_data/pinctrl-coh901.h | 13 +-
15508 .../linux/platform_data/remoteproc-omap.h | 0
15509 .../linux/platform_data/serial-imx.h | 0
15510 .../linux/platform_data/spi-davinci.h | 0
15511 .../linux/platform_data/spi-ep93xx.h | 0
15512 .../spi.h => include/linux/platform_data/spi-imx.h | 0
15513 .../linux/platform_data/spi-nuc900.h | 0
15514 .../linux/platform_data/spi-omap2-mcspi.h | 0
15515 .../linux/platform_data/spi-s3c64xx.h | 0
15516 .../linux/platform_data/touchscreen-s3c2410.h | 0
15517 .../linux/platform_data/usb-davinci.h | 0
15518 .../linux/platform_data/usb-ehci-mxc.h | 0
15519 .../linux/platform_data/usb-ehci-orion.h | 0
15520 .../linux/platform_data/usb-ehci-s5p.h | 0
15521 .../linux/platform_data/usb-exynos.h | 0
15522 .../linux/platform_data/usb-imx_udc.h | 0
15523 .../linux/platform_data/usb-musb-ux500.h | 0
15524 .../linux/platform_data/usb-mx2.h | 0
15525 .../linux/platform_data/usb-ohci-pxa27x.h | 0
15526 .../linux/platform_data/usb-ohci-s3c2410.h | 0
15527 .../linux/platform_data/usb-pxa3xx-ulpi.h | 0
15528 .../linux/platform_data/usb-s3c2410_udc.h | 0
15529 .../linux/platform_data/video-ep93xx.h | 0
15530 .../linux/platform_data/video-imxfb.h | 0
15531 .../linux/platform_data/video-msm_fb.h | 0
15532 .../linux/platform_data/video-mx3fb.h | 0
15533 .../linux/platform_data/video-nuc900fb.h | 0
15534 .../linux/platform_data/video-pxafb.h | 0
15535 .../linux/platform_data/video-vt8500lcdfb.h | 0
15536 .../linux/platform_data/voltage-omap.h | 0
15537 include/linux/power/smartreflex.h | 2 +-
15538 include/video/epson1355.h | 64 -
15539 sound/soc/cirrus/ep93xx-ac97.c | 2 +-
15540 sound/soc/cirrus/ep93xx-i2s.c | 2 +-
15541 sound/soc/cirrus/ep93xx-pcm.c | 2 +-
15542 sound/soc/fsl/imx-pcm-dma.c | 2 +-
15543 sound/soc/fsl/imx-pcm-fiq.c | 2 +-
15544 sound/soc/fsl/imx-ssi.c | 2 +-
15545 sound/soc/fsl/imx-ssi.h | 2 +-
15546 sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
15547 sound/soc/kirkwood/kirkwood-openrd.c | 2 +-
15548 sound/soc/kirkwood/kirkwood-t5325.c | 2 +-
15549 sound/soc/omap/am3517evm.c | 2 +-
15550 sound/soc/omap/ams-delta.c | 4 +-
15551 sound/soc/omap/mcbsp.c | 4 +-
15552 sound/soc/omap/n810.c | 2 +-
15553 sound/soc/omap/omap-abe-twl6040.c | 4 -
15554 sound/soc/omap/omap-mcbsp.c | 3 +-
15555 sound/soc/omap/omap-mcpdm.c | 2 +
15556 sound/soc/omap/omap-pcm.c | 1 +
15557 sound/soc/omap/omap3pandora.c | 2 +-
15558 sound/soc/omap/osk5912.c | 2 +-
15559 sound/soc/omap/rx51.c | 2 +-
15560 sound/soc/omap/sdp3430.c | 3 +-
15561 sound/soc/omap/zoom2.c | 2 +-
15562 sound/soc/pxa/palm27x.c | 2 +-
15563 sound/soc/samsung/ac97.c | 2 +-
15564 sound/soc/samsung/i2s.c | 2 +-
15565 sound/soc/samsung/pcm.c | 2 +-
15566 sound/soc/samsung/s3c24xx_simtec.c | 2 +-
15567 sound/soc/samsung/spdif.c | 2 +-
15568 sound/soc/tegra/Kconfig | 2 +-
15569 sound/soc/tegra/tegra_pcm.c | 232 --
15570 sound/soc/tegra/tegra_pcm.h | 14 -
15571 1723 files changed, 41908 insertions(+), 54913 deletions(-)
15572 create mode 100644 Documentation/arm/Marvell/README
15573 create mode 100644 Documentation/devicetree/bindings/arm/bcm2835.txt
15574 create mode 100644 Documentation/devicetree/bindings/arm/mrvl/tauros2.txt
15575 create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
15576 create mode 100644 Documentation/devicetree/bindings/arm/vt8500.txt
15577 create mode 100644 Documentation/devicetree/bindings/arm/vt8500/via,vt8500-intc.txt
15578 create mode 100644 Documentation/devicetree/bindings/arm/vt8500/via,vt8500-pmc.txt
15579 create mode 100644 Documentation/devicetree/bindings/arm/vt8500/via,vt8500-timer.txt
15580 create mode 100644 Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
15581 create mode 100644 Documentation/devicetree/bindings/clock/imx23-clock.txt
15582 create mode 100644 Documentation/devicetree/bindings/clock/imx28-clock.txt
15583 create mode 100644 Documentation/devicetree/bindings/clock/imx6q-clock.txt
15584 create mode 100644 Documentation/devicetree/bindings/clock/vt8500.txt
15585 create mode 100644 Documentation/devicetree/bindings/crypto/mv_cesa.txt
15586 create mode 100644 Documentation/devicetree/bindings/dma/mmp-dma.txt
15587 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-fan.txt
15588 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
15589 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-vt8500.txt
15590 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
15591 create mode 100644 Documentation/devicetree/bindings/lpddr2/lpddr2-timings.txt
15592 create mode 100644 Documentation/devicetree/bindings/lpddr2/lpddr2.txt
15593 create mode 100644 Documentation/devicetree/bindings/media/exynos5-gsc.txt
15594 create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
15595 create mode 100644 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt
15596 create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
15597 create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
15598 create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt
15599 create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt
15600 create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt
15601 create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
15602 create mode 100644 Documentation/devicetree/bindings/rtc/pxa-rtc.txt
15603 create mode 100644 Documentation/devicetree/bindings/rtc/via,vt8500-rtc.txt
15604 create mode 100644 Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt
15605 create mode 100644 Documentation/devicetree/bindings/tty/serial/via,vt8500-uart.txt
15606 create mode 100644 Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt
15607 create mode 100644 Documentation/devicetree/bindings/video/via,vt8500-fb.txt
15608 create mode 100644 Documentation/devicetree/bindings/video/wm,prizm-ge-rops.txt
15609 create mode 100644 Documentation/devicetree/bindings/video/wm,wm8505-fb.txt
15610 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
15611 create mode 100644 arch/arm/boot/dts/Makefile
15612 create mode 100644 arch/arm/boot/dts/armada-xp-mv78230.dtsi
15613 create mode 100644 arch/arm/boot/dts/armada-xp-mv78260.dtsi
15614 create mode 100644 arch/arm/boot/dts/armada-xp-mv78460.dtsi
15615 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b.dts
15616 create mode 100644 arch/arm/boot/dts/bcm2835.dtsi
15617 rename arch/arm/boot/dts/{db8500.dtsi => dbx5x0.dtsi} (88%)
15618 create mode 100644 arch/arm/boot/dts/dove-cm-a510.dts
15619 create mode 100644 arch/arm/boot/dts/dove-cubox.dts
15620 create mode 100644 arch/arm/boot/dts/dove-dove-db.dts
15621 create mode 100644 arch/arm/boot/dts/dove.dtsi
15622 create mode 100644 arch/arm/boot/dts/elpida_ecb240abacn.dtsi
15623 create mode 100644 arch/arm/boot/dts/exynos4.dtsi
15624 create mode 100644 arch/arm/boot/dts/exynos4210-pinctrl.dtsi
15625 create mode 100644 arch/arm/boot/dts/exynos4210-trats.dts
15626 create mode 100644 arch/arm/boot/dts/hrefv60plus.dts
15627 create mode 100644 arch/arm/boot/dts/imx28-cfa10049.dts
15628 create mode 100644 arch/arm/boot/dts/kirkwood-dockstar.dts
15629 create mode 100644 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
15630 create mode 100644 arch/arm/boot/dts/kirkwood-km_kirkwood.dts
15631 create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
15632 create mode 100644 arch/arm/boot/dts/omap2420.dtsi
15633 create mode 100644 arch/arm/boot/dts/omap2430.dtsi
15634 rename arch/arm/boot/dts/{omap3-beagle.dts => omap3-beagle-xm.dts} (52%)
15635 create mode 100644 arch/arm/boot/dts/omap3-overo.dtsi
15636 create mode 100644 arch/arm/boot/dts/omap3-tobi.dts
15637 create mode 100644 arch/arm/boot/dts/omap36xx.dtsi
15638 delete mode 100644 arch/arm/boot/dts/prima2-cb.dts
15639 create mode 100644 arch/arm/boot/dts/prima2-evb.dts
15640 create mode 100644 arch/arm/boot/dts/prima2.dtsi
15641 create mode 100644 arch/arm/boot/dts/pxa27x.dtsi
15642 create mode 100644 arch/arm/boot/dts/pxa2xx.dtsi
15643 create mode 100644 arch/arm/boot/dts/pxa3xx.dtsi
15644 create mode 100644 arch/arm/boot/dts/tegra20-medcom-wide.dts
15645 create mode 100644 arch/arm/boot/dts/tegra20-plutux.dts
15646 create mode 100644 arch/arm/boot/dts/tegra20-tamonten.dtsi
15647 create mode 100644 arch/arm/boot/dts/tegra20-tec.dts
15648 create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a02.dts
15649 create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a04.dts
15650 delete mode 100644 arch/arm/boot/dts/tegra30-cardhu.dts
15651 create mode 100644 arch/arm/boot/dts/tegra30-cardhu.dtsi
15652 create mode 100644 arch/arm/boot/dts/tps65217.dtsi
15653 create mode 100644 arch/arm/boot/dts/tps65910.dtsi
15654 create mode 100644 arch/arm/boot/dts/vt8500-bv07.dts
15655 create mode 100644 arch/arm/boot/dts/vt8500.dtsi
15656 create mode 100644 arch/arm/boot/dts/wm8505-ref.dts
15657 create mode 100644 arch/arm/boot/dts/wm8505.dtsi
15658 create mode 100644 arch/arm/boot/dts/wm8650-mid.dts
15659 create mode 100644 arch/arm/boot/dts/wm8650.dtsi
15660 create mode 100644 arch/arm/configs/bcm2835_defconfig
15661 delete mode 100644 arch/arm/configs/bcmring_defconfig
15662 create mode 100644 arch/arm/configs/multi_v7_defconfig
15663 delete mode 100644 arch/arm/configs/pnx4008_defconfig
15664 delete mode 100644 arch/arm/include/asm/leds.h
15665 rename arch/arm/{mach-highbank/include/mach/debug-macro.S => include/debug/highbank.S} (83%)
15666 create mode 100644 arch/arm/include/debug/icedcc.S
15667 rename arch/arm/{mach-mvebu/include/mach/debug-macro.S => include/debug/mvebu.S} (86%)
15668 rename arch/arm/{mach-picoxcell/include/mach/debug-macro.S => include/debug/picoxcell.S} (89%)
15669 rename arch/arm/{mach-socfpga/include/mach/debug-macro.S => include/debug/socfpga.S} (100%)
15670 rename arch/arm/{mach-vexpress/include/mach/debug-macro.S => include/debug/vexpress.S} (100%)
15671 delete mode 100644 arch/arm/kernel/leds.c
15672 create mode 100644 arch/arm/mach-bcm2835/Makefile
15673 create mode 100644 arch/arm/mach-bcm2835/Makefile.boot
15674 create mode 100644 arch/arm/mach-bcm2835/bcm2835.c
15675 rename arch/arm/{mach-picoxcell/include/mach/map.h => mach-bcm2835/include/mach/bcm2835_soc.h} (57%)
15676 create mode 100644 arch/arm/mach-bcm2835/include/mach/debug-macro.S
15677 rename arch/arm/{mach-pnx4008/include/mach/param.h => mach-bcm2835/include/mach/timex.h} (81%)
15678 create mode 100644 arch/arm/mach-bcm2835/include/mach/uncompress.h
15679 delete mode 100644 arch/arm/mach-bcmring/Kconfig
15680 delete mode 100644 arch/arm/mach-bcmring/Makefile
15681 delete mode 100644 arch/arm/mach-bcmring/Makefile.boot
15682 delete mode 100644 arch/arm/mach-bcmring/arch.c
15683 delete mode 100644 arch/arm/mach-bcmring/clock.c
15684 delete mode 100644 arch/arm/mach-bcmring/clock.h
15685 delete mode 100644 arch/arm/mach-bcmring/core.c
15686 delete mode 100644 arch/arm/mach-bcmring/core.h
15687 delete mode 100644 arch/arm/mach-bcmring/csp/Makefile
15688 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/Makefile
15689 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw.c
15690 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c
15691 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c
15692 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c
15693 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/Makefile
15694 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw.c
15695 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
15696 delete mode 100644 arch/arm/mach-bcmring/csp/tmr/Makefile
15697 delete mode 100644 arch/arm/mach-bcmring/csp/tmr/tmrHw.c
15698 delete mode 100644 arch/arm/mach-bcmring/dma.c
15699 delete mode 100644 arch/arm/mach-bcmring/dma_device.c
15700 delete mode 100644 arch/arm/mach-bcmring/include/cfg_global.h
15701 delete mode 100644 arch/arm/mach-bcmring/include/cfg_global_defines.h
15702 delete mode 100644 arch/arm/mach-bcmring/include/csp/cache.h
15703 delete mode 100644 arch/arm/mach-bcmring/include/csp/delay.h
15704 delete mode 100644 arch/arm/mach-bcmring/include/csp/dmacHw.h
15705 delete mode 100644 arch/arm/mach-bcmring/include/csp/errno.h
15706 delete mode 100644 arch/arm/mach-bcmring/include/csp/intcHw.h
15707 delete mode 100644 arch/arm/mach-bcmring/include/csp/module.h
15708 delete mode 100644 arch/arm/mach-bcmring/include/csp/reg.h
15709 delete mode 100644 arch/arm/mach-bcmring/include/csp/secHw.h
15710 delete mode 100644 arch/arm/mach-bcmring/include/csp/stdint.h
15711 delete mode 100644 arch/arm/mach-bcmring/include/csp/string.h
15712 delete mode 100644 arch/arm/mach-bcmring/include/csp/tmrHw.h
15713 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap.h
15714 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap_inline.h
15715 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h
15716 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h
15717 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h
15718 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h
15719 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h
15720 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h
15721 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h
15722 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h
15723 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h
15724 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_io.h
15725 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h
15726 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h
15727 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h
15728 delete mode 100644 arch/arm/mach-bcmring/include/mach/dma.h
15729 delete mode 100644 arch/arm/mach-bcmring/include/mach/entry-macro.S
15730 delete mode 100644 arch/arm/mach-bcmring/include/mach/hardware.h
15731 delete mode 100644 arch/arm/mach-bcmring/include/mach/irqs.h
15732 delete mode 100644 arch/arm/mach-bcmring/include/mach/memory_settings.h
15733 delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_nand.h
15734 delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_umi.h
15735 delete mode 100644 arch/arm/mach-bcmring/include/mach/timer.h
15736 delete mode 100644 arch/arm/mach-bcmring/include/mach/timex.h
15737 delete mode 100644 arch/arm/mach-bcmring/include/mach/uncompress.h
15738 delete mode 100644 arch/arm/mach-bcmring/irq.c
15739 delete mode 100644 arch/arm/mach-bcmring/mm.c
15740 delete mode 100644 arch/arm/mach-bcmring/timer.c
15741 delete mode 100644 arch/arm/mach-clps711x/ceiva.c
15742 delete mode 100644 arch/arm/mach-clps711x/p720t-leds.c
15743 delete mode 100644 arch/arm/mach-dove/include/mach/gpio.h
15744 delete mode 100644 arch/arm/mach-dove/include/mach/io.h
15745 rename arch/arm/mach-ep93xx/{include/mach => }/ts72xx.h (89%)
15746 delete mode 100644 arch/arm/mach-footbridge/ebsa285-leds.c
15747 delete mode 100644 arch/arm/mach-footbridge/netwinder-leds.c
15748 create mode 100644 arch/arm/mach-highbank/Kconfig
15749 delete mode 100644 arch/arm/mach-highbank/Makefile.boot
15750 delete mode 100644 arch/arm/mach-highbank/include/mach/gpio.h
15751 delete mode 100644 arch/arm/mach-highbank/include/mach/timex.h
15752 delete mode 100644 arch/arm/mach-highbank/include/mach/uncompress.h
15753 create mode 100644 arch/arm/mach-imx/clk.c
15754 delete mode 100644 arch/arm/mach-imx/devices-imx53.h
15755 delete mode 100644 arch/arm/mach-imx/efika.h
15756 rename arch/arm/mach-imx/{imx53-dt.c => mach-imx53.c} (81%)
15757 delete mode 100644 arch/arm/mach-imx/mach-mx51_efikamx.c
15758 delete mode 100644 arch/arm/mach-imx/mach-mx51_efikasb.c
15759 delete mode 100644 arch/arm/mach-imx/mach-mx53_ard.c
15760 delete mode 100644 arch/arm/mach-imx/mach-mx53_evk.c
15761 delete mode 100644 arch/arm/mach-imx/mach-mx53_loco.c
15762 delete mode 100644 arch/arm/mach-imx/mach-mx53_smd.c
15763 delete mode 100644 arch/arm/mach-imx/mx51_efika.c
15764 delete mode 100644 arch/arm/mach-integrator/include/mach/io.h
15765 delete mode 100644 arch/arm/mach-iop13xx/include/mach/io.h
15766 delete mode 100644 arch/arm/mach-iop32x/include/mach/io.h
15767 delete mode 100644 arch/arm/mach-iop33x/include/mach/io.h
15768 delete mode 100644 arch/arm/mach-ixp4xx/include/mach/gpio.h
15769 create mode 100644 arch/arm/mach-kirkwood/board-dockstar.c
15770 create mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c
15771 create mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c
15772 delete mode 100644 arch/arm/mach-kirkwood/include/mach/gpio.h
15773 delete mode 100644 arch/arm/mach-kirkwood/include/mach/io.h
15774 create mode 100644 arch/arm/mach-ks8695/board-og.c
15775 create mode 100644 arch/arm/mach-ks8695/board-sg.c
15776 delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-timer.h
15777 delete mode 100644 arch/arm/mach-ks8695/leds.c
15778 create mode 100644 arch/arm/mach-mmp/clock-mmp2.c
15779 create mode 100644 arch/arm/mach-mmp/clock-pxa168.c
15780 create mode 100644 arch/arm/mach-mmp/clock-pxa910.c
15781 delete mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
15782 delete mode 100644 arch/arm/mach-msm/acpuclock.h
15783 create mode 100644 arch/arm/mach-msm/board-dt-8660.c
15784 create mode 100644 arch/arm/mach-msm/board-dt-8960.c
15785 delete mode 100644 arch/arm/mach-msm/board-msm7x27.c
15786 delete mode 100644 arch/arm/mach-msm/board-msm8960.c
15787 delete mode 100644 arch/arm/mach-msm/board-msm8x60.c
15788 create mode 100644 arch/arm/mach-msm/common.h
15789 create mode 100644 arch/arm/mach-msm/core.h
15790 delete mode 100644 arch/arm/mach-msm/devices-msm8960.c
15791 delete mode 100644 arch/arm/mach-msm/idle.c
15792 delete mode 100644 arch/arm/mach-msm/include/mach/gpio.h
15793 delete mode 100644 arch/arm/mach-msm/include/mach/system.h
15794 delete mode 100644 arch/arm/mach-mv78xx0/include/mach/io.h
15795 delete mode 100644 arch/arm/mach-mvebu/Makefile.boot
15796 create mode 100644 arch/arm/mach-mvebu/addr-map.c
15797 rename arch/arm/mach-mvebu/{include/mach => }/armada-370-xp.h (91%)
15798 rename arch/arm/{mach-ep93xx => mach-mvebu}/include/mach/gpio.h (100%)
15799 delete mode 100644 arch/arm/mach-mvebu/include/mach/timex.h
15800 delete mode 100644 arch/arm/mach-mvebu/include/mach/uncompress.h
15801 delete mode 100644 arch/arm/mach-mxs/devices-mx23.h
15802 delete mode 100644 arch/arm/mach-mxs/devices-mx28.h
15803 delete mode 100644 arch/arm/mach-mxs/devices.c
15804 delete mode 100644 arch/arm/mach-mxs/devices/Kconfig
15805 delete mode 100644 arch/arm/mach-mxs/devices/Makefile
15806 delete mode 100644 arch/arm/mach-mxs/devices/platform-auart.c
15807 delete mode 100644 arch/arm/mach-mxs/devices/platform-dma.c
15808 delete mode 100644 arch/arm/mach-mxs/devices/platform-fec.c
15809 delete mode 100644 arch/arm/mach-mxs/devices/platform-flexcan.c
15810 delete mode 100644 arch/arm/mach-mxs/devices/platform-gpio-mxs.c
15811 delete mode 100644 arch/arm/mach-mxs/devices/platform-gpmi-nand.c
15812 delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-i2c.c
15813 delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-mmc.c
15814 delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-pwm.c
15815 delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
15816 delete mode 100644 arch/arm/mach-mxs/devices/platform-mxsfb.c
15817 delete mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
15818 delete mode 100644 arch/arm/mach-mxs/include/mach/devices-common.h
15819 delete mode 100644 arch/arm/mach-mxs/include/mach/entry-macro.S
15820 delete mode 100644 arch/arm/mach-mxs/include/mach/gpio.h
15821 delete mode 100644 arch/arm/mach-mxs/include/mach/iomux-mx23.h
15822 delete mode 100644 arch/arm/mach-mxs/include/mach/iomux-mx28.h
15823 delete mode 100644 arch/arm/mach-mxs/include/mach/iomux.h
15824 delete mode 100644 arch/arm/mach-mxs/include/mach/irqs.h
15825 delete mode 100644 arch/arm/mach-mxs/iomux.c
15826 delete mode 100644 arch/arm/mach-mxs/mach-apx4devkit.c
15827 delete mode 100644 arch/arm/mach-mxs/mach-m28evk.c
15828 delete mode 100644 arch/arm/mach-mxs/mach-mx23evk.c
15829 delete mode 100644 arch/arm/mach-mxs/mach-mx28evk.c
15830 delete mode 100644 arch/arm/mach-mxs/mach-stmp378x_devb.c
15831 delete mode 100644 arch/arm/mach-mxs/mach-tx28.c
15832 delete mode 100644 arch/arm/mach-mxs/module-tx28.c
15833 delete mode 100644 arch/arm/mach-mxs/module-tx28.h
15834 delete mode 100644 arch/arm/mach-nomadik/include/mach/gpio.h
15835 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-ams-delta.h (100%)
15836 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-sx1.h (100%)
15837 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-voiceblue.h (100%)
15838 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/flash.h (100%)
15839 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/irda.h (100%)
15840 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/mux.h (100%)
15841 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap1510.h (97%)
15842 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap16xx.h (99%)
15843 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap7xx.h (98%)
15844 delete mode 100644 arch/arm/mach-omap1/include/mach/smp.h
15845 delete mode 100644 arch/arm/mach-omap1/leds-h2p2-debug.c
15846 delete mode 100644 arch/arm/mach-omap1/leds-innovator.c
15847 delete mode 100644 arch/arm/mach-omap1/leds-osk.c
15848 delete mode 100644 arch/arm/mach-omap1/leds.c
15849 delete mode 100644 arch/arm/mach-omap1/leds.h
15850 rename arch/arm/{plat-omap/include/plat => mach-omap2}/am33xx.h (100%)
15851 rename arch/arm/mach-omap2/{include/mach => }/am35xx.h (100%)
15852 rename arch/arm/mach-omap2/{include/mach => }/board-rx51.h (100%)
15853 rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_core_44xx.h (100%)
15854 rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_pad_core_44xx.h (100%)
15855 rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_pad_wkup_44xx.h (100%)
15856 rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_wkup_44xx.h (100%)
15857 create mode 100644 arch/arm/mach-omap2/debug-devices.h
15858 rename arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc-smc91x.h (100%)
15859 rename arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc-smsc911x.h (100%)
15860 rename arch/arm/{plat-omap/include/plat => mach-omap2}/hdq1w.h (100%)
15861 rename arch/arm/mach-omap2/{include/mach => }/id.h (100%)
15862 delete mode 100644 arch/arm/mach-omap2/include/mach/smp.h
15863 rename arch/arm/{plat-omap/include/plat => mach-omap2}/l3_2xxx.h (100%)
15864 rename arch/arm/{plat-omap/include/plat => mach-omap2}/l3_3xxx.h (100%)
15865 rename arch/arm/{plat-omap/include/plat => mach-omap2}/l4_2xxx.h (100%)
15866 rename arch/arm/{plat-omap/include/plat => mach-omap2}/l4_3xxx.h (100%)
15867 rename arch/arm/mach-omap2/{include/mach => }/omap-secure.h (100%)
15868 rename arch/arm/mach-omap2/{include/mach => }/omap-wakeupgen.h (100%)
15869 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap24xx.h (98%)
15870 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap34xx.h (98%)
15871 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap4-keypad.h (87%)
15872 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap44xx.h (97%)
15873 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap54xx.h (100%)
15874 create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_data.c
15875 create mode 100644 arch/arm/mach-omap2/pmu.c
15876 create mode 100644 arch/arm/mach-omap2/soc.h
15877 rename arch/arm/{plat-omap/include/plat => mach-omap2}/ti81xx.h (100%)
15878 delete mode 100644 arch/arm/mach-orion5x/include/mach/gpio.h
15879 delete mode 100644 arch/arm/mach-orion5x/include/mach/io.h
15880 create mode 100644 arch/arm/mach-picoxcell/Kconfig
15881 delete mode 100644 arch/arm/mach-picoxcell/Makefile.boot
15882 delete mode 100644 arch/arm/mach-picoxcell/include/mach/gpio.h
15883 delete mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h
15884 delete mode 100644 arch/arm/mach-picoxcell/include/mach/timex.h
15885 delete mode 100644 arch/arm/mach-picoxcell/include/mach/uncompress.h
15886 delete mode 100644 arch/arm/mach-pnx4008/Makefile
15887 delete mode 100644 arch/arm/mach-pnx4008/Makefile.boot
15888 delete mode 100644 arch/arm/mach-pnx4008/clock.c
15889 delete mode 100644 arch/arm/mach-pnx4008/clock.h
15890 delete mode 100644 arch/arm/mach-pnx4008/core.c
15891 delete mode 100644 arch/arm/mach-pnx4008/dma.c
15892 delete mode 100644 arch/arm/mach-pnx4008/gpio.c
15893 delete mode 100644 arch/arm/mach-pnx4008/i2c.c
15894 delete mode 100644 arch/arm/mach-pnx4008/include/mach/clock.h
15895 delete mode 100644 arch/arm/mach-pnx4008/include/mach/debug-macro.S
15896 delete mode 100644 arch/arm/mach-pnx4008/include/mach/dma.h
15897 delete mode 100644 arch/arm/mach-pnx4008/include/mach/entry-macro.S
15898 delete mode 100644 arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
15899 delete mode 100644 arch/arm/mach-pnx4008/include/mach/hardware.h
15900 delete mode 100644 arch/arm/mach-pnx4008/include/mach/irq.h
15901 delete mode 100644 arch/arm/mach-pnx4008/include/mach/irqs.h
15902 delete mode 100644 arch/arm/mach-pnx4008/include/mach/platform.h
15903 delete mode 100644 arch/arm/mach-pnx4008/include/mach/pm.h
15904 delete mode 100644 arch/arm/mach-pnx4008/include/mach/timex.h
15905 delete mode 100644 arch/arm/mach-pnx4008/include/mach/uncompress.h
15906 delete mode 100644 arch/arm/mach-pnx4008/irq.c
15907 delete mode 100644 arch/arm/mach-pnx4008/pm.c
15908 delete mode 100644 arch/arm/mach-pnx4008/serial.c
15909 delete mode 100644 arch/arm/mach-pnx4008/sleep.S
15910 delete mode 100644 arch/arm/mach-pnx4008/time.c
15911 delete mode 100644 arch/arm/mach-pnx4008/time.h
15912 create mode 100644 arch/arm/mach-prima2/Kconfig
15913 rename arch/arm/mach-prima2/{prima2.c => common.c} (81%)
15914 delete mode 100644 arch/arm/mach-pxa/leds-idp.c
15915 delete mode 100644 arch/arm/mach-pxa/leds-lubbock.c
15916 delete mode 100644 arch/arm/mach-pxa/leds-mainstone.c
15917 delete mode 100644 arch/arm/mach-pxa/leds.c
15918 delete mode 100644 arch/arm/mach-pxa/leds.h
15919 create mode 100644 arch/arm/mach-pxa/pxa-dt.c
15920 delete mode 100644 arch/arm/mach-realview/include/mach/gpio.h
15921 delete mode 100644 arch/arm/mach-sa1100/leds-assabet.c
15922 delete mode 100644 arch/arm/mach-sa1100/leds-badge4.c
15923 delete mode 100644 arch/arm/mach-sa1100/leds-cerf.c
15924 delete mode 100644 arch/arm/mach-sa1100/leds-hackkit.c
15925 delete mode 100644 arch/arm/mach-sa1100/leds-lart.c
15926 delete mode 100644 arch/arm/mach-sa1100/leds.c
15927 delete mode 100644 arch/arm/mach-sa1100/leds.h
15928 delete mode 100644 arch/arm/mach-shark/include/mach/io.h
15929 rename arch/arm/mach-shmobile/{include/mach/gpio.h => sh-gpio.h} (69%)
15930 create mode 100644 arch/arm/mach-socfpga/Kconfig
15931 delete mode 100644 arch/arm/mach-socfpga/Makefile.boot
15932 delete mode 100644 arch/arm/mach-socfpga/include/mach/uncompress.h
15933 delete mode 100644 arch/arm/mach-spear13xx/include/mach/gpio.h
15934 delete mode 100644 arch/arm/mach-spear3xx/include/mach/gpio.h
15935 delete mode 100644 arch/arm/mach-spear6xx/include/mach/gpio.h
15936 delete mode 100644 arch/arm/mach-tegra/board-harmony-pinmux.c
15937 delete mode 100644 arch/arm/mach-tegra/board-harmony-power.c
15938 delete mode 100644 arch/arm/mach-tegra/board-harmony.c
15939 delete mode 100644 arch/arm/mach-tegra/board-harmony.h
15940 delete mode 100644 arch/arm/mach-tegra/board-paz00-pinmux.c
15941 delete mode 100644 arch/arm/mach-tegra/board-pinmux.c
15942 delete mode 100644 arch/arm/mach-tegra/board-pinmux.h
15943 delete mode 100644 arch/arm/mach-tegra/board-trimslice-pinmux.c
15944 delete mode 100644 arch/arm/mach-tegra/board-trimslice.c
15945 delete mode 100644 arch/arm/mach-tegra/board-trimslice.h
15946 create mode 100644 arch/arm/mach-tegra/common.h
15947 delete mode 100644 arch/arm/mach-tegra/devices.c
15948 delete mode 100644 arch/arm/mach-tegra/devices.h
15949 delete mode 100644 arch/arm/mach-tegra/dma.c
15950 delete mode 100644 arch/arm/mach-tegra/include/mach/gpio.h
15951 delete mode 100644 arch/arm/mach-tegra/include/mach/io.h
15952 delete mode 100644 arch/arm/mach-tegra/include/mach/pinconf-tegra.h
15953 delete mode 100644 arch/arm/mach-tegra/include/mach/suspend.h
15954 create mode 100644 arch/arm/mach-tegra/sleep-t20.S
15955 create mode 100644 arch/arm/mach-tegra/sleep-t30.S
15956 create mode 100644 arch/arm/mach-tegra/sleep.h
15957 create mode 100644 arch/arm/mach-tegra/tegra20_clocks.c
15958 create mode 100644 arch/arm/mach-tegra/tegra20_clocks.h
15959 create mode 100644 arch/arm/mach-tegra/tegra20_clocks_data.c
15960 delete mode 100644 arch/arm/mach-tegra/tegra2_clocks.c
15961 create mode 100644 arch/arm/mach-tegra/tegra30_clocks.h
15962 create mode 100644 arch/arm/mach-tegra/tegra30_clocks_data.c
15963 create mode 100644 arch/arm/mach-tegra/tegra_cpu_car.h
15964 rename arch/arm/mach-u300/{include/mach => }/dma_channels.h (88%)
15965 delete mode 100644 arch/arm/mach-u300/include/mach/clkdev.h
15966 delete mode 100644 arch/arm/mach-u300/include/mach/gpio.h
15967 delete mode 100644 arch/arm/mach-u300/include/mach/platform.h
15968 create mode 100644 arch/arm/mach-u300/timer.h
15969 delete mode 100644 arch/arm/mach-u300/u300.c
15970 rename arch/arm/mach-ux500/{board-mop500-msp.c => board-mop500-audio.c} (88%)
15971 delete mode 100644 arch/arm/mach-ux500/board-mop500-msp.h
15972 delete mode 100644 arch/arm/mach-ux500/include/mach/gpio.h
15973 delete mode 100644 arch/arm/mach-versatile/include/mach/gpio.h
15974 delete mode 100644 arch/arm/mach-vexpress/Makefile.boot
15975 delete mode 100644 arch/arm/mach-vexpress/include/mach/gpio.h
15976 delete mode 100644 arch/arm/mach-vexpress/include/mach/timex.h
15977 delete mode 100644 arch/arm/mach-vexpress/include/mach/uncompress.h
15978 delete mode 100644 arch/arm/mach-vt8500/Kconfig
15979 delete mode 100644 arch/arm/mach-vt8500/bv07.c
15980 rename arch/arm/{mach-tegra/include/mach/gpio-tegra.h => mach-vt8500/common.h} (53%)
15981 delete mode 100644 arch/arm/mach-vt8500/devices-vt8500.c
15982 delete mode 100644 arch/arm/mach-vt8500/devices-wm8505.c
15983 delete mode 100644 arch/arm/mach-vt8500/devices.c
15984 delete mode 100644 arch/arm/mach-vt8500/devices.h
15985 delete mode 100644 arch/arm/mach-vt8500/gpio.c
15986 delete mode 100644 arch/arm/mach-vt8500/include/mach/gpio.h
15987 delete mode 100644 arch/arm/mach-vt8500/include/mach/vt8500_irqs.h
15988 delete mode 100644 arch/arm/mach-vt8500/include/mach/vt8500_regs.h
15989 delete mode 100644 arch/arm/mach-vt8500/include/mach/wm8505_irqs.h
15990 delete mode 100644 arch/arm/mach-vt8500/include/mach/wm8505_regs.h
15991 delete mode 100644 arch/arm/mach-vt8500/restart.c
15992 create mode 100644 arch/arm/mach-vt8500/vt8500.c
15993 delete mode 100644 arch/arm/mach-vt8500/wm8505_7in.c
15994 delete mode 100644 arch/arm/plat-mxc/clock.c
15995 delete mode 100644 arch/arm/plat-mxc/include/mach/clock.h
15996 delete mode 100644 arch/arm/plat-mxc/include/mach/gpio.h
15997 delete mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx53.h
15998 delete mode 100644 arch/arm/plat-omap/devices.c
15999 delete mode 100644 arch/arm/plat-omap/include/plat/board.h
16000 delete mode 100644 arch/arm/plat-omap/include/plat/gpio-switch.h
16001 delete mode 100644 arch/arm/plat-omap/include/plat/hardware.h
16002 delete mode 100644 arch/arm/plat-omap/include/plat/irqs-44xx.h
16003 delete mode 100644 arch/arm/plat-omap/include/plat/irqs.h
16004 delete mode 100644 arch/arm/plat-omap/include/plat/param.h
16005 delete mode 100644 arch/arm/plat-omap/mux.c
16006 rename arch/arm/plat-orion/include/plat/{gpio.h => orion-gpio.h} (95%)
16007 delete mode 100644 arch/arm/plat-spear/include/plat/gpio.h
16008 create mode 100644 arch/arm/plat-versatile/include/plat/platsmp.h
16009 create mode 100644 drivers/bus/Kconfig
16010 create mode 100644 drivers/bus/Makefile
16011 create mode 100644 drivers/bus/omap-ocp2scp.c
16012 rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.c (99%)
16013 rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.h (100%)
16014 rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.c (100%)
16015 rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.h (100%)
16016 create mode 100644 drivers/clk/clk-bcm2835.c
16017 create mode 100644 drivers/clk/clk-vt8500.c
16018 create mode 100644 drivers/clocksource/bcm2835_timer.c
16019 create mode 100644 drivers/gpio/gpio-mvebu.c
16020 create mode 100644 drivers/gpio/gpio-vt8500.c
16021 create mode 100644 drivers/irqchip/Kconfig
16022 create mode 100644 drivers/irqchip/Makefile
16023 create mode 100644 drivers/irqchip/irq-bcm2835.c
16024 create mode 100644 drivers/leds/ledtrig-cpu.c
16025 create mode 100644 drivers/pinctrl/pinctrl-armada-370.c
16026 create mode 100644 drivers/pinctrl/pinctrl-armada-xp.c
16027 create mode 100644 drivers/pinctrl/pinctrl-dove.c
16028 create mode 100644 drivers/pinctrl/pinctrl-exynos.c
16029 create mode 100644 drivers/pinctrl/pinctrl-exynos.h
16030 create mode 100644 drivers/pinctrl/pinctrl-kirkwood.c
16031 create mode 100644 drivers/pinctrl/pinctrl-mvebu.c
16032 create mode 100644 drivers/pinctrl/pinctrl-mvebu.h
16033 create mode 100644 drivers/pinctrl/pinctrl-samsung.c
16034 create mode 100644 drivers/pinctrl/pinctrl-samsung.h
16035 delete mode 100644 drivers/video/epson1355fb.c
16036 rename arch/arm/mach-picoxcell/include/mach/hardware.h => include/linux/bcm2835_timer.h (70%)
16037 rename arch/arm/mach-socfpga/include/mach/timex.h => include/linux/clk/bcm2835.h (83%)
16038 rename arch/arm/mach-versatile/include/mach/io.h => include/linux/irqchip/bcm2835.h (74%)
16039 rename arch/arm/plat-mxc/include/mach/ssi.h => include/linux/platform_data/asoc-imx-ssi.h (100%)
16040 rename arch/arm/plat-orion/include/plat/audio.h => include/linux/platform_data/asoc-kirkwood.h (100%)
16041 rename arch/arm/mach-pxa/include/mach/palmasoc.h => include/linux/platform_data/asoc-palm27x.h (100%)
16042 rename arch/arm/plat-samsung/include/plat/audio.h => include/linux/platform_data/asoc-s3c.h (100%)
16043 rename arch/arm/plat-samsung/include/plat/audio-simtec.h => include/linux/platform_data/asoc-s3c24xx_simtec.h (100%)
16044 rename arch/arm/plat-omap/include/plat/mcbsp.h => include/linux/platform_data/asoc-ti-mcbsp.h (100%)
16045 rename arch/arm/mach-pxa/include/mach/pata_pxa.h => include/linux/platform_data/ata-pxa.h (100%)
16046 rename arch/arm/plat-samsung/include/plat/ata.h => include/linux/platform_data/ata-samsung_cf.h (100%)
16047 rename arch/arm/plat-mxc/include/mach/mx1_camera.h => include/linux/platform_data/camera-mx1.h (100%)
16048 rename arch/arm/plat-mxc/include/mach/mx2_cam.h => include/linux/platform_data/camera-mx2.h (95%)
16049 rename arch/arm/plat-mxc/include/mach/mx3_camera.h => include/linux/platform_data/camera-mx3.h (100%)
16050 rename arch/arm/mach-pxa/include/mach/camera.h => include/linux/platform_data/camera-pxa.h (100%)
16051 rename {arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%)
16052 rename arch/arm/mach-at91/include/mach/at_hdmac.h => include/linux/platform_data/dma-atmel.h (100%)
16053 rename arch/arm/mach-ep93xx/include/mach/dma.h => include/linux/platform_data/dma-ep93xx.h (100%)
16054 rename arch/arm/plat-mxc/include/mach/sdma.h => include/linux/platform_data/dma-imx-sdma.h (100%)
16055 rename arch/arm/plat-mxc/include/mach/dma.h => include/linux/platform_data/dma-imx.h (100%)
16056 rename arch/arm/mach-mmp/include/mach/sram.h => include/linux/platform_data/dma-mmp_tdma.h (100%)
16057 rename arch/arm/plat-orion/include/plat/mv_xor.h => include/linux/platform_data/dma-mv_xor.h (100%)
16058 rename arch/arm/plat-omap/include/plat/dsp.h => include/linux/platform_data/dsp-omap.h (100%)
16059 rename arch/arm/mach-netx/include/mach/eth.h => include/linux/platform_data/eth-netx.h (100%)
16060 rename arch/arm/plat-omap/include/plat/gpio.h => include/linux/platform_data/gpio-omap.h (94%)
16061 rename arch/arm/plat-samsung/include/plat/hwmon.h => include/linux/platform_data/hwmon-s3c.h (100%)
16062 rename arch/arm/mach-davinci/include/mach/i2c.h => include/linux/platform_data/i2c-davinci.h (100%)
16063 rename arch/arm/plat-mxc/include/mach/i2c.h => include/linux/platform_data/i2c-imx.h (100%)
16064 rename arch/arm/mach-w90x900/include/mach/i2c.h => include/linux/platform_data/i2c-nuc900.h (100%)
16065 rename arch/arm/plat-samsung/include/plat/iic.h => include/linux/platform_data/i2c-s3c2410.h (100%)
16066 rename arch/arm/mach-pxa/include/mach/irda.h => include/linux/platform_data/irda-pxaficp.h (100%)
16067 rename arch/arm/mach-pxa/include/mach/pxa930_rotary.h => include/linux/platform_data/keyboard-pxa930_rotary.h (100%)
16068 rename arch/arm/plat-spear/include/plat/keyboard.h => include/linux/platform_data/keyboard-spear.h (100%)
16069 rename arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h => include/linux/platform_data/keypad-ep93xx.h (100%)
16070 rename arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h (100%)
16071 rename arch/arm/plat-omap/include/plat/keypad.h => include/linux/platform_data/keypad-omap.h (100%)
16072 rename arch/arm/plat-pxa/include/plat/pxa27x_keypad.h => include/linux/platform_data/keypad-pxa27x.h (100%)
16073 rename arch/arm/mach-w90x900/include/mach/w90p910_keypad.h => include/linux/platform_data/keypad-w90p910.h (100%)
16074 rename arch/arm/mach-davinci/include/mach/keyscan.h => include/linux/platform_data/keyscan-davinci.h (100%)
16075 rename arch/arm/plat-omap/include/plat/lcd_mipid.h => include/linux/platform_data/lcd-mipid.h (100%)
16076 rename arch/arm/mach-kirkwood/include/mach/leds-netxbig.h => include/linux/platform_data/leds-kirkwood-netxbig.h (100%)
16077 rename arch/arm/mach-kirkwood/include/mach/leds-ns2.h => include/linux/platform_data/leds-kirkwood-ns2.h (100%)
16078 rename arch/arm/mach-s3c24xx/include/mach/leds-gpio.h => include/linux/platform_data/leds-s3c24xx.h (100%)
16079 rename arch/arm/mach-sa1100/include/mach/mcp.h => include/linux/platform_data/mfd-mcp-sa11x0.h (100%)
16080 rename arch/arm/plat-samsung/include/plat/mipi_csis.h => include/linux/platform_data/mipi-csis.h (100%)
16081 rename arch/arm/mach-davinci/include/mach/mmc.h => include/linux/platform_data/mmc-davinci.h (100%)
16082 rename arch/arm/plat-mxc/include/mach/esdhc.h => include/linux/platform_data/mmc-esdhc-imx.h (100%)
16083 rename arch/arm/mach-msm/include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h (100%)
16084 rename arch/arm/plat-orion/include/plat/mvsdio.h => include/linux/platform_data/mmc-mvsdio.h (100%)
16085 rename arch/arm/plat-mxc/include/mach/mmc.h => include/linux/platform_data/mmc-mxcmmc.h (100%)
16086 rename arch/arm/mach-pxa/include/mach/mmc.h => include/linux/platform_data/mmc-pxamci.h (100%)
16087 rename arch/arm/plat-samsung/include/plat/mci.h => include/linux/platform_data/mmc-s3cmci.h (100%)
16088 rename arch/arm/mach-tegra/include/mach/sdhci.h => include/linux/platform_data/mmc-sdhci-tegra.h (84%)
16089 rename arch/arm/mach-pxa/include/mach/pxa930_trkball.h => include/linux/platform_data/mouse-pxa930_trkball.h (100%)
16090 rename arch/arm/mach-davinci/include/mach/aemif.h => include/linux/platform_data/mtd-davinci-aemif.h (100%)
16091 rename arch/arm/mach-davinci/include/mach/nand.h => include/linux/platform_data/mtd-davinci.h (100%)
16092 rename arch/arm/plat-mxc/include/mach/mxc_nand.h => include/linux/platform_data/mtd-mxc_nand.h (100%)
16093 rename arch/arm/plat-omap/include/plat/nand.h => include/linux/platform_data/mtd-nand-omap2.h (96%)
16094 rename arch/arm/plat-pxa/include/plat/pxa3xx_nand.h => include/linux/platform_data/mtd-nand-pxa3xx.h (100%)
16095 rename arch/arm/plat-samsung/include/plat/nand.h => include/linux/platform_data/mtd-nand-s3c2410.h (100%)
16096 rename arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h (100%)
16097 rename arch/arm/plat-omap/include/plat/onenand.h => include/linux/platform_data/mtd-onenand-omap2.h (100%)
16098 rename arch/arm/plat-orion/include/plat/orion_nand.h => include/linux/platform_data/mtd-orion_nand.h (100%)
16099 create mode 100644 include/linux/platform_data/omap1_bl.h
16100 rename arch/arm/mach-pxa/include/mach/arcom-pcmcia.h => include/linux/platform_data/pcmcia-pxa2xx_viper.h (100%)
16101 rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (72%)
16102 rename arch/arm/plat-omap/include/plat/remoteproc.h => include/linux/platform_data/remoteproc-omap.h (100%)
16103 rename arch/arm/plat-mxc/include/mach/imx-uart.h => include/linux/platform_data/serial-imx.h (100%)
16104 rename arch/arm/mach-davinci/include/mach/spi.h => include/linux/platform_data/spi-davinci.h (100%)
16105 rename arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h (100%)
16106 rename arch/arm/plat-mxc/include/mach/spi.h => include/linux/platform_data/spi-imx.h (100%)
16107 rename arch/arm/mach-w90x900/include/mach/nuc900_spi.h => include/linux/platform_data/spi-nuc900.h (100%)
16108 rename arch/arm/plat-omap/include/plat/mcspi.h => include/linux/platform_data/spi-omap2-mcspi.h (100%)
16109 rename arch/arm/plat-samsung/include/plat/s3c64xx-spi.h => include/linux/platform_data/spi-s3c64xx.h (100%)
16110 rename arch/arm/plat-samsung/include/plat/ts.h => include/linux/platform_data/touchscreen-s3c2410.h (100%)
16111 rename arch/arm/mach-davinci/include/mach/usb.h => include/linux/platform_data/usb-davinci.h (100%)
16112 rename arch/arm/plat-mxc/include/mach/mxc_ehci.h => include/linux/platform_data/usb-ehci-mxc.h (100%)
16113 rename arch/arm/plat-orion/include/plat/ehci-orion.h => include/linux/platform_data/usb-ehci-orion.h (100%)
16114 rename arch/arm/plat-samsung/include/plat/ehci.h => include/linux/platform_data/usb-ehci-s5p.h (100%)
16115 rename arch/arm/mach-exynos/include/mach/ohci.h => include/linux/platform_data/usb-exynos.h (100%)
16116 rename arch/arm/plat-mxc/include/mach/usb.h => include/linux/platform_data/usb-imx_udc.h (100%)
16117 rename arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h (100%)
16118 rename arch/arm/plat-mxc/include/mach/mx21-usbhost.h => include/linux/platform_data/usb-mx2.h (100%)
16119 rename arch/arm/mach-pxa/include/mach/ohci.h => include/linux/platform_data/usb-ohci-pxa27x.h (100%)
16120 rename arch/arm/plat-samsung/include/plat/usb-control.h => include/linux/platform_data/usb-ohci-s3c2410.h (100%)
16121 rename arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h => include/linux/platform_data/usb-pxa3xx-ulpi.h (100%)
16122 rename arch/arm/plat-samsung/include/plat/udc.h => include/linux/platform_data/usb-s3c2410_udc.h (100%)
16123 rename arch/arm/mach-ep93xx/include/mach/fb.h => include/linux/platform_data/video-ep93xx.h (100%)
16124 rename arch/arm/plat-mxc/include/mach/imxfb.h => include/linux/platform_data/video-imxfb.h (100%)
16125 rename arch/arm/mach-msm/include/mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h (100%)
16126 rename arch/arm/plat-mxc/include/mach/mx3fb.h => include/linux/platform_data/video-mx3fb.h (100%)
16127 rename arch/arm/mach-w90x900/include/mach/fb.h => include/linux/platform_data/video-nuc900fb.h (100%)
16128 rename arch/arm/mach-pxa/include/mach/pxafb.h => include/linux/platform_data/video-pxafb.h (100%)
16129 rename arch/arm/mach-vt8500/include/mach/vt8500fb.h => include/linux/platform_data/video-vt8500lcdfb.h (100%)
16130 rename arch/arm/plat-omap/include/plat/voltage.h => include/linux/platform_data/voltage-omap.h (100%)
16131 delete mode 100644 include/video/epson1355.h
16132 Merging ep93xx/ep93xx-for-next (70f0f7c Merge branch 'ep93xx-fixes' into ep93xx-for-next)
16133 $ git merge ep93xx/ep93xx-for-next
16134 Already up-to-date!
16135 Merge made by the 'recursive' strategy.
16136 Merging ixp4xx/next (2346020 IXP4xx: map CPU config registers within VMALLOC region.)
16137 $ git merge ixp4xx/next
16138 Resolved 'arch/arm/mach-ixp4xx/common.c' using previous resolution.
16139 Resolved 'arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h' using previous resolution.
16140 Auto-merging drivers/crypto/Kconfig
16141 Auto-merging drivers/char/hw_random/Kconfig
16142 Auto-merging arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
16143 CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
16144 Auto-merging arch/arm/mach-ixp4xx/common.c
16145 CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/common.c
16146 Automatic merge failed; fix conflicts and then commit the result.
16148 [master 35d1398] Merge remote-tracking branch 'ixp4xx/next'
16149 $ git diff -M --stat --summary HEAD^..
16150 arch/arm/common/dmabounce.c | 4 +-
16151 arch/arm/mach-ixp4xx/common-pci.c | 1 +
16152 arch/arm/mach-ixp4xx/common.c | 13 +++----
16153 arch/arm/mach-ixp4xx/goramo_mlr.c | 3 +-
16154 arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 +-
16155 arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 ++++++++++-------------
16156 arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 +++---
16157 arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++-
16158 arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 14 +------
16159 drivers/char/hw_random/Kconfig | 6 +--
16160 drivers/char/hw_random/ixp4xx-rng.c | 5 ++-
16161 drivers/crypto/Kconfig | 2 +-
16162 drivers/crypto/ixp4xx_crypto.c | 12 +++---
16163 drivers/net/wan/ixp4xx_hss.c | 2 +-
16164 14 files changed, 62 insertions(+), 71 deletions(-)
16165 Merging msm/for-next (a0d271c Linux 3.6)
16166 $ git merge msm/for-next
16167 Already up-to-date.
16168 Merging renesas/next (b681273 Merge branch 'heads/boards' into next)
16169 $ git merge renesas/next
16170 Resolved 'arch/arm/Kconfig' using previous resolution.
16171 Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
16172 Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c
16173 Auto-merging arch/arm/mach-shmobile/include/mach/sh7372.h
16174 Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
16175 Auto-merging arch/arm/configs/kzm9g_defconfig
16176 Auto-merging arch/arm/Kconfig
16177 CONFLICT (content): Merge conflict in arch/arm/Kconfig
16178 Automatic merge failed; fix conflicts and then commit the result.
16180 [master a16d597] Merge remote-tracking branch 'renesas/next'
16181 $ git diff -M --stat --summary HEAD^..
16182 arch/arm/Kconfig | 9 +++++++++
16183 arch/arm/configs/armadillo800eva_defconfig | 1 +
16184 arch/arm/configs/kzm9g_defconfig | 4 ++++
16185 arch/arm/configs/mackerel_defconfig | 18 ++++++++++++++++--
16186 arch/arm/mach-shmobile/board-kzm9g.c | 14 +++++++++++++-
16187 arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++++
16188 arch/arm/mach-shmobile/setup-r8a7740.c | 16 ++++++++++++++++
16189 arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++++++++++++++++
16190 arch/arm/mm/proc-v7-2level.S | 8 ++++++++
16191 9 files changed, 91 insertions(+), 3 deletions(-)
16192 Merging samsung/for-next (59e65fd Merge branch 'next/dt-samsung-new' into for-next)
16193 $ git merge samsung/for-next
16194 Resolved 'arch/arm/mach-exynos/clock-exynos5.c' using previous resolution.
16195 Auto-merging arch/arm/mach-exynos/clock-exynos5.c
16196 CONFLICT (content): Merge conflict in arch/arm/mach-exynos/clock-exynos5.c
16197 Automatic merge failed; fix conflicts and then commit the result.
16199 [master 0ab5743] Merge remote-tracking branch 'samsung/for-next'
16200 $ git diff -M --stat --summary HEAD^..
16201 Merging tegra/for-next (979570e Linux 3.6-rc7)
16202 $ git merge tegra/for-next
16203 Already up-to-date.
16204 Merging kvmtool/master (5a337ac kvm tools: don't exit on debug ioport write)
16205 $ git merge kvmtool/master
16206 Merge made by the 'recursive' strategy.
16207 tools/kvm/Makefile | 17 +
16208 tools/kvm/builtin-run.c | 1111 +++++-------------------------
16209 tools/kvm/disk/core.c | 73 +-
16210 tools/kvm/framebuffer.c | 9 +-
16211 tools/kvm/hw/i8042.c | 15 +-
16212 tools/kvm/hw/pci-shmem.c | 147 +++-
16213 tools/kvm/hw/rtc.c | 14 +-
16214 tools/kvm/hw/serial.c | 24 +-
16215 tools/kvm/hw/vesa.c | 6 +-
16216 tools/kvm/include/kvm/brlock.h | 16 +-
16217 tools/kvm/include/kvm/disk-image.h | 9 +-
16218 tools/kvm/include/kvm/framebuffer.h | 5 +-
16219 tools/kvm/include/kvm/i8042.h | 2 +-
16220 tools/kvm/include/kvm/ioport.h | 7 +-
16221 tools/kvm/include/kvm/kvm-config.h | 60 ++
16222 tools/kvm/include/kvm/kvm-cpu.h | 6 +-
16223 tools/kvm/include/kvm/kvm-ipc.h | 8 +-
16224 tools/kvm/include/kvm/kvm.h | 38 +-
16225 tools/kvm/include/kvm/parse-options.h | 16 +-
16226 tools/kvm/include/kvm/pci-shmem.h | 6 +-
16227 tools/kvm/include/kvm/sdl.h | 18 +-
16228 tools/kvm/include/kvm/term.h | 16 +-
16229 tools/kvm/include/kvm/threadpool.h | 3 +-
16230 tools/kvm/include/kvm/util-init.h | 51 ++
16231 tools/kvm/include/kvm/virtio-9p.h | 3 +
16232 tools/kvm/include/kvm/virtio-balloon.h | 3 +-
16233 tools/kvm/include/kvm/virtio-console.h | 3 +-
16234 tools/kvm/include/kvm/virtio-net.h | 6 +-
16235 tools/kvm/include/kvm/vnc.h | 10 +-
16236 tools/kvm/ioeventfd.c | 2 +
16237 tools/kvm/ioport.c | 23 +-
16238 tools/kvm/kvm-cpu.c | 81 ++-
16239 tools/kvm/kvm-ipc.c | 301 +++++++-
16240 tools/kvm/kvm.c | 229 ++----
16241 tools/kvm/mmio.c | 13 +-
16242 tools/kvm/pci.c | 12 +-
16243 tools/kvm/powerpc/cpu_info.c | 2 +-
16244 tools/kvm/powerpc/include/kvm/kvm-arch.h | 24 +-
16245 tools/kvm/powerpc/irq.c | 2 +-
16246 tools/kvm/powerpc/kvm-cpu.c | 8 +-
16247 tools/kvm/powerpc/kvm.c | 42 +-
16248 tools/kvm/powerpc/spapr_hvcons.c | 14 +-
16249 tools/kvm/powerpc/spapr_pci.c | 2 +-
16250 tools/kvm/powerpc/xics.c | 24 +-
16251 tools/kvm/symbol.c | 4 +-
16252 tools/kvm/term.c | 61 +-
16253 tools/kvm/tests/pit/tick.S | 14 +-
16254 tools/kvm/ui/sdl.c | 26 +-
16255 tools/kvm/ui/vnc.c | 26 +-
16256 tools/kvm/util/init.c | 69 ++
16257 tools/kvm/util/threadpool.c | 38 +-
16258 tools/kvm/virtio/9p.c | 69 ++
16259 tools/kvm/virtio/balloon.c | 23 +-
16260 tools/kvm/virtio/blk.c | 2 +
16261 tools/kvm/virtio/console.c | 26 +-
16262 tools/kvm/virtio/net.c | 142 +++-
16263 tools/kvm/virtio/pci.c | 6 +-
16264 tools/kvm/virtio/rng.c | 5 +
16265 tools/kvm/virtio/scsi.c | 2 +
16266 tools/kvm/x86/bios.c | 6 +-
16267 tools/kvm/x86/boot.c | 6 +-
16268 tools/kvm/x86/include/kvm/kvm-arch.h | 26 +-
16269 tools/kvm/x86/ioport.c | 22 +-
16270 tools/kvm/x86/irq.c | 2 +
16271 tools/kvm/x86/kvm-cpu.c | 32 +-
16272 tools/kvm/x86/kvm.c | 26 +-
16273 tools/kvm/x86/mptable.c | 2 +
16274 67 files changed, 1664 insertions(+), 1452 deletions(-)
16275 create mode 100644 tools/kvm/include/kvm/kvm-config.h
16276 create mode 100644 tools/kvm/include/kvm/util-init.h
16277 create mode 100644 tools/kvm/util/init.c
16278 Merging dma-mapping/dma-mapping-next (8aa8bee Merge branch 'next-cleanup' into HEAD)
16279 $ git merge dma-mapping/dma-mapping-next
16280 Resolved 'Documentation/devicetree/bindings/ata/ahci-platform.txt' using previous resolution.
16281 Resolved 'arch/arm/boot/dts/highbank.dts' using previous resolution.
16282 Auto-merging arch/arm/mm/mmu.c
16283 Auto-merging arch/arm/mach-highbank/highbank.c
16284 Auto-merging arch/arm/boot/dts/highbank.dts
16285 CONFLICT (content): Merge conflict in arch/arm/boot/dts/highbank.dts
16286 Auto-merging Documentation/devicetree/bindings/ata/ahci-platform.txt
16287 CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ata/ahci-platform.txt
16288 Automatic merge failed; fix conflicts and then commit the result.
16290 [master 9aada5c] Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
16291 $ git diff -M --stat --summary HEAD^..
16292 .../devicetree/bindings/ata/ahci-platform.txt | 1 +
16293 .../devicetree/bindings/dma/arm-pl330.txt | 3 +
16294 .../devicetree/bindings/net/calxeda-xgmac.txt | 3 +
16295 arch/arm/boot/dts/highbank.dts | 1 +
16296 arch/arm/include/asm/barrier.h | 7 +-
16297 arch/arm/include/asm/dma-mapping.h | 1 +
16298 arch/arm/include/asm/memory.h | 8 -
16299 arch/arm/mach-highbank/highbank.c | 52 ++++
16300 arch/arm/mm/dma-mapping.c | 264 +++++++++++++++-----
16301 arch/arm/mm/mmu.c | 11 -
16302 drivers/base/dma-contiguous.c | 18 +-
16303 11 files changed, 278 insertions(+), 91 deletions(-)
16304 Merging pwm/for-next (72004bd pwm: Add Ingenic JZ4740 support)
16305 $ git merge pwm/for-next
16306 Auto-merging drivers/pwm/pwm-ab8500.c
16307 Auto-merging drivers/pwm/Makefile
16308 Auto-merging drivers/pwm/Kconfig
16309 Auto-merging drivers/misc/Kconfig
16310 Removing arch/unicore32/kernel/pwm.c
16311 Auto-merging arch/unicore32/Kconfig
16312 Removing arch/mips/jz4740/timer.h
16313 Removing arch/mips/jz4740/pwm.c
16314 Merge made by the 'recursive' strategy.
16315 Documentation/devicetree/bindings/pwm/imx-pwm.txt | 17 ++
16316 Documentation/driver-model/devres.txt | 4 +
16317 Documentation/pwm.txt | 3 +-
16318 arch/mips/include/asm/mach-jz4740/platform.h | 1 +
16319 arch/mips/include/asm/mach-jz4740/timer.h | 113 +++++++++
16320 arch/mips/jz4740/Kconfig | 3 -
16321 arch/mips/jz4740/Makefile | 2 +-
16322 arch/mips/jz4740/board-qi_lb60.c | 1 +
16323 arch/mips/jz4740/platform.c | 6 +
16324 arch/mips/jz4740/pwm.c | 177 -------------
16325 arch/mips/jz4740/time.c | 2 +-
16326 arch/mips/jz4740/timer.c | 4 +-
16327 arch/mips/jz4740/timer.h | 136 ----------
16328 arch/unicore32/Kconfig | 12 +-
16329 arch/unicore32/include/mach/regs-ost.h | 18 +-
16330 arch/unicore32/kernel/Makefile | 1 -
16331 arch/unicore32/kernel/pwm.c | 263 -------------------
16332 drivers/misc/Kconfig | 10 -
16333 drivers/misc/Makefile | 1 -
16334 drivers/pwm/Kconfig | 29 ++-
16335 drivers/pwm/Makefile | 3 +
16336 drivers/pwm/core.c | 80 ++++++
16337 drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} | 116 ++++-----
16338 drivers/pwm/pwm-imx.c | 278 ++++++++++++++-------
16339 drivers/pwm/pwm-jz4740.c | 221 ++++++++++++++++
16340 drivers/pwm/pwm-puv3.c | 161 ++++++++++++
16341 drivers/pwm/pwm-tiecap.c | 22 ++
16342 drivers/pwm/pwm-tiehrpwm.c | 73 ++++--
16343 drivers/video/backlight/pwm_bl.c | 7 +-
16344 include/linux/pwm.h | 108 +++++++-
16345 30 files changed, 1064 insertions(+), 808 deletions(-)
16346 create mode 100644 Documentation/devicetree/bindings/pwm/imx-pwm.txt
16347 delete mode 100644 arch/mips/jz4740/pwm.c
16348 delete mode 100644 arch/mips/jz4740/timer.h
16349 delete mode 100644 arch/unicore32/kernel/pwm.c
16350 rename drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} (52%)
16351 create mode 100644 drivers/pwm/pwm-jz4740.c
16352 create mode 100644 drivers/pwm/pwm-puv3.c
16353 Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
16354 $ git merge dma-buf/for-next
16355 Auto-merging drivers/base/dma-buf.c
16356 Merge made by the 'recursive' strategy.
16357 drivers/base/dma-buf.c | 2 ++
16358 1 file changed, 2 insertions(+)
16359 Merging userns/for-next (72235465 userns: Convert the ufs filesystem to use kuid/kgid where appropriate)
16360 $ git merge userns/for-next
16361 Resolved 'fs/ubifs/debug.c' using previous resolution.
16362 Resolved 'init/Kconfig' using previous resolution.
16363 Resolved 'kernel/audit.c' using previous resolution.
16364 Resolved 'kernel/auditsc.c' using previous resolution.
16365 Resolved 'security/integrity/ima/ima_policy.c' using previous resolution.
16366 Auto-merging security/security.c
16367 Auto-merging security/keys/keyctl.c
16368 Auto-merging security/keys/key.c
16369 Auto-merging security/integrity/ima/ima_policy.c
16370 CONFLICT (content): Merge conflict in security/integrity/ima/ima_policy.c
16371 Auto-merging net/xfrm/xfrm_user.c
16372 Auto-merging net/xfrm/xfrm_state.c
16373 Auto-merging net/xfrm/xfrm_policy.c
16374 Auto-merging net/netlabel/netlabel_unlabeled.c
16375 Auto-merging net/core/dev.c
16376 Auto-merging kernel/trace/trace.h
16377 Auto-merging kernel/trace/trace.c
16378 Auto-merging kernel/taskstats.c
16379 Auto-merging kernel/auditsc.c
16380 CONFLICT (content): Merge conflict in kernel/auditsc.c
16381 Auto-merging kernel/audit_watch.c
16382 Auto-merging kernel/audit.c
16383 CONFLICT (content): Merge conflict in kernel/audit.c
16384 Auto-merging init/Kconfig
16385 CONFLICT (content): Merge conflict in init/Kconfig
16386 Auto-merging include/net/xfrm.h
16387 Auto-merging include/linux/tty.h
16388 Auto-merging include/linux/security.h
16389 Auto-merging include/linux/sched.h
16390 Auto-merging include/linux/init_task.h
16391 Auto-merging include/linux/audit.h
16392 Auto-merging include/drm/drmP.h
16393 Auto-merging fs/xattr.c
16394 Auto-merging fs/udf/super.c
16395 Auto-merging fs/udf/inode.c
16396 Auto-merging fs/ubifs/ubifs.h
16397 Auto-merging fs/ubifs/super.c
16398 Auto-merging fs/ubifs/sb.c
16399 Auto-merging fs/ubifs/debug.c
16400 CONFLICT (content): Merge conflict in fs/ubifs/debug.c
16401 Auto-merging fs/ubifs/budget.c
16402 Auto-merging fs/sysv/inode.c
16403 Auto-merging fs/reiserfs/inode.c
16404 Auto-merging fs/quota/dquot.c
16405 Auto-merging fs/qnx6/inode.c
16406 Auto-merging fs/qnx4/inode.c
16407 Auto-merging fs/proc/base.c
16408 Auto-merging fs/open.c
16409 Auto-merging fs/ntfs/super.c
16410 Auto-merging fs/nfsd/vfs.c
16411 Auto-merging fs/minix/inode.c
16412 Auto-merging fs/logfs/readwrite.c
16413 Auto-merging fs/logfs/inode.c
16414 Auto-merging fs/jfs/super.c
16415 Auto-merging fs/jfs/jfs_incore.h
16416 Auto-merging fs/isofs/inode.c
16417 Auto-merging fs/hugetlbfs/inode.c
16418 Auto-merging fs/hpfs/super.c
16419 Auto-merging fs/hfs/super.c
16420 Auto-merging fs/hfs/inode.c
16421 Auto-merging fs/gfs2/quota.c
16422 Auto-merging fs/fat/inode.c
16423 Auto-merging fs/ext4/super.c
16424 Auto-merging fs/ext3/super.c
16425 Auto-merging fs/exofs/inode.c
16426 Auto-merging fs/ecryptfs/main.c
16427 Auto-merging fs/debugfs/inode.c
16428 Auto-merging fs/btrfs/ioctl.c
16429 Auto-merging fs/btrfs/inode.c
16430 Auto-merging fs/btrfs/delayed-inode.c
16431 Auto-merging fs/bfs/inode.c
16432 Auto-merging fs/befs/linuxvfs.c
16433 Auto-merging fs/affs/super.c
16434 Auto-merging fs/adfs/super.c
16435 Auto-merging drivers/usb/gadget/inode.c
16436 Auto-merging drivers/usb/gadget/f_fs.c
16437 Auto-merging drivers/staging/android/binder.c
16438 Auto-merging arch/s390/kernel/compat_linux.c
16439 Auto-merging arch/s390/hypfs/inode.c
16440 Auto-merging arch/powerpc/mm/fault.c
16441 Auto-merging arch/ia64/kernel/perfmon.c
16442 Auto-merging arch/alpha/kernel/osf_sys.c
16443 Automatic merge failed; fix conflicts and then commit the result.
16445 [master f4e673c] Merge remote-tracking branch 'userns/for-next'
16446 $ git diff -M --stat --summary HEAD^..
16447 arch/alpha/kernel/osf_sys.c | 4 +-
16448 arch/ia64/kernel/mca_drv.c | 3 +-
16449 arch/ia64/kernel/perfmon.c | 32 +++---
16450 arch/ia64/kernel/signal.c | 4 +-
16451 arch/powerpc/mm/fault.c | 2 +-
16452 arch/s390/hypfs/inode.c | 20 +++-
16453 arch/s390/kernel/compat_linux.c | 36 ++++--
16454 drivers/base/devtmpfs.c | 4 +-
16455 drivers/connector/cn_proc.c | 18 ++-
16456 drivers/gpu/drm/drm_fops.c | 3 +-
16457 drivers/gpu/drm/drm_info.c | 5 +-
16458 drivers/gpu/drm/drm_ioctl.c | 4 +-
16459 drivers/infiniband/hw/qib/qib_fs.c | 4 +-
16460 drivers/staging/android/binder.c | 14 +--
16461 drivers/tty/tty_audit.c | 17 +--
16462 drivers/usb/gadget/f_fs.c | 23 ++--
16463 drivers/usb/gadget/inode.c | 4 +-
16464 drivers/xen/xenfs/super.c | 3 +-
16466 fs/adfs/adfs.h | 4 +-
16467 fs/adfs/inode.c | 4 +-
16468 fs/adfs/super.c | 21 ++--
16469 fs/affs/affs.h | 4 +-
16470 fs/affs/inode.c | 20 ++--
16471 fs/affs/super.c | 18 +--
16472 fs/befs/befs.h | 4 +-
16473 fs/befs/linuxvfs.c | 27 +++--
16474 fs/bfs/inode.c | 8 +-
16475 fs/btrfs/acl.c | 8 +-
16476 fs/btrfs/delayed-inode.c | 8 +-
16477 fs/btrfs/inode.c | 8 +-
16478 fs/btrfs/ioctl.c | 6 +-
16479 fs/configfs/inode.c | 4 +-
16480 fs/cramfs/inode.c | 4 +-
16481 fs/debugfs/inode.c | 26 +++--
16482 fs/ecryptfs/main.c | 5 +-
16483 fs/ecryptfs/messaging.c | 5 +-
16484 fs/efs/inode.c | 4 +-
16485 fs/exofs/inode.c | 8 +-
16486 fs/ext2/acl.c | 32 ++++--
16487 fs/ext3/acl.c | 32 ++++--
16488 fs/ext3/super.c | 2 +-
16489 fs/ext4/acl.c | 31 +++--
16490 fs/ext4/super.c | 2 +-
16491 fs/fat/fat.h | 4 +-
16492 fs/fat/file.c | 6 +-
16493 fs/fat/inode.c | 18 ++-
16494 fs/freevxfs/vxfs_inode.c | 4 +-
16495 fs/generic_acl.c | 4 +-
16496 fs/gfs2/acl.c | 14 +--
16497 fs/gfs2/quota.c | 32 +++---
16498 fs/hfs/hfs_fs.h | 4 +-
16499 fs/hfs/inode.c | 4 +-
16500 fs/hfs/super.c | 16 ++-
16501 fs/hfsplus/catalog.c | 4 +-
16502 fs/hfsplus/hfsplus_fs.h | 4 +-
16503 fs/hfsplus/inode.c | 8 +-
16504 fs/hfsplus/options.c | 15 ++-
16505 fs/hostfs/hostfs_kern.c | 8 +-
16506 fs/hpfs/hpfs_fn.h | 4 +-
16507 fs/hpfs/inode.c | 19 +--
16508 fs/hpfs/namei.c | 8 +-
16509 fs/hpfs/super.c | 18 +--
16510 fs/hugetlbfs/inode.c | 16 ++-
16511 fs/isofs/inode.c | 17 ++-
16512 fs/isofs/isofs.h | 4 +-
16513 fs/isofs/rock.c | 4 +-
16514 fs/jffs2/acl.c | 30 +++--
16515 fs/jffs2/file.c | 8 +-
16516 fs/jffs2/fs.c | 24 ++--
16517 fs/jffs2/os-linux.h | 4 +-
16518 fs/jfs/acl.c | 4 +-
16519 fs/jfs/file.c | 4 +-
16520 fs/jfs/jfs_imap.c | 22 ++--
16521 fs/jfs/jfs_incore.h | 8 +-
16522 fs/jfs/super.c | 22 ++--
16523 fs/jfs/xattr.c | 4 +-
16524 fs/logfs/inode.c | 4 +-
16525 fs/logfs/readwrite.c | 8 +-
16526 fs/minix/inode.c | 16 +--
16527 fs/nfs/nfs3acl.c | 4 +-
16528 fs/nfsd/vfs.c | 8 +-
16529 fs/nilfs2/inode.c | 8 +-
16530 fs/ntfs/inode.c | 7 +-
16531 fs/ntfs/super.c | 39 +++++--
16532 fs/ntfs/volume.h | 5 +-
16533 fs/ocfs2/acl.c | 4 +-
16534 fs/ocfs2/file.c | 6 +-
16535 fs/ocfs2/quota_global.c | 43 ++++---
16536 fs/ocfs2/quota_local.c | 15 ++-
16537 fs/omfs/inode.c | 8 +-
16538 fs/omfs/omfs.h | 4 +-
16540 fs/posix_acl.c | 30 ++---
16541 fs/proc/base.c | 27 ++++-
16542 fs/qnx4/inode.c | 4 +-
16543 fs/qnx6/inode.c | 4 +-
16544 fs/quota/Makefile | 2 +-
16545 fs/quota/dquot.c | 114 +++++++++---------
16546 fs/quota/kqid.c | 132 +++++++++++++++++++++
16547 fs/quota/netlink.c | 10 +-
16548 fs/quota/quota.c | 28 ++++-
16549 fs/quota/quota_tree.c | 22 ++--
16550 fs/quota/quota_v1.c | 12 +-
16551 fs/quota/quota_v2.c | 26 +++--
16552 fs/reiserfs/inode.c | 26 ++---
16553 fs/reiserfs/xattr_acl.c | 24 +++-
16554 fs/squashfs/inode.c | 8 +-
16555 fs/sysv/inode.c | 8 +-
16556 fs/ubifs/budget.c | 4 +-
16557 fs/ubifs/debug.c | 4 +-
16558 fs/ubifs/journal.c | 4 +-
16559 fs/ubifs/sb.c | 4 +-
16560 fs/ubifs/super.c | 4 +-
16561 fs/ubifs/ubifs.h | 4 +-
16562 fs/udf/inode.c | 12 +-
16563 fs/udf/super.c | 20 ++--
16564 fs/udf/udf_sb.h | 4 +-
16565 fs/ufs/inode.c | 16 +--
16567 fs/xattr_acl.c | 96 ++++++++++++++--
16568 fs/xfs/xfs_acl.c | 4 +-
16569 fs/xfs/xfs_quotaops.c | 12 +-
16570 fs/xfs/xfs_trans_dquot.c | 8 +-
16571 include/drm/drmP.h | 4 +-
16572 include/linux/audit.h | 12 +-
16573 include/linux/init_task.h | 2 +-
16574 include/linux/ipc.h | 9 +-
16575 include/linux/key.h | 9 +-
16576 include/linux/posix_acl.h | 8 +-
16577 include/linux/posix_acl_xattr.h | 18 ++-
16578 include/linux/projid.h | 104 +++++++++++++++++
16579 include/linux/quota.h | 136 +++++++++++++++++++++-
16580 include/linux/quotaops.h | 6 +-
16581 include/linux/sched.h | 2 +-
16582 include/linux/security.h | 6 +-
16583 include/linux/tsacct_kern.h | 8 +-
16584 include/linux/tty.h | 4 +-
16585 include/linux/user_namespace.h | 3 +
16586 include/net/netlabel.h | 2 +-
16587 include/net/xfrm.h | 23 ++--
16588 init/Kconfig | 69 -----------
16592 ipc/util.c | 35 +++---
16594 kernel/acct.c | 4 +-
16595 kernel/audit.c | 121 ++++++++------------
16596 kernel/audit.h | 4 +-
16597 kernel/audit_watch.c | 2 +-
16598 kernel/auditfilter.c | 137 +++++++++++++++++++---
16599 kernel/auditsc.c | 216 ++++++++++++++++++-----------------
16600 kernel/cred.c | 10 +-
16601 kernel/taskstats.c | 23 +++-
16602 kernel/trace/trace.c | 3 +-
16603 kernel/trace/trace.h | 2 +-
16604 kernel/tsacct.c | 12 +-
16605 kernel/user.c | 8 ++
16606 kernel/user_namespace.c | 128 ++++++++++++++++++++-
16607 net/core/dev.c | 2 +-
16608 net/dns_resolver/dns_key.c | 3 +-
16609 net/netlabel/netlabel_unlabeled.c | 2 +-
16610 net/netlabel/netlabel_user.c | 2 +-
16611 net/rxrpc/ar-key.c | 6 +-
16612 net/xfrm/xfrm_policy.c | 8 +-
16613 net/xfrm/xfrm_state.c | 6 +-
16614 net/xfrm/xfrm_user.c | 12 +-
16615 security/apparmor/domain.c | 4 +-
16616 security/apparmor/file.c | 12 +-
16617 security/apparmor/include/audit.h | 2 +-
16618 security/apparmor/include/file.h | 4 +-
16619 security/apparmor/lsm.c | 2 +-
16620 security/capability.c | 2 +-
16621 security/integrity/evm/evm_crypto.c | 4 +-
16622 security/integrity/ima/ima_audit.c | 5 +-
16623 security/integrity/ima/ima_policy.c | 28 ++---
16624 security/keys/internal.h | 6 +-
16625 security/keys/key.c | 23 ++--
16626 security/keys/keyctl.c | 50 ++++----
16627 security/keys/keyring.c | 4 +-
16628 security/keys/permission.c | 14 +--
16629 security/keys/proc.c | 44 +++----
16630 security/keys/process_keys.c | 15 +--
16631 security/keys/request_key.c | 6 +-
16632 security/security.c | 2 +-
16633 security/selinux/selinuxfs.c | 6 +-
16634 security/selinux/ss/services.c | 2 +-
16635 security/tomoyo/audit.c | 23 ++--
16636 security/tomoyo/common.c | 4 +-
16637 security/tomoyo/common.h | 4 +-
16638 security/tomoyo/condition.c | 20 ++--
16639 security/tomoyo/tomoyo.c | 12 +-
16640 193 files changed, 2115 insertions(+), 1131 deletions(-)
16641 create mode 100644 fs/quota/kqid.c
16642 create mode 100644 include/linux/projid.h
16643 $ git am -3 ../patches/0001-audit-fix-up-for-pid-to-portid-change.patch
16644 Applying: audit: fix up for pid to portid change
16646 Unstaged changes after reset:
16649 $ git commit -v -a --amend
16650 [master c444bf7] Merge remote-tracking branch 'userns/for-next'
16651 Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
16652 $ git merge ktest/for-next
16653 Already up-to-date.
16654 Merging signal/for-next (12f79be alpha: don't open-code trace_report_syscall_{enter,exit})
16655 $ git merge signal/for-next
16656 Auto-merging kernel/sched/core.c
16657 Auto-merging kernel/fork.c
16658 Auto-merging include/linux/sched.h
16659 Auto-merging include/linux/ptrace.h
16660 Auto-merging include/linux/compat.h
16661 Auto-merging fs/exec.c
16662 CONFLICT (content): Merge conflict in fs/exec.c
16663 Auto-merging fs/binfmt_elf.c
16664 Removing arch/xtensa/include/asm/exec.h
16665 Auto-merging arch/x86/um/sys_call_table_32.c
16666 Auto-merging arch/x86/um/Kconfig
16667 Removing arch/x86/kernel/sys_i386_32.c
16668 Auto-merging arch/x86/kernel/signal.c
16669 CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c
16670 Auto-merging arch/x86/kernel/process_64.c
16671 Auto-merging arch/x86/kernel/process_32.c
16672 CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
16673 Auto-merging arch/x86/kernel/process.c
16674 Auto-merging arch/x86/kernel/entry_64.S
16675 Auto-merging arch/x86/kernel/entry_32.S
16676 Auto-merging arch/x86/kernel/Makefile
16677 Auto-merging arch/x86/include/asm/thread_info.h
16678 Auto-merging arch/x86/include/asm/sys_ia32.h
16679 Auto-merging arch/x86/include/asm/processor.h
16680 Auto-merging arch/x86/ia32/sys_ia32.c
16681 Auto-merging arch/x86/ia32/ia32entry.S
16682 Auto-merging arch/x86/Kconfig
16683 CONFLICT (content): Merge conflict in arch/x86/Kconfig
16684 Removing arch/unicore32/include/asm/exec.h
16685 Auto-merging arch/um/kernel/syscall.c
16686 Auto-merging arch/um/kernel/process.c
16687 Removing arch/um/kernel/internal.h
16688 Auto-merging arch/um/kernel/exec.c
16689 CONFLICT (content): Merge conflict in arch/um/kernel/exec.c
16690 Auto-merging arch/um/include/asm/processor-generic.h
16691 Removing arch/tile/include/asm/exec.h
16692 Removing arch/sparc/include/asm/exec.h
16693 Auto-merging arch/sparc/include/asm/Kbuild
16694 Removing arch/sh/include/asm/exec.h
16695 Auto-merging arch/s390/kernel/process.c
16696 Auto-merging arch/s390/kernel/entry64.S
16697 Auto-merging arch/s390/kernel/compat_wrapper.S
16698 Auto-merging arch/s390/kernel/compat_linux.c
16699 Auto-merging arch/s390/include/asm/unistd.h
16700 Auto-merging arch/s390/include/asm/processor.h
16701 Auto-merging arch/s390/Kconfig
16702 CONFLICT (content): Merge conflict in arch/s390/Kconfig
16703 Auto-merging arch/powerpc/kernel/sys_ppc32.c
16704 Auto-merging arch/powerpc/kernel/process.c
16705 Auto-merging arch/powerpc/kernel/ppc_ksyms.c
16706 Auto-merging arch/powerpc/kernel/entry_64.S
16707 Auto-merging arch/powerpc/kernel/entry_32.S
16708 Auto-merging arch/powerpc/include/asm/unistd.h
16709 Auto-merging arch/powerpc/include/asm/thread_info.h
16710 Auto-merging arch/powerpc/include/asm/processor.h
16711 Auto-merging arch/powerpc/Kconfig
16712 CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
16713 Removing arch/parisc/include/asm/exec.h
16714 Auto-merging arch/mn10300/kernel/process.c
16715 Removing arch/mn10300/kernel/kthread.S
16716 Removing arch/mn10300/kernel/kernel_execve.S
16717 Removing arch/mn10300/include/asm/exec.h
16718 Auto-merging arch/mn10300/Kconfig
16719 CONFLICT (content): Merge conflict in arch/mn10300/Kconfig
16720 Auto-merging arch/mips/include/asm/thread_info.h
16721 Removing arch/microblaze/include/asm/exec.h
16722 Auto-merging arch/m68k/kernel/process.c
16723 Removing arch/m68k/include/asm/exec.h
16724 Auto-merging arch/m68k/Kconfig
16725 CONFLICT (content): Merge conflict in arch/m68k/Kconfig
16726 Removing arch/m32r/include/asm/exec.h
16727 Auto-merging arch/m32r/include/asm/Kbuild
16728 CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
16729 Auto-merging arch/ia64/kernel/signal.c
16730 Removing arch/ia64/include/asm/exec.h
16731 Removing arch/h8300/include/asm/exec.h
16732 Auto-merging arch/h8300/include/asm/Kbuild
16733 CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
16734 Auto-merging arch/frv/kernel/process.c
16735 Removing arch/frv/kernel/kernel_thread.S
16736 Removing arch/frv/kernel/kernel_execve.S
16737 Removing arch/frv/include/asm/exec.h
16738 Removing arch/cris/include/asm/exec.h
16739 Auto-merging arch/cris/include/asm/Kbuild
16740 CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
16741 Removing arch/c6x/include/asm/exec.h
16742 Auto-merging arch/c6x/include/asm/Kbuild
16743 Auto-merging arch/c6x/Kconfig
16744 CONFLICT (content): Merge conflict in arch/c6x/Kconfig
16745 Removing arch/avr32/include/asm/exec.h
16746 Auto-merging arch/arm/kernel/process.c
16747 Auto-merging arch/arm/kernel/entry-common.S
16748 Auto-merging arch/arm/kernel/calls.S
16749 Auto-merging arch/arm/include/asm/unistd.h
16750 Auto-merging arch/arm/include/asm/thread_info.h
16751 Recorded preimage for 'fs/exec.c'
16752 Resolved 'arch/alpha/Kconfig' using previous resolution.
16753 Resolved 'arch/arm/Kconfig' using previous resolution.
16754 Resolved 'arch/arm/include/asm/thread_info.h' using previous resolution.
16755 Resolved 'arch/c6x/Kconfig' using previous resolution.
16756 Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
16757 Resolved 'arch/h8300/include/asm/Kbuild' using previous resolution.
16758 Resolved 'arch/m32r/include/asm/Kbuild' using previous resolution.
16759 Resolved 'arch/m68k/Kconfig' using previous resolution.
16760 Resolved 'arch/mn10300/Kconfig' using previous resolution.
16761 Resolved 'arch/um/kernel/exec.c' using previous resolution.
16762 Resolved 'arch/x86/Kconfig' using previous resolution.
16763 Resolved 'arch/x86/kernel/process_32.c' using previous resolution.
16764 Resolved 'arch/x86/kernel/signal.c' using previous resolution.
16765 CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
16766 Auto-merging arch/arm/include/asm/ptrace.h
16767 Auto-merging arch/arm/Kconfig
16768 CONFLICT (content): Merge conflict in arch/arm/Kconfig
16769 Auto-merging arch/alpha/kernel/process.c
16770 Removing arch/alpha/include/asm/exec.h
16771 Auto-merging arch/alpha/Kconfig
16772 CONFLICT (content): Merge conflict in arch/alpha/Kconfig
16773 Auto-merging arch/Kconfig
16774 Automatic merge failed; fix conflicts and then commit the result.
16776 Recorded resolution for 'arch/powerpc/Kconfig'.
16777 Recorded resolution for 'arch/s390/Kconfig'.
16778 Recorded resolution for 'fs/exec.c'.
16779 [master a135dd0] Merge remote-tracking branch 'signal/for-next'
16780 $ git diff -M --stat --summary HEAD^..
16782 arch/alpha/Kconfig | 1 +
16783 arch/alpha/include/asm/Kbuild | 1 +
16784 arch/alpha/include/asm/exec.h | 6 --
16785 arch/alpha/include/asm/processor.h | 3 -
16786 arch/alpha/include/asm/thread_info.h | 3 +-
16787 arch/alpha/include/asm/unistd.h | 2 +
16788 arch/alpha/kernel/alpha_ksyms.c | 3 -
16789 arch/alpha/kernel/entry.S | 82 +++++++---------------
16790 arch/alpha/kernel/process.c | 79 ++++++---------------
16791 arch/alpha/kernel/ptrace.c | 32 ++++-----
16792 arch/arm/Kconfig | 1 +
16793 arch/arm/include/asm/processor.h | 5 --
16794 arch/arm/include/asm/ptrace.h | 5 ++
16795 arch/arm/include/asm/system.h | 1 -
16796 arch/arm/include/asm/thread_info.h | 2 -
16797 arch/arm/include/asm/unistd.h | 2 +
16798 arch/arm/kernel/calls.S | 2 +-
16799 arch/arm/kernel/entry-common.S | 29 ++++++--
16800 arch/arm/kernel/process.c | 75 ++++----------------
16801 arch/arm/kernel/signal.c | 1 -
16802 arch/arm/kernel/sys_arm.c | 63 -----------------
16803 arch/avr32/include/asm/Kbuild | 1 +
16804 arch/avr32/include/asm/exec.h | 13 ----
16805 arch/avr32/include/asm/thread_info.h | 18 ++---
16806 arch/avr32/kernel/signal.c | 1 -
16807 arch/blackfin/include/asm/thread_info.h | 4 --
16808 arch/blackfin/kernel/signal.c | 1 -
16809 arch/c6x/Kconfig | 1 +
16810 arch/c6x/include/asm/Kbuild | 1 +
16811 arch/c6x/include/asm/exec.h | 6 --
16812 arch/c6x/include/asm/processor.h | 2 -
16813 arch/c6x/include/asm/syscalls.h | 5 --
16814 arch/c6x/include/asm/thread_info.h | 1 -
16815 arch/c6x/include/asm/unistd.h | 3 +
16816 arch/c6x/kernel/asm-offsets.c | 1 -
16817 arch/c6x/kernel/entry.S | 56 +++++++--------
16818 arch/c6x/kernel/process.c | 72 +++----------------
16819 arch/cris/include/asm/Kbuild | 1 +
16820 arch/cris/include/asm/exec.h | 6 --
16821 arch/cris/include/asm/thread_info.h | 3 -
16822 arch/frv/Kconfig | 1 +
16823 arch/frv/include/asm/Kbuild | 1 +
16824 arch/frv/include/asm/exec.h | 17 -----
16825 arch/frv/include/asm/processor.h | 9 +--
16826 arch/frv/include/asm/ptrace.h | 1 +
16827 arch/frv/include/asm/thread_info.h | 3 -
16828 arch/frv/include/asm/unistd.h | 2 +
16829 arch/frv/kernel/Makefile | 4 +-
16830 arch/frv/kernel/entry.S | 13 ++++
16831 arch/frv/kernel/frv_ksyms.c | 1 -
16832 arch/frv/kernel/kernel_execve.S | 33 ---------
16833 arch/frv/kernel/kernel_thread.S | 77 ---------------------
16834 arch/frv/kernel/process.c | 66 +++++++-----------
16835 arch/frv/kernel/signal.c | 9 ---
16836 arch/h8300/include/asm/Kbuild | 1 +
16837 arch/h8300/include/asm/exec.h | 6 --
16838 arch/h8300/include/asm/thread_info.h | 7 +-
16839 arch/h8300/kernel/signal.c | 1 -
16840 arch/hexagon/include/asm/thread_info.h | 5 --
16841 arch/hexagon/kernel/signal.c | 1 -
16842 arch/hexagon/kernel/syscall.c | 1 -
16843 arch/ia64/include/asm/Kbuild | 1 +
16844 arch/ia64/include/asm/exec.h | 14 ----
16845 arch/ia64/include/asm/thread_info.h | 2 -
16846 arch/ia64/kernel/signal.c | 8 ---
16847 arch/m32r/include/asm/Kbuild | 1 +
16848 arch/m32r/include/asm/exec.h | 14 ----
16849 arch/m32r/include/asm/thread_info.h | 9 +--
16850 arch/m32r/kernel/signal.c | 3 -
16851 arch/m68k/Kconfig | 1 +
16852 arch/m68k/include/asm/Kbuild | 1 +
16853 arch/m68k/include/asm/exec.h | 6 --
16854 arch/m68k/include/asm/processor.h | 25 ++++---
16855 arch/m68k/include/asm/ptrace.h | 2 +
16856 arch/m68k/include/asm/unistd.h | 2 +
16857 arch/m68k/kernel/entry.S | 16 +++++
16858 arch/m68k/kernel/process.c | 104 +++++++---------------------
16859 arch/m68k/kernel/sys_m68k.c | 17 -----
16860 arch/microblaze/include/asm/Kbuild | 1 +
16861 arch/microblaze/include/asm/exec.h | 14 ----
16862 arch/microblaze/include/asm/thread_info.h | 3 +-
16863 arch/microblaze/kernel/signal.c | 7 +-
16864 arch/mips/include/asm/thread_info.h | 3 -
16865 arch/mn10300/Kconfig | 1 +
16866 arch/mn10300/include/asm/Kbuild | 2 +
16867 arch/mn10300/include/asm/exec.h | 16 -----
16868 arch/mn10300/include/asm/frame.inc | 2 +-
16869 arch/mn10300/include/asm/processor.h | 18 +----
16870 arch/mn10300/include/asm/ptrace.h | 1 +
16871 arch/mn10300/include/asm/thread_info.h | 3 +-
16872 arch/mn10300/include/asm/unistd.h | 2 +
16873 arch/mn10300/kernel/Makefile | 4 +-
16874 arch/mn10300/kernel/entry.S | 18 +++++
16875 arch/mn10300/kernel/internal.h | 6 +-
16876 arch/mn10300/kernel/kernel_execve.S | 37 ----------
16877 arch/mn10300/kernel/kthread.S | 31 ---------
16878 arch/mn10300/kernel/process.c | 91 +++++++-----------------
16879 arch/mn10300/kernel/signal.c | 13 ----
16880 arch/openrisc/include/asm/thread_info.h | 3 +-
16881 arch/parisc/hpux/gate.S | 2 +-
16882 arch/parisc/include/asm/Kbuild | 1 +
16883 arch/parisc/include/asm/exec.h | 6 --
16884 arch/parisc/include/asm/thread_info.h | 5 +-
16885 arch/parisc/kernel/signal.c | 45 ++++--------
16886 arch/parisc/kernel/syscall.S | 9 +--
16887 arch/powerpc/Kconfig | 1 +
16888 arch/powerpc/include/asm/processor.h | 3 -
16889 arch/powerpc/include/asm/ptrace.h | 2 +
16890 arch/powerpc/include/asm/syscalls.h | 3 -
16891 arch/powerpc/include/asm/thread_info.h | 2 +
16892 arch/powerpc/include/asm/unistd.h | 2 +
16893 arch/powerpc/kernel/entry_32.S | 16 +++++
16894 arch/powerpc/kernel/entry_64.S | 16 +++++
16895 arch/powerpc/kernel/misc.S | 7 --
16896 arch/powerpc/kernel/misc_32.S | 33 ---------
16897 arch/powerpc/kernel/misc_64.S | 34 ---------
16898 arch/powerpc/kernel/ppc_ksyms.c | 1 -
16899 arch/powerpc/kernel/process.c | 59 ++++++++--------
16900 arch/powerpc/kernel/signal_32.c | 1 -
16901 arch/powerpc/kernel/sys_ppc32.c | 22 ------
16902 arch/s390/Kconfig | 1 +
16903 arch/s390/include/asm/processor.h | 4 +-
16904 arch/s390/include/asm/thread_info.h | 4 --
16905 arch/s390/include/asm/unistd.h | 2 +
16906 arch/s390/kernel/compat_linux.c | 26 -------
16907 arch/s390/kernel/compat_linux.h | 2 -
16908 arch/s390/kernel/compat_wrapper.S | 2 +-
16909 arch/s390/kernel/entry.S | 51 ++++++--------
16910 arch/s390/kernel/entry.h | 3 -
16911 arch/s390/kernel/entry64.S | 50 ++++++--------
16912 arch/s390/kernel/process.c | 107 +++++++++--------------------
16913 arch/score/include/asm/thread_info.h | 4 --
16914 arch/score/kernel/signal.c | 1 +
16915 arch/sh/include/asm/Kbuild | 1 +
16916 arch/sh/include/asm/exec.h | 10 ---
16917 arch/sh/include/asm/thread_info.h | 3 +
16918 arch/sh/kernel/signal_32.c | 1 -
16919 arch/sh/kernel/signal_64.c | 1 -
16920 arch/sparc/include/asm/Kbuild | 1 +
16921 arch/sparc/include/asm/exec.h | 6 --
16922 arch/sparc/include/asm/thread_info_32.h | 3 +-
16923 arch/sparc/include/asm/thread_info_64.h | 3 +
16924 arch/tile/include/asm/Kbuild | 1 +
16925 arch/tile/include/asm/exec.h | 20 ------
16926 arch/tile/kernel/compat_signal.c | 9 ---
16927 arch/tile/kernel/signal.c | 12 +---
16928 arch/um/include/asm/processor-generic.h | 2 -
16929 arch/um/include/asm/thread_info.h | 3 -
16930 arch/um/kernel/exec.c | 25 +------
16931 arch/um/kernel/internal.h | 1 -
16932 arch/um/kernel/process.c | 17 +----
16933 arch/um/kernel/syscall.c | 17 -----
16934 arch/unicore32/include/asm/Kbuild | 1 +
16935 arch/unicore32/include/asm/exec.h | 15 ----
16936 arch/unicore32/include/asm/thread_info.h | 4 +-
16937 arch/unicore32/kernel/entry.S | 2 -
16938 arch/unicore32/kernel/signal.c | 1 -
16939 arch/unicore32/kernel/sys.c | 1 -
16940 arch/x86/Kconfig | 1 +
16941 arch/x86/ia32/ia32entry.S | 2 +-
16942 arch/x86/ia32/sys_ia32.c | 15 ----
16943 arch/x86/include/asm/processor.h | 5 --
16944 arch/x86/include/asm/sys_ia32.h | 2 -
16945 arch/x86/include/asm/syscalls.h | 2 +-
16946 arch/x86/include/asm/thread_info.h | 2 -
16947 arch/x86/include/asm/unistd.h | 2 +
16948 arch/x86/kernel/Makefile | 2 +-
16949 arch/x86/kernel/asm-offsets.c | 3 +
16950 arch/x86/kernel/entry_32.S | 43 +++++++-----
16951 arch/x86/kernel/entry_64.S | 74 +++++++-------------
16952 arch/x86/kernel/process.c | 65 ------------------
16953 arch/x86/kernel/process_32.c | 37 ++++++++--
16954 arch/x86/kernel/process_64.c | 35 ++++++----
16955 arch/x86/kernel/signal.c | 4 --
16956 arch/x86/kernel/sys_i386_32.c | 40 -----------
16957 arch/x86/kernel/vm86_32.c | 6 +-
16958 arch/x86/syscalls/syscall_32.tbl | 2 +-
16959 arch/x86/um/Kconfig | 1 +
16960 arch/x86/um/sys_call_table_32.c | 1 -
16961 arch/xtensa/include/asm/Kbuild | 2 +
16962 arch/xtensa/include/asm/exec.h | 14 ----
16963 arch/xtensa/include/asm/thread_info.h | 5 --
16964 arch/xtensa/kernel/signal.c | 4 --
16965 fs/binfmt_elf.c | 1 -
16966 fs/binfmt_elf_fdpic.c | 1 -
16967 fs/exec.c | 61 ++++++++++++++--
16968 include/linux/binfmts.h | 6 ++
16969 include/linux/compat.h | 8 ++-
16970 include/linux/ptrace.h | 4 ++
16971 include/linux/sched.h | 3 +
16972 kernel/fork.c | 13 +++-
16973 kernel/sched/core.c | 2 +-
16974 193 files changed, 734 insertions(+), 1779 deletions(-)
16975 delete mode 100644 arch/alpha/include/asm/exec.h
16976 delete mode 100644 arch/avr32/include/asm/exec.h
16977 delete mode 100644 arch/c6x/include/asm/exec.h
16978 delete mode 100644 arch/cris/include/asm/exec.h
16979 delete mode 100644 arch/frv/include/asm/exec.h
16980 delete mode 100644 arch/frv/kernel/kernel_execve.S
16981 delete mode 100644 arch/frv/kernel/kernel_thread.S
16982 delete mode 100644 arch/h8300/include/asm/exec.h
16983 delete mode 100644 arch/ia64/include/asm/exec.h
16984 delete mode 100644 arch/m32r/include/asm/exec.h
16985 delete mode 100644 arch/m68k/include/asm/exec.h
16986 delete mode 100644 arch/microblaze/include/asm/exec.h
16987 delete mode 100644 arch/mn10300/include/asm/exec.h
16988 delete mode 100644 arch/mn10300/kernel/kernel_execve.S
16989 delete mode 100644 arch/mn10300/kernel/kthread.S
16990 delete mode 100644 arch/parisc/include/asm/exec.h
16991 delete mode 100644 arch/sh/include/asm/exec.h
16992 delete mode 100644 arch/sparc/include/asm/exec.h
16993 delete mode 100644 arch/tile/include/asm/exec.h
16994 delete mode 100644 arch/um/kernel/internal.h
16995 delete mode 100644 arch/unicore32/include/asm/exec.h
16996 delete mode 100644 arch/x86/kernel/sys_i386_32.c
16997 delete mode 100644 arch/xtensa/include/asm/exec.h
16998 Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
16999 $ git merge clk/clk-next
17000 Already up-to-date.
17001 Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
17002 $ git merge random/dev
17003 Already up-to-date.
17004 Merging scsi-post-merge/merge-base:master ()
17005 $ git clone -s -l -n -q . ../rebase-tmp
17007 $ git fetch --no-tags ../next refs/heads/akpm/master:akpm
17009 * [new branch] akpm/master -> akpm
17010 $ git fetch --no-tags ../next refs/heads/akpm/base:akpm-base
17012 * [new branch] akpm/base -> akpm-base
17013 $ git checkout akpm
17014 Switched to branch 'akpm'
17015 $ git rebase --onto master akpm-base
17016 First, rewinding head to replay your work on top of it...
17017 Applying: CRIS: Fix I/O macros
17018 Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
17019 Applying: vfs: d_obtain_alias() needs to use "/" as default name.
17020 Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
17021 Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
17022 Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
17023 Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
17024 Applying: acpi_memhotplug.c: remove memory info from list before freeing it
17025 Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
17026 Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
17027 Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
17028 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
17029 Applying: x86 numa: don't check if node is NUMA_NO_NODE
17030 Applying: arch/x86/tools/insn_sanity.c: identify source of messages
17031 Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
17032 Applying: audit.h: replace defines with C stubs
17033 Applying: audith-replace-defines-with-c-stubs-fix
17034 Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
17035 Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
17036 Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
17037 Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
17038 Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
17039 Applying: timeconst.pl: remove deprecated defined(@array)
17040 Applying: time: don't inline EXPORT_SYMBOL functions
17041 Applying: kbuild: make: fix if_changed when command contains backslashes
17042 Applying: compiler-gcc4.h: correct verion check for __compiletime_error
17043 Applying: h8300: select generic atomic64_t support
17044 Applying: unicore32: select generic atomic64_t support
17045 Applying: rapidio/rionet: fix multicast packet transmit logic
17046 Applying: readahead: fault retry breaks mmap file read random detection
17047 Applying: drivers/scsi/atp870u.c: fix bad use of udelay
17048 Applying: cciss: cleanup bitops usage
17049 Applying: cciss: use check_signature()
17050 Applying: block: store partition_meta_info.uuid as a string
17051 Applying: init: reduce PARTUUID min length to 1 from 36
17052 Applying: block: partition: msdos: provide UUIDs for partitions
17053 Applying: drbd: use copy_highpage
17054 Applying: vfs: increment iversion when a file is truncated
17055 Applying: fs: change return values from -EACCES to -EPERM
17056 Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
17057 Applying: mm/page_alloc.c: remove duplicate check
17058 Applying: mm: remove __GFP_NO_KSWAPD
17059 Applying: x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines
17060 Applying: x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn
17061 Applying: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix
17062 Applying: mm, x86, pat: rework linear pfn-mmap tracking
17063 Applying: mm: introduce arch-specific vma flag VM_ARCH_1
17064 Applying: mm: kill vma flag VM_INSERTPAGE
17065 Applying: mm: kill vma flag VM_CAN_NONLINEAR
17066 Applying: mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
17067 Applying: mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas
17068 Applying: mm: prepare VM_DONTDUMP for using in drivers
17069 Applying: mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
17070 Applying: mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix
17071 Applying: mm: fix nonuniform page status when writing new file with small buffer
17072 Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix
17073 Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix-fix
17074 Applying: mm/mmap.c: replace find_vma_prepare() with clearer find_vma_links()
17075 Applying: mm-mmapc-replace-find_vma_prepare-with-clearer-find_vma_links fix
17076 Applying: mm: compaction: update comment in try_to_compact_pages
17077 Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures
17078 Applying: mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures-fix
17079 Applying: mm: compaction: capture a suitable high-order page immediately when it is made available
17080 Applying: Revert "mm: mempolicy: Let vma_merge and vma_split handle vma->vm_policy linkages"
17081 Applying: mempolicy: remove mempolicy sharing
17082 Applying: mempolicy: fix a race in shared_policy_replace()
17083 Applying: mempolicy: fix refcount leak in mpol_set_shared_policy()
17084 Applying: mempolicy: fix a memory corruption by refcount imbalance in alloc_pages_vma()
17085 Applying: mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma-v2
17086 Applying: mm: mmu_notifier: fix inconsistent memory between secondary MMU and host
17087 Applying: mm-mmu_notifier-fix-inconsistent-memory-between-secondary-mmu-and-host-fix
17088 Applying: mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule
17089 Applying: mm/mmu_notifier: init notifier if necessary
17090 Applying: mm/mmu_notifier: init notifier if necessary
17091 Applying: mm/vmscan: fix error number for failed kthread
17092 Applying: mm: hugetlb: add arch hook for clearing page flags before entering pool
17093 Applying: mm: adjust final #endif position in mm/internal.h
17094 Applying: thp: fix the count of THP_COLLAPSE_ALLOC
17095 Applying: thp: remove unnecessary check in start_khugepaged
17096 Applying: thp: move khugepaged_mutex out of khugepaged
17097 Applying: thp: remove unnecessary khugepaged_thread check
17098 Applying: thp: remove wake_up_interruptible in the exit path
17099 Applying: thp: remove some code depend on CONFIG_NUMA
17100 Applying: thp: merge page pre-alloc in khugepaged_loop into khugepaged_do_scan
17101 Applying: thp: release page in page pre-alloc path
17102 Applying: thp: introduce khugepaged_prealloc_page and khugepaged_alloc_page
17103 Applying: thp: remove khugepaged_loop
17104 Applying: thp: use khugepaged_enabled to remove duplicate code
17105 Applying: thp: remove unnecessary set_recommended_min_free_kbytes
17106 Applying: mm: fix potential anon_vma locking issue in mprotect()
17107 Applying: thp, x86: introduce HAVE_ARCH_TRANSPARENT_HUGEPAGE
17108 Applying: thp: remove assumptions on pgtable_t type
17109 Applying: thp: introduce pmdp_invalidate()
17110 Applying: thp: make MADV_HUGEPAGE check for mm->def_flags
17111 Applying: thp, s390: thp splitting backend for s390
17112 Applying: thp, s390: thp pagetable pre-allocation for s390
17113 Applying: thp, s390: disable thp for kvm host on s390
17114 Applying: thp, s390: architecture backend for thp on s390
17115 Applying: thp, s390: add missing earlyclobber to inline assembly
17116 Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
17117 Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
17118 Applying: rbtree: empty nodes have no color
17119 Applying: rbtree-empty-nodes-have-no-color-fix
17120 Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c
17121 Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
17122 Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
17123 Applying: rbtree: performance and correctness test
17124 Applying: rbtree-performance-and-correctness-test-fix
17125 Applying: rbtree: break out of rb_insert_color loop after tree rotation
17126 Applying: rbtree: adjust root color in rb_insert_color() only when necessary
17127 Applying: rbtree: low level optimizations in rb_insert_color()
17128 Applying: rbtree: adjust node color in __rb_erase_color() only when necessary
17129 Applying: perf tools: fix build for another rbtree.c change
17130 Applying: rbtree: optimize case selection logic in __rb_erase_color()
17131 Applying: rbtree: low level optimizations in __rb_erase_color()
17132 Applying: rbtree: coding style adjustments
17133 Applying: rbtree: optimize fetching of sibling node
17134 Applying: rbtree test: fix sparse warning about 64-bit constant
17135 Applying: rbtree: add __rb_change_child() helper function
17136 Applying: rbtree: place easiest case first in rb_erase()
17137 Applying: rbtree: handle 1-child recoloring in rb_erase() instead of rb_erase_color()
17138 Applying: rbtree: low level optimizations in rb_erase()
17139 Applying: rbtree: augmented rbtree test
17140 Applying: rbtree: faster augmented rbtree manipulation
17141 Applying: rbtree: remove prior augmented rbtree implementation
17142 Applying: rbtree: add RB_DECLARE_CALLBACKS() macro
17143 Applying: rbtree: add prio tree and interval tree tests
17144 Applying: mm: replace vma prio_tree with an interval tree
17145 Applying: kmemleak: use rbtree instead of prio tree
17146 Applying: prio_tree: remove
17147 Applying: rbtree: move augmented rbtree functionality to rbtree_augmented.h
17148 Applying: mm: interval tree updates
17149 Applying: mm anon rmap: remove anon_vma_moveto_tail
17150 Applying: mm anon rmap: replace same_anon_vma linked list with an interval tree.
17151 Applying: mm rmap: remove vma_address check for address inside vma
17152 Applying: mm: add CONFIG_DEBUG_VM_RB build option
17153 Applying: mm anon rmap: in mremap, set the new vma's position before anon_vma_clone()
17154 Applying: mm: avoid taking rmap locks in move_ptes()
17155 Applying: memory-hotplug: build zonelists when offlining pages
17156 Applying: mm: mmu_notifier: make the mmu_notifier srcu static
17157 Applying: mm: cma: discard clean pages during contiguous allocation instead of migration
17158 Applying: mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix
17159 Applying: mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix-fix
17160 Applying: mm: fix tracing in free_pcppages_bulk()
17161 Applying: mm-fix-tracing-in-free_pcppages_bulk-fix
17162 Applying: cma: fix counting of isolated pages
17163 Applying: cma: count free CMA pages
17164 Applying: cma-count-free-cma-pages-fix
17165 Applying: cma: fix watermark checking
17166 Applying: cma: fix watermark checking cleanup
17167 Applying: mm: page_alloc: use get_freepage_migratetype() instead of page_private()
17168 Applying: mm: remain migratetype in freed page
17169 Applying: memory-hotplug: bug fix race between isolation and allocation
17170 Applying: memory-hotplug: fix pages missed by race rather than failing
17171 Applying: memory-hotplug-fix-pages-missed-by-race-rather-than-failng-fix
17172 Applying: atomic: implement generic atomic_dec_if_positive()
17173 Applying: atomic-implement-generic-atomic_dec_if_positive-fix
17174 Applying: swap: add a simple detector for inappropriate swapin readahead
17175 Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
17176 Applying: mm/memblock: reduce overhead in binary search
17177 Applying: mm/memblock: use existing interface to set nid
17178 Applying: mm/memblock: cleanup early_node_map[] related comments
17179 Applying: mm: compaction: abort compaction loop if lock is contended or run too long
17180 Applying: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix
17181 Applying: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix-2
17182 Applying: mm: compaction: move fatal signal check out of compact_checklock_irqsave
17183 Applying: mm: compaction: Update try_to_compact_pages()kerneldoc comment
17184 Applying: mm: compaction: acquire the zone->lru_lock as late as possible
17185 Applying: mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix
17186 Applying: mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix-fix
17187 Applying: mm: compaction: acquire the zone->lock as late as possible
17188 Applying: mm: compaction: iron out isolate_freepages_block() and isolate_freepages_range()
17189 Applying: Revert "mm: have order > 0 compaction start off where it left"
17190 Applying: mm: compaction: cache if a pageblock was scanned and no pages were isolated
17191 Applying: mm-compaction-cache-if-a-pageblock-was-scanned-and-no-pages-were-isolated-fix
17192 Applying: mm: compaction: cache if a pageblock was scanned and no pages were isolated -fix2
17193 Applying: mm: compaction: Restart compaction from near where it left off
17194 Applying: mm: compaction: Restart compaction from near where it left off -fix
17195 Applying: mm: compaction: clear PG_migrate_skip based on compaction and reclaim activity
17196 Applying: mm/hugetlb.c: remove duplicate inclusion of header file
17197 Applying: mm/page_alloc: refactor out __alloc_contig_migrate_alloc()
17198 Applying: mm-page_alloc-refactor-out-__alloc_contig_migrate_alloc-checkpatch-fixes
17199 Applying: memory-hotplug: don't replace lowmem pages with highmem
17200 Applying: thp: khugepaged_prealloc_page() forgot to reset the page alloc indicator
17201 Applying: mm: thp: fix the pmd_clear() arguments in pmdp_get_and_clear()
17202 Applying: mm: thp: fix the update_mmu_cache() last argument passing in mm/huge_memory.c
17203 Applying: mm: enable CONFIG_COMPACTION by default
17204 Applying: mm: fix-up zone present pages
17205 Applying: memcg: trivial fixes for Documentation/cgroups/memory.txt
17206 Applying: memcg: cleanup kmem tcp ifdefs
17207 Applying: memcg: move mem_cgroup_is_root upwards
17208 Applying: mm: fix invalidate_complete_page2() lock ordering
17209 Applying: mm: remove vma arg from page_evictable
17210 Applying: mm: use clear_page_mlock() in page_remove_rmap()
17211 Applying: mm: remove free_page_mlock
17212 Applying: mm, numa: reclaim from all nodes within reclaim distance
17213 Applying: mm-numa-reclaim-from-all-nodes-within-reclaim-distance-fix
17214 Applying: mm, numa: reclaim from all nodes within reclaim distance fix fix
17215 Applying: memory.txt: remove stray information
17216 Applying: mm: thp: fix pmd_present for split_huge_page and PROT_NONE with THP
17217 Applying: hugetlb: do not use vma_hugecache_offset() for vma_prio_tree_foreach
17218 Applying: mm: move all mmu notifier invocations to be done outside the PT lock
17219 Applying: mm: wrap calls to set_pte_at_notify with invalidate_range_start and invalidate_range_end
17220 Applying: mm: call invalidate_range_end in do_wp_page even for zero pages
17221 Applying: Revert 0def08e3 because check_range can't fail in migrate_to_node with
17222 Applying: mm: enhance comment and bug check
17223 Applying: memory-hotplug: fix zone stat mismatch
17224 Applying: mm: remove unevictable_pgs_mlockfreed
17225 Applying: KSM: numa awareness sysfs knob
17226 Applying: mm/memory.c: fix typo in comment
17227 Applying: fs/fs-writeback.c: remove unneccesary parameter of __writeback_single_inode()
17228 Applying: kpageflags: fix wrong KPF_THP on non-huge compound pages
17229 Applying: CMA: migrate mlocked pages
17230 Applying: cma: decrease cc.nr_migratepages after reclaiming pagelist
17231 Applying: sections: disable const sections for PA-RISC v2
17232 Applying: sections: fix section conflicts in arch/arm/
17233 Applying: sections: fix section conflicts in arch/frv
17234 Applying: sections: fix section conflicts in arch/h8300
17235 Applying: sections-fix-section-conflicts-in-arch-h8300-checkpatch-fixes
17236 Applying: sections: fix section conflicts in arch/ia64
17237 Applying: sections: fix section conflicts in arch/mips
17238 Applying: sections: fix section conflicts in arch/powerpc
17239 Applying: sections: fix section conflicts in arch/score
17240 Applying: sections: fix section conflicts in arch/sh
17241 Applying: sections-fix-section-conflicts-in-arch-sh-fix
17242 Applying: sections: fix section conflicts in arch/x86
17243 Applying: sections: fix section conflicts in drivers/atm
17244 Applying: sections: fix section conflicts in drivers/char
17245 Applying: sections: fix section conflicts in drivers/ide
17246 Applying: sections: fix section conflicts in drivers/macintosh
17247 Applying: sections-fix-section-conflicts-in-drivers-macintosh-checkpatch-fixes
17248 Applying: sections: fix section conflicts in drivers/mfd
17249 Applying: sections: fix section conflicts in drivers/mmc
17250 Applying: sections: fix section conflicts in drivers/net
17251 Applying: sections: fix section conflicts in drivers/net/hamradio
17252 Applying: sections: fix section conflicts in drivers/net/wan
17253 Applying: sections: fix section conflicts in drivers/platform/x86
17254 Applying: sections: fix section conflicts in drivers/scsi
17255 Applying: sections: fix section conflicts in drivers/video
17256 Applying: sections: fix section conflicts in mm/percpu.c
17257 Applying: sections: fix section conflicts in net/can
17258 Applying: sections: fix section conflicts in net
17259 Applying: sections: fix section conflicts in sound
17260 Applying: sections: fix const sections for crc32 table
17261 Applying: sectons-fix-const-sections-for-crc32-table-checkpatch-fixes
17262 Applying: frv: kill used but uninitialized variable
17263 Applying: score: select generic atomic64_t support
17264 Applying: cross-arch: don't corrupt personality flags upon exec()
17265 Applying: tile: fix personality bits handling upon exec()
17266 Applying: kernel/sys.c: call disable_nonboot_cpus() in kernel_restart()
17267 Applying: poweroff: fix bug in orderly_poweroff()
17268 Applying: lib: vsprintf: optimize division by 10 for small integers
17269 Applying: lib: vsprintf: optimize division by 10000
17270 Applying: lib: vsprintf: optimize put_dec_trunc8()
17271 Applying: lib-vsprintf-optimize-put_dec_trunc8-fix
17272 Applying: lib: vsprintf: fix broken comments
17273 Applying: lib/vsprintf: update documentation to cover all of %p[Mm][FR]
17274 Applying: MAINTAINERS: update gpio subsystem file list
17275 Applying: MAINTAINERS: add defconfig file to IMX section
17276 Applying: MAINTAINERS: Update gianfar_ptp after renaming
17277 Applying: MAINTAINERS: fix indentation for Viresh Kumar
17278 Applying: drivers/video/backlight/da9052_bl.c: use usleep_range() instead of msleep() for small sleeps
17279 Applying: drivers/video/backlight/ltv350qv.c: use usleep_range() instead of msleep() for small sleeps
17280 Applying: drivers/video/backlight/kb3886_bl.c: use usleep_range() instead of msleep() for small sleeps
17281 Applying: backlight: lp855x: add FAST bit description for LP8556
17282 Applying: backlight: add Backlight driver for lm3630 chip
17283 Applying: backlight-add-backlight-driver-for-lm3630-chip-fix
17284 Applying: backlight: add new lm3639 backlight driver
17285 Applying: backlight-add-new-lm3639-backlight-driver-fix
17286 Applying: backlight-add-new-lm3639-backlight-driver-fix-2
17287 Applying: backlight: remove ProGear driver
17288 Applying: drivers/video/backlight/da9052_bl.c: drop devm_kfree of devm_kzalloc'd data
17289 Applying: drivers/video/backlight/platform_lcd.c: add support for device tree based probe
17290 Applying: backlight-platform-lcd-add-support-for-device-tree-based-probe-fix
17291 Applying: pwm_backlight: add device tree support for Low Threshold Brightness
17292 Applying: pwm_backlight-add-device-tree-support-for-low-threshold-brightness-fix
17293 Applying: drivers/net/ethernet/sfc: use standard __{clear,set}_bit_le() functions
17294 Applying: drivers/net/ethernet/dec/tulip: Use standard __set_bit_le() function
17295 Applying: bitops: introduce generic {clear,set}_bit_le()
17296 Applying: powerpc: bitops: introduce {clear,set}_bit_le()
17297 Applying: kvm: replace test_and_set_bit_le() in mark_page_dirty_in_slot() with set_bit_le()
17298 Applying: idr: rename MAX_LEVEL to MAX_IDR_LEVEL
17299 Applying: idr-rename-max_level-to-max_idr_level-fix
17300 Applying: idr-rename-max_level-to-max_idr_level-fix-fix-2
17301 Applying: idr-rename-max_level-to-max_idr_level-fix-fix-2-fix
17302 Applying: idr-rename-max_level-to-max_idr_level-fix-3
17303 Applying: lib/parser.c: avoid overflow in match_number()
17304 Applying: lib-parserc-avoid-overflow-in-match_number-fix
17305 Applying: lib/Kconfig.debug: adjust hard-lockup related Kconfig options
17306 Applying: lib/gcd.c: prevent possible div by 0
17307 Applying: genalloc: make it possible to use a custom allocation algorithm
17308 Applying: lib/spinlock_debug: avoid livelock in do_raw_spin_lock()
17309 Applying: lib-spinlock_debug-avoid-livelock-in-do_raw_spin_lock-fix
17310 Applying: lib/vsprintf.c: improve standard conformance of sscanf()
17311 Applying: lib/plist.c: make plist test announcements KERN_DEBUG
17312 Applying: scatterlist: atomic sg_mapping_iter() no longer needs disabled IRQs
17313 Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
17314 Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
17315 Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
17316 Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
17317 Applying: checkpatch: check utf-8 content from a commit log when it's missing from charset
17318 Applying: checkpatch: update suggested printk conversions
17319 Applying: checkpatch: check networking specific block comment style
17320 Applying: CodingStyle: add networking specific block comment style
17321 Applying: epoll: support for disabling items, and a self-test app
17322 Applying: binfmt_elf: Uninitialized variable
17323 Applying: drivers/rtc/rtc-isl1208.c: add support for the ISL1218
17324 Applying: rtc-proc: permit the /proc/driver/rtc device to use other devices
17325 Applying: rtc: add Dallas DS2404 driver
17326 Applying: rtc-add-dallas-ds2404-driver-fix
17327 Applying: rtc: snvs: add Freescale rtc-snvs driver
17328 Applying: rtc: snvs: change timeout to use a fixed number of loop
17329 Applying: rtc: recycle id when unloading a rtc driver
17330 Applying: drivers/rtc/rtc-at91sam9.c: use module_platform_driver() macro
17331 Applying: rtc: tps65910: add RTC driver for TPS65910 PMIC RTC
17332 Applying: rtc: tps65910: change RTC driver name as per mfd
17333 Applying: rtc: add MAX8907 RTC driver
17334 Applying: rtc: kconfig: remove unnecessary dependencies.
17335 Applying: drivers/rtc/rtc-jz4740.c: fix IRQ error check
17336 Applying: drivers/rtc/rtc-spear.c: fix several error checks
17337 Applying: rtc: rc5t583: add ricoh rc5t583 RTC driver
17338 Applying: drivers/rtc/rtc-coh901331.c: use clk_prepare_enable() and clk_disable_unprepare()
17339 Applying: rtc: rtc-mxc: adapt to the new i.mx clock framework
17340 Applying: rtc: rtc-mxc: convert to module_platform_driver
17341 Applying: rtc_sysfs_show_hctosys(): display 0 if resume failed
17342 Applying: rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix
17343 Applying: rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix-fix
17344 Applying: drivers/rtc/rtc-s3c.c: fix return value in s3c_rtc_probe()
17345 Applying: drivers/rtc/rtc-ds1672.c: convert struct i2c_msg initialization to C99 format
17346 Applying: drivers/rtc/rtc-x1205.c: convert struct i2c_msg initialization to C99 format
17347 Applying: drivers/rtc/rtc-s35390a.c: convert struct i2c_msg initialization to C99 format
17348 Applying: drivers/rtc/rtc-rs5c372.c: convert struct i2c_msg initialization to C99 format
17349 Applying: drivers/rtc/rtc-pcf8563.c: convert struct i2c_msg initialization to C99 format
17350 Applying: drivers/rtc/rtc-isl1208.c: convert struct i2c_msg initialization to C99 format
17351 Applying: drivers/rtc/rtc-em3027.c: convert struct i2c_msg initialization to C99 format
17352 Applying: rtc: kconfig: fix up dependency for ab8500
17353 Applying: drivers/rtc/rtc-tps65910.c: use platform_get_irq() to get RTC irq details
17354 Applying: drivers/rtc/rtc-m41t80.c: remove disabled alarm functionality
17355 Applying: drivers/rtc/rtc-s35390a.c: add wakealarm support for rtc-s35390A rtc chip
17356 Applying: hfsplus: add on-disk layout declarations related to attributes tree
17357 Applying: hfsplus: add functionality of manipulating by records in attributes tree
17358 Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
17359 Applying: hfsplus: add support of manipulation by attributes file
17360 Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
17361 Applying: hfsplus: code style fixes - reworked support of extended attributes
17362 Applying: fat: use accessor function for msdos_dir_entry 'start'
17363 Applying: fat (exportfs): move NFS support code
17364 Applying: fat (exportfs): fix dentry reconnection
17365 Applying: fs/fat: fix a checkpatch issue in namei_msdos.c
17366 Applying: fs/fat: fix some checkpatch issues in fat.h
17367 Applying: fs/fat: chang indentation of some comments in fat.h
17368 Applying: fs/fat: fix two checkpatch issues in cache.c
17369 Applying: fs/fat: fix some small checkpatch issues in dir.c
17370 Applying: fs/fat: fix all other checkpatch issues in dir.c
17371 Applying: fs-fat-fix-all-other-checkpatch-issues-in-dirc-fix
17372 Applying: fs/fat: fix checkpatch issues in fatent.c
17373 Applying: fat: no need to reset EOF in ent_put for FAT32
17374 Applying: fat: simplify writeback_inode()
17375 Applying: fat-simplify-writeback_inode-checkpatch-fixes
17376 Applying: fat-simplify-writeback_inode-checkpatch-fixes-fix
17377 Applying: device_cgroup: add "deny_all" in dev_cgroup structure
17378 Applying: device_cgroup: introduce dev_whitelist_clean()
17379 Applying: device_cgroup: convert device_cgroup internally to policy + exceptions
17380 Applying: device_cgroup: rename whitelist to exception list
17381 Applying: coredump: make core dump functionality optional
17382 Applying: fs: amended coredump-related sysctl functions
17383 Applying: coredump-make-core-dump-functionality-optional-fix-fix
17384 Applying: coredump: update coredump-related headers
17385 Applying: coredump: add support for %d=__get_dumpable() in core name
17386 Applying: coredump-add-support-for-%d=__get_dumpable-in-core-name-fix
17387 Applying: coredump: use SUID_DUMPABLE_ENABLED rather than hardcoded 1
17388 Applying: coredump-use-suid_dumpable_enabled-rather-than-hardcoded-1-checkpatch-fixes
17389 Applying: coredump: pass siginfo_t* to do_coredump() and below, not merely signr
17390 Applying: compat: move compat_siginfo_t definition to asm/compat.h
17391 Applying: coredump: add a new elf note with siginfo of the signal
17392 Applying: coredump: extend core dump note section to contain file names of mapped files
17393 Applying: proc: return -ENOMEM when inode allocation failed
17394 Applying: proc: no need to initialize proc_inode->fd in proc_get_inode()
17395 Applying: proc: use kzalloc instead of kmalloc and memset
17396 Applying: proc-use-kzalloc-instead-of-kmalloc-and-memset-fix
17397 Applying: proc_sysctl.c: use BUG_ON instead of BUG
17398 Applying: fs/proc/root.c: use NULL instead of 0 for pointer
17399 Applying: kdump: remove unneeded include
17400 Applying: ipc/sem.c: alternatives to preempt_disable()
17401 Applying: rapidio/tsi721: modify mport name assignment
17402 Applying: rapidio: fix kerneldoc warnings after DMA support was added
17403 Applying: drivers/rapidio/devices/tsi721.c: fix error return code
17404 Applying: rapidio: add inbound memory mapping interface
17405 Applying: rapidio/tsi721: add inbound memory mapping callbacks
17406 Applying: rapidio: apply RX/TX enable to active switch ports only
17407 Applying: nbd: add set flags ioctl
17408 Applying: nbd: handle discard requests
17409 Applying: aoe: for performance support larger packet payloads
17410 Applying: aoe: kernel thread handles I/O completions for simple locking
17411 Applying: aoe: cleanup an allocation a bit
17412 Applying: aoe: become I/O request queue handler for increased user control
17413 Applying: aoe: use a kernel thread for transmissions
17414 Applying: aoe: use packets that work with the smallest-MTU local interface
17415 Applying: aoe: failover remote interface based on aoe_deadsecs parameter
17416 Applying: aoe: do revalidation steps in order
17417 Applying: aoe: disallow unsupported AoE minor addresses
17418 Applying: aoe: associate frames with the AoE storage target
17419 Applying: aoe: increase net_device reference count while using it
17420 Applying: aoe: remove unused code and add cosmetic improvements
17421 Applying: aoe: update internal version number to 49
17422 Applying: aoe: update copyright year in touched files
17423 Applying: aoe: update documentation with new URL and VM settings reference
17424 Applying: taskstats: cgroupstats_user_cmd() may leak on error
17425 Applying: kernel/resource.c: fix stack overflow in __reserve_region_with_split()
17426 Applying: lib/decompress.c add __init to decompress_method and data
17427 Applying: prio_tree: fix fs/block_dev.c for removal of prio_tree
17428 Applying: fs/block_dev.c:set_blocksize(): use mapping_mapped()
17430 $ git fetch -f ../rebase-tmp akpm:akpm/master
17432 + 14049c3...275c16c akpm -> akpm/master (forced update)
17433 $ rm -rf ../rebase-tmp
17434 Merging akpm/master (275c16c fs/block_dev.c:set_blocksize(): use mapping_mapped())
17435 $ git merge --no-ff akpm/master
17436 Removing mm/prio_tree.c
17437 Removing lib/prio_tree.c
17438 Removing include/linux/prio_tree.h
17439 Removing drivers/video/backlight/progear_bl.c
17440 Removing Documentation/prio_tree.txt
17441 Removing Documentation/memory.txt
17442 Merge made by the 'recursive' strategy.
17443 Documentation/00-INDEX | 2 -
17444 Documentation/CodingStyle | 10 +
17445 Documentation/aoe/aoe.txt | 9 +-
17446 Documentation/cgroups/memory.txt | 90 +-
17447 .../devicetree/bindings/crypto/fsl-sec4.txt | 51 +
17448 Documentation/devicetree/bindings/rtc/snvs-rtc.txt | 1 +
17449 .../bindings/video/backlight/pwm-backlight.txt | 10 +
17450 Documentation/memory.txt | 33 -
17451 Documentation/printk-formats.txt | 1 +
17452 Documentation/prio_tree.txt | 107 --
17453 Documentation/rbtree.txt | 209 +++-
17454 Documentation/rtc.txt | 5 +-
17455 Documentation/sysctl/kernel.txt | 2 +
17456 Documentation/vm/ksm.txt | 7 +
17457 Documentation/vm/unevictable-lru.txt | 14 +-
17458 MAINTAINERS | 22 +-
17460 arch/alpha/kernel/pci-sysfs.c | 2 +-
17461 arch/arm/mach-at91/clock.c | 2 +-
17462 arch/arm/mach-davinci/board-tnetv107x-evm.c | 6 +-
17463 arch/arm/mach-davinci/da830.c | 48 +-
17464 arch/arm/mach-davinci/da850.c | 6 +-
17465 arch/arm/mach-msm/board-qsd8x50.c | 4 +-
17466 arch/arm/mach-omap2/display.c | 6 +-
17467 arch/arm/mm/fault-armv.c | 3 +-
17468 arch/arm/mm/fault.c | 1 +
17469 arch/arm/mm/flush.c | 3 +-
17470 arch/arm64/include/asm/compat.h | 60 +-
17471 arch/arm64/kernel/signal32.c | 53 -
17472 arch/avr32/include/asm/elf.h | 3 +-
17473 arch/avr32/mm/fault.c | 1 +
17474 arch/blackfin/include/asm/elf.h | 3 +-
17475 arch/c6x/include/asm/elf.h | 3 +-
17476 arch/cris/include/asm/elf.h | 3 +-
17477 arch/cris/include/asm/io.h | 39 +-
17478 arch/cris/mm/fault.c | 1 +
17479 arch/frv/include/asm/elf.h | 3 +-
17480 arch/frv/kernel/pm.c | 19 +-
17481 arch/frv/kernel/setup.c | 2 +-
17482 arch/frv/mb93090-mb00/pci-irq.c | 2 +-
17483 arch/h8300/Kconfig | 1 +
17484 arch/h8300/include/asm/elf.h | 3 +-
17485 arch/h8300/kernel/sys_h8300.c | 1 +
17486 arch/h8300/kernel/timer/itu.c | 2 +-
17487 arch/h8300/kernel/timer/timer16.c | 2 +-
17488 arch/h8300/kernel/timer/timer8.c | 2 +-
17489 arch/h8300/kernel/timer/tpu.c | 2 +-
17490 arch/h8300/platform/h8300h/irq.c | 4 +-
17491 arch/h8300/platform/h8s/irq.c | 4 +-
17492 arch/hexagon/include/asm/elf.h | 3 +-
17493 arch/hexagon/mm/vm_fault.c | 1 +
17494 arch/ia64/include/asm/hugetlb.h | 4 +
17495 arch/ia64/kernel/perfmon.c | 2 +-
17496 arch/ia64/mm/fault.c | 1 +
17497 arch/ia64/mm/init.c | 4 +-
17498 arch/ia64/xen/irq_xen.c | 2 +-
17499 arch/ia64/xen/irq_xen.h | 2 +-
17500 arch/m32r/include/asm/elf.h | 3 +-
17501 arch/m68k/include/asm/elf.h | 3 +-
17502 arch/m68k/mm/fault.c | 1 +
17503 arch/microblaze/include/asm/atomic.h | 1 +
17504 arch/microblaze/include/asm/elf.h | 3 +-
17505 arch/microblaze/mm/fault.c | 1 +
17506 arch/mips/bcm63xx/boards/board_bcm963xx.c | 2 +-
17507 arch/mips/include/asm/compat-signal.h | 62 -
17508 arch/mips/include/asm/compat.h | 69 +-
17509 arch/mips/include/asm/hugetlb.h | 4 +
17510 arch/mips/mm/fault.c | 1 +
17511 arch/mips/pci/pci-octeon.c | 2 +-
17512 arch/mn10300/Makefile | 2 +-
17513 arch/mn10300/include/asm/elf.h | 3 +-
17514 arch/openrisc/include/asm/elf.h | 3 +-
17515 arch/openrisc/mm/fault.c | 1 +
17516 arch/parisc/Kconfig | 1 +
17517 arch/parisc/include/asm/compat.h | 59 +-
17518 arch/parisc/kernel/cache.c | 3 +-
17519 arch/parisc/kernel/signal32.h | 52 -
17520 arch/powerpc/include/asm/atomic.h | 1 +
17521 arch/powerpc/include/asm/bitops.h | 10 +
17522 arch/powerpc/include/asm/compat.h | 60 +-
17523 arch/powerpc/include/asm/hugetlb.h | 4 +
17524 arch/powerpc/include/asm/siginfo.h | 1 -
17525 arch/powerpc/kernel/ppc32.h | 51 -
17526 arch/powerpc/kvm/book3s_hv.c | 2 +-
17527 arch/powerpc/mm/fault.c | 1 +
17528 arch/powerpc/oprofile/cell/spu_task_sync.c | 15 +-
17529 arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +-
17530 arch/powerpc/platforms/512x/mpc5121_generic.c | 2 +-
17531 arch/powerpc/platforms/52xx/lite5200.c | 2 +-
17532 arch/powerpc/platforms/52xx/media5200.c | 2 +-
17533 arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 +-
17534 arch/powerpc/platforms/85xx/tqm85xx.c | 2 +-
17535 arch/s390/include/asm/compat.h | 75 +-
17536 arch/s390/include/asm/hugetlb.h | 19 +-
17537 arch/s390/include/asm/pgtable.h | 209 ++++
17538 arch/s390/include/asm/setup.h | 5 +-
17539 arch/s390/include/asm/tlb.h | 1 +
17540 arch/s390/kernel/compat_linux.h | 68 --
17541 arch/s390/kernel/early.c | 2 +
17542 arch/s390/mm/fault.c | 1 +
17543 arch/s390/mm/gup.c | 11 +-
17544 arch/s390/mm/pgtable.c | 108 ++
17545 arch/score/Kconfig | 3 +-
17546 arch/score/include/asm/elf.h | 2 +-
17547 arch/score/kernel/sys_score.c | 1 +
17548 arch/sh/include/asm/elf.h | 3 +-
17549 arch/sh/include/asm/hugetlb.h | 6 +
17550 arch/sh/include/asm/io.h | 2 +-
17551 arch/sh/kernel/ioport.c | 2 +-
17552 arch/sh/mm/fault.c | 1 +
17553 arch/sparc/include/asm/compat.h | 61 +-
17554 arch/sparc/include/asm/elf_32.h | 3 +-
17555 arch/sparc/include/asm/hugetlb.h | 4 +
17556 arch/sparc/include/asm/siginfo.h | 1 -
17557 arch/sparc/kernel/pci.c | 2 +-
17558 arch/sparc/kernel/signal32.c | 52 -
17559 arch/sparc/mm/fault_32.c | 1 +
17560 arch/sparc/mm/fault_64.c | 1 +
17561 arch/tile/include/asm/compat.h | 62 +
17562 arch/tile/include/asm/elf.h | 4 +-
17563 arch/tile/include/asm/hugetlb.h | 4 +
17564 arch/tile/kernel/compat_signal.c | 57 -
17565 arch/tile/mm/elf.c | 19 +-
17566 arch/tile/mm/fault.c | 1 +
17567 arch/um/kernel/trap.c | 1 +
17568 arch/unicore32/Kconfig | 1 +
17569 arch/unicore32/kernel/process.c | 2 +-
17570 arch/x86/Kconfig | 1 +
17571 arch/x86/include/asm/apic.h | 2 +-
17572 arch/x86/include/asm/atomic.h | 24 -
17573 arch/x86/include/asm/compat.h | 74 +-
17574 arch/x86/include/asm/hugetlb.h | 4 +
17575 arch/x86/include/asm/ia32.h | 67 --
17576 arch/x86/include/asm/pgtable.h | 11 +-
17577 arch/x86/include/asm/uv/uv.h | 2 +-
17578 arch/x86/kernel/acpi/boot.c | 7 +-
17579 arch/x86/kernel/apic/apic_numachip.c | 4 +-
17580 arch/x86/kernel/rtc.c | 2 +-
17581 arch/x86/mm/fault.c | 1 +
17582 arch/x86/mm/hugetlbpage.c | 3 +-
17583 arch/x86/mm/numa.c | 3 +-
17584 arch/x86/mm/pat.c | 87 +-
17585 arch/x86/mm/pat_rbtree.c | 34 +-
17586 arch/x86/platform/iris/iris.c | 67 +-
17587 arch/x86/platform/uv/tlb_uv.c | 10 +-
17588 arch/x86/tools/insn_sanity.c | 10 +-
17589 arch/x86/xen/mmu.c | 3 +-
17590 arch/xtensa/include/asm/elf.h | 3 +-
17591 arch/xtensa/mm/fault.c | 1 +
17592 block/genhd.c | 8 +-
17593 block/partitions/efi.c | 7 +-
17594 block/partitions/msdos.c | 21 +-
17595 drivers/acpi/acpi_memhotplug.c | 123 +-
17596 drivers/atm/eni.c | 2 +-
17597 drivers/block/aoe/aoe.h | 85 +-
17598 drivers/block/aoe/aoeblk.c | 89 +-
17599 drivers/block/aoe/aoechr.c | 11 +-
17600 drivers/block/aoe/aoecmd.c | 1222 +++++++++++++-------
17601 drivers/block/aoe/aoedev.c | 161 ++-
17602 drivers/block/aoe/aoemain.c | 10 +-
17603 drivers/block/aoe/aoenet.c | 61 +-
17604 drivers/block/cciss.c | 21 +-
17605 drivers/block/drbd/drbd_bitmap.c | 7 +-
17606 drivers/block/nbd.c | 23 +-
17607 drivers/char/mbcs.c | 4 +-
17608 drivers/char/mem.c | 2 +-
17609 drivers/char/mspec.c | 2 +-
17610 drivers/dma/dmaengine.c | 2 +-
17611 drivers/firmware/dmi_scan.c | 78 +-
17612 drivers/gpu/drm/drm_gem.c | 2 +-
17613 drivers/gpu/drm/drm_vm.c | 10 +-
17614 drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +-
17615 drivers/gpu/drm/gma500/framebuffer.c | 3 +-
17616 drivers/gpu/drm/i915/intel_pm.c | 3 +-
17617 drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +-
17618 drivers/gpu/drm/udl/udl_fb.c | 2 +-
17619 drivers/i2c/i2c-core.c | 2 +-
17620 drivers/ide/aec62xx.c | 2 +-
17621 drivers/ide/ali14xx.c | 4 +-
17622 drivers/ide/alim15x3.c | 2 +-
17623 drivers/ide/amd74xx.c | 2 +-
17624 drivers/ide/atiixp.c | 2 +-
17625 drivers/ide/cmd640.c | 2 +-
17626 drivers/ide/cmd64x.c | 2 +-
17627 drivers/ide/cs5520.c | 2 +-
17628 drivers/ide/cs5530.c | 2 +-
17629 drivers/ide/cs5535.c | 2 +-
17630 drivers/ide/cy82c693.c | 2 +-
17631 drivers/ide/dtc2278.c | 2 +-
17632 drivers/ide/hpt366.c | 24 +-
17633 drivers/ide/ht6560b.c | 2 +-
17634 drivers/ide/icside.c | 2 +-
17635 drivers/ide/ide-pci-generic.c | 2 +-
17636 drivers/ide/it8172.c | 2 +-
17637 drivers/ide/it8213.c | 2 +-
17638 drivers/ide/it821x.c | 2 +-
17639 drivers/ide/jmicron.c | 2 +-
17640 drivers/ide/ns87415.c | 2 +-
17641 drivers/ide/opti621.c | 2 +-
17642 drivers/ide/pdc202xx_new.c | 2 +-
17643 drivers/ide/pdc202xx_old.c | 2 +-
17644 drivers/ide/piix.c | 2 +-
17645 drivers/ide/qd65xx.c | 2 +-
17646 drivers/ide/rz1000.c | 2 +-
17647 drivers/ide/sc1200.c | 2 +-
17648 drivers/ide/scc_pata.c | 2 +-
17649 drivers/ide/serverworks.c | 2 +-
17650 drivers/ide/siimage.c | 2 +-
17651 drivers/ide/sis5513.c | 2 +-
17652 drivers/ide/sl82c105.c | 2 +-
17653 drivers/ide/slc90e66.c | 2 +-
17654 drivers/ide/tc86c001.c | 2 +-
17655 drivers/ide/triflex.c | 2 +-
17656 drivers/ide/trm290.c | 2 +-
17657 drivers/ide/tx4938ide.c | 2 +-
17658 drivers/ide/tx4939ide.c | 2 +-
17659 drivers/ide/umc8672.c | 2 +-
17660 drivers/ide/via82cxxx.c | 2 +-
17661 drivers/infiniband/core/cm.c | 2 +-
17662 drivers/infiniband/hw/ehca/ehca_uverbs.c | 4 +-
17663 drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +-
17664 drivers/infiniband/hw/mlx4/cm.c | 2 +-
17665 drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
17666 drivers/macintosh/macio_asic.c | 2 +-
17667 drivers/media/pci/meye/meye.c | 2 +-
17668 drivers/media/platform/omap/omap_vout.c | 2 +-
17669 drivers/media/platform/vino.c | 2 +-
17670 drivers/media/usb/sn9c102/sn9c102_core.c | 3 +-
17671 drivers/media/usb/usbvision/usbvision-video.c | 3 +-
17672 drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +-
17673 drivers/media/v4l2-core/videobuf-vmalloc.c | 2 +-
17674 drivers/media/v4l2-core/videobuf2-memops.c | 2 +-
17675 drivers/mfd/wm8994-core.c | 6 +-
17676 drivers/misc/carma/carma-fpga.c | 2 -
17677 drivers/misc/sgi-gru/grufile.c | 5 +-
17678 drivers/mmc/host/sdhci-pci.c | 2 +-
17679 drivers/mtd/mtdchar.c | 2 +-
17680 drivers/mtd/mtdcore.c | 6 +-
17681 drivers/net/can/slcan.c | 2 +-
17682 drivers/net/can/vcan.c | 2 +-
17683 drivers/net/ethernet/8390/ne3210.c | 2 +-
17684 drivers/net/ethernet/adaptec/starfire.c | 2 +-
17685 drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +-
17686 drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
17687 drivers/net/ethernet/dec/tulip/de2104x.c | 7 +-
17688 drivers/net/ethernet/dec/tulip/eeprom.c | 2 +-
17689 drivers/net/ethernet/dec/tulip/tulip_core.c | 7 +-
17690 drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +-
17691 drivers/net/ethernet/dlink/sundance.c | 2 +-
17692 drivers/net/ethernet/fealnx.c | 2 +-
17693 drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +-
17694 drivers/net/ethernet/realtek/8139too.c | 2 +-
17695 drivers/net/ethernet/sfc/efx.c | 4 +-
17696 drivers/net/ethernet/sfc/net_driver.h | 12 -
17697 drivers/net/ethernet/sfc/nic.c | 4 +-
17698 drivers/net/ethernet/sis/sis190.c | 2 +-
17699 drivers/net/hamradio/6pack.c | 6 +-
17700 drivers/net/hamradio/bpqether.c | 2 +-
17701 drivers/net/hamradio/mkiss.c | 6 +-
17702 drivers/net/hamradio/scc.c | 2 +-
17703 drivers/net/hamradio/yam.c | 2 +-
17704 drivers/net/rionet.c | 20 +-
17705 drivers/net/wan/z85230.c | 2 +-
17706 drivers/oprofile/buffer_sync.c | 17 +-
17707 drivers/pcmcia/cs.c | 37 +-
17708 drivers/platform/x86/amilo-rfkill.c | 2 +-
17709 drivers/platform/x86/fujitsu-tablet.c | 10 +-
17710 drivers/platform/x86/thinkpad_acpi.c | 2 +-
17711 drivers/pps/pps.c | 2 +-
17712 drivers/rapidio/devices/tsi721.c | 94 +-
17713 drivers/rapidio/devices/tsi721.h | 15 +-
17714 drivers/rapidio/rio-scan.c | 9 +-
17715 drivers/rapidio/rio.c | 44 +
17716 drivers/rtc/Kconfig | 87 +-
17717 drivers/rtc/Makefile | 5 +
17718 drivers/rtc/class.c | 9 +-
17719 drivers/rtc/hctosys.c | 4 +-
17720 drivers/rtc/rtc-at91sam9.c | 13 +-
17721 drivers/rtc/rtc-coh901331.c | 3 +-
17722 drivers/rtc/rtc-ds1672.c | 26 +-
17723 drivers/rtc/rtc-ds2404.c | 303 +++++
17724 drivers/rtc/rtc-em3027.c | 17 +-
17725 drivers/rtc/rtc-isl1208.c | 21 +-
17726 drivers/rtc/rtc-jz4740.c | 2 +-
17727 drivers/rtc/rtc-m41t80.c | 157 +--
17728 drivers/rtc/rtc-max8907.c | 245 ++++
17729 drivers/rtc/rtc-mxc.c | 30 +-
17730 drivers/rtc/rtc-pcf8563.c | 13 +-
17731 drivers/rtc/rtc-proc.c | 24 +-
17732 drivers/rtc/rtc-rc5t583.c | 331 ++++++
17733 drivers/rtc/rtc-rs5c372.c | 7 +-
17734 drivers/rtc/rtc-s35390a.c | 129 ++-
17735 drivers/rtc/rtc-s3c.c | 4 +-
17736 drivers/rtc/rtc-snvs.c | 350 ++++++
17737 drivers/rtc/rtc-spear.c | 12 +-
17738 drivers/rtc/rtc-sysfs.c | 6 +
17739 drivers/rtc/rtc-tps65910.c | 349 ++++++
17740 drivers/rtc/rtc-x1205.c | 92 +-
17741 drivers/scsi/aacraid/linit.c | 2 +-
17742 drivers/scsi/aic94xx/aic94xx_init.c | 2 +-
17743 drivers/scsi/atp870u.c | 11 +-
17744 drivers/scsi/sg.c | 2 +-
17745 drivers/staging/android/ashmem.c | 1 -
17746 drivers/staging/omapdrm/omap_gem_dmabuf.c | 2 +-
17747 drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 +-
17748 drivers/thermal/cpu_cooling.c | 2 +-
17749 drivers/thermal/thermal_sys.c | 2 +-
17750 drivers/uio/uio.c | 4 +-
17751 drivers/usb/mon/mon_bin.c | 2 +-
17752 drivers/vfio/pci/vfio_pci.c | 2 +-
17753 drivers/video/68328fb.c | 2 +-
17754 drivers/video/aty/aty128fb.c | 2 +-
17755 drivers/video/aty/atyfb_base.c | 3 +-
17756 drivers/video/backlight/Kconfig | 23 +-
17757 drivers/video/backlight/Makefile | 3 +-
17758 drivers/video/backlight/da9052_bl.c | 4 +-
17759 drivers/video/backlight/kb3886_bl.c | 4 +-
17760 drivers/video/backlight/lm3630_bl.c | 475 ++++++++
17761 drivers/video/backlight/lm3639_bl.c | 437 +++++++
17762 drivers/video/backlight/ltv350qv.c | 6 +-
17763 drivers/video/backlight/platform_lcd.c | 10 +
17764 drivers/video/backlight/progear_bl.c | 162 ---
17765 drivers/video/backlight/pwm_bl.c | 5 +
17766 drivers/video/fb-puv3.c | 3 +-
17767 drivers/video/fb_defio.c | 2 +-
17768 drivers/video/fbmem.c | 3 +-
17769 drivers/video/gbefb.c | 2 +-
17770 drivers/video/geode/gx1fb_core.c | 2 +-
17771 drivers/video/gxt4500.c | 4 +-
17772 drivers/video/i810/i810_main.c | 2 +-
17773 drivers/video/jz4740_fb.c | 2 +-
17774 drivers/video/omap2/omapfb/omapfb-main.c | 2 +-
17775 drivers/video/sbuslib.c | 5 +-
17776 drivers/video/smscufx.c | 1 -
17777 drivers/video/udlfb.c | 1 -
17778 drivers/video/vermilion/vermilion.c | 1 -
17779 drivers/video/vfb.c | 1 -
17780 drivers/xen/gntalloc.c | 2 +-
17781 drivers/xen/gntdev.c | 2 +-
17782 drivers/xen/privcmd.c | 3 +-
17783 fs/9p/vfs_file.c | 1 +
17784 fs/Kconfig.binfmt | 8 +
17787 fs/autofs4/root.c | 2 +-
17788 fs/binfmt_aout.c | 54 +-
17789 fs/binfmt_elf.c | 153 ++-
17790 fs/binfmt_elf_fdpic.c | 8 +-
17791 fs/binfmt_flat.c | 2 +-
17792 fs/block_dev.c | 11 +-
17793 fs/btrfs/file.c | 2 +-
17794 fs/ceph/addr.c | 2 +-
17795 fs/cifs/file.c | 1 +
17796 fs/compat_binfmt_elf.c | 7 +
17797 fs/coredump.c | 20 +-
17798 fs/coredump.h | 6 +
17800 fs/debugfs/inode.c | 1 -
17801 fs/dlm/config.c | 2 +-
17802 fs/eventpoll.c | 38 +-
17804 fs/ext4/file.c | 2 +-
17805 fs/fat/Makefile | 2 +-
17806 fs/fat/cache.c | 10 +-
17807 fs/fat/dir.c | 56 +-
17808 fs/fat/fat.h | 97 +-
17809 fs/fat/fatent.c | 13 +-
17810 fs/fat/inode.c | 187 +--
17811 fs/fat/namei_msdos.c | 7 +-
17812 fs/fat/namei_vfat.c | 5 +-
17813 fs/fat/nfs.c | 101 ++
17814 fs/fs-writeback.c | 7 +-
17815 fs/fuse/file.c | 1 +
17816 fs/gfs2/file.c | 2 +-
17817 fs/gfs2/sys.c | 18 +-
17818 fs/hfsplus/Makefile | 3 +-
17819 fs/hfsplus/attributes.c | 399 +++++++
17820 fs/hfsplus/bfind.c | 79 +-
17821 fs/hfsplus/bnode.c | 6 +-
17822 fs/hfsplus/brec.c | 23 +-
17823 fs/hfsplus/btree.c | 8 +
17824 fs/hfsplus/catalog.c | 36 +-
17825 fs/hfsplus/dir.c | 6 +-
17826 fs/hfsplus/extents.c | 4 +-
17827 fs/hfsplus/hfsplus_fs.h | 41 +-
17828 fs/hfsplus/hfsplus_raw.h | 68 +-
17829 fs/hfsplus/inode.c | 13 +
17830 fs/hfsplus/ioctl.c | 542 +++++++--
17831 fs/hfsplus/super.c | 33 +-
17832 fs/hfsplus/unicode.c | 7 +-
17833 fs/hugetlbfs/inode.c | 11 +-
17835 fs/jffs2/readinode.c | 13 +-
17836 fs/ncpfs/ioctl.c | 2 +-
17837 fs/nfs/file.c | 1 +
17838 fs/nilfs2/file.c | 2 +-
17839 fs/ocfs2/mmap.c | 2 +-
17840 fs/proc/base.c | 6 +-
17841 fs/proc/generic.c | 15 +-
17842 fs/proc/inode.c | 1 -
17843 fs/proc/internal.h | 2 +-
17844 fs/proc/page.c | 8 +-
17845 fs/proc/proc_sysctl.c | 8 +-
17846 fs/proc/root.c | 2 +-
17847 fs/proc/task_mmu.c | 2 +-
17849 fs/ubifs/file.c | 1 +
17850 fs/udf/file.c | 2 +-
17851 fs/xfs/xfs_file.c | 2 +-
17852 include/asm-generic/bitops/le.h | 10 +
17853 include/asm-generic/pgtable.h | 72 +-
17854 include/linux/atomic.h | 25 +
17855 include/linux/audit.h | 206 +++-
17856 include/linux/binfmts.h | 3 +-
17857 include/linux/compaction.h | 19 +-
17858 include/linux/compat.h | 5 -
17859 include/linux/compiler-gcc4.h | 2 +-
17860 include/linux/coredump.h | 5 +
17861 include/linux/elf.h | 6 +
17862 include/linux/eventpoll.h | 1 +
17863 include/linux/fs.h | 8 +-
17864 include/linux/genalloc.h | 27 +
17865 include/linux/genhd.h | 8 +-
17866 include/linux/gfp.h | 5 +-
17867 include/linux/huge_mm.h | 1 -
17868 include/linux/idr.h | 10 +-
17869 include/linux/init.h | 27 +-
17870 include/linux/interval_tree.h | 27 +
17871 include/linux/interval_tree_generic.h | 191 +++
17872 include/linux/memblock.h | 3 +-
17873 include/linux/mempolicy.h | 4 +-
17874 include/linux/mfd/rc5t583.h | 22 +
17875 include/linux/mfd/tps65910.h | 10 +
17876 include/linux/mm.h | 140 ++-
17877 include/linux/mm_types.h | 16 +-
17878 include/linux/mman.h | 1 -
17879 include/linux/mmu_notifier.h | 60 +-
17880 include/linux/mmzone.h | 10 +-
17881 include/linux/nbd.h | 15 +-
17882 include/linux/page-isolation.h | 7 +-
17883 include/linux/pageblock-flags.h | 19 +-
17884 include/linux/percpu.h | 2 +-
17885 include/linux/platform_data/lm3630_bl.h | 57 +
17886 include/linux/platform_data/lm3639_bl.h | 69 ++
17887 include/linux/platform_data/lp855x.h | 2 +
17888 include/linux/prio_tree.h | 120 --
17889 include/linux/rbtree.h | 119 +-
17890 include/linux/rbtree_augmented.h | 223 ++++
17891 include/linux/rio.h | 11 +-
17892 include/linux/rio_drv.h | 5 +
17893 include/linux/rmap.h | 39 +-
17894 include/linux/rtc-ds2404.h | 20 +
17895 include/linux/rtc.h | 2 +-
17896 include/linux/sched.h | 1 -
17897 include/linux/swap.h | 2 +-
17898 include/linux/timerqueue.h | 2 +-
17899 include/linux/vm_event_item.h | 1 -
17900 include/linux/vmstat.h | 12 +
17901 include/net/net_namespace.h | 2 +
17902 include/trace/events/gfpflags.h | 1 -
17904 init/do_mounts.c | 61 +-
17907 ipc/sem.c | 250 ++--
17908 kernel/auditsc.c | 13 +-
17909 kernel/events/core.c | 2 +-
17910 kernel/events/uprobes.c | 8 +-
17911 kernel/fork.c | 31 +-
17912 kernel/kexec.c | 1 -
17913 kernel/resource.c | 50 +-
17914 kernel/signal.c | 3 +-
17915 kernel/sys.c | 3 +-
17916 kernel/sysctl.c | 12 +-
17917 kernel/taskstats.c | 1 +
17918 kernel/time.c | 4 +-
17919 kernel/timeconst.pl | 2 +-
17920 lib/Kconfig.debug | 31 +-
17921 lib/Makefile | 7 +-
17923 lib/decompress.c | 9 +-
17925 lib/gen_crc32table.c | 6 +-
17926 lib/genalloc.c | 88 +-
17928 lib/interval_tree.c | 10 +
17929 lib/interval_tree_test_main.c | 105 ++
17930 lib/parser.c | 10 +-
17932 lib/prio_tree.c | 466 --------
17933 lib/rbtree.c | 656 ++++++-----
17934 lib/rbtree_test.c | 234 ++++
17935 lib/scatterlist.c | 16 +-
17936 lib/spinlock_debug.c | 32 +-
17937 lib/vsprintf.c | 139 ++-
17940 mm/bootmem.c | 10 +-
17941 mm/compaction.c | 559 ++++++---
17942 mm/filemap.c | 6 +-
17943 mm/filemap_xip.c | 10 +-
17944 mm/fremap.c | 16 +-
17945 mm/huge_memory.c | 423 ++++---
17946 mm/hugetlb.c | 29 +-
17947 mm/internal.h | 94 +-
17948 mm/interval_tree.c | 112 ++
17949 mm/kmemleak.c | 101 +-
17951 mm/madvise.c | 8 +-
17952 mm/memblock.c | 7 +-
17953 mm/memcontrol.c | 22 +-
17954 mm/memory-failure.c | 8 +-
17955 mm/memory.c | 116 +-
17956 mm/memory_hotplug.c | 29 +-
17957 mm/mempolicy.c | 148 ++-
17959 mm/mmap.c | 207 ++--
17960 mm/mmu_notifier.c | 103 +-
17961 mm/mremap.c | 73 +-
17962 mm/nobootmem.c | 5 +-
17964 mm/page_alloc.c | 285 +++--
17965 mm/page_isolation.c | 43 +-
17967 mm/pgtable-generic.c | 50 +
17968 mm/prio_tree.c | 208 ----
17969 mm/rmap.c | 162 +--
17972 mm/swap_state.c | 6 +
17973 mm/truncate.c | 3 -
17974 mm/vmalloc.c | 3 +-
17975 mm/vmscan.c | 111 +-
17976 mm/vmstat.c | 14 +-
17977 net/can/af_can.c | 2 +-
17978 net/can/bcm.c | 2 +-
17979 net/can/gw.c | 2 +-
17980 net/can/raw.c | 2 +-
17981 net/ceph/osd_client.c | 1 -
17982 net/decnet/dn_rules.c | 2 +-
17983 net/ipv4/fib_rules.c | 2 +-
17984 net/ipv4/ipmr.c | 2 +-
17985 net/ipv6/addrlabel.c | 2 +-
17986 net/ipv6/fib6_rules.c | 2 +-
17987 net/ipv6/ip6mr.c | 2 +-
17988 scripts/Kbuild.include | 2 +-
17989 scripts/checkpatch.pl | 35 +-
17990 security/device_cgroup.c | 373 +++---
17991 security/selinux/netnode.c | 3 +-
17992 security/selinux/selinuxfs.c | 2 +-
17993 security/tomoyo/util.c | 9 +-
17994 sound/core/pcm_native.c | 6 +-
17995 sound/soc/codecs/wm5100.c | 2 +-
17996 sound/usb/usx2y/us122l.c | 2 +-
17997 sound/usb/usx2y/usX2Yhwdep.c | 2 +-
17998 sound/usb/usx2y/usx2yhwdeppcm.c | 2 +-
17999 tools/perf/util/include/linux/rbtree.h | 1 +
18000 tools/testing/selftests/Makefile | 2 +-
18001 tools/testing/selftests/epoll/Makefile | 11 +
18002 tools/testing/selftests/epoll/test_epoll.c | 344 ++++++
18003 virt/kvm/kvm_main.c | 3 +-
18004 561 files changed, 12831 insertions(+), 5814 deletions(-)
18005 create mode 100644 Documentation/devicetree/bindings/rtc/snvs-rtc.txt
18006 delete mode 100644 Documentation/memory.txt
18007 delete mode 100644 Documentation/prio_tree.txt
18008 create mode 100644 drivers/rtc/rtc-ds2404.c
18009 create mode 100644 drivers/rtc/rtc-max8907.c
18010 create mode 100644 drivers/rtc/rtc-rc5t583.c
18011 create mode 100644 drivers/rtc/rtc-snvs.c
18012 create mode 100644 drivers/rtc/rtc-tps65910.c
18013 create mode 100644 drivers/video/backlight/lm3630_bl.c
18014 create mode 100644 drivers/video/backlight/lm3639_bl.c
18015 delete mode 100644 drivers/video/backlight/progear_bl.c
18016 create mode 100644 fs/coredump.h
18017 create mode 100644 fs/fat/nfs.c
18018 create mode 100644 fs/hfsplus/attributes.c
18019 create mode 100644 include/linux/interval_tree.h
18020 create mode 100644 include/linux/interval_tree_generic.h
18021 create mode 100644 include/linux/platform_data/lm3630_bl.h
18022 create mode 100644 include/linux/platform_data/lm3639_bl.h
18023 delete mode 100644 include/linux/prio_tree.h
18024 create mode 100644 include/linux/rbtree_augmented.h
18025 create mode 100644 include/linux/rtc-ds2404.h
18026 create mode 100644 lib/interval_tree.c
18027 create mode 100644 lib/interval_tree_test_main.c
18028 delete mode 100644 lib/prio_tree.c
18029 create mode 100644 lib/rbtree_test.c
18030 create mode 100644 mm/interval_tree.c
18031 delete mode 100644 mm/prio_tree.c
18032 create mode 100644 tools/testing/selftests/epoll/Makefile
18033 create mode 100644 tools/testing/selftests/epoll/test_epoll.c
projects / karo-tx-linux.git / blob