2 Fri Oct 7 10:45:13 EST 2011
5 $ git reset --hard stable
6 HEAD is now at 538d288 Merge branch 'for-linus' of git://github.com/dtor/input
8 $ git merge origin/master
9 Updating 538d288..3ee72ca
11 Documentation/networking/scaling.txt | 10 +++++-----
12 arch/x86/pci/acpi.c | 11 +++++++++++
13 drivers/md/dm-crypt.c | 2 ++
14 drivers/md/dm-flakey.c | 4 +++-
15 drivers/md/dm-raid.c | 2 +-
16 drivers/md/dm-table.c | 32 ++++++++++++++++++++++++++------
17 drivers/md/md.c | 22 +++++++++++++++++++---
18 drivers/md/md.h | 2 +-
19 drivers/md/multipath.c | 3 +--
20 drivers/md/raid1.c | 3 +--
21 drivers/md/raid10.c | 5 ++---
22 drivers/md/raid5.c | 6 ++----
23 drivers/net/macvlan.c | 2 +-
24 include/linux/device-mapper.h | 5 +++++
25 net/bridge/br_device.c | 3 ---
26 net/ipv4/tcp_input.c | 4 +---
27 net/ipv4/tcp_ipv4.c | 11 +++++++----
28 net/ipv6/tcp_ipv6.c | 8 +++++---
29 net/netfilter/ipvs/ip_vs_ctl.c | 2 +-
30 19 files changed, 94 insertions(+), 43 deletions(-)
32 $ git merge fixes/fixes
34 Merging kbuild-current/rc-fixes
35 $ git merge kbuild-current/rc-fixes
37 Merging arm-current/fixes
38 $ git merge arm-current/fixes
39 Merge made by recursive.
40 arch/arm/configs/integrator_defconfig | 19 +++++++++++++++----
41 arch/arm/mm/init.c | 7 +++++++
42 2 files changed, 22 insertions(+), 4 deletions(-)
43 Merging m68k-current/for-linus
44 $ git merge m68k-current/for-linus
46 Merging powerpc-merge/merge
47 $ git merge powerpc-merge/merge
49 Merging 52xx-and-virtex-current/powerpc/merge
50 $ git merge 52xx-and-virtex-current/powerpc/merge
52 Merging sparc-current/master
53 $ git merge sparc-current/master
55 Merging scsi-rc-fixes/master
56 $ git merge scsi-rc-fixes/master
58 Merging net-current/master
59 $ git merge net-current/master
61 Merging sound-current/for-linus
62 $ git merge sound-current/for-linus
64 Merging pci-current/for-linus
65 $ git merge pci-current/for-linus
66 Merge made by recursive.
67 drivers/pci/hotplug/shpchp_core.c | 4 ++--
68 drivers/pci/hotplug/shpchp_hpc.c | 4 ++--
69 2 files changed, 4 insertions(+), 4 deletions(-)
70 Merging wireless-current/master
71 $ git merge wireless-current/master
73 Merging driver-core.current/driver-core-linus
74 $ git merge driver-core.current/driver-core-linus
76 Merging tty.current/tty-linus
77 $ git merge tty.current/tty-linus
79 Merging usb.current/usb-linus
80 $ git merge usb.current/usb-linus
82 Merging staging.current/staging-linus
83 $ git merge staging.current/staging-linus
85 Merging cpufreq-current/fixes
86 $ git merge cpufreq-current/fixes
88 Merging input-current/for-linus
89 $ git merge input-current/for-linus
91 Merging md-current/for-linus
92 $ git merge md-current/for-linus
94 Merging audit-current/for-linus
95 $ git merge audit-current/for-linus
97 Merging crypto-current/master
98 $ git merge crypto-current/master
100 Merging ide-curent/master
101 $ git merge ide-curent/master
104 $ git merge dwmw2/master
106 Merging sh-current/sh-fixes-for-linus
107 $ git merge sh-current/sh-fixes-for-linus
109 Merging rmobile-current/rmobile-fixes-for-linus
110 $ git merge rmobile-current/rmobile-fixes-for-linus
112 Merging devicetree-current/devicetree/merge
113 $ git merge devicetree-current/devicetree/merge
115 Merging spi-current/spi/merge
116 $ git merge spi-current/spi/merge
119 $ git merge arm/for-next
120 Removing arch/arm/include/asm/auxvec.h
121 Removing arch/arm/include/asm/bitsperlong.h
122 Removing arch/arm/include/asm/cputime.h
123 Removing arch/arm/include/asm/emergency-restart.h
124 Removing arch/arm/include/asm/errno.h
125 Removing arch/arm/include/asm/ioctl.h
126 Removing arch/arm/include/asm/irq_regs.h
127 Removing arch/arm/include/asm/kdebug.h
128 Removing arch/arm/include/asm/local.h
129 Removing arch/arm/include/asm/local64.h
130 Removing arch/arm/include/asm/percpu.h
131 Removing arch/arm/include/asm/poll.h
132 Removing arch/arm/include/asm/resource.h
133 Removing arch/arm/include/asm/sections.h
134 Removing arch/arm/include/asm/siginfo.h
135 Removing arch/arm/include/asm/sizes.h
136 Auto-merging arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
137 Auto-merging arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
138 Removing arch/arm/mach-sa1100/leds-simpad.c
139 Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
140 Auto-merging drivers/gpio/gpio-davinci.c
141 Auto-merging drivers/gpio/gpio-ks8695.c
142 Auto-merging drivers/gpio/gpio-lpc32xx.c
143 Auto-merging drivers/gpio/gpio-sa1100.c
144 Merge made by recursive.
145 Documentation/devicetree/bindings/arm/l2cc.txt | 44 +
146 arch/arm/Kconfig | 79 +-
147 arch/arm/Kconfig.debug | 87 +-
148 arch/arm/Makefile | 3 +
149 arch/arm/boot/Makefile | 9 +
150 arch/arm/boot/compressed/.gitignore | 9 +
151 arch/arm/boot/compressed/Makefile | 40 +-
152 arch/arm/boot/compressed/atags_to_fdt.c | 97 ++
153 arch/arm/boot/compressed/head.S | 121 ++-
154 arch/arm/boot/compressed/libfdt_env.h | 15 +
155 arch/arm/boot/compressed/misc.c | 42 +-
156 arch/arm/boot/compressed/string.c | 127 ++
157 arch/arm/boot/compressed/vmlinux.lds.in | 4 +
158 arch/arm/common/gic.c | 205 +++-
159 arch/arm/common/sa1111.c | 9 +-
160 arch/arm/common/scoop.c | 2 +-
161 arch/arm/common/timer-sp.c | 9 +
162 arch/arm/include/asm/Kbuild | 17 +
163 arch/arm/include/asm/auxvec.h | 4 -
164 arch/arm/include/asm/bitsperlong.h | 1 -
165 arch/arm/include/asm/bug.h | 55 +-
166 arch/arm/include/asm/cachetype.h | 5 +-
167 arch/arm/include/asm/cputime.h | 6 -
168 arch/arm/include/asm/cputype.h | 6 +
169 arch/arm/include/asm/dma-mapping.h | 9 +-
170 arch/arm/include/asm/ecard.h | 1 -
171 arch/arm/include/asm/emergency-restart.h | 6 -
172 arch/arm/include/asm/errno.h | 6 -
173 arch/arm/include/asm/gpio.h | 19 +
174 arch/arm/include/asm/hardware/cache-l2x0.h | 17 +
175 arch/arm/include/asm/hardware/gic.h | 8 +
176 arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 +
177 arch/arm/include/asm/hw_breakpoint.h | 2 +
178 arch/arm/include/asm/io.h | 21 +
179 arch/arm/include/asm/ioctl.h | 1 -
180 arch/arm/include/asm/irq_regs.h | 1 -
181 arch/arm/include/asm/kdebug.h | 1 -
182 arch/arm/include/asm/local.h | 1 -
183 arch/arm/include/asm/local64.h | 1 -
184 arch/arm/include/asm/mach/arch.h | 5 +-
185 arch/arm/include/asm/mach/map.h | 1 +
186 arch/arm/include/asm/memory.h | 16 -
187 arch/arm/include/asm/module.h | 4 -
188 arch/arm/include/asm/page.h | 42 +-
189 arch/arm/include/asm/percpu.h | 6 -
190 arch/arm/include/asm/pgalloc.h | 6 +-
191 arch/arm/include/asm/pgtable-2level-hwdef.h | 93 ++
192 arch/arm/include/asm/pgtable-2level-types.h | 67 +
193 arch/arm/include/asm/pgtable-2level.h | 143 ++
194 arch/arm/include/asm/pgtable-hwdef.h | 77 +-
195 arch/arm/include/asm/pgtable.h | 167 +--
196 arch/arm/include/asm/pmu.h | 93 +-
197 arch/arm/include/asm/poll.h | 1 -
198 arch/arm/include/asm/proc-fns.h | 8 +
199 arch/arm/include/asm/resource.h | 6 -
200 arch/arm/include/asm/sections.h | 1 -
201 arch/arm/include/asm/siginfo.h | 6 -
202 arch/arm/include/asm/sizes.h | 21 -
203 arch/arm/include/asm/smp.h | 6 +
204 arch/arm/include/asm/suspend.h | 17 +-
205 arch/arm/include/asm/system.h | 4 +-
206 arch/arm/include/asm/tlb.h | 1 +
207 arch/arm/include/asm/tlbflush.h | 4 +-
208 arch/arm/include/asm/topology.h | 33 +
209 arch/arm/kernel/Makefile | 10 +-
210 arch/arm/kernel/armksyms.c | 3 -
211 arch/arm/kernel/ecard.c | 36 +-
212 arch/arm/kernel/entry-armv.S | 44 +-
213 arch/arm/kernel/head.S | 135 +-
214 arch/arm/kernel/hw_breakpoint.c | 270 ++--
215 arch/arm/kernel/kprobes-arm.c | 4 +
216 arch/arm/kernel/kprobes-test-arm.c | 1323 +++++++++++++++
217 arch/arm/kernel/kprobes-test-thumb.c | 1187 +++++++++++++
218 arch/arm/kernel/kprobes-test.c | 1748 ++++++++++++++++++++
219 arch/arm/kernel/kprobes-test.h | 392 +++++
220 arch/arm/kernel/kprobes-thumb.c | 7 +
221 arch/arm/kernel/kprobes.h | 8 +
222 arch/arm/kernel/machine_kexec.c | 35 +-
223 arch/arm/kernel/module.c | 2 +-
224 arch/arm/kernel/perf_event.c | 475 +++---
225 arch/arm/kernel/perf_event_v6.c | 87 +-
226 arch/arm/kernel/perf_event_v7.c | 395 +++---
227 arch/arm/kernel/perf_event_xscale.c | 90 +-
228 arch/arm/kernel/pmu.c | 182 +--
229 arch/arm/kernel/process.c | 2 +-
230 arch/arm/kernel/setup.c | 58 +-
231 arch/arm/kernel/sleep.S | 85 +-
232 arch/arm/kernel/smp.c | 20 +
233 arch/arm/kernel/smp_scu.c | 2 +-
234 arch/arm/kernel/suspend.c | 72 +
235 arch/arm/kernel/topology.c | 148 ++
236 arch/arm/kernel/traps.c | 31 +-
237 arch/arm/kernel/vmlinux.lds.S | 3 +-
238 arch/arm/lib/backtrace.S | 6 -
239 arch/arm/mach-at91/Makefile.boot | 6 +-
240 arch/arm/mach-at91/at91cap9_devices.c | 2 +-
241 arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
242 arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
243 arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
244 arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
245 arch/arm/mach-at91/at91sam9g45.c | 2 +
246 arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
247 arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
248 arch/arm/mach-at91/board-1arm.c | 2 +-
249 arch/arm/mach-at91/board-afeb-9260v1.c | 2 +-
250 arch/arm/mach-at91/board-cam60.c | 2 +-
251 arch/arm/mach-at91/board-cap9adk.c | 2 +-
252 arch/arm/mach-at91/board-carmeva.c | 2 +-
253 arch/arm/mach-at91/board-cpu9krea.c | 2 +-
254 arch/arm/mach-at91/board-cpuat91.c | 2 +-
255 arch/arm/mach-at91/board-csb337.c | 2 +-
256 arch/arm/mach-at91/board-csb637.c | 2 +-
257 arch/arm/mach-at91/board-eb9200.c | 2 +-
258 arch/arm/mach-at91/board-ecbat91.c | 2 +-
259 arch/arm/mach-at91/board-kafa.c | 2 +-
260 arch/arm/mach-at91/board-kb9202.c | 2 +-
261 arch/arm/mach-at91/board-neocore926.c | 2 +-
262 arch/arm/mach-at91/board-picotux200.c | 2 +-
263 arch/arm/mach-at91/board-qil-a9260.c | 2 +-
264 arch/arm/mach-at91/board-rm9200dk.c | 2 +-
265 arch/arm/mach-at91/board-rm9200ek.c | 2 +-
266 arch/arm/mach-at91/board-sam9-l9260.c | 2 +-
267 arch/arm/mach-at91/board-sam9260ek.c | 2 +-
268 arch/arm/mach-at91/board-sam9261ek.c | 2 +-
269 arch/arm/mach-at91/board-sam9263ek.c | 2 +-
270 arch/arm/mach-at91/board-sam9g20ek.c | 2 +-
271 arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
272 arch/arm/mach-at91/board-sam9rlek.c | 2 +-
273 arch/arm/mach-at91/board-usb-a9260.c | 2 +-
274 arch/arm/mach-at91/board-usb-a9263.c | 2 +-
275 arch/arm/mach-at91/board-yl-9200.c | 2 +-
276 arch/arm/mach-at91/gpio.c | 4 +-
277 arch/arm/mach-at91/include/mach/at91sam9g45.h | 2 -
278 arch/arm/mach-at91/include/mach/gpio.h | 5 -
279 arch/arm/mach-at91/leds.c | 2 +-
280 arch/arm/mach-at91/pm.c | 2 +-
281 arch/arm/mach-bcmring/Makefile.boot | 2 +-
282 arch/arm/mach-bcmring/arch.c | 4 +-
283 arch/arm/mach-bcmring/include/mach/memory.h | 5 -
284 arch/arm/mach-bcmring/mm.c | 3 +
285 arch/arm/mach-clps711x/Makefile.boot | 2 +-
286 arch/arm/mach-clps711x/autcpu12.c | 2 +-
287 arch/arm/mach-clps711x/cdb89712.c | 2 +-
288 arch/arm/mach-clps711x/ceiva.c | 2 +-
289 arch/arm/mach-clps711x/clep7312.c | 5 +-
290 arch/arm/mach-clps711x/edb7211-arch.c | 5 +-
291 arch/arm/mach-clps711x/fortunet.c | 4 +-
292 arch/arm/mach-clps711x/p720t.c | 5 +-
293 arch/arm/mach-cns3xxx/Makefile.boot | 2 +-
294 arch/arm/mach-cns3xxx/cns3420vb.c | 2 +-
295 arch/arm/mach-davinci/Makefile | 3 +-
296 arch/arm/mach-davinci/Makefile.boot | 4 +-
297 arch/arm/mach-davinci/board-da830-evm.c | 2 +-
298 arch/arm/mach-davinci/board-da850-evm.c | 2 +-
299 arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
300 arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
301 arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
302 arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
303 arch/arm/mach-davinci/board-dm646x-evm.c | 4 +-
304 arch/arm/mach-davinci/board-mityomapl138.c | 2 +-
305 arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
306 arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +-
307 arch/arm/mach-davinci/board-sffsdr.c | 2 +-
308 arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +-
309 arch/arm/mach-davinci/common.c | 3 +
310 arch/arm/mach-davinci/da830.c | 3 +-
311 arch/arm/mach-davinci/da850.c | 3 +-
312 arch/arm/mach-davinci/dm355.c | 2 +-
313 arch/arm/mach-davinci/dm365.c | 3 +-
314 arch/arm/mach-davinci/dm644x.c | 2 +-
315 arch/arm/mach-davinci/dm646x.c | 2 +-
316 arch/arm/mach-davinci/include/mach/gpio-davinci.h | 91 +
317 arch/arm/mach-davinci/include/mach/gpio.h | 79 +-
318 arch/arm/mach-davinci/include/mach/memory.h | 5 -
319 arch/arm/mach-davinci/tnetv107x.c | 3 +-
320 arch/arm/mach-dove/Makefile.boot | 2 +-
321 arch/arm/mach-dove/cm-a510.c | 2 +-
322 arch/arm/mach-dove/dove-db-setup.c | 2 +-
323 arch/arm/mach-ebsa110/Makefile.boot | 2 +-
324 arch/arm/mach-ebsa110/core.c | 2 +-
325 arch/arm/mach-ebsa110/include/mach/io.h | 2 -
326 arch/arm/mach-ep93xx/Makefile.boot | 10 +-
327 arch/arm/mach-ep93xx/adssphere.c | 2 +-
328 arch/arm/mach-ep93xx/edb93xx.c | 16 +-
329 arch/arm/mach-ep93xx/gesbc9312.c | 2 +-
330 arch/arm/mach-ep93xx/include/mach/gpio.h | 17 +-
331 arch/arm/mach-ep93xx/micro9.c | 8 +-
332 arch/arm/mach-ep93xx/simone.c | 4 +-
333 arch/arm/mach-ep93xx/snappercl15.c | 2 +-
334 arch/arm/mach-ep93xx/ts72xx.c | 2 +-
335 arch/arm/mach-exynos4/Makefile.boot | 2 +-
336 arch/arm/mach-exynos4/include/mach/gpio.h | 7 -
337 arch/arm/mach-exynos4/mach-armlex4210.c | 2 +-
338 arch/arm/mach-exynos4/mach-nuri.c | 2 +-
339 arch/arm/mach-exynos4/mach-smdkc210.c | 2 +-
340 arch/arm/mach-exynos4/mach-smdkv310.c | 2 +-
341 arch/arm/mach-exynos4/mach-universal_c210.c | 2 +-
342 arch/arm/mach-footbridge/Kconfig | 4 +-
343 arch/arm/mach-footbridge/Makefile.boot | 2 +-
344 arch/arm/mach-footbridge/cats-hw.c | 5 +-
345 arch/arm/mach-footbridge/ebsa285.c | 2 +-
346 arch/arm/mach-footbridge/include/mach/io.h | 2 -
347 arch/arm/mach-footbridge/netwinder-hw.c | 5 +-
348 arch/arm/mach-footbridge/personal.c | 2 +-
349 arch/arm/mach-gemini/Makefile.boot | 4 +-
350 arch/arm/mach-gemini/board-nas4220b.c | 2 +-
351 arch/arm/mach-gemini/board-rut1xx.c | 2 +-
352 arch/arm/mach-gemini/board-wbd111.c | 2 +-
353 arch/arm/mach-gemini/board-wbd222.c | 2 +-
354 arch/arm/mach-gemini/include/mach/gpio.h | 5 -
355 arch/arm/mach-h720x/Makefile.boot | 2 +-
356 arch/arm/mach-h720x/h7201-eval.c | 2 +-
357 arch/arm/mach-h720x/h7202-eval.c | 2 +-
358 arch/arm/mach-imx/Makefile.boot | 10 +-
359 arch/arm/mach-imx/iomux-imx31.c | 3 +-
360 arch/arm/mach-imx/mach-armadillo5x0.c | 2 +-
361 arch/arm/mach-imx/mach-cpuimx27.c | 2 +-
362 arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
363 arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 +-
364 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +-
365 arch/arm/mach-imx/mach-imx27ipcam.c | 2 +-
366 arch/arm/mach-imx/mach-imx27lite.c | 2 +-
367 arch/arm/mach-imx/mach-kzm_arm11_01.c | 2 +-
368 arch/arm/mach-imx/mach-mx1ads.c | 4 +-
369 arch/arm/mach-imx/mach-mx21ads.c | 2 +-
370 arch/arm/mach-imx/mach-mx25_3ds.c | 2 +-
371 arch/arm/mach-imx/mach-mx27_3ds.c | 2 +-
372 arch/arm/mach-imx/mach-mx27ads.c | 5 +-
373 arch/arm/mach-imx/mach-mx31_3ds.c | 2 +-
374 arch/arm/mach-imx/mach-mx31ads.c | 2 +-
375 arch/arm/mach-imx/mach-mx31lilly.c | 2 +-
376 arch/arm/mach-imx/mach-mx31lite.c | 2 +-
377 arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
378 arch/arm/mach-imx/mach-mx35_3ds.c | 2 +-
379 arch/arm/mach-imx/mach-mxt_td60.c | 2 +-
380 arch/arm/mach-imx/mach-pca100.c | 2 +-
381 arch/arm/mach-imx/mach-pcm037.c | 2 +-
382 arch/arm/mach-imx/mach-pcm038.c | 2 +-
383 arch/arm/mach-imx/mach-pcm043.c | 2 +-
384 arch/arm/mach-imx/mach-qong.c | 2 +-
385 arch/arm/mach-imx/mach-scb9328.c | 2 +-
386 arch/arm/mach-integrator/Makefile.boot | 2 +-
387 arch/arm/mach-integrator/core.c | 4 +
388 arch/arm/mach-integrator/include/mach/io.h | 2 -
389 arch/arm/mach-integrator/include/mach/platform.h | 12 -
390 arch/arm/mach-integrator/integrator_ap.c | 88 +-
391 arch/arm/mach-integrator/integrator_cp.c | 2 +-
392 arch/arm/mach-iop13xx/Makefile.boot | 2 +-
393 arch/arm/mach-iop13xx/iq81340mc.c | 2 +-
394 arch/arm/mach-iop13xx/iq81340sc.c | 2 +-
395 arch/arm/mach-iop32x/Makefile.boot | 2 +-
396 arch/arm/mach-iop32x/em7210.c | 2 +-
397 arch/arm/mach-iop32x/glantank.c | 2 +-
398 arch/arm/mach-iop32x/iq31244.c | 4 +-
399 arch/arm/mach-iop32x/iq80321.c | 2 +-
400 arch/arm/mach-iop32x/n2100.c | 2 +-
401 arch/arm/mach-iop33x/Makefile.boot | 2 +-
402 arch/arm/mach-iop33x/iq80331.c | 2 +-
403 arch/arm/mach-iop33x/iq80332.c | 2 +-
404 arch/arm/mach-ixp2000/Makefile.boot | 2 +-
405 arch/arm/mach-ixp2000/core.c | 4 +-
406 arch/arm/mach-ixp2000/enp2611.c | 2 +-
407 .../include/mach/{gpio.h => gpio-ixp2000.h} | 4 +-
408 arch/arm/mach-ixp2000/ixdp2400.c | 2 +-
409 arch/arm/mach-ixp2000/ixdp2800.c | 2 +-
410 arch/arm/mach-ixp2000/ixdp2x00.c | 4 +-
411 arch/arm/mach-ixp2000/ixdp2x01.c | 6 +-
412 arch/arm/mach-ixp23xx/Makefile.boot | 2 +-
413 arch/arm/mach-ixp23xx/espresso.c | 2 +-
414 arch/arm/mach-ixp23xx/ixdp2351.c | 2 +-
415 arch/arm/mach-ixp23xx/roadrunner.c | 2 +-
416 arch/arm/mach-ixp4xx/Makefile.boot | 2 +-
417 arch/arm/mach-ixp4xx/avila-setup.c | 4 +-
418 arch/arm/mach-ixp4xx/common-pci.c | 3 +-
419 arch/arm/mach-ixp4xx/coyote-setup.c | 4 +-
420 arch/arm/mach-ixp4xx/dsmg600-setup.c | 5 +-
421 arch/arm/mach-ixp4xx/fsg-setup.c | 5 +-
422 arch/arm/mach-ixp4xx/gateway7001-setup.c | 2 +-
423 arch/arm/mach-ixp4xx/goramo_mlr.c | 2 +-
424 arch/arm/mach-ixp4xx/gtwx5715-setup.c | 2 +-
425 arch/arm/mach-ixp4xx/include/mach/gpio.h | 3 +
426 arch/arm/mach-ixp4xx/include/mach/io.h | 2 -
427 arch/arm/mach-ixp4xx/ixdp425-setup.c | 8 +-
428 arch/arm/mach-ixp4xx/nas100d-setup.c | 5 +-
429 arch/arm/mach-ixp4xx/nslu2-setup.c | 5 +-
430 arch/arm/mach-ixp4xx/vulcan-setup.c | 2 +-
431 arch/arm/mach-ixp4xx/wg302v2-setup.c | 2 +-
432 arch/arm/mach-kirkwood/Makefile.boot | 2 +-
433 arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
434 arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +-
435 arch/arm/mach-kirkwood/dockstar-setup.c | 2 +-
436 arch/arm/mach-kirkwood/guruplug-setup.c | 2 +-
437 arch/arm/mach-kirkwood/irq.c | 3 +-
438 arch/arm/mach-kirkwood/mpp.c | 3 +-
439 arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-
440 arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 +-
441 arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +-
442 arch/arm/mach-kirkwood/openrd-setup.c | 6 +-
443 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-
444 arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +-
445 arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 +-
446 arch/arm/mach-kirkwood/t5325-setup.c | 2 +-
447 arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
448 arch/arm/mach-kirkwood/ts41x-setup.c | 2 +-
449 arch/arm/mach-ks8695/Makefile | 2 +-
450 arch/arm/mach-ks8695/Makefile.boot | 2 +-
451 arch/arm/mach-ks8695/board-acs5k.c | 6 +-
452 arch/arm/mach-ks8695/board-dsm320.c | 6 +-
453 arch/arm/mach-ks8695/board-micrel.c | 6 +-
454 arch/arm/mach-ks8695/devices.c | 1 +
455 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h | 39 +
456 arch/arm/mach-ks8695/include/mach/gpio.h | 38 -
457 arch/arm/mach-ks8695/leds.c | 4 +-
458 arch/arm/mach-lpc32xx/Makefile | 2 +-
459 arch/arm/mach-lpc32xx/Makefile.boot | 2 +-
460 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h | 50 +
461 arch/arm/mach-lpc32xx/include/mach/gpio.h | 74 -
462 arch/arm/mach-lpc32xx/phy3250.c | 3 +-
463 arch/arm/mach-mmp/Makefile.boot | 2 +-
464 arch/arm/mach-mmp/aspenite.c | 5 +-
465 arch/arm/mach-mmp/mmp2.c | 3 +-
466 arch/arm/mach-mmp/pxa168.c | 3 +-
467 arch/arm/mach-mmp/pxa910.c | 3 +-
468 arch/arm/mach-mmp/tavorevb.c | 3 +-
469 arch/arm/mach-mmp/ttc_dkb.c | 2 +-
470 arch/arm/mach-msm/Makefile.boot | 2 +-
471 arch/arm/mach-msm/board-halibut.c | 6 +-
472 arch/arm/mach-msm/board-mahimahi.c | 6 +-
473 arch/arm/mach-msm/board-msm7x27.c | 11 +-
474 arch/arm/mach-msm/board-msm7x30.c | 31 +-
475 arch/arm/mach-msm/board-msm8960.c | 22 +
476 arch/arm/mach-msm/board-msm8x60.c | 25 +
477 arch/arm/mach-msm/board-qsd8x50.c | 7 +-
478 arch/arm/mach-msm/board-sapphire.c | 9 +-
479 arch/arm/mach-msm/board-trout-mmc.c | 3 +-
480 arch/arm/mach-msm/board-trout-panel.c | 3 +-
481 arch/arm/mach-msm/board-trout.c | 6 +-
482 arch/arm/mach-msm/include/mach/gpio.h | 27 +-
483 arch/arm/mach-msm/include/mach/memory.h | 6 +-
484 arch/arm/mach-mv78xx0/Makefile.boot | 2 +-
485 arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +-
486 arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +-
487 arch/arm/mach-mv78xx0/irq.c | 3 +-
488 arch/arm/mach-mv78xx0/mpp.c | 3 +-
489 arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +-
490 arch/arm/mach-mx5/Makefile.boot | 6 +-
491 arch/arm/mach-mx5/board-cpuimx51.c | 2 +-
492 arch/arm/mach-mx5/board-cpuimx51sd.c | 2 +-
493 arch/arm/mach-mx5/board-mx51_3ds.c | 2 +-
494 arch/arm/mach-mx5/board-mx51_babbage.c | 2 +-
495 arch/arm/mach-mx5/board-mx51_efikamx.c | 2 +-
496 arch/arm/mach-mx5/board-mx51_efikasb.c | 2 +-
497 arch/arm/mach-mxs/Makefile.boot | 2 +-
498 arch/arm/mach-mxs/include/mach/gpio.h | 8 -
499 arch/arm/mach-netx/Makefile.boot | 2 +-
500 arch/arm/mach-netx/nxdb500.c | 2 +-
501 arch/arm/mach-netx/nxdkn.c | 2 +-
502 arch/arm/mach-netx/nxeb500hmi.c | 2 +-
503 arch/arm/mach-nomadik/Makefile.boot | 2 +-
504 arch/arm/mach-nomadik/board-nhk8815.c | 3 +-
505 arch/arm/mach-nomadik/cpu-8815.c | 2 +-
506 arch/arm/mach-nomadik/i2c-8815nhk.c | 2 +-
507 arch/arm/mach-nomadik/include/mach/gpio.h | 2 -
508 arch/arm/mach-nuc93x/Makefile.boot | 2 +-
509 arch/arm/mach-nuc93x/mach-nuc932evb.c | 1 -
510 arch/arm/mach-omap1/Makefile.boot | 2 +-
511 arch/arm/mach-omap1/board-ams-delta.c | 5 +-
512 arch/arm/mach-omap1/board-fsample.c | 5 +-
513 arch/arm/mach-omap1/board-generic.c | 5 +-
514 arch/arm/mach-omap1/board-h2-mmc.c | 3 +-
515 arch/arm/mach-omap1/board-h2.c | 5 +-
516 arch/arm/mach-omap1/board-h3-mmc.c | 3 +-
517 arch/arm/mach-omap1/board-h3.c | 5 +-
518 arch/arm/mach-omap1/board-htcherald.c | 3 +-
519 arch/arm/mach-omap1/board-innovator.c | 5 +-
520 arch/arm/mach-omap1/board-nokia770.c | 5 +-
521 arch/arm/mach-omap1/board-osk.c | 5 +-
522 arch/arm/mach-omap1/board-palmte.c | 5 +-
523 arch/arm/mach-omap1/board-palmtt.c | 4 +-
524 arch/arm/mach-omap1/board-palmz71.c | 4 +-
525 arch/arm/mach-omap1/board-perseus2.c | 5 +-
526 arch/arm/mach-omap1/board-sx1-mmc.c | 2 +-
527 arch/arm/mach-omap1/board-sx1.c | 5 +-
528 arch/arm/mach-omap1/board-voiceblue.c | 4 +-
529 arch/arm/mach-omap1/devices.c | 2 +-
530 arch/arm/mach-omap1/fpga.c | 2 +-
531 arch/arm/mach-omap1/io.c | 1 +
532 arch/arm/mach-omap1/irq.c | 3 +-
533 arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +-
534 arch/arm/mach-omap1/leds-osk.c | 3 +-
535 arch/arm/mach-omap1/leds.c | 2 +-
536 arch/arm/mach-omap1/serial.c | 3 +-
537 arch/arm/mach-omap2/Makefile.boot | 2 +-
538 arch/arm/mach-omap2/board-2430sdp.c | 2 +-
539 arch/arm/mach-omap2/board-3430sdp.c | 2 +-
540 arch/arm/mach-omap2/board-3630sdp.c | 2 +-
541 arch/arm/mach-omap2/board-4430sdp.c | 2 +-
542 arch/arm/mach-omap2/board-am3517crane.c | 2 +-
543 arch/arm/mach-omap2/board-am3517evm.c | 2 +-
544 arch/arm/mach-omap2/board-apollon.c | 2 +-
545 arch/arm/mach-omap2/board-cm-t35.c | 4 +-
546 arch/arm/mach-omap2/board-cm-t3517.c | 2 +-
547 arch/arm/mach-omap2/board-devkit8000.c | 2 +-
548 arch/arm/mach-omap2/board-generic.c | 5 +-
549 arch/arm/mach-omap2/board-h4.c | 5 +-
550 arch/arm/mach-omap2/board-igep0020.c | 4 +-
551 arch/arm/mach-omap2/board-ldp.c | 5 +-
552 arch/arm/mach-omap2/board-n8x0.c | 6 +-
553 arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
554 arch/arm/mach-omap2/board-omap3evm.c | 2 +-
555 arch/arm/mach-omap2/board-omap3logic.c | 4 +-
556 arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
557 arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
558 arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
559 arch/arm/mach-omap2/board-omap4panda.c | 2 +-
560 arch/arm/mach-omap2/board-overo.c | 2 +-
561 arch/arm/mach-omap2/board-rm680.c | 2 +-
562 arch/arm/mach-omap2/board-rx51.c | 2 +-
563 arch/arm/mach-omap2/board-ti8168evm.c | 2 +-
564 arch/arm/mach-omap2/board-zoom.c | 4 +-
565 arch/arm/mach-omap2/devices.c | 3 +-
566 arch/arm/mach-omap2/io.c | 2 +-
567 arch/arm/mach-orion5x/Makefile.boot | 2 +-
568 arch/arm/mach-orion5x/common.c | 4 +-
569 arch/arm/mach-orion5x/common.h | 4 +-
570 arch/arm/mach-orion5x/d2net-setup.c | 4 +-
571 arch/arm/mach-orion5x/db88f5281-setup.c | 5 +-
572 arch/arm/mach-orion5x/dns323-setup.c | 5 +-
573 arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +-
574 arch/arm/mach-orion5x/irq.c | 3 +-
575 arch/arm/mach-orion5x/kurobox_pro-setup.c | 7 +-
576 arch/arm/mach-orion5x/ls-chl-setup.c | 2 +-
577 arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +-
578 arch/arm/mach-orion5x/lsmini-setup.c | 2 +-
579 arch/arm/mach-orion5x/mss2-setup.c | 2 +-
580 arch/arm/mach-orion5x/mv2120-setup.c | 5 +-
581 arch/arm/mach-orion5x/net2big-setup.c | 2 +-
582 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 5 +-
583 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 5 +-
584 arch/arm/mach-orion5x/rd88f5182-setup.c | 5 +-
585 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 5 +-
586 arch/arm/mach-orion5x/terastation_pro2-setup.c | 5 +-
587 arch/arm/mach-orion5x/ts209-setup.c | 5 +-
588 arch/arm/mach-orion5x/ts409-setup.c | 5 +-
589 arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
590 arch/arm/mach-orion5x/wnr854t-setup.c | 5 +-
591 arch/arm/mach-orion5x/wrt350n-v2-setup.c | 5 +-
592 arch/arm/mach-pnx4008/Makefile.boot | 2 +-
593 arch/arm/mach-pnx4008/core.c | 2 +-
594 arch/arm/mach-pnx4008/gpio.c | 3 +-
595 .../include/mach/{gpio.h => gpio-pnx4008.h} | 2 +-
596 arch/arm/mach-pnx4008/serial.c | 3 +-
597 arch/arm/mach-prima2/Makefile.boot | 2 +-
598 arch/arm/mach-prima2/prima2.c | 2 +-
599 arch/arm/mach-pxa/Makefile.boot | 2 +-
600 arch/arm/mach-pxa/balloon3.c | 2 +-
601 arch/arm/mach-pxa/capc7117.c | 2 +-
602 arch/arm/mach-pxa/cm-x2xx.c | 2 +-
603 arch/arm/mach-pxa/cm-x300.c | 6 +-
604 arch/arm/mach-pxa/colibri-pxa270.c | 4 +-
605 arch/arm/mach-pxa/colibri-pxa300.c | 2 +-
606 arch/arm/mach-pxa/colibri-pxa320.c | 2 +-
607 arch/arm/mach-pxa/corgi.c | 4 +-
608 arch/arm/mach-pxa/csb726.c | 2 +-
609 arch/arm/mach-pxa/em-x270.c | 4 +-
610 arch/arm/mach-pxa/eseries.c | 15 +-
611 arch/arm/mach-pxa/eseries.h | 3 +-
612 arch/arm/mach-pxa/ezx.c | 12 +-
613 arch/arm/mach-pxa/generic.c | 2 +-
614 arch/arm/mach-pxa/gumstix.c | 2 +-
615 arch/arm/mach-pxa/h5000.c | 2 +-
616 arch/arm/mach-pxa/himalaya.c | 2 +-
617 arch/arm/mach-pxa/hx4700.c | 2 +-
618 arch/arm/mach-pxa/icontrol.c | 2 +-
619 arch/arm/mach-pxa/include/mach/littleton.h | 2 +-
620 arch/arm/mach-pxa/irq.c | 3 +-
621 arch/arm/mach-pxa/littleton.c | 2 +-
622 arch/arm/mach-pxa/lpd270.c | 5 +-
623 arch/arm/mach-pxa/lubbock.c | 2 +-
624 arch/arm/mach-pxa/magician.c | 2 +-
625 arch/arm/mach-pxa/mainstone.c | 5 +-
626 arch/arm/mach-pxa/mfp-pxa2xx.c | 3 +-
627 arch/arm/mach-pxa/mioa701.c | 2 +-
628 arch/arm/mach-pxa/mp900.c | 2 +-
629 arch/arm/mach-pxa/palmld.c | 2 +-
630 arch/arm/mach-pxa/palmt5.c | 2 +-
631 arch/arm/mach-pxa/palmtc.c | 2 +-
632 arch/arm/mach-pxa/palmte2.c | 2 +-
633 arch/arm/mach-pxa/palmtreo.c | 4 +-
634 arch/arm/mach-pxa/palmtx.c | 2 +-
635 arch/arm/mach-pxa/palmz72.c | 2 +-
636 arch/arm/mach-pxa/pcm027.c | 2 +-
637 arch/arm/mach-pxa/pcm990-baseboard.c | 3 +-
638 arch/arm/mach-pxa/poodle.c | 4 +-
639 arch/arm/mach-pxa/pxa25x.c | 2 +-
640 arch/arm/mach-pxa/pxa27x.c | 2 +-
641 arch/arm/mach-pxa/pxa3xx.c | 3 +-
642 arch/arm/mach-pxa/pxa95x.c | 3 +-
643 arch/arm/mach-pxa/raumfeld.c | 6 +-
644 arch/arm/mach-pxa/saar.c | 4 +-
645 arch/arm/mach-pxa/saarb.c | 5 +-
646 arch/arm/mach-pxa/spitz.c | 4 +-
647 arch/arm/mach-pxa/stargate2.c | 4 +-
648 arch/arm/mach-pxa/tavorevb.c | 2 +-
649 arch/arm/mach-pxa/tavorevb3.c | 2 +-
650 arch/arm/mach-pxa/tosa.c | 4 +-
651 arch/arm/mach-pxa/trizeps4.c | 4 +-
652 arch/arm/mach-pxa/viper.c | 2 +-
653 arch/arm/mach-pxa/vpac270.c | 2 +-
654 arch/arm/mach-pxa/xcep.c | 2 +-
655 arch/arm/mach-pxa/z2.c | 2 +-
656 arch/arm/mach-pxa/zeus.c | 2 +-
657 arch/arm/mach-pxa/zylonite.c | 2 +-
658 arch/arm/mach-realview/Makefile.boot | 4 +-
659 arch/arm/mach-realview/core.c | 3 +-
660 arch/arm/mach-realview/core.h | 4 +-
661 arch/arm/mach-realview/include/mach/gpio.h | 7 +-
662 arch/arm/mach-realview/realview_eb.c | 2 +-
663 arch/arm/mach-realview/realview_pb1176.c | 5 +-
664 arch/arm/mach-realview/realview_pb11mp.c | 2 +-
665 arch/arm/mach-realview/realview_pba8.c | 2 +-
666 arch/arm/mach-realview/realview_pbx.c | 8 +-
667 arch/arm/mach-rpc/Makefile.boot | 2 +-
668 arch/arm/mach-rpc/include/mach/hardware.h | 25 +-
669 arch/arm/mach-rpc/include/mach/io.h | 193 +---
670 arch/arm/mach-rpc/riscpc.c | 4 +-
671 arch/arm/mach-s3c2410/Makefile.boot | 4 +-
672 arch/arm/mach-s3c2410/include/mach/gpio.h | 6 -
673 arch/arm/mach-s3c2410/include/mach/h1940-latch.h | 2 +-
674 arch/arm/mach-s3c2410/include/mach/io.h | 2 -
675 arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +-
676 arch/arm/mach-s3c2410/mach-bast.c | 2 +-
677 arch/arm/mach-s3c2410/mach-h1940.c | 2 +-
678 arch/arm/mach-s3c2410/mach-n30.c | 4 +-
679 arch/arm/mach-s3c2410/mach-otom.c | 2 +-
680 arch/arm/mach-s3c2410/mach-qt2410.c | 2 +-
681 arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +-
682 arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +-
683 arch/arm/mach-s3c2410/mach-vr1000.c | 2 +-
684 arch/arm/mach-s3c2412/mach-jive.c | 2 +-
685 arch/arm/mach-s3c2412/mach-smdk2413.c | 9 +-
686 arch/arm/mach-s3c2412/mach-vstms.c | 7 +-
687 arch/arm/mach-s3c2416/mach-smdk2416.c | 2 +-
688 arch/arm/mach-s3c2440/mach-anubis.c | 2 +-
689 arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +-
690 arch/arm/mach-s3c2440/mach-gta02.c | 2 +-
691 arch/arm/mach-s3c2440/mach-mini2440.c | 2 +-
692 arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +-
693 arch/arm/mach-s3c2440/mach-osiris.c | 2 +-
694 arch/arm/mach-s3c2440/mach-rx1950.c | 2 +-
695 arch/arm/mach-s3c2440/mach-rx3715.c | 2 +-
696 arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +-
697 arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +-
698 arch/arm/mach-s3c64xx/Makefile.boot | 2 +-
699 arch/arm/mach-s3c64xx/cpu.c | 2 +
700 arch/arm/mach-s3c64xx/include/mach/gpio.h | 7 -
701 arch/arm/mach-s3c64xx/include/mach/memory.h | 2 -
702 arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
703 arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
704 arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
705 arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
706 arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
707 arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
708 arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
709 arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
710 arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
711 arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
712 arch/arm/mach-s5p64x0/Makefile.boot | 2 +-
713 arch/arm/mach-s5p64x0/cpu.c | 3 +
714 arch/arm/mach-s5p64x0/include/mach/gpio.h | 7 -
715 arch/arm/mach-s5p64x0/include/mach/memory.h | 1 -
716 arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +-
717 arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +-
718 arch/arm/mach-s5pc100/Makefile.boot | 2 +-
719 arch/arm/mach-s5pc100/include/mach/gpio.h | 7 -
720 arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +-
721 arch/arm/mach-s5pv210/Makefile.boot | 2 +-
722 arch/arm/mach-s5pv210/cpu.c | 2 +
723 arch/arm/mach-s5pv210/include/mach/gpio.h | 7 -
724 arch/arm/mach-s5pv210/include/mach/memory.h | 1 -
725 arch/arm/mach-s5pv210/mach-aquila.c | 2 +-
726 arch/arm/mach-s5pv210/mach-goni.c | 2 +-
727 arch/arm/mach-s5pv210/mach-smdkc110.c | 2 +-
728 arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +-
729 arch/arm/mach-s5pv210/mach-torbreck.c | 2 +-
730 arch/arm/mach-sa1100/Makefile | 3 +-
731 arch/arm/mach-sa1100/Makefile.boot | 5 +-
732 arch/arm/mach-sa1100/assabet.c | 5 +-
733 arch/arm/mach-sa1100/badge4.c | 2 +-
734 arch/arm/mach-sa1100/generic.c | 2 +-
735 arch/arm/mach-sa1100/h3100.c | 2 +-
736 arch/arm/mach-sa1100/h3600.c | 2 +-
737 arch/arm/mach-sa1100/hackkit.c | 2 +-
738 arch/arm/mach-sa1100/include/mach/gpio.h | 4 +-
739 arch/arm/mach-sa1100/include/mach/io.h | 6 +-
740 arch/arm/mach-sa1100/include/mach/simpad.h | 94 +-
741 arch/arm/mach-sa1100/jornada720.c | 2 +-
742 arch/arm/mach-sa1100/lart.c | 2 +-
743 arch/arm/mach-sa1100/leds-simpad.c | 100 --
744 arch/arm/mach-sa1100/leds.c | 2 -
745 arch/arm/mach-sa1100/leds.h | 1 -
746 arch/arm/mach-sa1100/nanoengine.c | 2 +-
747 arch/arm/mach-sa1100/shannon.c | 2 +-
748 arch/arm/mach-sa1100/simpad.c | 215 +++-
749 arch/arm/mach-shark/Makefile.boot | 2 +-
750 arch/arm/mach-shark/core.c | 2 +-
751 arch/arm/mach-shmobile/Makefile.boot | 2 +-
752 arch/arm/mach-shmobile/board-ag5evm.c | 3 +
753 arch/arm/mach-shmobile/board-ap4evb.c | 3 +
754 arch/arm/mach-shmobile/board-g3evm.c | 3 +
755 arch/arm/mach-shmobile/board-g4evm.c | 3 +
756 arch/arm/mach-shmobile/board-mackerel.c | 3 +
757 arch/arm/mach-shmobile/include/mach/gpio.h | 24 +-
758 arch/arm/mach-shmobile/include/mach/memory.h | 3 -
759 arch/arm/mach-spear3xx/Makefile.boot | 2 +-
760 arch/arm/mach-spear3xx/spear300_evb.c | 2 +-
761 arch/arm/mach-spear3xx/spear310_evb.c | 2 +-
762 arch/arm/mach-spear3xx/spear320_evb.c | 2 +-
763 arch/arm/mach-spear6xx/Makefile.boot | 2 +-
764 arch/arm/mach-spear6xx/spear600_evb.c | 2 +-
765 arch/arm/mach-tcc8k/Makefile.boot | 2 +-
766 arch/arm/mach-tcc8k/board-tcc8000-sdk.c | 2 +-
767 arch/arm/mach-tegra/Makefile.boot | 2 +-
768 arch/arm/mach-tegra/board-harmony-pcie.c | 10 +-
769 arch/arm/mach-tegra/board-harmony.c | 6 +-
770 arch/arm/mach-tegra/board-harmony.h | 3 +
771 arch/arm/mach-tegra/board-paz00.c | 6 +-
772 arch/arm/mach-tegra/board-paz00.h | 2 +
773 arch/arm/mach-tegra/board-seaboard.c | 6 +-
774 arch/arm/mach-tegra/board-seaboard.h | 2 +
775 arch/arm/mach-tegra/board-trimslice-pinmux.c | 3 +-
776 arch/arm/mach-tegra/board-trimslice.c | 6 +-
777 arch/arm/mach-tegra/board-trimslice.h | 2 +
778 arch/arm/mach-tegra/include/mach/gpio-tegra.h | 39 +
779 arch/arm/mach-tegra/include/mach/gpio.h | 60 -
780 arch/arm/mach-tegra/usb_phy.c | 1 +
781 arch/arm/mach-u300/Kconfig | 1 +
782 arch/arm/mach-u300/Makefile.boot | 4 +-
783 arch/arm/mach-u300/core.c | 34 +-
784 arch/arm/mach-u300/include/mach/gpio-u300.h | 150 ++
785 arch/arm/mach-u300/include/mach/gpio.h | 294 ----
786 arch/arm/mach-u300/include/mach/irqs.h | 25 +-
787 arch/arm/mach-u300/include/mach/memory.h | 13 +-
788 arch/arm/mach-u300/mmc.c | 2 +-
789 arch/arm/mach-u300/u300.c | 2 +-
790 arch/arm/mach-ux500/Makefile.boot | 2 +-
791 arch/arm/mach-ux500/board-mop500-pins.c | 2 +-
792 arch/arm/mach-ux500/board-mop500-u8500uib.c | 3 +-
793 arch/arm/mach-ux500/board-mop500.c | 7 +-
794 arch/arm/mach-ux500/board-u5500-sdi.c | 2 +-
795 arch/arm/mach-ux500/board-u5500.c | 4 +-
796 arch/arm/mach-ux500/cpu-db5500.c | 2 +-
797 arch/arm/mach-ux500/cpu-db8500.c | 2 +-
798 arch/arm/mach-ux500/devices-common.c | 2 +-
799 arch/arm/mach-ux500/include/mach/gpio.h | 2 -
800 arch/arm/mach-versatile/Makefile.boot | 2 +-
801 arch/arm/mach-versatile/include/mach/gpio.h | 7 +-
802 arch/arm/mach-versatile/versatile_ab.c | 2 +-
803 arch/arm/mach-versatile/versatile_pb.c | 2 +-
804 arch/arm/mach-vexpress/Makefile.boot | 2 +-
805 arch/arm/mach-vexpress/hotplug.c | 9 +-
806 arch/arm/mach-vexpress/include/mach/io.h | 2 -
807 arch/arm/mach-vexpress/v2m.c | 2 +-
808 arch/arm/mach-vt8500/Makefile.boot | 2 +-
809 arch/arm/mach-vt8500/bv07.c | 2 +-
810 arch/arm/mach-vt8500/include/mach/gpio.h | 7 +-
811 arch/arm/mach-vt8500/include/mach/io.h | 2 -
812 arch/arm/mach-vt8500/wm8505_7in.c | 2 +-
813 arch/arm/mach-w90x900/Makefile.boot | 2 +-
814 arch/arm/mach-w90x900/include/mach/gpio.h | 6 +-
815 arch/arm/mach-w90x900/mach-nuc910evb.c | 1 -
816 arch/arm/mach-w90x900/mach-nuc950evb.c | 1 -
817 arch/arm/mach-w90x900/mach-nuc960evb.c | 1 -
818 arch/arm/mach-zynq/Makefile.boot | 2 +-
819 arch/arm/mm/cache-l2x0.c | 105 ++-
820 arch/arm/mm/dma-mapping.c | 46 +-
821 arch/arm/mm/init.c | 9 -
822 arch/arm/mm/mm.h | 4 +-
823 arch/arm/mm/mmu.c | 26 +-
824 arch/arm/mm/proc-arm920.S | 21 +-
825 arch/arm/mm/proc-arm926.S | 21 +-
826 arch/arm/mm/proc-sa1100.S | 25 +-
827 arch/arm/mm/proc-v6.S | 44 +-
828 arch/arm/mm/proc-v7.S | 50 +-
829 arch/arm/mm/proc-xsc3.S | 28 +-
830 arch/arm/mm/proc-xscale.S | 25 +-
831 arch/arm/plat-mxc/include/mach/gpio.h | 6 -
832 arch/arm/plat-mxc/include/mach/memory.h | 15 -
833 .../include/plat/{gpio.h => gpio-nomadik.h} | 17 +-
834 arch/arm/plat-omap/debug-devices.c | 3 +-
835 arch/arm/plat-omap/debug-leds.c | 3 +-
836 arch/arm/plat-omap/devices.c | 3 +-
837 arch/arm/plat-omap/include/plat/gpio.h | 20 -
838 arch/arm/plat-omap/include/plat/io.h | 2 +
839 arch/arm/plat-omap/include/plat/memory.h | 13 -
840 arch/arm/plat-omap/io.c | 8 +
841 arch/arm/plat-orion/include/plat/gpio.h | 10 +-
842 arch/arm/plat-pxa/gpio.c | 4 +-
843 arch/arm/plat-pxa/include/plat/gpio.h | 2 +
844 arch/arm/plat-spear/include/plat/gpio.h | 25 +-
845 arch/arm/vfp/vfpmodule.c | 31 +-
846 drivers/amba/bus.c | 68 +-
847 drivers/ata/pata_at91.c | 2 +-
848 drivers/gpio/Kconfig | 9 +
849 drivers/gpio/Makefile | 6 +-
850 .../gpio.c => drivers/gpio/gpio-davinci.c | 7 +-
851 drivers/gpio/gpio-ep93xx.c | 19 +-
852 .../gpio.c => drivers/gpio/gpio-ks8695.c | 4 +-
853 .../gpiolib.c => drivers/gpio/gpio-lpc32xx.c | 2 +-
854 drivers/gpio/gpio-nomadik.c | 3 +-
855 drivers/gpio/gpio-omap.c | 2 +-
856 .../gpio.c => drivers/gpio/gpio-sa1100.c | 4 +-
857 drivers/gpio/gpio-tegra.c | 23 +-
858 .../mach-davinci => drivers/gpio}/gpio-tnetv107x.c | 0
859 drivers/gpio/gpio-u300.c | 1190 ++++++++------
860 drivers/i2c/busses/i2c-ixp2000.c | 2 +-
861 drivers/ide/at91_ide.c | 2 +-
862 drivers/input/keyboard/omap-keypad.c | 2 +-
863 drivers/mfd/menelaus.c | 2 +-
864 drivers/mmc/host/mmci.c | 21 +-
865 drivers/mmc/host/omap.c | 2 +-
866 drivers/mmc/host/sdhci-tegra.c | 4 +-
867 drivers/mtd/nand/ams-delta.c | 2 +-
868 drivers/mtd/onenand/omap2.c | 2 +-
869 drivers/net/arm/at91_ether.c | 2 +-
870 drivers/pcmcia/pxa2xx_vpac270.c | 2 +-
871 drivers/pcmcia/sa1100_simpad.c | 35 +-
872 drivers/spi/spi-atmel.c | 2 +-
873 drivers/spi/spi-pl022.c | 92 +-
874 drivers/tty/serial/amba-pl010.c | 14 +-
875 drivers/tty/serial/amba-pl011.c | 14 +-
876 drivers/tty/serial/atmel_serial.c | 2 +-
877 drivers/usb/host/ohci-pnx4008.c | 2 +-
878 drivers/usb/musb/davinci.c | 2 +-
879 drivers/video/amba-clcd.c | 9 +-
880 drivers/video/atmel_lcdfb.c | 2 +-
881 drivers/video/omap/lcd_apollon.c | 2 +-
882 drivers/video/omap/lcd_h3.c | 2 +-
883 drivers/video/omap/lcd_inn1610.c | 2 +-
884 drivers/video/omap/lcd_ldp.c | 2 +-
885 drivers/video/omap/lcd_osk.c | 2 +-
886 drivers/video/omap/lcd_overo.c | 2 +-
887 drivers/video/omap/lcd_palmtt.c | 2 +-
888 drivers/video/pnx4008/sdum.c | 2 +-
889 include/linux/clk.h | 43 +
890 include/linux/cpu_pm.h | 109 ++
891 kernel/Makefile | 1 +
892 kernel/cpu_pm.c | 233 +++
893 kernel/events/core.c | 4 +-
894 kernel/power/Kconfig | 4 +
895 750 files changed, 10503 insertions(+), 4313 deletions(-)
896 create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt
897 create mode 100644 arch/arm/boot/compressed/atags_to_fdt.c
898 create mode 100644 arch/arm/boot/compressed/libfdt_env.h
899 create mode 100644 arch/arm/boot/compressed/string.c
900 delete mode 100644 arch/arm/include/asm/auxvec.h
901 delete mode 100644 arch/arm/include/asm/bitsperlong.h
902 delete mode 100644 arch/arm/include/asm/cputime.h
903 delete mode 100644 arch/arm/include/asm/emergency-restart.h
904 delete mode 100644 arch/arm/include/asm/errno.h
905 delete mode 100644 arch/arm/include/asm/ioctl.h
906 delete mode 100644 arch/arm/include/asm/irq_regs.h
907 delete mode 100644 arch/arm/include/asm/kdebug.h
908 delete mode 100644 arch/arm/include/asm/local.h
909 delete mode 100644 arch/arm/include/asm/local64.h
910 delete mode 100644 arch/arm/include/asm/percpu.h
911 create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
912 create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
913 create mode 100644 arch/arm/include/asm/pgtable-2level.h
914 delete mode 100644 arch/arm/include/asm/poll.h
915 delete mode 100644 arch/arm/include/asm/resource.h
916 delete mode 100644 arch/arm/include/asm/sections.h
917 delete mode 100644 arch/arm/include/asm/siginfo.h
918 delete mode 100644 arch/arm/include/asm/sizes.h
919 create mode 100644 arch/arm/kernel/kprobes-test-arm.c
920 create mode 100644 arch/arm/kernel/kprobes-test-thumb.c
921 create mode 100644 arch/arm/kernel/kprobes-test.c
922 create mode 100644 arch/arm/kernel/kprobes-test.h
923 create mode 100644 arch/arm/kernel/suspend.c
924 create mode 100644 arch/arm/kernel/topology.c
925 create mode 100644 arch/arm/mach-davinci/include/mach/gpio-davinci.h
926 rename arch/arm/mach-ixp2000/include/mach/{gpio.h => gpio-ixp2000.h} (95%)
927 create mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h
928 create mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h
929 rename arch/arm/mach-pnx4008/include/mach/{gpio.h => gpio-pnx4008.h} (99%)
930 delete mode 100644 arch/arm/mach-sa1100/leds-simpad.c
931 create mode 100644 arch/arm/mach-tegra/include/mach/gpio-tegra.h
932 create mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h
933 rename arch/arm/plat-nomadik/include/plat/{gpio.h => gpio-nomadik.h} (82%)
934 rename arch/arm/mach-davinci/gpio.c => drivers/gpio/gpio-davinci.c (98%)
935 rename arch/arm/mach-ks8695/gpio.c => drivers/gpio/gpio-ks8695.c (99%)
936 rename arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c (99%)
937 rename arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c (96%)
938 rename {arch/arm/mach-davinci => drivers/gpio}/gpio-tnetv107x.c (100%)
939 create mode 100644 include/linux/cpu_pm.h
940 create mode 100644 kernel/cpu_pm.c
941 Merging arm-lpae/for-next
942 $ git merge arm-lpae/for-next
943 Resolved 'arch/arm/include/asm/page.h' using previous resolution.
944 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
945 Resolved 'arch/arm/include/asm/pgtable-hwdef.h' using previous resolution.
946 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
947 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
948 Resolved 'arch/arm/kernel/head.S' using previous resolution.
949 Resolved 'arch/arm/kernel/sleep.S' using previous resolution.
950 Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution.
951 Resolved 'arch/arm/mm/mmu.c' using previous resolution.
952 Auto-merging arch/arm/Kconfig
953 Auto-merging arch/arm/boot/compressed/head.S
954 Auto-merging arch/arm/include/asm/page.h
955 CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
956 Auto-merging arch/arm/include/asm/pgalloc.h
957 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
958 Auto-merging arch/arm/include/asm/pgtable-hwdef.h
959 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
960 Auto-merging arch/arm/include/asm/pgtable.h
961 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
962 Auto-merging arch/arm/include/asm/proc-fns.h
963 Auto-merging arch/arm/include/asm/system.h
964 Auto-merging arch/arm/include/asm/tlb.h
965 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
966 Auto-merging arch/arm/kernel/head.S
967 CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
968 Auto-merging arch/arm/kernel/hw_breakpoint.c
969 Auto-merging arch/arm/kernel/setup.c
970 Auto-merging arch/arm/kernel/sleep.S
971 CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
972 Auto-merging arch/arm/mm/dma-mapping.c
973 CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
974 Auto-merging arch/arm/mm/mmu.c
975 CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
976 Automatic merge failed; fix conflicts and then commit the result.
978 [master 7863d89] Merge remote-tracking branch 'arm-lpae/for-next'
979 $ git diff -M --stat --summary HEAD^..
980 arch/arm/Kconfig | 2 +-
981 arch/arm/boot/compressed/head.S | 1 +
982 arch/arm/include/asm/assembler.h | 11 +
983 arch/arm/include/asm/page.h | 4 +
984 arch/arm/include/asm/pgalloc.h | 24 ++
985 arch/arm/include/asm/pgtable-3level-hwdef.h | 82 ++++++
986 arch/arm/include/asm/pgtable-3level-types.h | 70 +++++
987 arch/arm/include/asm/pgtable-3level.h | 107 +++++++
988 arch/arm/include/asm/pgtable-hwdef.h | 4 +
989 arch/arm/include/asm/pgtable.h | 70 ++++-
990 arch/arm/include/asm/proc-fns.h | 21 ++
991 arch/arm/include/asm/setup.h | 8 +
992 arch/arm/include/asm/system.h | 8 +
993 arch/arm/include/asm/tlb.h | 11 +-
994 arch/arm/kernel/head.S | 45 +++-
995 arch/arm/kernel/hw_breakpoint.c | 8 +-
996 arch/arm/kernel/setup.c | 10 +
997 arch/arm/kernel/sleep.S | 2 +
998 arch/arm/mm/Kconfig | 13 +
999 arch/arm/mm/Makefile | 4 +
1000 arch/arm/mm/alignment.c | 2 +-
1001 arch/arm/mm/context.c | 19 +-
1002 arch/arm/mm/fault.c | 87 ++++++
1003 arch/arm/mm/idmap.c | 36 +++-
1004 arch/arm/mm/ioremap.c | 39 ++-
1005 arch/arm/mm/mmu.c | 35 ++-
1006 arch/arm/mm/pgd.c | 51 +++-
1007 arch/arm/mm/proc-macros.S | 5 +-
1008 arch/arm/mm/proc-v7lpae.S | 422 +++++++++++++++++++++++++++
1009 29 files changed, 1160 insertions(+), 41 deletions(-)
1010 create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
1011 create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
1012 create mode 100644 arch/arm/include/asm/pgtable-3level.h
1013 create mode 100644 arch/arm/mm/proc-v7lpae.S
1014 Merging arm-soc/for-next
1015 $ git merge arm-soc/for-next
1016 error: refusing to lose untracked file at 'arch/arm/mach-picoxcell/include/mach/uncompress.h'
1017 CONFLICT (rename/delete): Rename arch/arm/include/asm/sizes.h->arch/arm/mach-picoxcell/include/mach/uncompress.h in arm-soc/for-next and deleted in HEAD
1018 Auto-merging Documentation/devicetree/bindings/arm/l2cc.txt
1019 CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
1020 Auto-merging arch/arm/Kconfig
1021 Auto-merging arch/arm/Makefile
1022 Auto-merging arch/arm/configs/imx_v4_v5_defconfig
1023 Removing arch/arm/configs/mx1_defconfig
1024 Removing arch/arm/configs/mx21_defconfig
1025 Auto-merging arch/arm/configs/mx5_defconfig
1026 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
1027 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
1028 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
1029 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
1030 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
1031 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
1032 CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
1033 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
1034 Auto-merging arch/arm/mach-davinci/da850.c
1035 Auto-merging arch/arm/mach-davinci/dm355.c
1036 Auto-merging arch/arm/mach-davinci/dm644x.c
1037 Auto-merging arch/arm/mach-davinci/dm646x.c
1038 Removing arch/arm/mach-exynos4/mach-smdkc210.c
1039 Auto-merging arch/arm/mach-msm/board-msm8x60.c
1040 CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
1041 Removing arch/arm/mach-mx5/devices.c
1042 Removing arch/arm/mach-mx5/devices.h
1043 Auto-merging arch/arm/mach-mxs/include/mach/gpio.h
1044 CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
1045 Removing arch/arm/mach-nuc93x/Kconfig
1046 Removing arch/arm/mach-nuc93x/Makefile
1047 CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
1048 Removing arch/arm/mach-nuc93x/clock.c
1049 Removing arch/arm/mach-nuc93x/clock.h
1050 Removing arch/arm/mach-nuc93x/cpu.c
1051 Removing arch/arm/mach-nuc93x/cpu.h
1052 Removing arch/arm/mach-nuc93x/dev.c
1053 Removing arch/arm/mach-nuc93x/include/mach/entry-macro.S
1054 Removing arch/arm/mach-nuc93x/include/mach/hardware.h
1055 Removing arch/arm/mach-nuc93x/include/mach/io.h
1056 Removing arch/arm/mach-nuc93x/include/mach/irqs.h
1057 Removing arch/arm/mach-nuc93x/include/mach/map.h
1058 Removing arch/arm/mach-nuc93x/include/mach/memory.h
1059 Removing arch/arm/mach-nuc93x/include/mach/regs-clock.h
1060 Removing arch/arm/mach-nuc93x/include/mach/regs-ebi.h
1061 Removing arch/arm/mach-nuc93x/include/mach/regs-irq.h
1062 Removing arch/arm/mach-nuc93x/include/mach/regs-serial.h
1063 Removing arch/arm/mach-nuc93x/include/mach/regs-timer.h
1064 Removing arch/arm/mach-nuc93x/include/mach/system.h
1065 Removing arch/arm/mach-nuc93x/include/mach/timex.h
1066 Removing arch/arm/mach-nuc93x/include/mach/uncompress.h
1067 Removing arch/arm/mach-nuc93x/include/mach/vmalloc.h
1068 Removing arch/arm/mach-nuc93x/irq.c
1069 Removing arch/arm/mach-nuc93x/mach-nuc932evb.c
1070 Removing arch/arm/mach-nuc93x/nuc932.c
1071 Removing arch/arm/mach-nuc93x/nuc932.h
1072 Removing arch/arm/mach-nuc93x/time.c
1073 Auto-merging arch/arm/mach-omap2/board-generic.c
1074 Auto-merging arch/arm/mach-omap2/board-h4.c
1075 Auto-merging arch/arm/mach-omap2/board-ldp.c
1076 Auto-merging arch/arm/mach-omap2/devices.c
1077 Removing arch/arm/mach-s3c2410/gpio.c
1078 Removing arch/arm/mach-s3c2412/gpio.c
1079 Auto-merging arch/arm/mach-tegra/board-harmony.c
1080 Auto-merging arch/arm/mach-tegra/board-paz00.c
1081 Auto-merging arch/arm/mach-tegra/board-paz00.h
1082 CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
1083 Auto-merging arch/arm/mach-tegra/board-seaboard.h
1084 CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
1085 Auto-merging arch/arm/mach-tegra/board-trimslice.c
1086 Auto-merging arch/arm/mach-u300/Kconfig
1087 Auto-merging arch/arm/mach-u300/Makefile.boot
1088 CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
1089 Auto-merging arch/arm/mach-u300/core.c
1090 Auto-merging arch/arm/mach-ux500/board-mop500-pins.c
1091 Auto-merging arch/arm/mach-ux500/board-mop500.c
1092 Auto-merging arch/arm/mach-vexpress/hotplug.c
1093 Auto-merging arch/arm/mm/cache-l2x0.c
1094 CONFLICTResolved 'Documentation/devicetree/bindings/arm/l2cc.txt' using previous resolution.
1095 Resolved 'arch/arm/mach-msm/board-msm8x60.c' using previous resolution.
1096 Resolved 'arch/arm/mach-mxs/include/mach/gpio.h' using previous resolution.
1097 Resolved 'arch/arm/mach-tegra/board-paz00.h' using previous resolution.
1098 Resolved 'arch/arm/mach-tegra/board-seaboard.h' using previous resolution.
1099 Resolved 'arch/arm/mach-u300/Makefile.boot' using previous resolution.
1100 Resolved 'arch/arm/mm/cache-l2x0.c' using previous resolution.
1101 Resolved 'arch/arm/plat-mxc/include/mach/gpio.h' using previous resolution.
1102 (content): Merge conflict in arch/arm/mm/cache-l2x0.c
1103 Auto-merging arch/arm/plat-mxc/include/mach/gpio.h
1104 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
1105 Auto-merging arch/arm/plat-omap/devices.c
1106 Removing arch/arm/plat-s3c24xx/include/plat/map.h
1107 Auto-merging arch/arm/plat-samsung/include/plat/map-s5p.h
1108 Automatic merge failed; fix conflicts and then commit the result.
1109 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
1110 Documentation/devicetree/bindings/arm/l2cc.txt: needs merge
1111 arch/arm/mach-at91/board-usb-a9260.c: needs merge
1112 arch/arm/mach-msm/board-msm8x60.c: needs merge
1113 arch/arm/mach-mxs/include/mach/gpio.h: needs merge
1114 arch/arm/mach-nuc93x/Makefile.boot: needs merge
1115 arch/arm/mach-picoxcell/include/mach/uncompress.h: needs merge
1116 arch/arm/mach-tegra/board-paz00.h: needs merge
1117 arch/arm/mach-tegra/board-seaboard.h: needs merge
1118 arch/arm/mach-u300/Makefile.boot: needs merge
1119 arch/arm/mm/cache-l2x0.c: needs merge
1120 arch/arm/plat-mxc/include/mach/gpio.h: needs merge
1121 rm 'arch/arm/mach-at91/board-usb-a9260.c'
1122 rm 'arch/arm/mach-nuc93x/Makefile.boot'
1124 [master 5ed851c] Merge remote-tracking branch 'arm-soc/for-next'
1125 $ git diff -M --stat --summary HEAD^..
1126 .../devicetree/bindings/arm/picoxcell.txt | 24 +
1127 .../devicetree/bindings/tty/serial/msm_serial.txt | 27 +
1128 arch/arm/Kconfig | 29 +-
1129 arch/arm/Makefile | 6 +-
1130 arch/arm/boot/dts/msm8660-surf.dts | 24 +
1131 arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 249 ++
1132 arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 365 ++
1133 arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts | 86 +
1134 arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts | 92 +
1135 arch/arm/boot/dts/prima2-cb.dts | 9 +-
1136 arch/arm/boot/dts/tegra-harmony.dts | 1 +
1137 arch/arm/boot/dts/tegra-seaboard.dts | 4 +
1138 arch/arm/configs/at91sam9g45_defconfig | 214 ++
1139 arch/arm/configs/exynos4_defconfig | 1 +
1140 .../{mx27_defconfig => imx_v4_v5_defconfig} | 68 +-
1141 arch/arm/configs/mx1_defconfig | 91 -
1142 arch/arm/configs/mx21_defconfig | 97 -
1143 arch/arm/configs/{mx51_defconfig => mx5_defconfig} | 60 +-
1144 arch/arm/include/asm/device.h | 5 +
1145 arch/arm/mach-at91/Kconfig | 13 +
1146 arch/arm/mach-at91/Makefile | 6 +-
1147 arch/arm/mach-at91/at91cap9.c | 2 +
1148 arch/arm/mach-at91/at91cap9_devices.c | 6 +
1149 arch/arm/mach-at91/at91rm9200.c | 2 +
1150 arch/arm/mach-at91/at91rm9200_devices.c | 8 +
1151 arch/arm/mach-at91/at91sam9260.c | 2 +
1152 arch/arm/mach-at91/at91sam9260_devices.c | 8 +
1153 arch/arm/mach-at91/at91sam9261.c | 29 +-
1154 arch/arm/mach-at91/at91sam9261_devices.c | 8 +
1155 arch/arm/mach-at91/at91sam9263.c | 2 +
1156 arch/arm/mach-at91/at91sam9263_devices.c | 6 +
1157 arch/arm/mach-at91/at91sam9g45.c | 2 +
1158 arch/arm/mach-at91/at91sam9g45_devices.c | 6 +
1159 arch/arm/mach-at91/board-rsi-ews.c | 233 ++
1160 arch/arm/mach-at91/board-usb-a9260.c | 230 --
1161 .../{board-usb-a9263.c => board-usb-a926x.c} | 179 +-
1162 arch/arm/mach-at91/include/mach/board.h | 5 +
1163 arch/arm/mach-at91/include/mach/timex.h | 5 +
1164 arch/arm/mach-davinci/Kconfig | 10 +
1165 arch/arm/mach-davinci/board-da850-evm.c | 114 +
1166 arch/arm/mach-davinci/da850.c | 9 +
1167 arch/arm/mach-davinci/devices-da8xx.c | 3 +
1168 arch/arm/mach-davinci/devices-tnetv107x.c | 1 +
1169 arch/arm/mach-davinci/dm355.c | 1 +
1170 arch/arm/mach-davinci/dm644x.c | 1 +
1171 arch/arm/mach-davinci/dm646x.c | 1 +
1172 arch/arm/mach-davinci/dma.c | 5 +-
1173 arch/arm/mach-davinci/include/mach/mmc.h | 3 +
1174 arch/arm/mach-davinci/include/mach/mux.h | 10 +
1175 arch/arm/mach-exynos4/Kconfig | 57 +-
1176 arch/arm/mach-exynos4/Makefile | 11 +-
1177 arch/arm/mach-exynos4/clock-exynos4210.c | 139 +
1178 arch/arm/mach-exynos4/clock-exynos4212.c | 118 +
1179 arch/arm/mach-exynos4/clock.c | 218 +-
1180 arch/arm/mach-exynos4/cpu.c | 40 +-
1181 arch/arm/mach-exynos4/hotplug.c | 2 +-
1182 arch/arm/mach-exynos4/include/mach/exynos4-clock.h | 43 +
1183 arch/arm/mach-exynos4/include/mach/map.h | 3 +-
1184 arch/arm/mach-exynos4/include/mach/regs-clock.h | 54 +-
1185 arch/arm/mach-exynos4/mach-origen.c | 108 +
1186 arch/arm/mach-exynos4/mach-smdk4212.c | 292 ++
1187 arch/arm/mach-exynos4/mach-smdkc210.c | 309 --
1188 arch/arm/mach-exynos4/mach-smdkv310.c | 78 +
1189 arch/arm/mach-exynos4/platsmp.c | 10 +-
1190 arch/arm/mach-exynos4/pm.c | 79 +-
1191 arch/arm/mach-imx/Kconfig | 51 +-
1192 arch/arm/mach-imx/Makefile | 10 +-
1193 arch/arm/mach-imx/cache-l2x0.c | 2 +-
1194 arch/arm/mach-imx/clock-imx25.c | 6 +
1195 arch/arm/mach-imx/clock-imx27.c | 6 +-
1196 arch/arm/mach-imx/clock-imx31.c | 8 +-
1197 arch/arm/mach-imx/clock-imx35.c | 7 +-
1198 arch/arm/mach-imx/cpu-imx25.c | 41 +
1199 arch/arm/mach-imx/cpu-imx27.c | 28 +-
1200 arch/arm/mach-imx/cpu-imx31.c | 49 +-
1201 arch/arm/mach-imx/cpu-imx35.c | 30 +-
1202 arch/arm/mach-imx/devices-imx27.h | 4 +
1203 arch/arm/mach-imx/devices-imx31.h | 4 +
1204 arch/arm/mach-imx/devices-imx35.h | 4 +
1205 arch/arm/mach-imx/mach-armadillo5x0.c | 18 +-
1206 arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
1207 arch/arm/mach-imx/mach-mx1ads.c | 15 +-
1208 arch/arm/mach-imx/mach-mx25_3ds.c | 10 +
1209 arch/arm/mach-imx/mach-mx27_3ds.c | 2 +-
1210 arch/arm/mach-imx/mach-vpr200.c | 2 +-
1211 arch/arm/mach-ixp4xx/Kconfig | 19 +
1212 arch/arm/mach-ixp4xx/Makefile | 4 +
1213 arch/arm/mach-ixp4xx/include/mach/uncompress.h | 3 +-
1214 arch/arm/mach-ixp4xx/miccpt-pci.c | 78 +
1215 arch/arm/mach-ixp4xx/omixp-setup.c | 273 ++
1216 arch/arm/mach-msm/board-msm8x60.c | 58 +-
1217 arch/arm/mach-msm/hotplug.c | 2 +-
1218 arch/arm/mach-msm/platsmp.c | 2 +-
1219 arch/arm/mach-mx5/Kconfig | 29 +-
1220 arch/arm/mach-mx5/Makefile | 2 +-
1221 arch/arm/mach-mx5/board-cpuimx51.c | 27 +-
1222 arch/arm/mach-mx5/board-cpuimx51sd.c | 25 +-
1223 arch/arm/mach-mx5/board-mx51_3ds.c | 1 -
1224 arch/arm/mach-mx5/board-mx51_babbage.c | 26 +-
1225 arch/arm/mach-mx5/board-mx51_efikamx.c | 13 +-
1226 arch/arm/mach-mx5/board-mx51_efikasb.c | 24 +-
1227 arch/arm/mach-mx5/board-mx53_ard.c | 4 +-
1228 arch/arm/mach-mx5/board-mx53_loco.c | 20 +
1229 arch/arm/mach-mx5/clock-mx51-mx53.c | 14 +-
1230 arch/arm/mach-mx5/cpu.c | 74 +-
1231 arch/arm/mach-mx5/devices-imx51.h | 17 +
1232 arch/arm/mach-mx5/devices-imx53.h | 4 +
1233 arch/arm/mach-mx5/devices.c | 120 -
1234 arch/arm/mach-mx5/devices.h | 5 -
1235 arch/arm/mach-mx5/ehci.c | 2 +-
1236 arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 3 +-
1237 arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 6 +-
1238 arch/arm/mach-mx5/mm.c | 8 +-
1239 arch/arm/mach-mx5/mx51_efika.c | 20 +-
1240 arch/arm/mach-mx5/pm-imx5.c | 15 +-
1241 arch/arm/mach-mxs/Kconfig | 6 +
1242 arch/arm/mach-mxs/clock-mx28.c | 8 +-
1243 arch/arm/mach-mxs/devices-mx23.h | 2 +
1244 arch/arm/mach-mxs/devices-mx28.h | 5 +
1245 arch/arm/mach-mxs/devices/Kconfig | 6 +
1246 arch/arm/mach-mxs/devices/Makefile | 2 +
1247 arch/arm/mach-mxs/devices/platform-mxs-saif.c | 60 +
1248 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 +
1249 arch/arm/mach-mxs/include/mach/devices-common.h | 12 +
1250 arch/arm/mach-mxs/include/mach/gpio.h | 4 -
1251 arch/arm/mach-mxs/include/mach/mxs.h | 2 +
1252 arch/arm/mach-mxs/mach-mx23evk.c | 2 +-
1253 arch/arm/mach-mxs/mach-mx28evk.c | 79 +-
1254 arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 +-
1255 arch/arm/mach-mxs/mach-tx28.c | 1 +
1256 arch/arm/mach-nuc93x/Kconfig | 19 -
1257 arch/arm/mach-nuc93x/Makefile | 14 -
1258 arch/arm/mach-nuc93x/Makefile.boot | 3 -
1259 arch/arm/mach-nuc93x/clock.c | 83 -
1260 arch/arm/mach-nuc93x/clock.h | 36 -
1261 arch/arm/mach-nuc93x/cpu.c | 135 -
1262 arch/arm/mach-nuc93x/cpu.h | 48 -
1263 arch/arm/mach-nuc93x/dev.c | 42 -
1264 arch/arm/mach-nuc93x/include/mach/entry-macro.S | 32 -
1265 arch/arm/mach-nuc93x/include/mach/hardware.h | 22 -
1266 arch/arm/mach-nuc93x/include/mach/io.h | 28 -
1267 arch/arm/mach-nuc93x/include/mach/irqs.h | 59 -
1268 arch/arm/mach-nuc93x/include/mach/map.h | 139 -
1269 arch/arm/mach-nuc93x/include/mach/memory.h | 21 -
1270 arch/arm/mach-nuc93x/include/mach/regs-clock.h | 53 -
1271 arch/arm/mach-nuc93x/include/mach/regs-ebi.h | 33 -
1272 arch/arm/mach-nuc93x/include/mach/regs-irq.h | 42 -
1273 arch/arm/mach-nuc93x/include/mach/regs-serial.h | 52 -
1274 arch/arm/mach-nuc93x/include/mach/regs-timer.h | 28 -
1275 arch/arm/mach-nuc93x/include/mach/system.h | 28 -
1276 arch/arm/mach-nuc93x/include/mach/timex.h | 25 -
1277 arch/arm/mach-nuc93x/include/mach/uncompress.h | 50 -
1278 arch/arm/mach-nuc93x/include/mach/vmalloc.h | 23 -
1279 arch/arm/mach-nuc93x/irq.c | 66 -
1280 arch/arm/mach-nuc93x/mach-nuc932evb.c | 42 -
1281 arch/arm/mach-nuc93x/nuc932.c | 65 -
1282 arch/arm/mach-nuc93x/nuc932.h | 29 -
1283 arch/arm/mach-nuc93x/time.c | 100 -
1284 arch/arm/mach-omap1/Makefile | 2 +-
1285 arch/arm/mach-omap1/mcbsp.c | 45 +
1286 arch/arm/mach-omap1/timer.c | 173 +
1287 arch/arm/mach-omap2/Makefile | 88 +-
1288 arch/arm/mach-omap2/board-2430sdp.c | 17 +-
1289 arch/arm/mach-omap2/board-3430sdp.c | 9 +-
1290 arch/arm/mach-omap2/board-3630sdp.c | 11 +-
1291 arch/arm/mach-omap2/board-4430sdp.c | 17 +-
1292 arch/arm/mach-omap2/board-am3517crane.c | 9 +-
1293 arch/arm/mach-omap2/board-am3517evm.c | 8 +-
1294 arch/arm/mach-omap2/board-apollon.c | 17 +-
1295 arch/arm/mach-omap2/board-cm-t35.c | 13 +-
1296 arch/arm/mach-omap2/board-cm-t3517.c | 9 +-
1297 arch/arm/mach-omap2/board-devkit8000.c | 19 +-
1298 arch/arm/mach-omap2/board-flash.c | 5 -
1299 arch/arm/mach-omap2/board-flash.h | 19 +
1300 arch/arm/mach-omap2/board-generic.c | 2 +-
1301 arch/arm/mach-omap2/board-h4.c | 24 +-
1302 arch/arm/mach-omap2/board-igep0020.c | 13 +-
1303 arch/arm/mach-omap2/board-ldp.c | 9 +-
1304 arch/arm/mach-omap2/board-n8x0.c | 25 +-
1305 arch/arm/mach-omap2/board-omap3beagle.c | 11 +-
1306 arch/arm/mach-omap2/board-omap3evm.c | 9 +-
1307 arch/arm/mach-omap2/board-omap3logic.c | 11 +-
1308 arch/arm/mach-omap2/board-omap3pandora.c | 11 +-
1309 arch/arm/mach-omap2/board-omap3stalker.c | 16 +-
1310 arch/arm/mach-omap2/board-omap3touchbook.c | 18 +-
1311 arch/arm/mach-omap2/board-omap4panda.c | 17 +-
1312 arch/arm/mach-omap2/board-overo.c | 11 +-
1313 arch/arm/mach-omap2/board-rm680.c | 25 +-
1314 arch/arm/mach-omap2/board-rx51.c | 25 +-
1315 arch/arm/mach-omap2/board-ti8168evm.c | 9 +-
1316 arch/arm/mach-omap2/board-zoom.c | 23 +-
1317 arch/arm/mach-omap2/clock2420_data.c | 48 +
1318 arch/arm/mach-omap2/clock2430_data.c | 48 +
1319 arch/arm/mach-omap2/clock3xxx_data.c | 47 +-
1320 arch/arm/mach-omap2/clock44xx_data.c | 33 +
1321 arch/arm/mach-omap2/clockdomain.c | 147 +-
1322 arch/arm/mach-omap2/clockdomain.h | 22 +-
1323 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 4 -
1324 arch/arm/mach-omap2/clockdomain44xx.c | 2 -
1325 arch/arm/mach-omap2/clockdomains2420_data.c | 154 +
1326 arch/arm/mach-omap2/clockdomains2430_data.c | 181 +
1327 arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c | 803 +-----
1328 arch/arm/mach-omap2/clockdomains3xxx_data.c | 398 +++
1329 arch/arm/mach-omap2/clockdomains44xx_data.c | 409 +--
1330 arch/arm/mach-omap2/common.c | 18 +
1331 arch/arm/mach-omap2/devices.c | 44 +-
1332 arch/arm/mach-omap2/display.c | 6 +-
1333 arch/arm/mach-omap2/dma.c | 16 +-
1334 arch/arm/mach-omap2/gpio.c | 10 +-
1335 arch/arm/mach-omap2/hsmmc.c | 8 +-
1336 arch/arm/mach-omap2/hwspinlock.c | 8 +-
1337 arch/arm/mach-omap2/id.c | 191 +-
1338 arch/arm/mach-omap2/io.c | 57 +-
1339 arch/arm/mach-omap2/mcbsp.c | 111 +-
1340 arch/arm/mach-omap2/omap_hwmod.c | 3 -
1341 arch/arm/mach-omap2/omap_hwmod_2420_data.c | 59 +-
1342 arch/arm/mach-omap2/omap_hwmod_2430_data.c | 67 +-
1343 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 200 +-
1344 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 104 +-
1345 arch/arm/mach-omap2/omap_twl.c | 107 +-
1346 arch/arm/mach-omap2/opp.c | 2 +-
1347 arch/arm/mach-omap2/pm.c | 36 +-
1348 arch/arm/mach-omap2/pm24xx.c | 27 -
1349 arch/arm/mach-omap2/pm34xx.c | 2 +-
1350 arch/arm/mach-omap2/powerdomain-common.c | 7 +-
1351 arch/arm/mach-omap2/powerdomain.c | 110 +-
1352 arch/arm/mach-omap2/powerdomain.h | 19 +-
1353 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 2 +-
1354 arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c | 21 +-
1355 arch/arm/mach-omap2/powerdomains2xxx_data.c | 48 +-
1356 arch/arm/mach-omap2/powerdomains3xxx_data.c | 97 +-
1357 arch/arm/mach-omap2/powerdomains44xx_data.c | 36 +-
1358 arch/arm/mach-omap2/prm2xxx_3xxx.c | 56 +
1359 arch/arm/mach-omap2/prm2xxx_3xxx.h | 12 +
1360 arch/arm/mach-omap2/prm44xx.c | 71 +
1361 arch/arm/mach-omap2/prm44xx.h | 12 +
1362 arch/arm/mach-omap2/serial.c | 14 +-
1363 arch/arm/mach-omap2/smartreflex-class3.c | 4 +-
1364 arch/arm/mach-omap2/smartreflex.c | 29 +-
1365 arch/arm/mach-omap2/sr_device.c | 8 +-
1366 arch/arm/mach-omap2/timer.c | 194 +-
1367 arch/arm/mach-omap2/vc.c | 367 ++
1368 arch/arm/mach-omap2/vc.h | 88 +-
1369 arch/arm/mach-omap2/vc3xxx_data.c | 31 +-
1370 arch/arm/mach-omap2/vc44xx_data.c | 44 +-
1371 arch/arm/mach-omap2/voltage.c | 1088 ++-----
1372 arch/arm/mach-omap2/voltage.h | 150 +-
1373 arch/arm/mach-omap2/voltagedomains2xxx_data.c | 32 +
1374 arch/arm/mach-omap2/voltagedomains3xxx_data.c | 83 +-
1375 arch/arm/mach-omap2/voltagedomains44xx_data.c | 99 +-
1376 arch/arm/mach-omap2/vp.c | 278 ++
1377 arch/arm/mach-omap2/vp.h | 133 +-
1378 arch/arm/mach-omap2/vp3xxx_data.c | 35 +-
1379 arch/arm/mach-omap2/vp44xx_data.c | 47 +-
1380 arch/arm/mach-picoxcell/Makefile | 3 +
1381 arch/arm/mach-picoxcell/Makefile.boot | 1 +
1382 arch/arm/mach-picoxcell/common.c | 55 +
1383 arch/arm/mach-picoxcell/common.h | 18 +
1384 arch/arm/mach-picoxcell/include/mach/debug-macro.S | 35 +
1385 arch/arm/mach-picoxcell/include/mach/entry-macro.S | 19 +
1386 arch/arm/mach-picoxcell/include/mach/gpio.h | 1 +
1387 arch/arm/mach-picoxcell/include/mach/hardware.h | 21 +
1388 arch/arm/mach-picoxcell/include/mach/io.h | 22 +
1389 arch/arm/mach-picoxcell/include/mach/irqs.h | 25 +
1390 arch/arm/mach-picoxcell/include/mach/map.h | 25 +
1391 arch/arm/mach-picoxcell/include/mach/memory.h | 1 +
1392 .../mach-picoxcell/include/mach/picoxcell_soc.h | 25 +
1393 arch/arm/mach-picoxcell/include/mach/system.h | 31 +
1394 arch/arm/mach-picoxcell/include/mach/timex.h | 25 +
1395 arch/arm/mach-picoxcell/include/mach/uncompress.h | 21 +
1396 arch/arm/mach-picoxcell/io.c | 32 +
1397 arch/arm/mach-picoxcell/time.c | 132 +
1398 arch/arm/mach-prima2/Makefile | 2 +
1399 arch/arm/mach-prima2/irq.c | 43 +
1400 arch/arm/mach-prima2/pm.c | 149 +
1401 arch/arm/mach-prima2/pm.h | 29 +
1402 arch/arm/mach-prima2/rtciobrg.c | 139 +
1403 arch/arm/mach-prima2/sleep.S | 64 +
1404 arch/arm/mach-prima2/timer.c | 34 +
1405 arch/arm/mach-realview/hotplug.c | 2 +-
1406 arch/arm/mach-s3c2410/Kconfig | 6 -
1407 arch/arm/mach-s3c2410/Makefile | 1 -
1408 arch/arm/mach-s3c2410/dma.c | 14 -
1409 arch/arm/mach-s3c2410/gpio.c | 72 -
1410 arch/arm/mach-s3c2410/include/mach/map.h | 52 +-
1411 arch/arm/mach-s3c2412/Kconfig | 1 -
1412 arch/arm/mach-s3c2412/Makefile | 1 -
1413 arch/arm/mach-s3c2412/dma.c | 18 -
1414 arch/arm/mach-s3c2412/gpio.c | 62 -
1415 arch/arm/mach-s3c2440/Kconfig | 2 -
1416 arch/arm/mach-s3c2440/dma.c | 17 -
1417 arch/arm/mach-s3c2443/dma.c | 27 -
1418 arch/arm/mach-s3c64xx/cpu.c | 22 +-
1419 arch/arm/mach-s3c64xx/include/mach/map.h | 9 +-
1420 arch/arm/mach-s3c64xx/mach-crag6410.c | 3 -
1421 arch/arm/mach-s3c64xx/mach-mini6410.c | 8 +-
1422 arch/arm/mach-s3c64xx/mach-real6410.c | 8 +-
1423 arch/arm/mach-s3c64xx/mach-smdk6410.c | 8 +-
1424 arch/arm/mach-s5p64x0/dev-spi.c | 8 +-
1425 arch/arm/mach-s5p64x0/dma.c | 7 +-
1426 arch/arm/mach-s5p64x0/gpiolib.c | 7 +-
1427 arch/arm/mach-s5p64x0/irq-eint.c | 3 +-
1428 arch/arm/mach-s5p64x0/mach-smdk6440.c | 8 +-
1429 arch/arm/mach-s5p64x0/mach-smdk6450.c | 8 +-
1430 arch/arm/mach-s5pc100/mach-smdkc100.c | 8 +-
1431 arch/arm/mach-s5pv210/Kconfig | 6 -
1432 arch/arm/mach-s5pv210/Makefile | 2 +-
1433 arch/arm/mach-s5pv210/mach-smdkv210.c | 8 +-
1434 arch/arm/mach-shmobile/smp-sh73a0.c | 6 +-
1435 arch/arm/mach-tegra/board-harmony.c | 5 +-
1436 arch/arm/mach-tegra/board-paz00-pinmux.c | 3 +
1437 arch/arm/mach-tegra/board-paz00.c | 62 +-
1438 arch/arm/mach-tegra/board-paz00.h | 16 +-
1439 arch/arm/mach-tegra/board-seaboard-pinmux.c | 6 +-
1440 arch/arm/mach-tegra/board-seaboard.c | 81 +-
1441 arch/arm/mach-tegra/board-seaboard.h | 12 +-
1442 arch/arm/mach-tegra/board-trimslice.c | 3 +-
1443 arch/arm/mach-u300/Kconfig | 46 -
1444 arch/arm/mach-u300/Makefile.boot | 17 +-
1445 arch/arm/mach-u300/core.c | 82 +-
1446 arch/arm/mach-u300/include/mach/memory.h | 22 +-
1447 arch/arm/mach-u300/u300.c | 16 -
1448 arch/arm/mach-ux500/Kconfig | 1 +
1449 arch/arm/mach-ux500/Makefile | 3 +-
1450 arch/arm/mach-ux500/board-mop500-pins.c | 34 +-
1451 arch/arm/mach-ux500/board-mop500-sdi.c | 52 +-
1452 arch/arm/mach-ux500/board-mop500.c | 78 +-
1453 arch/arm/mach-ux500/board-mop500.h | 3 +
1454 arch/arm/mach-ux500/cache-l2x0.c | 95 +
1455 arch/arm/mach-ux500/cpu.c | 98 +-
1456 arch/arm/mach-ux500/hotplug.c | 2 +-
1457 arch/arm/mach-ux500/include/mach/db5500-regs.h | 2 +
1458 arch/arm/mach-ux500/include/mach/db8500-regs.h | 3 +
1459 arch/arm/mach-ux500/include/mach/uncompress.h | 10 +-
1460 arch/arm/mach-ux500/pins-db8500.h | 142 +-
1461 arch/arm/mach-ux500/platsmp.c | 2 +-
1462 arch/arm/mach-ux500/timer.c | 65 +
1463 arch/arm/mach-vexpress/hotplug.c | 2 +-
1464 arch/arm/plat-mxc/Kconfig | 39 +-
1465 arch/arm/plat-mxc/audmux-v2.c | 18 +-
1466 arch/arm/plat-mxc/cpu.c | 9 +
1467 arch/arm/plat-mxc/devices.c | 14 -
1468 arch/arm/plat-mxc/devices/Kconfig | 5 +-
1469 arch/arm/plat-mxc/devices/Makefile | 1 +
1470 arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 5 +
1471 arch/arm/plat-mxc/devices/platform-imx-i2c.c | 6 +
1472 arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 9 +
1473 arch/arm/plat-mxc/devices/platform-pata_imx.c | 59 +
1474 arch/arm/plat-mxc/include/mach/common.h | 2 +-
1475 arch/arm/plat-mxc/include/mach/devices-common.h | 8 +
1476 arch/arm/plat-mxc/include/mach/gpio.h | 8 -
1477 arch/arm/plat-mxc/include/mach/hardware.h | 6 +
1478 arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2270 +++++---------
1479 arch/arm/plat-mxc/include/mach/iomux-mx53.h | 3530 +++++++-------------
1480 arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 +
1481 arch/arm/plat-mxc/include/mach/memory.h | 16 +-
1482 arch/arm/plat-mxc/include/mach/mx25.h | 5 +
1483 arch/arm/plat-mxc/include/mach/mx35.h | 2 +-
1484 arch/arm/plat-mxc/include/mach/mx3x.h | 18 +-
1485 arch/arm/plat-mxc/include/mach/mx51.h | 167 +-
1486 arch/arm/plat-mxc/pwm.c | 2 +-
1487 arch/arm/plat-nomadik/Kconfig | 8 +-
1488 arch/arm/plat-nomadik/include/plat/mtu.h | 47 +-
1489 arch/arm/plat-nomadik/include/plat/pincfg.h | 5 -
1490 arch/arm/plat-nomadik/timer.c | 138 +-
1491 arch/arm/plat-omap/devices.c | 46 -
1492 arch/arm/plat-omap/dmtimer.c | 713 +++--
1493 arch/arm/plat-omap/i2c.c | 8 +-
1494 arch/arm/plat-omap/include/plat/clock.h | 2 -
1495 arch/arm/plat-omap/include/plat/common.h | 13 +
1496 arch/arm/plat-omap/include/plat/cpu.h | 108 +-
1497 arch/arm/plat-omap/include/plat/dmtimer.h | 233 +-
1498 arch/arm/plat-omap/include/plat/io.h | 2 +-
1499 arch/arm/plat-omap/include/plat/mcbsp.h | 208 +-
1500 arch/arm/plat-omap/include/plat/omap_device.h | 30 +-
1501 arch/arm/plat-omap/include/plat/omap_hwmod.h | 3 -
1502 arch/arm/plat-omap/include/plat/voltage.h | 20 +
1503 arch/arm/plat-omap/mcbsp.c | 385 +--
1504 arch/arm/plat-omap/omap_device.c | 185 +-
1505 arch/arm/plat-s3c24xx/cpu.c | 9 +-
1506 arch/arm/plat-s3c24xx/include/plat/map.h | 100 -
1507 arch/arm/plat-s5p/cpu.c | 37 +-
1508 arch/arm/plat-s5p/include/plat/exynos4.h | 5 +-
1509 arch/arm/plat-s5p/include/plat/pll.h | 56 +-
1510 arch/arm/plat-samsung/Makefile | 2 +-
1511 arch/arm/plat-samsung/cpu.c | 58 +
1512 arch/arm/plat-samsung/dev-hsmmc.c | 19 +-
1513 arch/arm/plat-samsung/dev-hsmmc1.c | 19 +-
1514 arch/arm/plat-samsung/dev-hsmmc2.c | 19 +-
1515 arch/arm/plat-samsung/dev-hsmmc3.c | 19 +-
1516 arch/arm/plat-samsung/dev-ts.c | 9 +
1517 arch/arm/plat-samsung/include/plat/cpu.h | 105 +-
1518 arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 6 -
1519 arch/arm/plat-samsung/include/plat/map-s3c.h | 84 +
1520 .../include/plat/map-s5p.h | 6 +-
1521 arch/arm/plat-samsung/include/plat/sdhci.h | 7 +
1522 arch/arm/plat-samsung/platformdata.c | 22 +
1523 arch/arm/plat-versatile/platsmp.c | 2 +-
1524 drivers/clocksource/Kconfig | 15 +
1525 drivers/clocksource/Makefile | 1 +
1526 drivers/clocksource/clksrc-dbx500-prcmu.c | 104 +
1527 drivers/gpio/gpio-mxc.c | 12 +
1528 drivers/gpio/gpio-mxs.c | 2 +
1529 drivers/misc/Kconfig | 1 -
1530 drivers/mmc/host/davinci_mmc.c | 13 +
1531 drivers/tty/serial/msm_serial.c | 30 +-
1532 drivers/usb/host/ohci-at91.c | 239 ++-
1533 include/linux/clksrc-dbx500-prcmu.h | 22 +
1534 include/linux/rtc/sirfsoc_rtciobrg.h | 18 +
1535 409 files changed, 13379 insertions(+), 12321 deletions(-)
1536 create mode 100644 Documentation/devicetree/bindings/arm/picoxcell.txt
1537 create mode 100644 Documentation/devicetree/bindings/tty/serial/msm_serial.txt
1538 create mode 100644 arch/arm/boot/dts/msm8660-surf.dts
1539 create mode 100644 arch/arm/boot/dts/picoxcell-pc3x2.dtsi
1540 create mode 100644 arch/arm/boot/dts/picoxcell-pc3x3.dtsi
1541 create mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts
1542 create mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts
1543 create mode 100644 arch/arm/configs/at91sam9g45_defconfig
1544 rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
1545 delete mode 100644 arch/arm/configs/mx1_defconfig
1546 delete mode 100644 arch/arm/configs/mx21_defconfig
1547 rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
1548 create mode 100644 arch/arm/mach-at91/board-rsi-ews.c
1549 delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c
1550 rename arch/arm/mach-at91/{board-usb-a9263.c => board-usb-a926x.c} (54%)
1551 create mode 100644 arch/arm/mach-exynos4/clock-exynos4210.c
1552 create mode 100644 arch/arm/mach-exynos4/clock-exynos4212.c
1553 create mode 100644 arch/arm/mach-exynos4/include/mach/exynos4-clock.h
1554 create mode 100644 arch/arm/mach-exynos4/mach-origen.c
1555 create mode 100644 arch/arm/mach-exynos4/mach-smdk4212.c
1556 delete mode 100644 arch/arm/mach-exynos4/mach-smdkc210.c
1557 create mode 100644 arch/arm/mach-imx/cpu-imx25.c
1558 create mode 100644 arch/arm/mach-ixp4xx/miccpt-pci.c
1559 create mode 100644 arch/arm/mach-ixp4xx/omixp-setup.c
1560 delete mode 100644 arch/arm/mach-mx5/devices.c
1561 delete mode 100644 arch/arm/mach-mx5/devices.h
1562 create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
1563 create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
1564 delete mode 100644 arch/arm/mach-nuc93x/Kconfig
1565 delete mode 100644 arch/arm/mach-nuc93x/Makefile
1566 delete mode 100644 arch/arm/mach-nuc93x/Makefile.boot
1567 delete mode 100644 arch/arm/mach-nuc93x/clock.c
1568 delete mode 100644 arch/arm/mach-nuc93x/clock.h
1569 delete mode 100644 arch/arm/mach-nuc93x/cpu.c
1570 delete mode 100644 arch/arm/mach-nuc93x/cpu.h
1571 delete mode 100644 arch/arm/mach-nuc93x/dev.c
1572 delete mode 100644 arch/arm/mach-nuc93x/include/mach/entry-macro.S
1573 delete mode 100644 arch/arm/mach-nuc93x/include/mach/hardware.h
1574 delete mode 100644 arch/arm/mach-nuc93x/include/mach/io.h
1575 delete mode 100644 arch/arm/mach-nuc93x/include/mach/irqs.h
1576 delete mode 100644 arch/arm/mach-nuc93x/include/mach/map.h
1577 delete mode 100644 arch/arm/mach-nuc93x/include/mach/memory.h
1578 delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-clock.h
1579 delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-ebi.h
1580 delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-irq.h
1581 delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-serial.h
1582 delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-timer.h
1583 delete mode 100644 arch/arm/mach-nuc93x/include/mach/system.h
1584 delete mode 100644 arch/arm/mach-nuc93x/include/mach/timex.h
1585 delete mode 100644 arch/arm/mach-nuc93x/include/mach/uncompress.h
1586 delete mode 100644 arch/arm/mach-nuc93x/include/mach/vmalloc.h
1587 delete mode 100644 arch/arm/mach-nuc93x/irq.c
1588 delete mode 100644 arch/arm/mach-nuc93x/mach-nuc932evb.c
1589 delete mode 100644 arch/arm/mach-nuc93x/nuc932.c
1590 delete mode 100644 arch/arm/mach-nuc93x/nuc932.h
1591 delete mode 100644 arch/arm/mach-nuc93x/time.c
1592 create mode 100644 arch/arm/mach-omap1/timer.c
1593 create mode 100644 arch/arm/mach-omap2/clockdomains2420_data.c
1594 create mode 100644 arch/arm/mach-omap2/clockdomains2430_data.c
1595 create mode 100644 arch/arm/mach-omap2/clockdomains3xxx_data.c
1596 create mode 100644 arch/arm/mach-omap2/vc.c
1597 create mode 100644 arch/arm/mach-omap2/voltagedomains2xxx_data.c
1598 create mode 100644 arch/arm/mach-omap2/vp.c
1599 create mode 100644 arch/arm/mach-picoxcell/Makefile
1600 create mode 100644 arch/arm/mach-picoxcell/Makefile.boot
1601 create mode 100644 arch/arm/mach-picoxcell/common.c
1602 create mode 100644 arch/arm/mach-picoxcell/common.h
1603 create mode 100644 arch/arm/mach-picoxcell/include/mach/debug-macro.S
1604 create mode 100644 arch/arm/mach-picoxcell/include/mach/entry-macro.S
1605 create mode 100644 arch/arm/mach-picoxcell/include/mach/gpio.h
1606 create mode 100644 arch/arm/mach-picoxcell/include/mach/hardware.h
1607 create mode 100644 arch/arm/mach-picoxcell/include/mach/io.h
1608 create mode 100644 arch/arm/mach-picoxcell/include/mach/irqs.h
1609 create mode 100644 arch/arm/mach-picoxcell/include/mach/map.h
1610 create mode 100644 arch/arm/mach-picoxcell/include/mach/memory.h
1611 create mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h
1612 create mode 100644 arch/arm/mach-picoxcell/include/mach/system.h
1613 create mode 100644 arch/arm/mach-picoxcell/include/mach/timex.h
1614 create mode 100644 arch/arm/mach-picoxcell/include/mach/uncompress.h
1615 create mode 100644 arch/arm/mach-picoxcell/io.c
1616 create mode 100644 arch/arm/mach-picoxcell/time.c
1617 create mode 100644 arch/arm/mach-prima2/pm.c
1618 create mode 100644 arch/arm/mach-prima2/pm.h
1619 create mode 100644 arch/arm/mach-prima2/rtciobrg.c
1620 create mode 100644 arch/arm/mach-prima2/sleep.S
1621 delete mode 100644 arch/arm/mach-s3c2410/gpio.c
1622 delete mode 100644 arch/arm/mach-s3c2412/gpio.c
1623 create mode 100644 arch/arm/mach-ux500/cache-l2x0.c
1624 create mode 100644 arch/arm/mach-ux500/timer.c
1625 create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
1626 create mode 100644 arch/arm/plat-omap/include/plat/voltage.h
1627 delete mode 100644 arch/arm/plat-s3c24xx/include/plat/map.h
1628 create mode 100644 arch/arm/plat-samsung/cpu.c
1629 create mode 100644 arch/arm/plat-samsung/include/plat/map-s3c.h
1630 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/map-s5p.h (94%)
1631 create mode 100644 drivers/clocksource/clksrc-dbx500-prcmu.c
1632 create mode 100644 include/linux/clksrc-dbx500-prcmu.h
1633 create mode 100644 include/linux/rtc/sirfsoc_rtciobrg.h
1634 $ git am -3 ../patches/0001-arm-soc-merge-fixup-for-fixup-reserve-being-added-to.patch
1635 Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
1637 Unstaged changes after reset:
1638 M arch/arm/mach-msm/board-msm8x60.c
1640 $ git commit -v -a --amend
1641 [master f2f5c1e] Merge remote-tracking branch 'arm-soc/for-next'
1642 $ git reset --hard HEAD^
1643 HEAD is now at 7863d89 Merge remote-tracking branch 'arm-lpae/for-next'
1644 Merging refs/next/20110930/arm-soc
1645 $ git merge refs/next/20110930/arm-soc
1646 Auto-merging Documentation/devicetree/bindings/arm/l2cc.txt
1647 CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
1648 Auto-merging arch/arm/Kconfig
1649 Auto-merging arch/arm/Makefile
1650 Auto-merging arch/arm/configs/imx_v4_v5_defconfig
1651 Removing arch/arm/configs/mx1_defconfig
1652 Removing arch/arm/configs/mx21_defconfig
1653 Auto-merging arch/arm/configs/mx5_defconfig
1654 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
1655 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
1656 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
1657 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
1658 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
1659 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
1660 CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in refs/next/20110930/arm-soc and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
1661 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
1662 Auto-merging arch/arm/mach-davinci/da850.c
1663 Auto-merging arch/arm/mach-davinci/dm355.c
1664 Auto-merging arch/arm/mach-davinci/dm644x.c
1665 Auto-merging arch/arm/mach-davinci/dm646x.c
1666 Auto-merging arch/arm/mach-exynos4/clock.c
1667 Removing arch/arm/mach-exynos4/mach-smdkc210.c
1668 Auto-merging arch/arm/mach-msm/board-msm8x60.c
1669 CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
1670 Removing arch/arm/mach-mx5/devices.c
1671 Removing arch/arm/mach-mx5/devices.h
1672 Auto-merging arch/arm/mach-mxs/include/mach/gpio.h
1673 CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
1674 Removing arch/arm/mach-nuc93x/Kconfig
1675 Removing arch/arm/mach-nuc93x/Makefile
1676 CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in refs/next/20110930/arm-soc and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
1677 Removing arch/arm/mach-nuc93x/clock.c
1678 Removing arch/arm/mach-nuc93x/clock.h
1679 Removing arch/arm/mach-nuc93x/cpu.c
1680 Removing arch/arm/mach-nuc93x/cpu.h
1681 Removing arch/arm/mach-nuc93x/dev.c
1682 Removing arch/arm/mach-nuc93x/include/mach/entry-macro.S
1683 Removing arch/arm/mach-nuc93x/include/mach/hardware.h
1684 Removing arch/arm/mach-nuc93x/include/mach/io.h
1685 Removing arch/arm/mach-nuc93x/include/mach/irqs.h
1686 Removing arch/arm/mach-nuc93x/include/mach/map.h
1687 Removing arch/arm/mach-nuc93x/include/mach/memory.h
1688 Removing arch/arm/mach-nuc93x/include/mach/regs-clock.h
1689 Removing arch/arm/mach-nuc93x/include/mach/regs-ebi.h
1690 Removing arch/arm/mach-nuc93x/include/mach/regs-irq.h
1691 Removing arch/arm/mach-nuc93x/include/mach/regs-serial.h
1692 Removing arch/arm/mach-nuc93x/include/mach/regs-timer.h
1693 Removing arch/arm/mach-nuc93x/include/mach/system.h
1694 Removing arch/arm/mach-nuc93x/include/mach/timex.h
1695 Removing arch/arm/mach-nuc93x/include/mach/uncompress.h
1696 Removing arch/arm/mach-nuc93x/include/mach/vmalloc.h
1697 Removing arch/arm/mach-nuc93x/irq.c
1698 Removing arch/arm/mach-nuc93x/mach-nuc932evb.c
1699 Removing arch/arm/mach-nuc93x/nuc932.c
1700 Removing arch/arm/mach-nuc93x/nuc932.h
1701 Removing arch/arm/mach-nuc93x/time.c
1702 Auto-merging arch/arm/mach-omap2/board-generic.c
1703 Auto-merging arch/arm/mach-omap2/board-h4.c
1704 Auto-merging arch/arm/mach-omap2/board-ldp.c
1705 Removing arch/arm/mach-s3c2410/gpio.c
1706 Removing arch/arm/mach-s3c2412/gpio.c
1707 Auto-merging arch/arm/mach-tegra/board-harmony.c
1708 Auto-merging arch/arm/mach-tegra/board-paz00.c
1709 Auto-merging arch/arm/mach-tegra/board-paz00.h
1710 CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
1711 Auto-merging arch/arm/mach-tegra/board-seaboard.h
1712 CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
1713 Auto-merging arch/arm/mach-tegra/board-trimslice.c
1714 Auto-merging arch/arm/mach-u300/Kconfig
1715 Auto-merging arch/arm/mach-u300/Makefile.boot
1716 CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
1717 Auto-merging arch/arm/mach-u300/core.c
1718 Auto-merging arch/arm/mach-ux500/board-mop500-pins.c
1719 Auto-merging arch/arm/mach-ux500/board-mop500.c
1720 Auto-merging arch/arm/mach-vexpress/hotplug.c
1721 Auto-merging arch/arm/mm/cache-l2x0.c
1722 CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
1723 Auto-merging arch/arm/plat-mxc/include/mach/gpio.h
1724 CONFLICT (content): Merge cResolved 'Documentation/devicetree/bindings/arm/l2cc.txt' using previous resolution.
1725 Resolved 'arch/arm/mach-msm/board-msm8x60.c' using previous resolution.
1726 Resolved 'arch/arm/mach-mxs/include/mach/gpio.h' using previous resolution.
1727 Resolved 'arch/arm/mach-tegra/board-paz00.h' using previous resolution.
1728 Resolved 'arch/arm/mach-tegra/board-seaboard.h' using previous resolution.
1729 Resolved 'arch/arm/mach-u300/Makefile.boot' using previous resolution.
1730 Resolved 'arch/arm/mm/cache-l2x0.c' using previous resolution.
1731 Resolved 'arch/arm/plat-mxc/include/mach/gpio.h' using previous resolution.
1732 onflict in arch/arm/plat-mxc/include/mach/gpio.h
1733 Removing arch/arm/plat-s3c24xx/include/plat/map.h
1734 Auto-merging arch/arm/plat-samsung/include/plat/map-s5p.h
1735 Automatic merge failed; fix conflicts and then commit the result.
1736 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
1737 Documentation/devicetree/bindings/arm/l2cc.txt: needs merge
1738 arch/arm/mach-at91/board-usb-a9260.c: needs merge
1739 arch/arm/mach-msm/board-msm8x60.c: needs merge
1740 arch/arm/mach-mxs/include/mach/gpio.h: needs merge
1741 arch/arm/mach-nuc93x/Makefile.boot: needs merge
1742 arch/arm/mach-tegra/board-paz00.h: needs merge
1743 arch/arm/mach-tegra/board-seaboard.h: needs merge
1744 arch/arm/mach-u300/Makefile.boot: needs merge
1745 arch/arm/mm/cache-l2x0.c: needs merge
1746 arch/arm/plat-mxc/include/mach/gpio.h: needs merge
1747 rm 'arch/arm/mach-at91/board-usb-a9260.c'
1748 rm 'arch/arm/mach-nuc93x/Makefile.boot'
1750 [master 171c394] Merge commit 'refs/next/20110930/arm-soc'
1751 $ git diff -M --stat --summary HEAD^..
1752 .../devicetree/bindings/tty/serial/msm_serial.txt | 27 +
1753 arch/arm/Kconfig | 11 +-
1754 arch/arm/Makefile | 5 +-
1755 arch/arm/boot/dts/msm8660-surf.dts | 24 +
1756 arch/arm/boot/dts/prima2-cb.dts | 9 +-
1757 arch/arm/boot/dts/tegra-harmony.dts | 1 +
1758 arch/arm/boot/dts/tegra-seaboard.dts | 4 +
1759 arch/arm/configs/exynos4_defconfig | 1 +
1760 .../{mx27_defconfig => imx_v4_v5_defconfig} | 68 +-
1761 arch/arm/configs/mx1_defconfig | 91 -
1762 arch/arm/configs/mx21_defconfig | 97 -
1763 arch/arm/configs/{mx51_defconfig => mx5_defconfig} | 60 +-
1764 arch/arm/mach-at91/Kconfig | 13 +
1765 arch/arm/mach-at91/Makefile | 6 +-
1766 arch/arm/mach-at91/at91cap9.c | 2 +
1767 arch/arm/mach-at91/at91cap9_devices.c | 6 +
1768 arch/arm/mach-at91/at91rm9200.c | 2 +
1769 arch/arm/mach-at91/at91rm9200_devices.c | 8 +
1770 arch/arm/mach-at91/at91sam9260.c | 2 +
1771 arch/arm/mach-at91/at91sam9260_devices.c | 8 +
1772 arch/arm/mach-at91/at91sam9261.c | 29 +-
1773 arch/arm/mach-at91/at91sam9261_devices.c | 8 +
1774 arch/arm/mach-at91/at91sam9263.c | 2 +
1775 arch/arm/mach-at91/at91sam9263_devices.c | 6 +
1776 arch/arm/mach-at91/at91sam9g45.c | 2 +
1777 arch/arm/mach-at91/at91sam9g45_devices.c | 6 +
1778 arch/arm/mach-at91/board-rsi-ews.c | 233 ++
1779 arch/arm/mach-at91/board-usb-a9260.c | 230 --
1780 .../{board-usb-a9263.c => board-usb-a926x.c} | 179 +-
1781 arch/arm/mach-at91/include/mach/board.h | 5 +
1782 arch/arm/mach-at91/include/mach/timex.h | 5 +
1783 arch/arm/mach-davinci/Kconfig | 10 +
1784 arch/arm/mach-davinci/board-da850-evm.c | 114 +
1785 arch/arm/mach-davinci/da850.c | 9 +
1786 arch/arm/mach-davinci/devices-da8xx.c | 3 +
1787 arch/arm/mach-davinci/devices-tnetv107x.c | 1 +
1788 arch/arm/mach-davinci/dm355.c | 1 +
1789 arch/arm/mach-davinci/dm644x.c | 1 +
1790 arch/arm/mach-davinci/dm646x.c | 1 +
1791 arch/arm/mach-davinci/dma.c | 5 +-
1792 arch/arm/mach-davinci/include/mach/mmc.h | 3 +
1793 arch/arm/mach-davinci/include/mach/mux.h | 10 +
1794 arch/arm/mach-exynos4/Kconfig | 57 +-
1795 arch/arm/mach-exynos4/Makefile | 11 +-
1796 arch/arm/mach-exynos4/clock-exynos4210.c | 139 +
1797 arch/arm/mach-exynos4/clock-exynos4212.c | 118 +
1798 arch/arm/mach-exynos4/clock.c | 218 +-
1799 arch/arm/mach-exynos4/cpu.c | 40 +-
1800 arch/arm/mach-exynos4/hotplug.c | 2 +-
1801 arch/arm/mach-exynos4/include/mach/exynos4-clock.h | 43 +
1802 arch/arm/mach-exynos4/include/mach/map.h | 3 +-
1803 arch/arm/mach-exynos4/include/mach/regs-clock.h | 54 +-
1804 arch/arm/mach-exynos4/mach-origen.c | 108 +
1805 arch/arm/mach-exynos4/mach-smdk4212.c | 292 ++
1806 arch/arm/mach-exynos4/mach-smdkc210.c | 309 --
1807 arch/arm/mach-exynos4/mach-smdkv310.c | 78 +
1808 arch/arm/mach-exynos4/platsmp.c | 10 +-
1809 arch/arm/mach-exynos4/pm.c | 79 +-
1810 arch/arm/mach-imx/Kconfig | 51 +-
1811 arch/arm/mach-imx/Makefile | 10 +-
1812 arch/arm/mach-imx/cache-l2x0.c | 2 +-
1813 arch/arm/mach-imx/clock-imx25.c | 6 +
1814 arch/arm/mach-imx/clock-imx27.c | 6 +-
1815 arch/arm/mach-imx/clock-imx31.c | 8 +-
1816 arch/arm/mach-imx/clock-imx35.c | 7 +-
1817 arch/arm/mach-imx/cpu-imx25.c | 41 +
1818 arch/arm/mach-imx/cpu-imx27.c | 28 +-
1819 arch/arm/mach-imx/cpu-imx31.c | 49 +-
1820 arch/arm/mach-imx/cpu-imx35.c | 30 +-
1821 arch/arm/mach-imx/devices-imx27.h | 4 +
1822 arch/arm/mach-imx/devices-imx31.h | 4 +
1823 arch/arm/mach-imx/devices-imx35.h | 4 +
1824 arch/arm/mach-imx/mach-armadillo5x0.c | 18 +-
1825 arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
1826 arch/arm/mach-imx/mach-mx1ads.c | 15 +-
1827 arch/arm/mach-imx/mach-mx25_3ds.c | 10 +
1828 arch/arm/mach-imx/mach-mx27_3ds.c | 2 +-
1829 arch/arm/mach-imx/mach-vpr200.c | 2 +-
1830 arch/arm/mach-msm/board-msm8x60.c | 58 +-
1831 arch/arm/mach-msm/hotplug.c | 2 +-
1832 arch/arm/mach-msm/platsmp.c | 2 +-
1833 arch/arm/mach-mx5/Kconfig | 29 +-
1834 arch/arm/mach-mx5/Makefile | 2 +-
1835 arch/arm/mach-mx5/board-cpuimx51.c | 27 +-
1836 arch/arm/mach-mx5/board-cpuimx51sd.c | 25 +-
1837 arch/arm/mach-mx5/board-mx51_3ds.c | 1 -
1838 arch/arm/mach-mx5/board-mx51_babbage.c | 26 +-
1839 arch/arm/mach-mx5/board-mx51_efikamx.c | 13 +-
1840 arch/arm/mach-mx5/board-mx51_efikasb.c | 24 +-
1841 arch/arm/mach-mx5/board-mx53_ard.c | 4 +-
1842 arch/arm/mach-mx5/board-mx53_loco.c | 20 +
1843 arch/arm/mach-mx5/clock-mx51-mx53.c | 14 +-
1844 arch/arm/mach-mx5/cpu.c | 74 +-
1845 arch/arm/mach-mx5/devices-imx51.h | 17 +
1846 arch/arm/mach-mx5/devices-imx53.h | 4 +
1847 arch/arm/mach-mx5/devices.c | 120 -
1848 arch/arm/mach-mx5/devices.h | 5 -
1849 arch/arm/mach-mx5/ehci.c | 2 +-
1850 arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 3 +-
1851 arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 6 +-
1852 arch/arm/mach-mx5/mm.c | 8 +-
1853 arch/arm/mach-mx5/mx51_efika.c | 20 +-
1854 arch/arm/mach-mx5/pm-imx5.c | 15 +-
1855 arch/arm/mach-mxs/Kconfig | 6 +
1856 arch/arm/mach-mxs/clock-mx28.c | 8 +-
1857 arch/arm/mach-mxs/devices-mx23.h | 2 +
1858 arch/arm/mach-mxs/devices-mx28.h | 5 +
1859 arch/arm/mach-mxs/devices/Kconfig | 6 +
1860 arch/arm/mach-mxs/devices/Makefile | 2 +
1861 arch/arm/mach-mxs/devices/platform-mxs-saif.c | 60 +
1862 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 +
1863 arch/arm/mach-mxs/include/mach/devices-common.h | 12 +
1864 arch/arm/mach-mxs/include/mach/gpio.h | 4 -
1865 arch/arm/mach-mxs/include/mach/mxs.h | 2 +
1866 arch/arm/mach-mxs/mach-mx23evk.c | 2 +-
1867 arch/arm/mach-mxs/mach-mx28evk.c | 79 +-
1868 arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 +-
1869 arch/arm/mach-mxs/mach-tx28.c | 1 +
1870 arch/arm/mach-nuc93x/Kconfig | 19 -
1871 arch/arm/mach-nuc93x/Makefile | 14 -
1872 arch/arm/mach-nuc93x/Makefile.boot | 3 -
1873 arch/arm/mach-nuc93x/clock.c | 83 -
1874 arch/arm/mach-nuc93x/clock.h | 36 -
1875 arch/arm/mach-nuc93x/cpu.c | 135 -
1876 arch/arm/mach-nuc93x/cpu.h | 48 -
1877 arch/arm/mach-nuc93x/dev.c | 42 -
1878 arch/arm/mach-nuc93x/include/mach/entry-macro.S | 32 -
1879 arch/arm/mach-nuc93x/include/mach/hardware.h | 22 -
1880 arch/arm/mach-nuc93x/include/mach/io.h | 28 -
1881 arch/arm/mach-nuc93x/include/mach/irqs.h | 59 -
1882 arch/arm/mach-nuc93x/include/mach/map.h | 139 -
1883 arch/arm/mach-nuc93x/include/mach/memory.h | 21 -
1884 arch/arm/mach-nuc93x/include/mach/regs-clock.h | 53 -
1885 arch/arm/mach-nuc93x/include/mach/regs-ebi.h | 33 -
1886 arch/arm/mach-nuc93x/include/mach/regs-irq.h | 42 -
1887 arch/arm/mach-nuc93x/include/mach/regs-serial.h | 52 -
1888 arch/arm/mach-nuc93x/include/mach/regs-timer.h | 28 -
1889 arch/arm/mach-nuc93x/include/mach/system.h | 28 -
1890 arch/arm/mach-nuc93x/include/mach/timex.h | 25 -
1891 arch/arm/mach-nuc93x/include/mach/uncompress.h | 50 -
1892 arch/arm/mach-nuc93x/include/mach/vmalloc.h | 23 -
1893 arch/arm/mach-nuc93x/irq.c | 66 -
1894 arch/arm/mach-nuc93x/mach-nuc932evb.c | 42 -
1895 arch/arm/mach-nuc93x/nuc932.c | 65 -
1896 arch/arm/mach-nuc93x/nuc932.h | 29 -
1897 arch/arm/mach-nuc93x/time.c | 100 -
1898 arch/arm/mach-omap2/Makefile | 86 +-
1899 arch/arm/mach-omap2/board-2430sdp.c | 9 +-
1900 arch/arm/mach-omap2/board-3430sdp.c | 9 +-
1901 arch/arm/mach-omap2/board-3630sdp.c | 11 +-
1902 arch/arm/mach-omap2/board-4430sdp.c | 9 +-
1903 arch/arm/mach-omap2/board-am3517crane.c | 9 +-
1904 arch/arm/mach-omap2/board-am3517evm.c | 8 +-
1905 arch/arm/mach-omap2/board-apollon.c | 9 +-
1906 arch/arm/mach-omap2/board-cm-t35.c | 13 +-
1907 arch/arm/mach-omap2/board-cm-t3517.c | 9 +-
1908 arch/arm/mach-omap2/board-devkit8000.c | 12 +-
1909 arch/arm/mach-omap2/board-generic.c | 2 +-
1910 arch/arm/mach-omap2/board-h4.c | 9 +-
1911 arch/arm/mach-omap2/board-igep0020.c | 13 +-
1912 arch/arm/mach-omap2/board-ldp.c | 9 +-
1913 arch/arm/mach-omap2/board-n8x0.c | 13 +-
1914 arch/arm/mach-omap2/board-omap3beagle.c | 4 +-
1915 arch/arm/mach-omap2/board-omap3evm.c | 9 +-
1916 arch/arm/mach-omap2/board-omap3logic.c | 11 +-
1917 arch/arm/mach-omap2/board-omap3pandora.c | 11 +-
1918 arch/arm/mach-omap2/board-omap3stalker.c | 9 +-
1919 arch/arm/mach-omap2/board-omap3touchbook.c | 11 +-
1920 arch/arm/mach-omap2/board-omap4panda.c | 9 +-
1921 arch/arm/mach-omap2/board-overo.c | 11 +-
1922 arch/arm/mach-omap2/board-rm680.c | 17 +-
1923 arch/arm/mach-omap2/board-rx51.c | 17 +-
1924 arch/arm/mach-omap2/board-ti8168evm.c | 9 +-
1925 arch/arm/mach-omap2/board-zoom.c | 23 +-
1926 arch/arm/mach-omap2/clock3xxx_data.c | 11 +-
1927 arch/arm/mach-omap2/clockdomain.c | 147 +-
1928 arch/arm/mach-omap2/clockdomain.h | 22 +-
1929 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 4 -
1930 arch/arm/mach-omap2/clockdomain44xx.c | 2 -
1931 arch/arm/mach-omap2/clockdomains2420_data.c | 154 +
1932 arch/arm/mach-omap2/clockdomains2430_data.c | 181 +
1933 arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c | 803 +-----
1934 arch/arm/mach-omap2/clockdomains3xxx_data.c | 398 +++
1935 arch/arm/mach-omap2/clockdomains44xx_data.c | 409 +--
1936 arch/arm/mach-omap2/id.c | 191 +-
1937 arch/arm/mach-omap2/io.c | 57 +-
1938 arch/arm/mach-omap2/omap_hwmod.c | 3 -
1939 arch/arm/mach-omap2/omap_hwmod_2420_data.c | 37 -
1940 arch/arm/mach-omap2/omap_hwmod_2430_data.c | 45 -
1941 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 173 +-
1942 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 82 -
1943 arch/arm/mach-omap2/omap_twl.c | 107 +-
1944 arch/arm/mach-omap2/pm.c | 6 +-
1945 arch/arm/mach-omap2/powerdomain-common.c | 7 +-
1946 arch/arm/mach-omap2/powerdomain.c | 110 +-
1947 arch/arm/mach-omap2/powerdomain.h | 19 +-
1948 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 2 +-
1949 arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c | 21 +-
1950 arch/arm/mach-omap2/powerdomains2xxx_data.c | 48 +-
1951 arch/arm/mach-omap2/powerdomains3xxx_data.c | 97 +-
1952 arch/arm/mach-omap2/powerdomains44xx_data.c | 36 +-
1953 arch/arm/mach-omap2/prm2xxx_3xxx.c | 56 +
1954 arch/arm/mach-omap2/prm2xxx_3xxx.h | 12 +
1955 arch/arm/mach-omap2/prm44xx.c | 71 +
1956 arch/arm/mach-omap2/prm44xx.h | 12 +
1957 arch/arm/mach-omap2/smartreflex-class3.c | 4 +-
1958 arch/arm/mach-omap2/smartreflex.c | 29 +-
1959 arch/arm/mach-omap2/sr_device.c | 2 +-
1960 arch/arm/mach-omap2/vc.c | 367 ++
1961 arch/arm/mach-omap2/vc.h | 88 +-
1962 arch/arm/mach-omap2/vc3xxx_data.c | 31 +-
1963 arch/arm/mach-omap2/vc44xx_data.c | 44 +-
1964 arch/arm/mach-omap2/voltage.c | 1088 ++-----
1965 arch/arm/mach-omap2/voltage.h | 138 +-
1966 arch/arm/mach-omap2/voltagedomains2xxx_data.c | 32 +
1967 arch/arm/mach-omap2/voltagedomains3xxx_data.c | 83 +-
1968 arch/arm/mach-omap2/voltagedomains44xx_data.c | 99 +-
1969 arch/arm/mach-omap2/vp.c | 278 ++
1970 arch/arm/mach-omap2/vp.h | 133 +-
1971 arch/arm/mach-omap2/vp3xxx_data.c | 35 +-
1972 arch/arm/mach-omap2/vp44xx_data.c | 47 +-
1973 arch/arm/mach-prima2/Makefile | 2 +
1974 arch/arm/mach-prima2/irq.c | 43 +
1975 arch/arm/mach-prima2/pm.c | 149 +
1976 arch/arm/mach-prima2/pm.h | 29 +
1977 arch/arm/mach-prima2/rtciobrg.c | 139 +
1978 arch/arm/mach-prima2/sleep.S | 64 +
1979 arch/arm/mach-prima2/timer.c | 34 +
1980 arch/arm/mach-realview/hotplug.c | 2 +-
1981 arch/arm/mach-s3c2410/Kconfig | 6 -
1982 arch/arm/mach-s3c2410/Makefile | 1 -
1983 arch/arm/mach-s3c2410/dma.c | 14 -
1984 arch/arm/mach-s3c2410/gpio.c | 72 -
1985 arch/arm/mach-s3c2410/include/mach/map.h | 52 +-
1986 arch/arm/mach-s3c2412/Kconfig | 1 -
1987 arch/arm/mach-s3c2412/Makefile | 1 -
1988 arch/arm/mach-s3c2412/dma.c | 18 -
1989 arch/arm/mach-s3c2412/gpio.c | 62 -
1990 arch/arm/mach-s3c2440/Kconfig | 2 -
1991 arch/arm/mach-s3c2440/dma.c | 17 -
1992 arch/arm/mach-s3c2443/dma.c | 27 -
1993 arch/arm/mach-s3c64xx/cpu.c | 22 +-
1994 arch/arm/mach-s3c64xx/include/mach/map.h | 9 +-
1995 arch/arm/mach-s3c64xx/mach-crag6410.c | 3 -
1996 arch/arm/mach-s3c64xx/mach-mini6410.c | 8 +-
1997 arch/arm/mach-s3c64xx/mach-real6410.c | 8 +-
1998 arch/arm/mach-s3c64xx/mach-smdk6410.c | 8 +-
1999 arch/arm/mach-s5p64x0/dev-spi.c | 8 +-
2000 arch/arm/mach-s5p64x0/dma.c | 7 +-
2001 arch/arm/mach-s5p64x0/gpiolib.c | 7 +-
2002 arch/arm/mach-s5p64x0/irq-eint.c | 3 +-
2003 arch/arm/mach-s5p64x0/mach-smdk6440.c | 8 +-
2004 arch/arm/mach-s5p64x0/mach-smdk6450.c | 8 +-
2005 arch/arm/mach-s5pc100/mach-smdkc100.c | 8 +-
2006 arch/arm/mach-s5pv210/Kconfig | 6 -
2007 arch/arm/mach-s5pv210/Makefile | 2 +-
2008 arch/arm/mach-s5pv210/mach-smdkv210.c | 8 +-
2009 arch/arm/mach-shmobile/smp-sh73a0.c | 6 +-
2010 arch/arm/mach-tegra/board-harmony.c | 5 +-
2011 arch/arm/mach-tegra/board-paz00-pinmux.c | 3 +
2012 arch/arm/mach-tegra/board-paz00.c | 62 +-
2013 arch/arm/mach-tegra/board-paz00.h | 16 +-
2014 arch/arm/mach-tegra/board-seaboard-pinmux.c | 6 +-
2015 arch/arm/mach-tegra/board-seaboard.c | 81 +-
2016 arch/arm/mach-tegra/board-seaboard.h | 12 +-
2017 arch/arm/mach-tegra/board-trimslice.c | 3 +-
2018 arch/arm/mach-u300/Kconfig | 46 -
2019 arch/arm/mach-u300/Makefile.boot | 17 +-
2020 arch/arm/mach-u300/core.c | 82 +-
2021 arch/arm/mach-u300/include/mach/memory.h | 22 +-
2022 arch/arm/mach-u300/u300.c | 16 -
2023 arch/arm/mach-ux500/Kconfig | 1 +
2024 arch/arm/mach-ux500/Makefile | 1 +
2025 arch/arm/mach-ux500/board-mop500-pins.c | 34 +-
2026 arch/arm/mach-ux500/board-mop500-sdi.c | 52 +-
2027 arch/arm/mach-ux500/board-mop500.c | 78 +-
2028 arch/arm/mach-ux500/board-mop500.h | 3 +
2029 arch/arm/mach-ux500/cache-l2x0.c | 95 +
2030 arch/arm/mach-ux500/cpu.c | 69 -
2031 arch/arm/mach-ux500/hotplug.c | 2 +-
2032 arch/arm/mach-ux500/include/mach/uncompress.h | 10 +-
2033 arch/arm/mach-ux500/pins-db8500.h | 142 +-
2034 arch/arm/mach-ux500/platsmp.c | 2 +-
2035 arch/arm/mach-vexpress/hotplug.c | 2 +-
2036 arch/arm/plat-mxc/Kconfig | 39 +-
2037 arch/arm/plat-mxc/audmux-v2.c | 18 +-
2038 arch/arm/plat-mxc/cpu.c | 9 +
2039 arch/arm/plat-mxc/devices.c | 14 -
2040 arch/arm/plat-mxc/devices/Kconfig | 5 +-
2041 arch/arm/plat-mxc/devices/Makefile | 1 +
2042 arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 5 +
2043 arch/arm/plat-mxc/devices/platform-imx-i2c.c | 6 +
2044 arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 9 +
2045 arch/arm/plat-mxc/devices/platform-pata_imx.c | 59 +
2046 arch/arm/plat-mxc/include/mach/common.h | 2 +-
2047 arch/arm/plat-mxc/include/mach/devices-common.h | 8 +
2048 arch/arm/plat-mxc/include/mach/gpio.h | 8 -
2049 arch/arm/plat-mxc/include/mach/hardware.h | 6 +
2050 arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2270 +++++---------
2051 arch/arm/plat-mxc/include/mach/iomux-mx53.h | 3530 +++++++-------------
2052 arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 +
2053 arch/arm/plat-mxc/include/mach/memory.h | 16 +-
2054 arch/arm/plat-mxc/include/mach/mx25.h | 5 +
2055 arch/arm/plat-mxc/include/mach/mx35.h | 2 +-
2056 arch/arm/plat-mxc/include/mach/mx3x.h | 18 +-
2057 arch/arm/plat-mxc/include/mach/mx51.h | 167 +-
2058 arch/arm/plat-mxc/pwm.c | 2 +-
2059 arch/arm/plat-nomadik/include/plat/pincfg.h | 5 -
2060 arch/arm/plat-omap/include/plat/clock.h | 2 -
2061 arch/arm/plat-omap/include/plat/common.h | 9 +
2062 arch/arm/plat-omap/include/plat/cpu.h | 108 +-
2063 arch/arm/plat-omap/include/plat/io.h | 2 +-
2064 arch/arm/plat-omap/include/plat/omap_hwmod.h | 3 -
2065 arch/arm/plat-omap/include/plat/voltage.h | 20 +
2066 arch/arm/plat-s3c24xx/cpu.c | 9 +-
2067 arch/arm/plat-s3c24xx/include/plat/map.h | 100 -
2068 arch/arm/plat-s5p/cpu.c | 37 +-
2069 arch/arm/plat-s5p/include/plat/exynos4.h | 5 +-
2070 arch/arm/plat-s5p/include/plat/pll.h | 56 +-
2071 arch/arm/plat-samsung/Makefile | 2 +-
2072 arch/arm/plat-samsung/cpu.c | 58 +
2073 arch/arm/plat-samsung/dev-hsmmc.c | 19 +-
2074 arch/arm/plat-samsung/dev-hsmmc1.c | 19 +-
2075 arch/arm/plat-samsung/dev-hsmmc2.c | 19 +-
2076 arch/arm/plat-samsung/dev-hsmmc3.c | 19 +-
2077 arch/arm/plat-samsung/dev-ts.c | 9 +
2078 arch/arm/plat-samsung/include/plat/cpu.h | 105 +-
2079 arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 6 -
2080 arch/arm/plat-samsung/include/plat/map-s3c.h | 84 +
2081 .../include/plat/map-s5p.h | 6 +-
2082 arch/arm/plat-samsung/include/plat/sdhci.h | 7 +
2083 arch/arm/plat-samsung/platformdata.c | 22 +
2084 arch/arm/plat-versatile/platsmp.c | 2 +-
2085 drivers/gpio/gpio-mxc.c | 12 +
2086 drivers/gpio/gpio-mxs.c | 2 +
2087 drivers/mmc/host/davinci_mmc.c | 13 +
2088 drivers/tty/serial/msm_serial.c | 30 +-
2089 drivers/usb/host/ohci-at91.c | 239 ++-
2090 include/linux/rtc/sirfsoc_rtciobrg.h | 18 +
2091 339 files changed, 9354 insertions(+), 11059 deletions(-)
2092 create mode 100644 Documentation/devicetree/bindings/tty/serial/msm_serial.txt
2093 create mode 100644 arch/arm/boot/dts/msm8660-surf.dts
2094 rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
2095 delete mode 100644 arch/arm/configs/mx1_defconfig
2096 delete mode 100644 arch/arm/configs/mx21_defconfig
2097 rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
2098 create mode 100644 arch/arm/mach-at91/board-rsi-ews.c
2099 delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c
2100 rename arch/arm/mach-at91/{board-usb-a9263.c => board-usb-a926x.c} (54%)
2101 create mode 100644 arch/arm/mach-exynos4/clock-exynos4210.c
2102 create mode 100644 arch/arm/mach-exynos4/clock-exynos4212.c
2103 create mode 100644 arch/arm/mach-exynos4/include/mach/exynos4-clock.h
2104 create mode 100644 arch/arm/mach-exynos4/mach-origen.c
2105 create mode 100644 arch/arm/mach-exynos4/mach-smdk4212.c
2106 delete mode 100644 arch/arm/mach-exynos4/mach-smdkc210.c
2107 create mode 100644 arch/arm/mach-imx/cpu-imx25.c
2108 delete mode 100644 arch/arm/mach-mx5/devices.c
2109 delete mode 100644 arch/arm/mach-mx5/devices.h
2110 create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
2111 create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
2112 delete mode 100644 arch/arm/mach-nuc93x/Kconfig
2113 delete mode 100644 arch/arm/mach-nuc93x/Makefile
2114 delete mode 100644 arch/arm/mach-nuc93x/Makefile.boot
2115 delete mode 100644 arch/arm/mach-nuc93x/clock.c
2116 delete mode 100644 arch/arm/mach-nuc93x/clock.h
2117 delete mode 100644 arch/arm/mach-nuc93x/cpu.c
2118 delete mode 100644 arch/arm/mach-nuc93x/cpu.h
2119 delete mode 100644 arch/arm/mach-nuc93x/dev.c
2120 delete mode 100644 arch/arm/mach-nuc93x/include/mach/entry-macro.S
2121 delete mode 100644 arch/arm/mach-nuc93x/include/mach/hardware.h
2122 delete mode 100644 arch/arm/mach-nuc93x/include/mach/io.h
2123 delete mode 100644 arch/arm/mach-nuc93x/include/mach/irqs.h
2124 delete mode 100644 arch/arm/mach-nuc93x/include/mach/map.h
2125 delete mode 100644 arch/arm/mach-nuc93x/include/mach/memory.h
2126 delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-clock.h
2127 delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-ebi.h
2128 delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-irq.h
2129 delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-serial.h
2130 delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-timer.h
2131 delete mode 100644 arch/arm/mach-nuc93x/include/mach/system.h
2132 delete mode 100644 arch/arm/mach-nuc93x/include/mach/timex.h
2133 delete mode 100644 arch/arm/mach-nuc93x/include/mach/uncompress.h
2134 delete mode 100644 arch/arm/mach-nuc93x/include/mach/vmalloc.h
2135 delete mode 100644 arch/arm/mach-nuc93x/irq.c
2136 delete mode 100644 arch/arm/mach-nuc93x/mach-nuc932evb.c
2137 delete mode 100644 arch/arm/mach-nuc93x/nuc932.c
2138 delete mode 100644 arch/arm/mach-nuc93x/nuc932.h
2139 delete mode 100644 arch/arm/mach-nuc93x/time.c
2140 create mode 100644 arch/arm/mach-omap2/clockdomains2420_data.c
2141 create mode 100644 arch/arm/mach-omap2/clockdomains2430_data.c
2142 create mode 100644 arch/arm/mach-omap2/clockdomains3xxx_data.c
2143 create mode 100644 arch/arm/mach-omap2/vc.c
2144 create mode 100644 arch/arm/mach-omap2/voltagedomains2xxx_data.c
2145 create mode 100644 arch/arm/mach-omap2/vp.c
2146 create mode 100644 arch/arm/mach-prima2/pm.c
2147 create mode 100644 arch/arm/mach-prima2/pm.h
2148 create mode 100644 arch/arm/mach-prima2/rtciobrg.c
2149 create mode 100644 arch/arm/mach-prima2/sleep.S
2150 delete mode 100644 arch/arm/mach-s3c2410/gpio.c
2151 delete mode 100644 arch/arm/mach-s3c2412/gpio.c
2152 create mode 100644 arch/arm/mach-ux500/cache-l2x0.c
2153 create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
2154 create mode 100644 arch/arm/plat-omap/include/plat/voltage.h
2155 delete mode 100644 arch/arm/plat-s3c24xx/include/plat/map.h
2156 create mode 100644 arch/arm/plat-samsung/cpu.c
2157 create mode 100644 arch/arm/plat-samsung/include/plat/map-s3c.h
2158 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/map-s5p.h (94%)
2159 create mode 100644 include/linux/rtc/sirfsoc_rtciobrg.h
2160 $ git am -3 ../patches/0001-arm-soc-merge-fixup-for-fixup-reserve-being-added-to.patch
2161 Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
2163 Unstaged changes after reset:
2164 M arch/arm/mach-msm/board-msm8x60.c
2166 $ git commit -v -a --amend
2167 [master 88b5f56] Merge commit 'refs/next/20110930/arm-soc'
2168 Merging at91/at91-next
2169 $ git merge at91/at91-next
2170 Auto-merging arch/arm/mach-at91/at91cap9.c
2171 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
2172 Auto-merging arch/arm/mach-at91/at91rm9200.c
2173 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
2174 Auto-merging arch/arm/mach-at91/at91sam9260.c
2175 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
2176 Auto-merging arch/arm/mach-at91/at91sam9261.c
2177 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
2178 Auto-merging arch/arm/mach-at91/at91sam9263.c
2179 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
2180 Auto-merging arch/arm/mach-at91/at91sam9g45.c
2181 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
2182 Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
2183 Auto-merging arch/arm/mach-at91/board-1arm.c
2184 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
2185 Auto-merging arch/arm/mach-at91/board-cam60.c
2186 Auto-merging arch/arm/mach-at91/board-cap9adk.c
2187 Auto-merging arch/arm/mach-at91/board-carmeva.c
2188 Auto-merging arch/arm/mach-at91/board-cpu9krea.c
2189 Auto-merging arch/arm/mach-at91/board-cpuat91.c
2190 Auto-merging arch/arm/mach-at91/board-csb337.c
2191 Auto-merging arch/arm/mach-at91/board-csb637.c
2192 Auto-merging arch/arm/mach-at91/board-eb9200.c
2193 Auto-merging arch/arm/mach-at91/board-ecbat91.c
2194 Auto-merging arch/arm/mach-at91/board-kafa.c
2195 Auto-merging arch/arm/mach-at91/board-kb9202.c
2196 Auto-merging arch/arm/mach-at91/board-neocore926.c
2197 Auto-merging arch/arm/mach-at91/board-picotux200.c
2198 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
2199 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
2200 Auto-merging arch/arm/mach-at91/board-rm9200ek.c
2201 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
2202 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
2203 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
2204 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
2205 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
2206 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
2207 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
2208 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
2209 Auto-merging arch/arm/mach-at91/board-yl-9200.c
2210 Auto-merging arch/arm/mach-at91/gpio.c
2211 Auto-merging arch/arm/mach-at91/include/mach/at91sam9g45.h
2212 Auto-merging arch/arm/mach-at91/include/mach/gpio.h
2213 Auto-merging drivers/ata/pata_at91.c
2214 Auto-merging drivers/ide/at91_ide.c
2215 Auto-merging drivers/usb/host/ohci-at91.c
2216 Merge made by recursive.
2217 arch/arm/mach-at91/at91cap9.c | 8 +-
2218 arch/arm/mach-at91/at91cap9_devices.c | 20 +-
2219 arch/arm/mach-at91/at91rm9200.c | 8 +-
2220 arch/arm/mach-at91/at91rm9200_devices.c | 22 +-
2221 arch/arm/mach-at91/at91sam9260.c | 6 +-
2222 arch/arm/mach-at91/at91sam9260_devices.c | 26 +-
2223 arch/arm/mach-at91/at91sam9261.c | 6 +-
2224 arch/arm/mach-at91/at91sam9261_devices.c | 14 +-
2225 arch/arm/mach-at91/at91sam9263.c | 10 +-
2226 arch/arm/mach-at91/at91sam9263_devices.c | 26 +-
2227 arch/arm/mach-at91/at91sam9g45.c | 10 +-
2228 arch/arm/mach-at91/at91sam9g45_devices.c | 20 +-
2229 arch/arm/mach-at91/at91sam9rl.c | 8 +-
2230 arch/arm/mach-at91/at91sam9rl_devices.c | 16 +-
2231 arch/arm/mach-at91/board-1arm.c | 1 +
2232 arch/arm/mach-at91/board-afeb-9260v1.c | 7 +-
2233 arch/arm/mach-at91/board-cam60.c | 3 +-
2234 arch/arm/mach-at91/board-cap9adk.c | 14 +-
2235 arch/arm/mach-at91/board-carmeva.c | 6 +-
2236 arch/arm/mach-at91/board-cpu9krea.c | 7 +-
2237 arch/arm/mach-at91/board-cpuat91.c | 4 +
2238 arch/arm/mach-at91/board-csb337.c | 4 +-
2239 arch/arm/mach-at91/board-csb637.c | 1 +
2240 arch/arm/mach-at91/board-eb9200.c | 8 +-
2241 arch/arm/mach-at91/board-ecbat91.c | 4 +
2242 arch/arm/mach-at91/board-eco920.c | 4 +
2243 arch/arm/mach-at91/board-flexibity.c | 4 +-
2244 arch/arm/mach-at91/board-foxg20.c | 6 +-
2245 arch/arm/mach-at91/board-gsia18s.c | 4 +-
2246 arch/arm/mach-at91/board-kafa.c | 1 +
2247 arch/arm/mach-at91/board-kb9202.c | 5 +-
2248 arch/arm/mach-at91/board-neocore926.c | 4 +-
2249 arch/arm/mach-at91/board-pcontrol-g20.c | 1 +
2250 arch/arm/mach-at91/board-picotux200.c | 2 +
2251 arch/arm/mach-at91/board-qil-a9260.c | 11 +-
2252 arch/arm/mach-at91/board-rm9200dk.c | 10 +-
2253 arch/arm/mach-at91/board-rm9200ek.c | 2 +
2254 arch/arm/mach-at91/board-sam9-l9260.c | 7 +-
2255 arch/arm/mach-at91/board-sam9260ek.c | 11 +-
2256 arch/arm/mach-at91/board-sam9261ek.c | 8 +-
2257 arch/arm/mach-at91/board-sam9263ek.c | 7 +-
2258 arch/arm/mach-at91/board-sam9g20ek.c | 8 +-
2259 arch/arm/mach-at91/board-sam9m10g45ek.c | 3 +
2260 arch/arm/mach-at91/board-sam9rlek.c | 7 +-
2261 arch/arm/mach-at91/board-snapper9260.c | 5 +
2262 arch/arm/mach-at91/board-stamp9g20.c | 11 +-
2263 arch/arm/mach-at91/board-usb-a926x.c | 5 +-
2264 arch/arm/mach-at91/board-yl-9200.c | 6 +-
2265 arch/arm/mach-at91/generic.h | 2 +-
2266 arch/arm/mach-at91/gpio.c | 62 +++--
2267 arch/arm/mach-at91/include/mach/at91cap9.h | 9 +-
2268 arch/arm/mach-at91/include/mach/at91rm9200.h | 9 +-
2269 arch/arm/mach-at91/include/mach/at91sam9260.h | 7 +-
2270 arch/arm/mach-at91/include/mach/at91sam9261.h | 7 +-
2271 arch/arm/mach-at91/include/mach/at91sam9263.h | 11 +-
2272 arch/arm/mach-at91/include/mach/at91sam9g45.h | 11 +-
2273 arch/arm/mach-at91/include/mach/at91sam9rl.h | 9 +-
2274 arch/arm/mach-at91/include/mach/gpio.h | 336 ++++++++++++-------------
2275 drivers/ata/pata_at91.c | 6 +-
2276 drivers/ide/at91_ide.c | 2 +-
2277 drivers/mmc/host/at91_mci.c | 30 ++--
2278 drivers/mtd/nand/atmel_nand.c | 8 +-
2279 drivers/usb/gadget/at91_udc.c | 14 +-
2280 drivers/usb/host/ohci-at91.c | 4 +-
2281 64 files changed, 510 insertions(+), 408 deletions(-)
2282 Merging davinci/davinci-next
2283 $ git merge davinci/davinci-next
2285 Merging i.MX/for-next
2286 $ git merge i.MX/for-next
2287 Resolved 'arch/arm/mach-imx/Makefile' using previous resolution.
2288 Auto-merging arch/arm/mach-imx/Makefile
2289 CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
2290 Removing arch/arm/mach-mx5/mm-mx50.c
2291 Automatic merge failed; fix conflicts and then commit the result.
2293 [master 3bb8a9c] Merge remote-tracking branch 'i.MX/for-next'
2294 $ git diff -M --stat --summary HEAD^..
2295 arch/arm/mach-imx/Kconfig | 1 +
2296 arch/arm/mach-imx/Makefile | 2 +-
2297 arch/arm/mach-mx5/Makefile | 1 -
2298 arch/arm/mach-mx5/mm-mx50.c | 72 ---------------------------
2299 arch/arm/mach-mx5/mm.c | 76 ++++++++++++++++++-----------
2300 arch/arm/mach-mxs/clock-mx28.c | 6 ++-
2301 arch/arm/plat-mxc/include/mach/hardware.h | 7 ++-
2302 arch/arm/plat-mxc/include/mach/mx51.h | 16 +------
2303 arch/arm/plat-mxc/include/mach/mx53.h | 1 +
2304 9 files changed, 62 insertions(+), 120 deletions(-)
2305 delete mode 100644 arch/arm/mach-mx5/mm-mx50.c
2306 Merging linux-spec/for-next
2307 $ git merge linux-spec/for-next
2309 Merging omap/for-next
2310 $ git merge omap/for-next
2312 Merging pxa/for-next
2313 $ git merge pxa/for-next
2315 Merging samsung/next-samsung
2316 $ git merge samsung/next-samsung
2318 Merging s5p/for-next
2319 $ git merge s5p/for-next
2320 Auto-merging arch/arm/Kconfig
2321 Removing arch/arm/mach-exynos4/include/mach/clkdev.h
2322 Auto-merging arch/arm/mach-exynos4/mach-nuri.c
2323 Auto-merging arch/arm/mach-exynos4/mach-origen.c
2324 Auto-merging arch/arm/mach-exynos4/mach-smdk4x12.c
2325 Auto-merging arch/arm/mach-exynos4/mach-smdkv310.c
2326 Auto-merging arch/arm/mach-exynos4/mach-universal_c210.c
2327 Auto-merging arch/arm/mach-exynos4/platsmp.c
2328 Auto-merging arch/arm/mach-s3c2410/mach-h1940.c
2329 Auto-merging arch/arm/mach-s3c64xx/cpu.c
2330 Removing arch/arm/mach-s3c64xx/gpiolib.c
2331 Removing arch/arm/mach-s3c64xx/include/mach/clkdev.h
2332 Removing arch/arm/mach-s3c64xx/include/mach/pll.h
2333 Removing arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
2334 Auto-merging arch/arm/mach-s3c64xx/mach-anw6410.c
2335 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
2336 Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c
2337 Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
2338 Auto-merging arch/arm/mach-s3c64xx/mach-ncp.c
2339 Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
2340 Auto-merging arch/arm/mach-s3c64xx/mach-smartq5.c
2341 Auto-merging arch/arm/mach-s3c64xx/mach-smartq7.c
2342 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6400.c
2343 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
2344 Auto-merging arch/arm/mach-s5p64x0/cpu.c
2345 Removing arch/arm/mach-s5p64x0/include/mach/clkdev.h
2346 Removing arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
2347 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
2348 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
2349 Removing arch/arm/mach-s5pc100/include/mach/clkdev.h
2350 Removing arch/arm/mach-s5pc100/include/mach/pwm-clock.h
2351 Auto-merging arch/arm/mach-s5pv210/cpu.c
2352 Removing arch/arm/mach-s5pv210/include/mach/clkdev.h
2353 Removing arch/arm/mach-s5pv210/include/mach/pwm-clock.h
2354 Auto-merging arch/arm/mach-s5pv210/mach-goni.c
2355 Removing arch/arm/mach-s5pv210/sleep.S
2356 Removing arch/arm/plat-s3c24xx/gpio.c
2357 Removing arch/arm/plat-s3c24xx/gpiolib.c
2358 Removing arch/arm/plat-s3c24xx/include/mach/clkdev.h
2359 Removing arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
2360 Removing arch/arm/plat-s3c24xx/include/plat/pll.h
2361 Removing arch/arm/plat-s3c24xx/include/plat/regs-iis.h
2362 Removing arch/arm/plat-s3c24xx/include/plat/regs-spi.h
2363 Auto-merging arch/arm/plat-s5p/sleep.S
2364 Removing arch/arm/plat-samsung/gpio-config.c
2365 Removing arch/arm/plat-samsung/gpio.c
2366 Auto-merging arch/arm/plat-samsung/include/plat/audio-simtec.h
2367 Auto-merging arch/arm/plat-samsung/include/plat/camport.h
2368 Auto-merging arch/arm/plat-samsung/include/plat/common-smdk.h
2369 Auto-merging arch/arm/plat-samsung/include/plat/cpu-freq-core.h
2370 Auto-merging arch/arm/plat-samsung/include/plat/dma-pl330.h
2371 Auto-merging arch/arm/plat-samsung/include/plat/ehci.h
2372 Auto-merging arch/arm/plat-samsung/include/plat/exynos4.h
2373 Auto-merging arch/arm/plat-samsung/include/plat/fiq.h
2374 Auto-merging arch/arm/plat-samsung/include/plat/irq.h
2375 Auto-merging arch/arm/plat-samsung/include/plat/irqs.h
2376 Auto-merging arch/arm/plat-samsung/include/plat/mci.h
2377 Auto-merging arch/arm/plat-samsung/include/plat/mfc.h
2378 Auto-merging arch/arm/plat-samsung/include/plat/mipi_csis.h
2379 Auto-merging arch/arm/plat-samsung/include/plat/pll.h
2380 Removing arch/arm/plat-samsung/include/plat/pll6553x.h
2381 Auto-merging arch/arm/plat-samsung/include/plat/pwm-clock.h
2382 Auto-merging arch/arm/plat-samsung/include/plat/regs-dma.h
2383 Auto-merging arch/arm/plat-samsung/include/plat/regs-srom.h
2384 Auto-merging arch/arm/plat-samsung/include/plat/regs-udc.h
2385 Auto-merging arch/arm/plat-samsung/include/plat/reset.h
2386 Removing arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
2387 Auto-merging arch/arm/plat-samsung/include/plat/s3c2410.h
2388 Auto-merging arch/arm/plat-samsung/include/plat/s3c2412.h
2389 Auto-merging arch/arm/plat-samsung/include/plat/s3c2416.h
2390 Auto-merging arch/arm/plat-samsung/include/plat/s3c2443.h
2391 Auto-merging arch/arm/plat-samsung/include/plat/s3c244x.h
2392 Auto-merging arch/arm/plat-samsung/include/plat/s3c6400.h
2393 Auto-merging arch/arm/plat-samsung/include/plat/s3c6410.h
2394 Auto-merging arch/arm/plat-samsung/include/plat/s5p-clock.h
2395 Auto-merging arch/arm/plat-samsung/include/plat/s5p-time.h
2396 Auto-merging arch/arm/plat-samsung/include/plat/s5p6440.h
2397 Auto-merging arch/arm/plat-samsung/include/plat/s5p6450.h
2398 AutResolved 'drivers/gpio/Makefile' using previous resolution.
2399 o-merging arch/arm/plat-samsung/include/plat/s5pc100.h
2400 Auto-merging arch/arm/plat-samsung/include/plat/s5pv210.h
2401 Auto-merging arch/arm/plat-samsung/include/plat/sysmmu.h
2402 Auto-merging arch/arm/plat-samsung/include/plat/system-reset.h
2403 Auto-merging arch/arm/plat-samsung/include/plat/udc.h
2404 Auto-merging arch/arm/plat-samsung/include/plat/usb-phy.h
2405 Removing arch/arm/plat-samsung/s3c-pl330.c
2406 Auto-merging drivers/gpio/Kconfig
2407 Auto-merging drivers/gpio/Makefile
2408 CONFLICT (content): Merge conflict in drivers/gpio/Makefile
2409 Removing drivers/gpio/gpio-exynos4.c
2410 Removing drivers/gpio/gpio-plat-samsung.c
2411 Removing drivers/gpio/gpio-s5pc100.c
2412 Removing drivers/gpio/gpio-s5pv210.c
2413 Automatic merge failed; fix conflicts and then commit the result.
2415 [master bdeb3d7] Merge remote-tracking branch 's5p/for-next'
2416 $ git diff -M --stat --summary HEAD^..
2417 arch/arm/Kconfig | 5 +-
2418 arch/arm/include/asm/hardware/pl080.h | 4 +
2419 arch/arm/mach-exynos4/Kconfig | 53 +-
2420 arch/arm/mach-exynos4/Makefile | 5 +-
2421 arch/arm/mach-exynos4/clock.c | 224 ++-
2422 arch/arm/mach-exynos4/cpu.c | 23 +-
2423 arch/arm/mach-exynos4/dma.c | 300 ++-
2424 arch/arm/mach-exynos4/include/mach/clkdev.h | 7 -
2425 arch/arm/mach-exynos4/include/mach/dma.h | 4 +-
2426 arch/arm/mach-exynos4/include/mach/entry-macro.S | 29 +-
2427 arch/arm/mach-exynos4/include/mach/i2c-hdmiphy.h | 16 +
2428 arch/arm/mach-exynos4/include/mach/irqs.h | 6 +
2429 arch/arm/mach-exynos4/include/mach/map.h | 13 +-
2430 arch/arm/mach-exynos4/include/mach/pm-core.h | 8 +-
2431 arch/arm/mach-exynos4/include/mach/pmu.h | 7 +
2432 arch/arm/mach-exynos4/include/mach/regs-mct.h | 5 +-
2433 arch/arm/mach-exynos4/include/mach/regs-pmu.h | 74 +-
2434 arch/arm/mach-exynos4/mach-nuri.c | 34 +
2435 arch/arm/mach-exynos4/mach-origen.c | 577 +++++-
2436 .../{mach-smdk4212.c => mach-smdk4x12.c} | 126 +-
2437 arch/arm/mach-exynos4/mach-smdkv310.c | 49 +
2438 arch/arm/mach-exynos4/mach-universal_c210.c | 312 +++-
2439 arch/arm/mach-exynos4/mct.c | 166 +-
2440 arch/arm/mach-exynos4/platsmp.c | 5 +-
2441 arch/arm/mach-exynos4/pm.c | 7 +
2442 arch/arm/mach-exynos4/pmu.c | 353 ++--
2443 arch/arm/mach-exynos4/setup-sdhci.c | 47 -
2444 arch/arm/mach-s3c2410/Kconfig | 1 -
2445 arch/arm/mach-s3c2410/include/mach/dma.h | 20 +-
2446 arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 99 +-
2447 arch/arm/mach-s3c2410/include/mach/gpio-track.h | 6 +-
2448 arch/arm/mach-s3c2410/include/mach/pm-core.h | 2 +-
2449 .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 1 +
2450 arch/arm/mach-s3c2410/mach-h1940.c | 6 +-
2451 arch/arm/mach-s3c2410/s3c2410.c | 4 +-
2452 arch/arm/mach-s3c2412/dma.c | 4 +-
2453 arch/arm/mach-s3c2412/gpio.c | 62 +
2454 arch/arm/mach-s3c2416/Kconfig | 1 -
2455 arch/arm/mach-s3c2416/clock.c | 29 +-
2456 arch/arm/mach-s3c2416/s3c2416.c | 4 +-
2457 arch/arm/mach-s3c2416/setup-sdhci.c | 37 -
2458 arch/arm/mach-s3c2440/Kconfig | 2 -
2459 arch/arm/mach-s3c2440/s3c2440.c | 4 +-
2460 arch/arm/mach-s3c2440/s3c2442.c | 4 +-
2461 arch/arm/mach-s3c2443/Kconfig | 1 -
2462 arch/arm/mach-s3c2443/clock.c | 55 +-
2463 arch/arm/mach-s3c2443/s3c2443.c | 4 +-
2464 arch/arm/mach-s3c64xx/Kconfig | 1 +
2465 arch/arm/mach-s3c64xx/Makefile | 3 +-
2466 arch/arm/mach-s3c64xx/clock.c | 13 +-
2467 arch/arm/mach-s3c64xx/cpu.c | 4 +-
2468 arch/arm/mach-s3c64xx/dma.c | 12 +-
2469 arch/arm/mach-s3c64xx/gpiolib.c | 290 ---
2470 arch/arm/mach-s3c64xx/include/mach/clkdev.h | 7 -
2471 arch/arm/mach-s3c64xx/include/mach/crag6410.h | 23 +
2472 arch/arm/mach-s3c64xx/include/mach/dma.h | 8 +-
2473 arch/arm/mach-s3c64xx/include/mach/pll.h | 45 -
2474 arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 +-
2475 arch/arm/mach-s3c64xx/include/mach/pwm-clock.h | 56 -
2476 arch/arm/mach-s3c64xx/include/mach/regs-sys.h | 3 +
2477 arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
2478 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 182 ++
2479 arch/arm/mach-s3c64xx/mach-crag6410.c | 108 +-
2480 arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
2481 arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
2482 arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
2483 arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
2484 arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
2485 arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
2486 arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
2487 arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
2488 arch/arm/mach-s3c64xx/pm.c | 4 +
2489 arch/arm/mach-s3c64xx/s3c6400.c | 2 +-
2490 arch/arm/mach-s3c64xx/s3c6410.c | 4 +-
2491 arch/arm/mach-s3c64xx/setup-sdhci.c | 48 -
2492 arch/arm/mach-s5p64x0/Kconfig | 18 +-
2493 arch/arm/mach-s5p64x0/Makefile | 4 +-
2494 arch/arm/mach-s5p64x0/clock-s5p6440.c | 10 +-
2495 arch/arm/mach-s5p64x0/clock-s5p6450.c | 10 +-
2496 arch/arm/mach-s5p64x0/cpu.c | 3 +
2497 arch/arm/mach-s5p64x0/dma.c | 269 ++-
2498 arch/arm/mach-s5p64x0/include/mach/clkdev.h | 7 -
2499 arch/arm/mach-s5p64x0/include/mach/dma.h | 4 +-
2500 arch/arm/mach-s5p64x0/include/mach/irqs.h | 4 +
2501 arch/arm/mach-s5p64x0/include/mach/map.h | 4 +
2502 arch/arm/mach-s5p64x0/include/mach/pm-core.h | 117 +
2503 arch/arm/mach-s5p64x0/include/mach/pwm-clock.h | 68 -
2504 arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 33 +
2505 arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 21 +
2506 arch/arm/mach-s5p64x0/irq-eint.c | 2 +
2507 arch/arm/mach-s5p64x0/irq-pm.c | 92 +
2508 arch/arm/mach-s5p64x0/mach-smdk6440.c | 74 +
2509 arch/arm/mach-s5p64x0/mach-smdk6450.c | 75 +
2510 arch/arm/mach-s5p64x0/pm.c | 204 ++
2511 arch/arm/mach-s5p64x0/setup-fb-24bpp.c | 29 +
2512 arch/arm/mach-s5pc100/Kconfig | 2 +-
2513 arch/arm/mach-s5pc100/clock.c | 15 +-
2514 arch/arm/mach-s5pc100/dma.c | 324 ++-
2515 arch/arm/mach-s5pc100/include/mach/clkdev.h | 7 -
2516 arch/arm/mach-s5pc100/include/mach/dma.h | 4 +-
2517 arch/arm/mach-s5pc100/include/mach/pwm-clock.h | 56 -
2518 arch/arm/mach-s5pc100/setup-sdhci.c | 42 -
2519 arch/arm/mach-s5pv210/Kconfig | 6 +-
2520 arch/arm/mach-s5pv210/Makefile | 2 +-
2521 arch/arm/mach-s5pv210/clock.c | 151 +-
2522 arch/arm/mach-s5pv210/cpu.c | 4 +
2523 arch/arm/mach-s5pv210/dma.c | 317 ++-
2524 arch/arm/mach-s5pv210/include/mach/clkdev.h | 7 -
2525 arch/arm/mach-s5pv210/include/mach/dma.h | 4 +-
2526 arch/arm/mach-s5pv210/include/mach/i2c-hdmiphy.h | 16 +
2527 arch/arm/mach-s5pv210/include/mach/irqs.h | 4 +-
2528 arch/arm/mach-s5pv210/include/mach/map.h | 13 +
2529 arch/arm/mach-s5pv210/include/mach/pm-core.h | 2 +-
2530 arch/arm/mach-s5pv210/include/mach/pwm-clock.h | 70 -
2531 arch/arm/mach-s5pv210/include/mach/regs-clock.h | 3 +-
2532 arch/arm/mach-s5pv210/mach-goni.c | 62 +
2533 arch/arm/mach-s5pv210/setup-sdhci.c | 41 -
2534 arch/arm/mach-s5pv210/sleep.S | 52 -
2535 arch/arm/plat-s3c24xx/Kconfig | 1 -
2536 arch/arm/plat-s3c24xx/Makefile | 2 -
2537 arch/arm/plat-s3c24xx/dma.c | 10 +-
2538 arch/arm/plat-s3c24xx/gpio.c | 96 -
2539 arch/arm/plat-s3c24xx/gpiolib.c | 229 --
2540 arch/arm/plat-s3c24xx/include/mach/clkdev.h | 7 -
2541 arch/arm/plat-s3c24xx/include/mach/pwm-clock.h | 55 -
2542 arch/arm/plat-s3c24xx/include/plat/pll.h | 62 -
2543 arch/arm/plat-s3c24xx/include/plat/regs-iis.h | 68 -
2544 arch/arm/plat-s3c24xx/include/plat/regs-spi.h | 81 -
2545 arch/arm/plat-s3c24xx/s3c2443-clock.c | 57 +
2546 arch/arm/plat-s5p/Kconfig | 25 +-
2547 arch/arm/plat-s5p/Makefile | 6 +-
2548 arch/arm/plat-s5p/cpu.c | 9 +
2549 arch/arm/plat-s5p/dev-i2c-hdmiphy.c | 59 +
2550 arch/arm/plat-s5p/dev-tv.c | 98 +
2551 arch/arm/plat-s5p/irq-gpioint.c | 10 +-
2552 arch/arm/{mach-exynos4 => plat-s5p}/sleep.S | 13 +-
2553 arch/arm/plat-samsung/Kconfig | 36 +-
2554 arch/arm/plat-samsung/Makefile | 6 +-
2555 arch/arm/plat-samsung/dma-ops.c | 131 +
2556 arch/arm/plat-samsung/gpio-config.c | 431 ----
2557 arch/arm/plat-samsung/gpio.c | 167 --
2558 .../include/plat/audio-simtec.h | 2 +-
2559 .../include/plat/camport.h | 6 +-
2560 .../include/plat/common-smdk.h | 2 +-
2561 .../include/plat/cpu-freq-core.h | 5 +-
2562 arch/arm/plat-samsung/include/plat/cpu.h | 8 +
2563 arch/arm/plat-samsung/include/plat/devs.h | 6 +
2564 arch/arm/plat-samsung/include/plat/dma-ops.h | 63 +
2565 .../include/plat/{s3c-dma-pl330.h => dma-pl330.h} | 24 +-
2566 arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 2 +-
2567 arch/arm/plat-samsung/include/plat/dma.h | 10 +-
2568 .../{plat-s5p => plat-samsung}/include/plat/ehci.h | 6 +-
2569 .../include/plat/exynos4.h | 2 +-
2570 arch/arm/plat-samsung/include/plat/fb.h | 7 +
2571 .../include/plat/fiq.h | 2 +-
2572 .../plat-samsung/include/plat/gpio-cfg-helpers.h | 172 +-
2573 arch/arm/plat-samsung/include/plat/gpio-cfg.h | 34 +-
2574 arch/arm/plat-samsung/include/plat/gpio-core.h | 97 +-
2575 arch/arm/plat-samsung/include/plat/gpio-fns.h | 98 +
2576 arch/arm/plat-samsung/include/plat/iic.h | 1 +
2577 .../include/plat/irq.h | 25 +-
2578 .../{plat-s5p => plat-samsung}/include/plat/irqs.h | 8 +-
2579 .../include/plat/mci.h | 10 +-
2580 .../{plat-s5p => plat-samsung}/include/plat/mfc.h | 6 +-
2581 .../include/plat/mipi_csis.h | 6 +-
2582 .../{plat-s5p => plat-samsung}/include/plat/pll.h | 134 +-
2583 arch/arm/plat-samsung/include/plat/pll6553x.h | 51 -
2584 arch/arm/plat-samsung/include/plat/pm.h | 10 +-
2585 .../mach => plat-samsung/include/plat}/pwm-clock.h | 39 +-
2586 .../include/plat/regs-dma.h | 112 +-
2587 arch/arm/plat-samsung/include/plat/regs-iis.h | 70 +
2588 arch/arm/plat-samsung/include/plat/regs-spi.h | 48 +
2589 .../include/plat/regs-srom.h | 8 +-
2590 .../include/plat/regs-udc.h | 132 +-
2591 .../include/plat/reset.h | 8 +-
2592 .../plat-samsung/include/plat/s3c-pl330-pdata.h | 32 -
2593 .../include/plat/s3c2410.h | 2 +-
2594 .../include/plat/s3c2412.h | 2 +-
2595 .../include/plat/s3c2416.h | 2 +-
2596 .../include/plat/s3c2443.h | 2 +-
2597 .../include/plat/s3c244x.h | 2 +-
2598 .../mach => plat-samsung/include/plat}/s3c6400.h | 2 +-
2599 .../mach => plat-samsung/include/plat}/s3c6410.h | 2 +-
2600 .../include/plat/s5p-clock.h | 2 +-
2601 .../include/plat/s5p-time.h | 2 +-
2602 .../include/plat/s5p6440.h | 2 +-
2603 .../include/plat/s5p6450.h | 2 +-
2604 .../include/plat/s5pc100.h | 2 +-
2605 .../include/plat/s5pv210.h | 2 +-
2606 arch/arm/plat-samsung/include/plat/sdhci.h | 57 -
2607 .../include/plat/sysmmu.h | 6 +-
2608 .../include/plat/system-reset.h | 2 +-
2609 arch/arm/plat-samsung/include/plat/tv-core.h | 44 +
2610 .../include/plat/udc.h | 4 +-
2611 .../include/plat/usb-phy.h | 6 +-
2612 arch/arm/plat-samsung/platformdata.c | 2 -
2613 arch/arm/plat-samsung/pm-gpio.c | 72 +-
2614 arch/arm/plat-samsung/pm.c | 6 +-
2615 arch/arm/plat-samsung/pwm-clock.c | 13 +-
2616 arch/arm/plat-samsung/s3c-dma-ops.c | 130 +
2617 arch/arm/plat-samsung/s3c-pl330.c | 1244 ---------
2618 drivers/dma/Kconfig | 3 +-
2619 drivers/dma/amba-pl08x.c | 455 ++--
2620 drivers/dma/at_hdmac.c | 159 +-
2621 drivers/dma/at_hdmac_regs.h | 24 +
2622 drivers/dma/dmatest.c | 23 +-
2623 drivers/dma/imx-sdma.c | 47 +-
2624 drivers/dma/mxs-dma.c | 45 +-
2625 drivers/dma/pl330.c | 229 ++-
2626 drivers/gpio/Kconfig | 16 -
2627 drivers/gpio/Makefile | 6 +-
2628 drivers/gpio/gpio-exynos4.c | 385 ---
2629 drivers/gpio/gpio-plat-samsung.c | 205 --
2630 drivers/gpio/gpio-s5pc100.c | 354 ---
2631 drivers/gpio/gpio-s5pv210.c | 287 ---
2632 drivers/gpio/gpio-samsung.c | 2688 ++++++++++++++++++++
2633 drivers/mmc/host/s3cmci.c | 6 +-
2634 drivers/spi/spi-s3c64xx.c | 175 +-
2635 include/linux/amba/pl08x.h | 14 +-
2636 include/linux/amba/pl330.h | 6 +-
2637 include/linux/dmaengine.h | 13 +-
2638 sound/soc/samsung/ac97.c | 10 +-
2639 sound/soc/samsung/dma.c | 148 +-
2640 sound/soc/samsung/dma.h | 4 +-
2641 224 files changed, 8821 insertions(+), 6888 deletions(-)
2642 delete mode 100644 arch/arm/mach-exynos4/include/mach/clkdev.h
2643 create mode 100644 arch/arm/mach-exynos4/include/mach/i2c-hdmiphy.h
2644 rename arch/arm/mach-exynos4/{mach-smdk4212.c => mach-smdk4x12.c} (61%)
2645 create mode 100644 arch/arm/mach-s3c2412/gpio.c
2646 delete mode 100644 arch/arm/mach-s3c64xx/gpiolib.c
2647 delete mode 100644 arch/arm/mach-s3c64xx/include/mach/clkdev.h
2648 create mode 100644 arch/arm/mach-s3c64xx/include/mach/crag6410.h
2649 delete mode 100644 arch/arm/mach-s3c64xx/include/mach/pll.h
2650 delete mode 100644 arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
2651 create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410-module.c
2652 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/clkdev.h
2653 create mode 100644 arch/arm/mach-s5p64x0/include/mach/pm-core.h
2654 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
2655 create mode 100644 arch/arm/mach-s5p64x0/irq-pm.c
2656 create mode 100644 arch/arm/mach-s5p64x0/pm.c
2657 create mode 100644 arch/arm/mach-s5p64x0/setup-fb-24bpp.c
2658 delete mode 100644 arch/arm/mach-s5pc100/include/mach/clkdev.h
2659 delete mode 100644 arch/arm/mach-s5pc100/include/mach/pwm-clock.h
2660 delete mode 100644 arch/arm/mach-s5pv210/include/mach/clkdev.h
2661 create mode 100644 arch/arm/mach-s5pv210/include/mach/i2c-hdmiphy.h
2662 delete mode 100644 arch/arm/mach-s5pv210/include/mach/pwm-clock.h
2663 delete mode 100644 arch/arm/mach-s5pv210/sleep.S
2664 delete mode 100644 arch/arm/plat-s3c24xx/gpio.c
2665 delete mode 100644 arch/arm/plat-s3c24xx/gpiolib.c
2666 delete mode 100644 arch/arm/plat-s3c24xx/include/mach/clkdev.h
2667 delete mode 100644 arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
2668 delete mode 100644 arch/arm/plat-s3c24xx/include/plat/pll.h
2669 delete mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-iis.h
2670 delete mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-spi.h
2671 create mode 100644 arch/arm/plat-s5p/dev-i2c-hdmiphy.c
2672 create mode 100644 arch/arm/plat-s5p/dev-tv.c
2673 rename arch/arm/{mach-exynos4 => plat-s5p}/sleep.S (81%)
2674 create mode 100644 arch/arm/plat-samsung/dma-ops.c
2675 delete mode 100644 arch/arm/plat-samsung/gpio-config.c
2676 delete mode 100644 arch/arm/plat-samsung/gpio.c
2677 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/audio-simtec.h (95%)
2678 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/camport.h (86%)
2679 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/common-smdk.h (87%)
2680 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/cpu-freq-core.h (98%)
2681 create mode 100644 arch/arm/plat-samsung/include/plat/dma-ops.h
2682 rename arch/arm/plat-samsung/include/plat/{s3c-dma-pl330.h => dma-pl330.h} (84%)
2683 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/ehci.h (84%)
2684 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/exynos4.h (94%)
2685 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/fiq.h (88%)
2686 create mode 100644 arch/arm/plat-samsung/include/plat/gpio-fns.h
2687 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/irq.h (81%)
2688 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/irqs.h (96%)
2689 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/mci.h (90%)
2690 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/mfc.h (90%)
2691 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/mipi_csis.h (90%)
2692 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/pll.h (57%)
2693 delete mode 100644 arch/arm/plat-samsung/include/plat/pll6553x.h
2694 rename arch/arm/{mach-exynos4/include/mach => plat-samsung/include/plat}/pwm-clock.h (68%)
2695 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-dma.h (58%)
2696 create mode 100644 arch/arm/plat-samsung/include/plat/regs-iis.h
2697 create mode 100644 arch/arm/plat-samsung/include/plat/regs-spi.h
2698 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/regs-srom.h (89%)
2699 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-udc.h (51%)
2700 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/reset.h (66%)
2701 delete mode 100644 arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
2702 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2410.h (93%)
2703 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2412.h (92%)
2704 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2416.h (92%)
2705 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2443.h (96%)
2706 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c244x.h (94%)
2707 rename arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6400.h (94%)
2708 rename arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6410.h (93%)
2709 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-clock.h (96%)
2710 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-time.h (94%)
2711 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6440.h (94%)
2712 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6450.h (94%)
2713 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pc100.h (94%)
2714 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pv210.h (94%)
2715 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/sysmmu.h (96%)
2716 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/system-reset.h (92%)
2717 create mode 100644 arch/arm/plat-samsung/include/plat/tv-core.h
2718 rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/udc.h (95%)
2719 rename arch/arm/{plat-s5p => plat-samsung}/include/plat/usb-phy.h (83%)
2720 create mode 100644 arch/arm/plat-samsung/s3c-dma-ops.c
2721 delete mode 100644 arch/arm/plat-samsung/s3c-pl330.c
2722 delete mode 100644 drivers/gpio/gpio-exynos4.c
2723 delete mode 100644 drivers/gpio/gpio-plat-samsung.c
2724 delete mode 100644 drivers/gpio/gpio-s5pc100.c
2725 delete mode 100644 drivers/gpio/gpio-s5pv210.c
2726 create mode 100644 drivers/gpio/gpio-samsung.c
2727 Merging tegra/for-next
2728 $ git merge tegra/for-next
2730 Merging xilinx/arm-next
2731 $ git merge xilinx/arm-next
2733 Merging blackfin/for-linus
2734 $ git merge blackfin/for-linus
2735 Removing arch/blackfin/include/asm/mutex.h
2736 Merge made by recursive.
2737 arch/blackfin/include/asm/Kbuild | 1 +
2738 arch/blackfin/include/asm/bfin_serial.h | 2 +
2739 arch/blackfin/include/asm/mutex.h | 1 -
2740 arch/blackfin/include/asm/uaccess.h | 6 ++--
2741 arch/blackfin/mach-bf518/boards/ezbrd.c | 14 +++++++++++-
2742 arch/blackfin/mach-bf518/boards/tcm-bf518.c | 14 +++++++++++-
2743 arch/blackfin/mach-bf527/boards/ad7160eval.c | 14 +++++++++++-
2744 arch/blackfin/mach-bf527/boards/cm_bf527.c | 14 +++++++++++-
2745 arch/blackfin/mach-bf527/boards/ezbrd.c | 14 +++++++++++-
2746 arch/blackfin/mach-bf527/boards/ezkit.c | 14 +++++++++++-
2747 arch/blackfin/mach-bf527/boards/tll6527m.c | 14 +++++++++++-
2748 arch/blackfin/mach-bf533/boards/H8606.c | 10 +++++++-
2749 arch/blackfin/mach-bf533/boards/blackstamp.c | 7 +++++-
2750 arch/blackfin/mach-bf533/boards/cm_bf533.c | 7 +++++-
2751 arch/blackfin/mach-bf533/boards/ezkit.c | 7 +++++-
2752 arch/blackfin/mach-bf533/boards/ip0x.c | 7 +++++-
2753 arch/blackfin/mach-bf533/boards/stamp.c | 7 +++++-
2754 arch/blackfin/mach-bf537/boards/cm_bf537e.c | 14 +++++++++++-
2755 arch/blackfin/mach-bf537/boards/cm_bf537u.c | 14 +++++++++++-
2756 arch/blackfin/mach-bf537/boards/dnp5370.c | 14 +++++++++++-
2757 arch/blackfin/mach-bf537/boards/minotaur.c | 14 +++++++++++-
2758 arch/blackfin/mach-bf537/boards/pnav10.c | 14 +++++++++++-
2759 arch/blackfin/mach-bf537/boards/stamp.c | 14 +++++++++++-
2760 arch/blackfin/mach-bf537/boards/tcm_bf537.c | 14 +++++++++++-
2761 arch/blackfin/mach-bf538/boards/ezkit.c | 21 ++++++++++++++++--
2762 arch/blackfin/mach-bf548/boards/cm_bf548.c | 28 ++++++++++++++++++++++---
2763 arch/blackfin/mach-bf548/boards/ezkit.c | 28 ++++++++++++++++++++++---
2764 arch/blackfin/mach-bf561/boards/acvilon.c | 7 +++++-
2765 arch/blackfin/mach-bf561/boards/cm_bf561.c | 7 +++++-
2766 arch/blackfin/mach-bf561/boards/ezkit.c | 7 +++++-
2767 arch/blackfin/mach-bf561/boards/tepla.c | 7 +++++-
2768 31 files changed, 302 insertions(+), 54 deletions(-)
2769 delete mode 100644 arch/blackfin/include/asm/mutex.h
2770 Merging cris/for-next
2771 $ git merge cris/for-next
2772 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
2773 Auto-merging drivers/net/cris/eth_v10.c
2774 Merge made by recursive.
2775 Documentation/cris/README | 62 +++++++++++++++---------------
2776 arch/cris/arch-v32/drivers/cryptocop.c | 6 +--
2777 arch/cris/arch-v32/kernel/ptrace.c | 2 -
2778 arch/cris/include/arch-v32/arch/cache.h | 2 +-
2779 drivers/net/cris/eth_v10.c | 1 -
2780 5 files changed, 34 insertions(+), 39 deletions(-)
2781 Merging quilt/hexagon
2782 $ git merge quilt/hexagon
2783 Auto-merging MAINTAINERS
2784 Merge made by recursive.
2786 arch/hexagon/Kconfig | 220 ++++++++++++
2787 arch/hexagon/Makefile | 59 +++
2788 arch/hexagon/configs/comet_defconfig | 85 +++++
2789 arch/hexagon/include/asm/Kbuild | 60 ++++
2790 arch/hexagon/include/asm/asm-offsets.h | 1 +
2791 arch/hexagon/include/asm/atomic.h | 164 +++++++++
2792 arch/hexagon/include/asm/bitops.h | 301 ++++++++++++++++
2793 arch/hexagon/include/asm/bitsperlong.h | 26 ++
2794 arch/hexagon/include/asm/byteorder.h | 28 ++
2795 arch/hexagon/include/asm/cache.h | 34 ++
2796 arch/hexagon/include/asm/cacheflush.h | 99 ++++++
2797 arch/hexagon/include/asm/checksum.h | 50 +++
2798 arch/hexagon/include/asm/delay.h | 28 ++
2799 arch/hexagon/include/asm/dma-mapping.h | 101 ++++++
2800 arch/hexagon/include/asm/dma.h | 29 ++
2801 arch/hexagon/include/asm/elf.h | 229 ++++++++++++
2802 arch/hexagon/include/asm/fixmap.h | 73 ++++
2803 arch/hexagon/include/asm/fpu.h | 4 +
2804 arch/hexagon/include/asm/futex.h | 137 ++++++++
2805 arch/hexagon/include/asm/hexagon_vm.h | 281 +++++++++++++++
2806 arch/hexagon/include/asm/intrinsics.h | 26 ++
2807 arch/hexagon/include/asm/io.h | 326 +++++++++++++++++
2808 arch/hexagon/include/asm/irq.h | 36 ++
2809 arch/hexagon/include/asm/irqflags.h | 62 ++++
2810 arch/hexagon/include/asm/kgdb.h | 43 +++
2811 arch/hexagon/include/asm/linkage.h | 25 ++
2812 arch/hexagon/include/asm/mem-layout.h | 112 ++++++
2813 arch/hexagon/include/asm/mmu.h | 37 ++
2814 arch/hexagon/include/asm/mmu_context.h | 100 ++++++
2815 arch/hexagon/include/asm/module.h | 26 ++
2816 arch/hexagon/include/asm/mutex.h | 8 +
2817 arch/hexagon/include/asm/page.h | 157 +++++++++
2818 arch/hexagon/include/asm/param.h | 26 ++
2819 arch/hexagon/include/asm/perf_event.h | 24 ++
2820 arch/hexagon/include/asm/pgalloc.h | 146 ++++++++
2821 arch/hexagon/include/asm/pgtable.h | 518 +++++++++++++++++++++++++++
2822 arch/hexagon/include/asm/processor.h | 123 +++++++
2823 arch/hexagon/include/asm/ptrace.h | 48 +++
2824 arch/hexagon/include/asm/registers.h | 236 +++++++++++++
2825 arch/hexagon/include/asm/setup.h | 29 ++
2826 arch/hexagon/include/asm/sigcontext.h | 33 ++
2827 arch/hexagon/include/asm/signal.h | 26 ++
2828 arch/hexagon/include/asm/smp.h | 44 +++
2829 arch/hexagon/include/asm/spinlock.h | 186 ++++++++++
2830 arch/hexagon/include/asm/spinlock_types.h | 42 +++
2831 arch/hexagon/include/asm/string.h | 32 ++
2832 arch/hexagon/include/asm/suspend.h | 27 ++
2833 arch/hexagon/include/asm/swab.h | 24 ++
2834 arch/hexagon/include/asm/syscall.h | 54 +++
2835 arch/hexagon/include/asm/system.h | 126 +++++++
2836 arch/hexagon/include/asm/thread_info.h | 154 ++++++++
2837 arch/hexagon/include/asm/time.h | 29 ++
2838 arch/hexagon/include/asm/timer-regs.h | 39 ++
2839 arch/hexagon/include/asm/timex.h | 37 ++
2840 arch/hexagon/include/asm/tlb.h | 39 ++
2841 arch/hexagon/include/asm/tlbflush.h | 58 +++
2842 arch/hexagon/include/asm/traps.h | 29 ++
2843 arch/hexagon/include/asm/uaccess.h | 116 ++++++
2844 arch/hexagon/include/asm/unistd.h | 36 ++
2845 arch/hexagon/include/asm/user.h | 83 +++++
2846 arch/hexagon/include/asm/vdso.h | 31 ++
2847 arch/hexagon/include/asm/vm_fault.h | 26 ++
2848 arch/hexagon/include/asm/vm_mmu.h | 111 ++++++
2849 arch/hexagon/kernel/Makefile | 19 +
2850 arch/hexagon/kernel/asm-offsets.c | 104 ++++++
2851 arch/hexagon/kernel/dma.c | 220 ++++++++++++
2852 arch/hexagon/kernel/head.S | 162 +++++++++
2853 arch/hexagon/kernel/hexagon_ksyms.c | 42 +++
2854 arch/hexagon/kernel/init_task.c | 54 +++
2855 arch/hexagon/kernel/irq_cpu.c | 90 +++++
2856 arch/hexagon/kernel/kgdb.c | 247 +++++++++++++
2857 arch/hexagon/kernel/module.c | 162 +++++++++
2858 arch/hexagon/kernel/process.c | 279 +++++++++++++++
2859 arch/hexagon/kernel/ptrace.c | 178 ++++++++++
2860 arch/hexagon/kernel/reset.c | 38 ++
2861 arch/hexagon/kernel/setup.c | 145 ++++++++
2862 arch/hexagon/kernel/signal.c | 345 ++++++++++++++++++
2863 arch/hexagon/kernel/smp.c | 280 +++++++++++++++
2864 arch/hexagon/kernel/stacktrace.c | 66 ++++
2865 arch/hexagon/kernel/syscall.c | 90 +++++
2866 arch/hexagon/kernel/syscalltab.c | 32 ++
2867 arch/hexagon/kernel/time.c | 258 ++++++++++++++
2868 arch/hexagon/kernel/topology.c | 52 +++
2869 arch/hexagon/kernel/trampoline.S | 35 ++
2870 arch/hexagon/kernel/traps.c | 370 ++++++++++++++++++++
2871 arch/hexagon/kernel/vdso.c | 101 ++++++
2872 arch/hexagon/kernel/vm_entry.S | 269 ++++++++++++++
2873 arch/hexagon/kernel/vm_events.c | 101 ++++++
2874 arch/hexagon/kernel/vm_init_segtable.S | 442 +++++++++++++++++++++++
2875 arch/hexagon/kernel/vm_ops.S | 102 ++++++
2876 arch/hexagon/kernel/vm_switch.S | 95 +++++
2877 arch/hexagon/kernel/vm_vectors.S | 50 +++
2878 arch/hexagon/kernel/vmlinux.lds.S | 93 +++++
2879 arch/hexagon/lib/Makefile | 4 +
2880 arch/hexagon/lib/checksum.c | 203 +++++++++++
2881 arch/hexagon/lib/io.c | 91 +++++
2882 arch/hexagon/lib/memcpy.S | 543 +++++++++++++++++++++++++++++
2883 arch/hexagon/lib/memset.S | 316 +++++++++++++++++
2884 arch/hexagon/mm/Makefile | 7 +
2885 arch/hexagon/mm/cache.c | 128 +++++++
2886 arch/hexagon/mm/copy_from_user.S | 114 ++++++
2887 arch/hexagon/mm/copy_to_user.S | 92 +++++
2888 arch/hexagon/mm/copy_user_template.S | 185 ++++++++++
2889 arch/hexagon/mm/init.c | 276 +++++++++++++++
2890 arch/hexagon/mm/ioremap.c | 56 +++
2891 arch/hexagon/mm/pgalloc.c | 25 ++
2892 arch/hexagon/mm/strnlen_user.S | 140 ++++++++
2893 arch/hexagon/mm/uaccess.c | 59 +++
2894 arch/hexagon/mm/vm_fault.c | 187 ++++++++++
2895 arch/hexagon/mm/vm_tlb.c | 93 +++++
2896 include/asm-generic/checksum.h | 4 +
2897 include/asm-generic/rwsem.h | 132 +++++++
2898 113 files changed, 12681 insertions(+), 0 deletions(-)
2899 create mode 100644 arch/hexagon/Kconfig
2900 create mode 100644 arch/hexagon/Makefile
2901 create mode 100644 arch/hexagon/configs/comet_defconfig
2902 create mode 100644 arch/hexagon/include/asm/Kbuild
2903 create mode 100644 arch/hexagon/include/asm/asm-offsets.h
2904 create mode 100644 arch/hexagon/include/asm/atomic.h
2905 create mode 100644 arch/hexagon/include/asm/bitops.h
2906 create mode 100644 arch/hexagon/include/asm/bitsperlong.h
2907 create mode 100644 arch/hexagon/include/asm/byteorder.h
2908 create mode 100644 arch/hexagon/include/asm/cache.h
2909 create mode 100644 arch/hexagon/include/asm/cacheflush.h
2910 create mode 100644 arch/hexagon/include/asm/checksum.h
2911 create mode 100644 arch/hexagon/include/asm/delay.h
2912 create mode 100644 arch/hexagon/include/asm/dma-mapping.h
2913 create mode 100644 arch/hexagon/include/asm/dma.h
2914 create mode 100644 arch/hexagon/include/asm/elf.h
2915 create mode 100644 arch/hexagon/include/asm/fixmap.h
2916 create mode 100644 arch/hexagon/include/asm/fpu.h
2917 create mode 100644 arch/hexagon/include/asm/futex.h
2918 create mode 100644 arch/hexagon/include/asm/hexagon_vm.h
2919 create mode 100644 arch/hexagon/include/asm/intrinsics.h
2920 create mode 100644 arch/hexagon/include/asm/io.h
2921 create mode 100644 arch/hexagon/include/asm/irq.h
2922 create mode 100644 arch/hexagon/include/asm/irqflags.h
2923 create mode 100644 arch/hexagon/include/asm/kgdb.h
2924 create mode 100644 arch/hexagon/include/asm/linkage.h
2925 create mode 100644 arch/hexagon/include/asm/mem-layout.h
2926 create mode 100644 arch/hexagon/include/asm/mmu.h
2927 create mode 100644 arch/hexagon/include/asm/mmu_context.h
2928 create mode 100644 arch/hexagon/include/asm/module.h
2929 create mode 100644 arch/hexagon/include/asm/mutex.h
2930 create mode 100644 arch/hexagon/include/asm/page.h
2931 create mode 100644 arch/hexagon/include/asm/param.h
2932 create mode 100644 arch/hexagon/include/asm/perf_event.h
2933 create mode 100644 arch/hexagon/include/asm/pgalloc.h
2934 create mode 100644 arch/hexagon/include/asm/pgtable.h
2935 create mode 100644 arch/hexagon/include/asm/processor.h
2936 create mode 100644 arch/hexagon/include/asm/ptrace.h
2937 create mode 100644 arch/hexagon/include/asm/registers.h
2938 create mode 100644 arch/hexagon/include/asm/setup.h
2939 create mode 100644 arch/hexagon/include/asm/sigcontext.h
2940 create mode 100644 arch/hexagon/include/asm/signal.h
2941 create mode 100644 arch/hexagon/include/asm/smp.h
2942 create mode 100644 arch/hexagon/include/asm/spinlock.h
2943 create mode 100644 arch/hexagon/include/asm/spinlock_types.h
2944 create mode 100644 arch/hexagon/include/asm/string.h
2945 create mode 100644 arch/hexagon/include/asm/suspend.h
2946 create mode 100644 arch/hexagon/include/asm/swab.h
2947 create mode 100644 arch/hexagon/include/asm/syscall.h
2948 create mode 100644 arch/hexagon/include/asm/system.h
2949 create mode 100644 arch/hexagon/include/asm/thread_info.h
2950 create mode 100644 arch/hexagon/include/asm/time.h
2951 create mode 100644 arch/hexagon/include/asm/timer-regs.h
2952 create mode 100644 arch/hexagon/include/asm/timex.h
2953 create mode 100644 arch/hexagon/include/asm/tlb.h
2954 create mode 100644 arch/hexagon/include/asm/tlbflush.h
2955 create mode 100644 arch/hexagon/include/asm/traps.h
2956 create mode 100644 arch/hexagon/include/asm/uaccess.h
2957 create mode 100644 arch/hexagon/include/asm/unistd.h
2958 create mode 100644 arch/hexagon/include/asm/user.h
2959 create mode 100644 arch/hexagon/include/asm/vdso.h
2960 create mode 100644 arch/hexagon/include/asm/vm_fault.h
2961 create mode 100644 arch/hexagon/include/asm/vm_mmu.h
2962 create mode 100644 arch/hexagon/kernel/Makefile
2963 create mode 100644 arch/hexagon/kernel/asm-offsets.c
2964 create mode 100644 arch/hexagon/kernel/dma.c
2965 create mode 100644 arch/hexagon/kernel/head.S
2966 create mode 100644 arch/hexagon/kernel/hexagon_ksyms.c
2967 create mode 100644 arch/hexagon/kernel/init_task.c
2968 create mode 100644 arch/hexagon/kernel/irq_cpu.c
2969 create mode 100644 arch/hexagon/kernel/kgdb.c
2970 create mode 100644 arch/hexagon/kernel/module.c
2971 create mode 100644 arch/hexagon/kernel/process.c
2972 create mode 100644 arch/hexagon/kernel/ptrace.c
2973 create mode 100644 arch/hexagon/kernel/reset.c
2974 create mode 100644 arch/hexagon/kernel/setup.c
2975 create mode 100644 arch/hexagon/kernel/signal.c
2976 create mode 100644 arch/hexagon/kernel/smp.c
2977 create mode 100644 arch/hexagon/kernel/stacktrace.c
2978 create mode 100644 arch/hexagon/kernel/syscall.c
2979 create mode 100644 arch/hexagon/kernel/syscalltab.c
2980 create mode 100644 arch/hexagon/kernel/time.c
2981 create mode 100644 arch/hexagon/kernel/topology.c
2982 create mode 100644 arch/hexagon/kernel/trampoline.S
2983 create mode 100644 arch/hexagon/kernel/traps.c
2984 create mode 100644 arch/hexagon/kernel/vdso.c
2985 create mode 100644 arch/hexagon/kernel/vm_entry.S
2986 create mode 100644 arch/hexagon/kernel/vm_events.c
2987 create mode 100644 arch/hexagon/kernel/vm_init_segtable.S
2988 create mode 100644 arch/hexagon/kernel/vm_ops.S
2989 create mode 100644 arch/hexagon/kernel/vm_switch.S
2990 create mode 100644 arch/hexagon/kernel/vm_vectors.S
2991 create mode 100644 arch/hexagon/kernel/vmlinux.lds.S
2992 create mode 100644 arch/hexagon/lib/Makefile
2993 create mode 100644 arch/hexagon/lib/checksum.c
2994 create mode 100644 arch/hexagon/lib/io.c
2995 create mode 100644 arch/hexagon/lib/memcpy.S
2996 create mode 100644 arch/hexagon/lib/memset.S
2997 create mode 100644 arch/hexagon/mm/Makefile
2998 create mode 100644 arch/hexagon/mm/cache.c
2999 create mode 100644 arch/hexagon/mm/copy_from_user.S
3000 create mode 100644 arch/hexagon/mm/copy_to_user.S
3001 create mode 100644 arch/hexagon/mm/copy_user_template.S
3002 create mode 100644 arch/hexagon/mm/init.c
3003 create mode 100644 arch/hexagon/mm/ioremap.c
3004 create mode 100644 arch/hexagon/mm/pgalloc.c
3005 create mode 100644 arch/hexagon/mm/strnlen_user.S
3006 create mode 100644 arch/hexagon/mm/uaccess.c
3007 create mode 100644 arch/hexagon/mm/vm_fault.c
3008 create mode 100644 arch/hexagon/mm/vm_tlb.c
3009 create mode 100644 include/asm-generic/rwsem.h
3011 $ git merge ia64/test
3012 Merge made by recursive.
3013 arch/ia64/configs/generic_defconfig | 1 +
3014 arch/ia64/configs/gensparse_defconfig | 1 +
3015 arch/ia64/configs/tiger_defconfig | 1 +
3016 arch/ia64/configs/xen_domu_defconfig | 1 +
3017 arch/ia64/configs/zx1_defconfig | 1 +
3018 arch/ia64/sn/kernel/sn2/sn_hwperf.c | 12 +++--
3019 drivers/acpi/apei/erst.c | 2 +-
3020 drivers/char/agp/hp-agp.c | 6 ++-
3021 drivers/firmware/efivars.c | 2 +-
3022 fs/pstore/inode.c | 40 ++++++++++++++--
3023 fs/pstore/internal.h | 2 +-
3024 fs/pstore/platform.c | 82 ++++++++++++++++++++++++++------
3025 include/linux/pstore.h | 2 +-
3026 13 files changed, 123 insertions(+), 30 deletions(-)
3027 Merging m68k/for-next
3028 $ git merge m68k/for-next
3029 Merge made by recursive.
3030 arch/m68k/mac/macints.c | 2 +-
3031 arch/m68k/mac/misc.c | 40 +++++++++++++++++++++++-----------------
3032 drivers/zorro/zorro-driver.c | 8 ++++----
3033 3 files changed, 28 insertions(+), 22 deletions(-)
3034 Merging m68knommu/for-next
3035 $ git merge m68knommu/for-next
3036 Auto-merging arch/m68k/Kconfig.machine
3037 Removing arch/m68k/Kconfig.mmu
3038 Removing arch/m68k/Makefile_mm
3039 Removing arch/m68k/Makefile_no
3040 Removing arch/m68k/include/asm/entry_mm.h
3041 Removing arch/m68k/include/asm/entry_no.h
3042 Removing arch/m68k/kernel/Makefile_mm
3043 Removing arch/m68k/kernel/Makefile_no
3044 Removing arch/m68k/kernel/traps_mm.c
3045 Removing arch/m68k/kernel/traps_no.c
3046 Merge made by recursive.
3047 arch/m68k/Kconfig | 195 +----
3048 arch/m68k/Kconfig.bus | 55 ++
3049 arch/m68k/Kconfig.cpu | 429 +++++++++
3050 arch/m68k/Kconfig.devices | 171 ++++
3051 arch/m68k/{Kconfig.nommu => Kconfig.machine} | 543 ++++--------
3052 arch/m68k/Kconfig.mmu | 411 ---------
3053 arch/m68k/Makefile | 168 ++++-
3054 arch/m68k/Makefile_mm | 121 ---
3055 arch/m68k/Makefile_no | 124 ---
3056 arch/m68k/include/asm/entry.h | 255 ++++++-
3057 arch/m68k/include/asm/entry_mm.h | 128 ---
3058 arch/m68k/include/asm/entry_no.h | 181 ----
3059 arch/m68k/include/asm/m520xsim.h | 26 +-
3060 arch/m68k/include/asm/mcfqspi.h | 8 +-
3061 arch/m68k/include/asm/page_no.h | 3 +
3062 arch/m68k/include/asm/processor.h | 6 +
3063 arch/m68k/include/asm/sections.h | 2 +
3064 arch/m68k/kernel/Makefile | 24 +-
3065 arch/m68k/kernel/Makefile_mm | 17 -
3066 arch/m68k/kernel/Makefile_no | 10 -
3067 arch/m68k/kernel/entry_no.S | 6 +-
3068 arch/m68k/kernel/setup_no.c | 4 +-
3069 arch/m68k/kernel/traps.c | 1108 +++++++++++++++++++++++-
3070 arch/m68k/kernel/traps_mm.c | 1207 --------------------------
3071 arch/m68k/kernel/traps_no.c | 361 --------
3072 arch/m68k/kernel/vectors.c | 145 +++
3073 arch/m68k/lib/memcpy.c | 9 +
3074 arch/m68k/mm/init_no.c | 21 +-
3075 arch/m68k/platform/520x/config.c | 6 +-
3076 arch/m68k/platform/520x/gpio.c | 50 +-
3077 arch/m68k/platform/68328/Makefile | 5 +-
3078 arch/m68k/platform/68328/entry.S | 18 +-
3079 arch/m68k/platform/68360/Makefile | 6 +-
3080 arch/m68k/platform/68360/entry.S | 4 +-
3081 arch/m68k/platform/coldfire/entry.S | 6 +-
3082 35 files changed, 2656 insertions(+), 3177 deletions(-)
3083 create mode 100644 arch/m68k/Kconfig.bus
3084 create mode 100644 arch/m68k/Kconfig.cpu
3085 create mode 100644 arch/m68k/Kconfig.devices
3086 rename arch/m68k/{Kconfig.nommu => Kconfig.machine} (62%)
3087 delete mode 100644 arch/m68k/Kconfig.mmu
3088 delete mode 100644 arch/m68k/Makefile_mm
3089 delete mode 100644 arch/m68k/Makefile_no
3090 delete mode 100644 arch/m68k/include/asm/entry_mm.h
3091 delete mode 100644 arch/m68k/include/asm/entry_no.h
3092 delete mode 100644 arch/m68k/kernel/Makefile_mm
3093 delete mode 100644 arch/m68k/kernel/Makefile_no
3094 delete mode 100644 arch/m68k/kernel/traps_mm.c
3095 delete mode 100644 arch/m68k/kernel/traps_no.c
3096 create mode 100644 arch/m68k/kernel/vectors.c
3097 Merging microblaze/next
3098 $ git merge microblaze/next
3100 Merging mips/mips-for-linux-next
3101 $ git merge mips/mips-for-linux-next
3102 Auto-merging arch/mips/alchemy/common/gpiolib.c
3103 Removing arch/mips/alchemy/common/pci.c
3104 Removing arch/mips/include/asm/mach-au1x00/au1xxx.h
3105 Removing arch/mips/pci/fixup-au1000.c
3106 Removing arch/mips/pci/ops-au1000.c
3107 Merge made by recursive.
3108 arch/mips/Kconfig | 11 +-
3109 arch/mips/alchemy/Kconfig | 50 +-
3110 arch/mips/alchemy/common/Makefile | 6 +-
3111 arch/mips/alchemy/common/dbdma.c | 203 ++--
3112 arch/mips/alchemy/common/dma.c | 72 +-
3113 .../alchemy/common/{gpiolib-au1000.c => gpiolib.c} | 35 +-
3114 arch/mips/alchemy/common/pci.c | 104 --
3115 arch/mips/alchemy/common/platform.c | 372 ++-----
3116 arch/mips/alchemy/common/power.c | 68 +-
3117 arch/mips/alchemy/common/setup.c | 6 +-
3118 arch/mips/alchemy/devboards/bcsr.c | 4 +
3119 arch/mips/alchemy/devboards/db1200/platform.c | 153 ++-
3120 arch/mips/alchemy/devboards/db1200/setup.c | 7 -
3121 arch/mips/alchemy/devboards/db1x00/board_setup.c | 28 +-
3122 arch/mips/alchemy/devboards/db1x00/platform.c | 199 +++-
3123 arch/mips/alchemy/devboards/pb1100/platform.c | 49 +-
3124 arch/mips/alchemy/devboards/pb1200/platform.c | 190 +++-
3125 arch/mips/alchemy/devboards/pb1500/board_setup.c | 33 +-
3126 arch/mips/alchemy/devboards/pb1500/platform.c | 71 +-
3127 arch/mips/alchemy/devboards/pb1550/board_setup.c | 6 -
3128 arch/mips/alchemy/devboards/pb1550/platform.c | 119 ++-
3129 arch/mips/alchemy/gpr/board_setup.c | 12 -
3130 arch/mips/alchemy/gpr/platform.c | 47 +
3131 arch/mips/alchemy/mtx-1/board_setup.c | 40 -
3132 arch/mips/alchemy/mtx-1/platform.c | 62 +
3133 arch/mips/alchemy/xxs1500/board_setup.c | 8 -
3134 arch/mips/alchemy/xxs1500/platform.c | 12 +-
3135 arch/mips/ar7/irq.c | 3 +-
3136 arch/mips/bcm63xx/irq.c | 1 +
3137 arch/mips/cobalt/irq.c | 1 +
3138 arch/mips/dec/setup.c | 4 +
3139 arch/mips/emma/markeins/irq.c | 2 +-
3140 arch/mips/include/asm/cpu.h | 3 +
3141 arch/mips/include/asm/mach-au1x00/au1000.h | 559 ++++------
3142 arch/mips/include/asm/mach-au1x00/au1xxx.h | 43 -
3143 arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 114 +-
3144 arch/mips/include/asm/mach-au1x00/au1xxx_ide.h | 1 +
3145 arch/mips/include/asm/mach-au1x00/au1xxx_psc.h | 26 -
3146 arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 31 +-
3147 arch/mips/include/asm/mach-au1x00/gpio.h | 79 ++-
3148 .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 -
3149 arch/mips/include/asm/mach-db1x00/db1200.h | 2 -
3150 arch/mips/include/asm/mach-db1x00/db1x00.h | 16 +-
3151 arch/mips/include/asm/mach-pb1x00/pb1200.h | 18 +-
3152 arch/mips/include/asm/mach-pb1x00/pb1550.h | 16 +-
3153 arch/mips/include/asm/mach-powertv/dma-coherence.h | 1 -
3154 arch/mips/include/asm/mipsregs.h | 8 +
3155 arch/mips/include/asm/regdef.h | 6 +
3156 arch/mips/include/asm/stackframe.h | 4 +-
3157 arch/mips/jz4740/gpio.c | 148 +--
3158 arch/mips/jz4740/irq.c | 92 +-
3159 arch/mips/jz4740/irq.h | 6 +-
3160 arch/mips/jz4740/pm.c | 3 -
3161 arch/mips/kernel/Makefile | 5 +-
3162 arch/mips/kernel/cpu-probe.c | 3 +
3163 arch/mips/kernel/ftrace.c | 39 +-
3164 arch/mips/kernel/i8259.c | 3 +-
3165 arch/mips/kernel/linux32.c | 7 +
3166 arch/mips/kernel/perf_event.c | 519 +--------
3167 arch/mips/kernel/perf_event_mipsxx.c | 1265 ++++++++++++++------
3168 arch/mips/kernel/scall64-n32.S | 2 +-
3169 arch/mips/kernel/scall64-o32.S | 2 +-
3170 arch/mips/kernel/signal.c | 3 +
3171 arch/mips/kernel/traps.c | 6 +-
3172 arch/mips/kernel/vpe.c | 2 +-
3173 arch/mips/lantiq/irq.c | 6 +-
3174 arch/mips/lantiq/xway/ebu.c | 1 -
3175 arch/mips/lantiq/xway/pmu.c | 1 -
3176 arch/mips/lasat/interrupt.c | 1 +
3177 arch/mips/loongson/fuloong-2e/irq.c | 1 +
3178 arch/mips/loongson/lemote-2f/irq.c | 3 +-
3179 arch/mips/mm/mmap.c | 48 +-
3180 arch/mips/mm/tlb-r3k.c | 4 +-
3181 arch/mips/mm/tlb-r4k.c | 4 +-
3182 arch/mips/mm/tlbex.c | 6 +-
3183 arch/mips/mti-malta/malta-int.c | 6 +-
3184 arch/mips/netlogic/xlr/Makefile | 2 +-
3185 arch/mips/netlogic/xlr/smp.c | 4 +
3186 arch/mips/pci/Makefile | 3 +-
3187 arch/mips/pci/fixup-au1000.c | 43 -
3188 arch/mips/pci/ops-au1000.c | 308 -----
3189 arch/mips/pci/pci-alchemy.c | 516 ++++++++
3190 arch/mips/pci/pci-lantiq.c | 9 +-
3191 arch/mips/pci/pci-rc32434.c | 2 +-
3192 arch/mips/pmc-sierra/msp71xx/msp_irq.c | 6 +-
3193 arch/mips/pnx8550/common/int.c | 2 +-
3194 arch/mips/sgi-ip22/ip22-int.c | 10 +-
3195 arch/mips/sni/rm200.c | 1 +
3196 arch/mips/vr41xx/common/irq.c | 1 +
3197 drivers/i2c/busses/Kconfig | 2 +-
3198 drivers/i2c/busses/i2c-au1550.c | 2 +-
3199 drivers/ide/Kconfig | 6 +-
3200 drivers/ide/au1xxx-ide.c | 46 +-
3201 drivers/mmc/host/Kconfig | 2 +-
3202 drivers/mmc/host/au1xmmc.c | 93 +-
3203 drivers/mtd/nand/Kconfig | 2 +-
3204 drivers/mtd/nand/au1550nd.c | 6 +-
3205 drivers/net/au1000_eth.c | 48 +-
3206 drivers/net/au1000_eth.h | 2 +-
3207 drivers/net/irda/Kconfig | 2 +-
3208 drivers/spi/Kconfig | 2 +-
3209 drivers/staging/octeon/ethernet-rx.c | 3 +-
3210 drivers/tty/serial/lantiq.c | 4 +-
3211 drivers/usb/Kconfig | 1 -
3212 drivers/usb/host/Makefile | 1 +
3213 drivers/usb/host/alchemy-common.c | 337 ++++++
3214 drivers/usb/host/ehci-au1xxx.c | 77 +-
3215 drivers/usb/host/ehci-hcd.c | 2 +-
3216 drivers/usb/host/ohci-au1xxx.c | 110 +--
3217 drivers/video/Kconfig | 4 +-
3218 sound/mips/Kconfig | 2 +-
3219 sound/soc/au1x/Kconfig | 2 +-
3220 112 files changed, 3571 insertions(+), 3184 deletions(-)
3221 rename arch/mips/alchemy/common/{gpiolib-au1000.c => gpiolib.c} (83%)
3222 delete mode 100644 arch/mips/alchemy/common/pci.c
3223 delete mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx.h
3224 delete mode 100644 arch/mips/pci/fixup-au1000.c
3225 delete mode 100644 arch/mips/pci/ops-au1000.c
3226 create mode 100644 arch/mips/pci/pci-alchemy.c
3227 create mode 100644 drivers/usb/host/alchemy-common.c
3228 Merging openrisc/for-upstream
3229 $ git merge openrisc/for-upstream
3231 Merging parisc/for-next
3232 $ git merge parisc/for-next
3234 Merging powerpc/next
3235 $ git merge powerpc/next
3236 Removing arch/powerpc/boot/dts/hcu4.dts
3237 Removing arch/powerpc/configs/40x/hcu4_defconfig
3238 Removing arch/powerpc/platforms/40x/hcu4.c
3239 Auto-merging drivers/gpio/Kconfig
3240 Auto-merging drivers/gpio/Makefile
3241 Auto-merging kernel/sched.c
3242 Merge made by recursive.
3243 arch/powerpc/Kconfig | 7 +-
3244 arch/powerpc/Kconfig.debug | 46 +-
3245 arch/powerpc/boot/Makefile | 3 +-
3246 arch/powerpc/boot/dts/digsy_mtc.dts | 59 +-
3247 arch/powerpc/boot/dts/hcu4.dts | 168 ---
3248 arch/powerpc/boot/dts/mpc5200b.dtsi | 2 +
3249 arch/powerpc/boot/dts/yosemite.dts | 36 +
3250 arch/powerpc/configs/40x/hcu4_defconfig | 80 --
3251 arch/powerpc/configs/85xx/p1023rds_defconfig | 2 +-
3252 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 2 +-
3253 arch/powerpc/configs/mpc512x_defconfig | 19 +-
3254 arch/powerpc/configs/mpc5200_defconfig | 12 +
3255 arch/powerpc/configs/mpc85xx_defconfig | 2 +-
3256 arch/powerpc/configs/mpc85xx_smp_defconfig | 2 +-
3257 arch/powerpc/configs/ppc40x_defconfig | 1 -
3258 arch/powerpc/configs/ppc6xx_defconfig | 2 +-
3259 arch/powerpc/include/asm/device.h | 2 +
3260 arch/powerpc/include/asm/firmware.h | 10 +
3261 arch/powerpc/include/asm/hugetlb.h | 63 ++-
3262 arch/powerpc/include/asm/kexec.h | 2 +-
3263 arch/powerpc/include/asm/machdep.h | 3 +-
3264 arch/powerpc/include/asm/mmu-book3e.h | 7 +
3265 arch/powerpc/include/asm/mmu-hash64.h | 3 +-
3266 arch/powerpc/include/asm/mmu.h | 18 +-
3267 arch/powerpc/include/asm/mpic.h | 2 -
3268 arch/powerpc/include/asm/opal.h | 443 ++++++++
3269 arch/powerpc/include/asm/paca.h | 8 +
3270 arch/powerpc/include/asm/page.h | 31 +-
3271 arch/powerpc/include/asm/page_64.h | 11 -
3272 arch/powerpc/include/asm/pte-book3e.h | 3 +
3273 arch/powerpc/include/asm/rtas.h | 6 +-
3274 arch/powerpc/include/asm/smp.h | 1 +
3275 arch/powerpc/include/asm/sparsemem.h | 2 +-
3276 arch/powerpc/include/asm/topology.h | 14 +-
3277 arch/powerpc/include/asm/udbg.h | 3 +
3278 arch/powerpc/include/asm/xics.h | 19 +
3279 arch/powerpc/kernel/asm-offsets.c | 10 +
3280 arch/powerpc/kernel/dma-iommu.c | 28 +-
3281 arch/powerpc/kernel/dma-swiotlb.c | 16 +
3282 arch/powerpc/kernel/dma.c | 44 +-
3283 arch/powerpc/kernel/exceptions-64s.S | 27 +-
3284 arch/powerpc/kernel/head_32.S | 7 +-
3285 arch/powerpc/kernel/head_40x.S | 15 +-
3286 arch/powerpc/kernel/head_44x.S | 16 +-
3287 arch/powerpc/kernel/head_64.S | 22 +-
3288 arch/powerpc/kernel/head_8xx.S | 13 +-
3289 arch/powerpc/kernel/head_fsl_booke.S | 175 +++-
3290 arch/powerpc/kernel/ibmebus.c | 22 +-
3291 arch/powerpc/kernel/iommu.c | 8 +
3292 arch/powerpc/kernel/legacy_serial.c | 25 +
3293 arch/powerpc/kernel/machine_kexec_64.c | 3 +-
3294 arch/powerpc/kernel/misc_32.S | 171 +++
3295 arch/powerpc/kernel/pci-common.c | 11 +
3296 arch/powerpc/kernel/power6-pmu.c | 4 +-
3297 arch/powerpc/kernel/power7-pmu.c | 2 +
3298 arch/powerpc/kernel/prom.c | 14 +
3299 arch/powerpc/kernel/prom_init.c | 383 ++++++-
3300 arch/powerpc/kernel/prom_init_check.sh | 4 +-
3301 arch/powerpc/kernel/ptrace.c | 18 +-
3302 arch/powerpc/kernel/setup_32.c | 2 +-
3303 arch/powerpc/kernel/setup_64.c | 22 +-
3304 arch/powerpc/kernel/smp.c | 30 +-
3305 arch/powerpc/kernel/swsusp.c | 2 +-
3306 arch/powerpc/kernel/udbg.c | 6 +
3307 arch/powerpc/kernel/vio.c | 21 +-
3308 arch/powerpc/mm/Makefile | 1 +
3309 arch/powerpc/mm/hash_utils_64.c | 9 +-
3310 arch/powerpc/mm/hugetlbpage-book3e.c | 121 +++
3311 arch/powerpc/mm/hugetlbpage.c | 379 ++++++-
3312 arch/powerpc/mm/init_32.c | 9 +
3313 arch/powerpc/mm/mem.c | 8 +-
3314 arch/powerpc/mm/mmu_context_hash64.c | 12 +-
3315 arch/powerpc/mm/mmu_context_nohash.c | 5 +
3316 arch/powerpc/mm/numa.c | 20 +-
3317 arch/powerpc/mm/pgtable.c | 3 +-
3318 arch/powerpc/mm/tlb_low_64e.S | 24 +-
3319 arch/powerpc/mm/tlb_nohash.c | 46 +-
3320 arch/powerpc/platforms/40x/Kconfig | 8 -
3321 arch/powerpc/platforms/40x/Makefile | 1 -
3322 arch/powerpc/platforms/40x/hcu4.c | 61 --
3323 arch/powerpc/platforms/512x/Kconfig | 1 +
3324 arch/powerpc/platforms/83xx/Kconfig | 9 +-
3325 arch/powerpc/platforms/85xx/Kconfig | 12 +-
3326 arch/powerpc/platforms/86xx/Kconfig | 1 +
3327 arch/powerpc/platforms/Kconfig | 11 +-
3328 arch/powerpc/platforms/Kconfig.cputype | 4 +-
3329 arch/powerpc/platforms/Makefile | 1 +
3330 arch/powerpc/platforms/cell/iommu.c | 21 +
3331 arch/powerpc/platforms/powernv/Kconfig | 16 +
3332 arch/powerpc/platforms/powernv/Makefile | 5 +
3333 arch/powerpc/platforms/powernv/opal-nvram.c | 88 ++
3334 arch/powerpc/platforms/powernv/opal-rtc.c | 97 ++
3335 arch/powerpc/platforms/powernv/opal-takeover.S | 140 +++
3336 arch/powerpc/platforms/powernv/opal-wrappers.S | 101 ++
3337 arch/powerpc/platforms/powernv/opal.c | 322 ++++++
3338 arch/powerpc/platforms/powernv/pci-p5ioc2.c | 234 ++++
3339 arch/powerpc/platforms/powernv/pci.c | 427 ++++++++
3340 arch/powerpc/platforms/powernv/pci.h | 48 +
3341 arch/powerpc/platforms/powernv/powernv.h | 16 +
3342 arch/powerpc/platforms/powernv/setup.c | 196 ++++
3343 arch/powerpc/platforms/powernv/smp.c | 182 ++++
3344 arch/powerpc/platforms/ps3/Kconfig | 12 +
3345 arch/powerpc/platforms/ps3/Makefile | 1 +
3346 arch/powerpc/platforms/ps3/gelic_udbg.c | 273 +++++
3347 arch/powerpc/platforms/ps3/system-bus.c | 7 +
3348 arch/powerpc/platforms/pseries/Kconfig | 1 +
3349 arch/powerpc/platforms/pseries/dlpar.c | 4 +
3350 arch/powerpc/platforms/pseries/eeh.c | 2 +-
3351 arch/powerpc/platforms/pseries/iommu.c | 34 +-
3352 arch/powerpc/platforms/pseries/nvram.c | 171 +++-
3353 arch/powerpc/platforms/wsp/Kconfig | 11 +-
3354 arch/powerpc/platforms/wsp/Makefile | 2 +
3355 arch/powerpc/platforms/wsp/ics.c | 48 +
3356 arch/powerpc/platforms/wsp/ics.h | 5 +
3357 arch/powerpc/platforms/wsp/msi.c | 102 ++
3358 arch/powerpc/platforms/wsp/msi.h | 19 +
3359 arch/powerpc/platforms/wsp/psr2.c | 4 +
3360 arch/powerpc/platforms/wsp/wsp.h | 3 +
3361 arch/powerpc/platforms/wsp/wsp_pci.c | 1133 ++++++++++++++++++++
3362 arch/powerpc/platforms/wsp/wsp_pci.h | 268 +++++
3363 arch/powerpc/sysdev/Makefile | 1 -
3364 arch/powerpc/sysdev/mpic.c | 24 +-
3365 arch/powerpc/sysdev/ppc4xx_pci.c | 101 ++-
3366 arch/powerpc/sysdev/ppc4xx_pci.h | 12 +
3367 arch/powerpc/sysdev/xics/Makefile | 1 +
3368 arch/powerpc/sysdev/xics/icp-native.c | 2 +-
3369 arch/powerpc/sysdev/xics/ics-opal.c | 244 +++++
3370 arch/powerpc/sysdev/xics/xics-common.c | 8 +-
3371 arch/powerpc/xmon/xmon.c | 4 +-
3372 drivers/edac/cpc925_edac.c | 67 ++-
3373 drivers/edac/ppc4xx_edac.c | 2 +-
3374 drivers/gpio/Kconfig | 8 +
3375 drivers/gpio/Makefile | 1 +
3376 .../mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c | 0
3377 drivers/net/ps3_gelic_net.c | 3 +
3378 drivers/net/ps3_gelic_net.h | 6 +
3379 drivers/of/fdt.c | 7 +-
3380 drivers/tty/hvc/Kconfig | 9 +
3381 drivers/tty/hvc/Makefile | 1 +
3382 drivers/tty/hvc/hvc_opal.c | 424 ++++++++
3383 drivers/tty/hvc/hvcs.c | 6 +-
3384 drivers/tty/hvc/hvsi_lib.c | 4 +-
3385 drivers/tty/serial/8250.c | 23 -
3386 include/linux/dma-mapping.h | 3 +
3387 include/linux/topology.h | 4 +
3388 kernel/sched.c | 2 -
3389 146 files changed, 7176 insertions(+), 745 deletions(-)
3390 delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
3391 delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
3392 create mode 100644 arch/powerpc/include/asm/opal.h
3393 create mode 100644 arch/powerpc/mm/hugetlbpage-book3e.c
3394 delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
3395 create mode 100644 arch/powerpc/platforms/powernv/Kconfig
3396 create mode 100644 arch/powerpc/platforms/powernv/Makefile
3397 create mode 100644 arch/powerpc/platforms/powernv/opal-nvram.c
3398 create mode 100644 arch/powerpc/platforms/powernv/opal-rtc.c
3399 create mode 100644 arch/powerpc/platforms/powernv/opal-takeover.S
3400 create mode 100644 arch/powerpc/platforms/powernv/opal-wrappers.S
3401 create mode 100644 arch/powerpc/platforms/powernv/opal.c
3402 create mode 100644 arch/powerpc/platforms/powernv/pci-p5ioc2.c
3403 create mode 100644 arch/powerpc/platforms/powernv/pci.c
3404 create mode 100644 arch/powerpc/platforms/powernv/pci.h
3405 create mode 100644 arch/powerpc/platforms/powernv/powernv.h
3406 create mode 100644 arch/powerpc/platforms/powernv/setup.c
3407 create mode 100644 arch/powerpc/platforms/powernv/smp.c
3408 create mode 100644 arch/powerpc/platforms/ps3/gelic_udbg.c
3409 create mode 100644 arch/powerpc/platforms/wsp/msi.c
3410 create mode 100644 arch/powerpc/platforms/wsp/msi.h
3411 create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.c
3412 create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.h
3413 create mode 100644 arch/powerpc/sysdev/xics/ics-opal.c
3414 rename arch/powerpc/sysdev/mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c (100%)
3415 create mode 100644 drivers/tty/hvc/hvc_opal.c
3417 $ git merge 4xx/next
3419 Merging 52xx-and-virtex/powerpc/next
3420 $ git merge 52xx-and-virtex/powerpc/next
3421 Merge made by recursive.
3422 arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++
3423 arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++-
3424 arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
3425 3 files changed, 249 insertions(+), 8 deletions(-)
3426 create mode 100644 arch/powerpc/boot/dts/charon.dts
3428 $ git merge galak/next
3430 Merging s390/features
3431 $ git merge s390/features
3432 Merge made by recursive.
3433 Documentation/kernel-parameters.txt | 6 +-
3434 arch/s390/Kconfig | 10 +
3435 arch/s390/defconfig | 2 +-
3436 arch/s390/include/asm/ccwdev.h | 3 +
3437 arch/s390/include/asm/compat.h | 13 +-
3438 arch/s390/include/asm/ipl.h | 1 +
3439 arch/s390/include/asm/irq.h | 3 +-
3440 arch/s390/include/asm/kexec.h | 6 +
3441 arch/s390/include/asm/lowcore.h | 10 +-
3442 arch/s390/include/asm/processor.h | 46 +++--
3443 arch/s390/include/asm/ptrace.h | 29 ++--
3444 arch/s390/include/asm/reset.h | 2 +-
3445 arch/s390/include/asm/setup.h | 9 +
3446 arch/s390/include/asm/smp.h | 5 +
3447 arch/s390/include/asm/syscall.h | 5 +-
3448 arch/s390/include/asm/system.h | 8 +-
3449 arch/s390/include/asm/thread_info.h | 3 +-
3450 arch/s390/kernel/Makefile | 1 +
3451 arch/s390/kernel/asm-offsets.c | 4 +-
3452 arch/s390/kernel/base.S | 6 +
3453 arch/s390/kernel/compat_linux.c | 9 +-
3454 arch/s390/kernel/compat_signal.c | 20 ++-
3455 arch/s390/kernel/crash_dump.c | 39 ++++
3456 arch/s390/kernel/early.c | 2 +-
3457 arch/s390/kernel/entry.S | 30 ++--
3458 arch/s390/kernel/entry64.S | 29 ++--
3459 arch/s390/kernel/head.S | 16 ++
3460 arch/s390/kernel/head_kdump.S | 116 ++++++++++++
3461 arch/s390/kernel/ipl.c | 17 ++-
3462 arch/s390/kernel/irq.c | 3 +-
3463 arch/s390/kernel/machine_kexec.c | 313 ++++++++++++++++++++++++++++++++-
3464 arch/s390/kernel/mem_detect.c | 69 +++++++
3465 arch/s390/kernel/process.c | 3 +-
3466 arch/s390/kernel/processor.c | 2 +-
3467 arch/s390/kernel/ptrace.c | 155 ++++++++++++++---
3468 arch/s390/kernel/reipl.S | 6 +
3469 arch/s390/kernel/reipl64.S | 9 +-
3470 arch/s390/kernel/setup.c | 275 +++++++++++++++++++++++++----
3471 arch/s390/kernel/signal.c | 123 +++++++------
3472 arch/s390/kernel/smp.c | 37 ++++-
3473 arch/s390/kernel/traps.c | 2 +-
3474 arch/s390/kernel/vtime.c | 9 +-
3475 arch/s390/lib/delay.c | 3 +-
3476 arch/s390/mm/fault.c | 4 +-
3477 arch/s390/mm/maccess.c | 56 ++++++
3478 arch/s390/mm/vmem.c | 6 +
3479 drivers/s390/block/dasd.c | 2 -
3480 drivers/s390/block/dasd_eckd.c | 1 +
3481 drivers/s390/block/dasd_fba.c | 1 +
3482 drivers/s390/char/con3215.c | 3 +-
3483 drivers/s390/char/raw3270.c | 3 +-
3484 drivers/s390/char/sclp_cmd.c | 4 +-
3485 drivers/s390/char/sclp_quiesce.c | 3 +-
3486 drivers/s390/char/tape_34xx.c | 1 +
3487 drivers/s390/char/tape_3590.c | 1 +
3488 drivers/s390/char/tape_core.c | 2 -
3489 drivers/s390/char/vmur.c | 3 +-
3490 drivers/s390/char/zcore.c | 20 +--
3491 drivers/s390/cio/ccwgroup.c | 333 ++++++++++++++--------------------
3492 drivers/s390/cio/ccwreq.c | 23 ++-
3493 drivers/s390/cio/chsc_sch.c | 5 +-
3494 drivers/s390/cio/cio.c | 19 ++-
3495 drivers/s390/cio/device.c | 13 ++
3496 drivers/s390/cio/device.h | 13 ++-
3497 drivers/s390/cio/io_sch.h | 2 +
3498 drivers/s390/cio/qdio_main.c | 2 -
3499 drivers/s390/net/claw.c | 3 +-
3500 drivers/s390/net/ctcm_main.c | 3 +-
3501 drivers/s390/net/lcs.c | 3 +-
3502 include/linux/crash_dump.h | 1 +
3503 include/linux/elf.h | 1 +
3504 include/linux/kexec.h | 10 +
3505 kernel/crash_dump.c | 11 ++
3506 kernel/kexec.c | 41 +++--
3507 74 files changed, 1545 insertions(+), 507 deletions(-)
3508 create mode 100644 arch/s390/kernel/crash_dump.c
3509 create mode 100644 arch/s390/kernel/head_kdump.S
3510 Merging sh/sh-latest
3511 $ git merge sh/sh-latest
3512 Merge made by recursive.
3513 arch/sh/boards/mach-ecovec24/setup.c | 4 ++++
3514 1 files changed, 4 insertions(+), 0 deletions(-)
3515 Merging rmobile/rmobile-latest
3516 $ git merge rmobile/rmobile-latest
3517 Merge made by recursive.
3518 arch/arm/mach-shmobile/include/mach/sh73a0.h | 13 ++++
3519 arch/arm/mach-shmobile/pfc-sh73a0.c | 77 +++++++++++++++++++++-----
3520 2 files changed, 75 insertions(+), 15 deletions(-)
3521 Merging sparc/master
3522 $ git merge sparc/master
3525 $ git merge tile/master
3526 Merge made by recursive.
3527 arch/tile/kernel/intvec_32.S | 2 +-
3528 arch/tile/lib/atomic_asm_32.S | 2 +-
3529 fs/nfs/nfs4filelayout.c | 6 +++---
3530 3 files changed, 5 insertions(+), 5 deletions(-)
3531 Merging unicore32/unicore32
3532 $ git merge unicore32/unicore32
3533 Merge made by recursive.
3534 arch/unicore32/boot/compressed/Makefile | 4 ++--
3535 arch/unicore32/include/asm/bitops.h | 12 ++++++------
3536 arch/unicore32/kernel/ksyms.c | 4 ++--
3537 arch/unicore32/lib/findbit.S | 14 ++++++++------
3538 4 files changed, 18 insertions(+), 16 deletions(-)
3539 Merging xtensa/master
3540 $ git merge xtensa/master
3541 Merge made by recursive.
3542 arch/xtensa/include/asm/irqflags.h | 1 +
3543 arch/xtensa/include/asm/regs.h | 91 ++++++++++++++++++---------------
3544 arch/xtensa/include/asm/timex.h | 4 +-
3545 arch/xtensa/include/asm/uaccess.h | 2 +-
3546 arch/xtensa/kernel/align.S | 14 +++---
3547 arch/xtensa/kernel/coprocessor.S | 10 ++--
3548 arch/xtensa/kernel/entry.S | 98 ++++++++++++++++++------------------
3549 arch/xtensa/kernel/head.S | 12 ++--
3550 arch/xtensa/kernel/irq.c | 5 ++
3551 arch/xtensa/kernel/traps.c | 4 +-
3552 arch/xtensa/kernel/vectors.S | 22 ++++----
3553 arch/xtensa/kernel/vmlinux.lds.S | 1 +
3554 12 files changed, 139 insertions(+), 125 deletions(-)
3555 Merging ceph/for-next
3556 $ git merge ceph/for-next
3557 Auto-merging fs/ceph/caps.c
3558 Auto-merging fs/ceph/inode.c
3559 Auto-merging fs/ceph/super.h
3560 Auto-merging include/linux/ceph/libceph.h
3561 Auto-merging net/ceph/ceph_common.c
3562 Auto-merging net/ceph/messenger.c
3563 Auto-merging net/ceph/osd_client.c
3564 Merge made by recursive.
3565 drivers/block/rbd.c | 2 +-
3566 fs/ceph/addr.c | 192 +++++++++++++++++++++++++---------------
3567 fs/ceph/caps.c | 2 +-
3568 fs/ceph/inode.c | 46 +---------
3569 fs/ceph/ioctl.c | 34 ++++++--
3570 fs/ceph/ioctl.h | 55 +++++++++++-
3571 fs/ceph/mds_client.c | 11 ++-
3572 fs/ceph/super.c | 61 ++++++++-----
3573 fs/ceph/super.h | 8 +-
3574 include/linux/ceph/libceph.h | 4 +-
3575 include/linux/ceph/messenger.h | 3 +-
3576 net/ceph/ceph_common.c | 47 +++++-----
3577 net/ceph/messenger.c | 16 +++-
3578 net/ceph/mon_client.c | 79 +++++++++--------
3579 net/ceph/msgpool.c | 4 +-
3580 net/ceph/osd_client.c | 8 +-
3581 16 files changed, 344 insertions(+), 228 deletions(-)
3583 $ git merge cifs/master
3585 Merging configfs/linux-next
3586 $ git merge configfs/linux-next
3588 Merging ecryptfs/next
3589 $ git merge ecryptfs/next
3591 Merging ext3/for_next
3592 $ git merge ext3/for_next
3595 $ git merge ext4/dev
3597 Merging fatfs/master
3598 $ git merge fatfs/master
3600 Merging fuse/for-next
3601 $ git merge fuse/for-next
3604 $ git merge gfs2/master
3605 Auto-merging fs/gfs2/acl.c
3606 Auto-merging fs/gfs2/quota.c
3607 Merge made by recursive.
3608 fs/gfs2/acl.c | 5 +-
3609 fs/gfs2/aops.c | 6 ---
3610 fs/gfs2/dir.c | 42 +++++---------------
3611 fs/gfs2/file.c | 50 ++++++++++++++++++------
3612 fs/gfs2/glops.c | 29 +++++++++++---
3613 fs/gfs2/incore.h | 1 +
3614 fs/gfs2/inode.c | 85 +++++++++++++++--------------------------
3615 fs/gfs2/inode.h | 2 +-
3616 fs/gfs2/quota.c | 13 +-----
3617 fs/gfs2/super.c | 111 +++++++++++++++++++++++++++++++++++-------------------
3618 fs/gfs2/xattr.c | 5 +-
3619 11 files changed, 182 insertions(+), 167 deletions(-)
3620 Merging hfsplus/for-next
3621 $ git merge hfsplus/for-next
3624 $ git merge jfs/next
3626 Merging logfs/master
3627 $ git merge logfs/master
3628 Auto-merging fs/logfs/logfs.h
3629 Merge made by recursive.
3630 fs/logfs/dev_mtd.c | 26 ++++++++++++--------------
3631 fs/logfs/logfs.h | 1 +
3632 fs/logfs/readwrite.c | 4 ++++
3633 fs/logfs/segment.c | 14 ++++++++++----
3634 fs/logfs/super.c | 1 +
3635 5 files changed, 28 insertions(+), 18 deletions(-)
3636 Merging nfs/linux-next
3637 $ git merge nfs/linux-next
3639 Merging nfsd/nfsd-next
3640 $ git merge nfsd/nfsd-next
3641 Auto-merging fs/compat.c
3642 Auto-merging fs/nfs/nfs4_fs.h
3643 Auto-merging include/linux/fs.h
3644 Removing include/linux/nfsd/const.h
3645 Removing include/linux/nfsd/syscall.h
3646 Merge made by recursive.
3647 arch/alpha/include/asm/fcntl.h | 2 -
3649 fs/lockd/host.c | 25 +-
3650 fs/lockd/svc.c | 2 +-
3651 fs/locks.c | 223 ++++---
3652 fs/nfs/callback.c | 4 +-
3653 fs/nfs/nfs4_fs.h | 24 -
3654 fs/nfsd/export.c | 16 +-
3655 fs/nfsd/nfs4callback.c | 2 +-
3656 fs/nfsd/nfs4proc.c | 346 ++++++++--
3657 fs/nfsd/nfs4recover.c | 53 ++-
3658 fs/nfsd/nfs4state.c | 1431 ++++++++++++++++++----------------------
3659 fs/nfsd/nfs4xdr.c | 227 ++++---
3660 fs/nfsd/nfsctl.c | 1 -
3661 fs/nfsd/nfsd.h | 33 +
3662 fs/nfsd/nfsfh.c | 39 +-
3663 fs/nfsd/state.h | 128 ++--
3664 fs/nfsd/vfs.c | 29 +-
3665 fs/nfsd/vfs.h | 27 +-
3666 fs/nfsd/xdr4.h | 15 +-
3667 include/asm-generic/fcntl.h | 5 -
3668 include/linux/fs.h | 8 +-
3669 include/linux/nfs4.h | 16 +
3670 include/linux/nfsd/Kbuild | 2 -
3671 include/linux/nfsd/const.h | 55 --
3672 include/linux/nfsd/export.h | 2 +-
3673 include/linux/nfsd/nfsfh.h | 7 +-
3674 include/linux/nfsd/syscall.h | 116 ----
3675 include/linux/sunrpc/clnt.h | 8 +-
3676 include/linux/sunrpc/svc.h | 32 +-
3677 net/sunrpc/svc.c | 33 +-
3678 net/sunrpc/svc_xprt.c | 13 +-
3679 net/sunrpc/svcsock.c | 23 +-
3680 33 files changed, 1512 insertions(+), 1436 deletions(-)
3681 delete mode 100644 include/linux/nfsd/const.h
3682 delete mode 100644 include/linux/nfsd/syscall.h
3683 Merging nilfs2/for-next
3684 $ git merge nilfs2/for-next
3686 Merging ocfs2/linux-next
3687 $ git merge ocfs2/linux-next
3688 Auto-merging fs/ocfs2/file.c
3689 Auto-merging fs/ocfs2/move_extents.c
3690 Merge made by recursive.
3691 fs/ocfs2/aops.c | 69 +++++++++++++--
3692 fs/ocfs2/aops.h | 14 +++
3693 fs/ocfs2/cluster/heartbeat.c | 194 ++++++++++++++++++++++++++----------------
3694 fs/ocfs2/cluster/netdebug.c | 102 +++++++++++++++-------
3695 fs/ocfs2/cluster/tcp.c | 138 ++++++++++++++++--------------
3696 fs/ocfs2/cluster/tcp.h | 2 +
3697 fs/ocfs2/dir.c | 3 +-
3698 fs/ocfs2/dlm/dlmcommon.h | 56 +++----------
3699 fs/ocfs2/dlm/dlmdomain.c | 44 +++++-----
3700 fs/ocfs2/dlm/dlmlock.c | 54 ++++++------
3701 fs/ocfs2/dlm/dlmmaster.c | 175 +++++++++++++++++++-------------------
3702 fs/ocfs2/dlm/dlmrecovery.c | 164 ++++++++++++++++++------------------
3703 fs/ocfs2/dlm/dlmthread.c | 16 ++--
3704 fs/ocfs2/dlmglue.c | 21 +++--
3705 fs/ocfs2/extent_map.c | 96 +++++++++++++++++++++
3706 fs/ocfs2/extent_map.h | 2 +
3707 fs/ocfs2/file.c | 93 ++++++++++++++++++++-
3708 fs/ocfs2/inode.h | 3 +
3709 fs/ocfs2/ioctl.c | 8 +-
3710 fs/ocfs2/journal.c | 23 +++++-
3711 fs/ocfs2/mmap.c | 53 +++++------
3712 fs/ocfs2/move_extents.c | 2 +-
3713 fs/ocfs2/ocfs2.h | 4 +-
3714 fs/ocfs2/quota_local.c | 13 ++-
3715 fs/ocfs2/slot_map.c | 4 +-
3716 fs/ocfs2/stack_o2cb.c | 71 ++++++++++++++--
3717 fs/ocfs2/super.c | 23 +++--
3718 fs/ocfs2/xattr.c | 9 ++-
3719 28 files changed, 932 insertions(+), 524 deletions(-)
3720 Merging omfs/for-next
3721 $ git merge omfs/for-next
3723 Merging squashfs/master
3724 $ git merge squashfs/master
3726 Merging udf/for_next
3727 $ git merge udf/for_next
3729 Merging v9fs/for-next
3730 $ git merge v9fs/for-next
3731 Merge made by recursive.
3732 Documentation/filesystems/9p.txt | 2 +-
3733 fs/9p/v9fs.c | 33 ++-
3734 fs/9p/vfs_dir.c | 14 +-
3735 fs/9p/vfs_inode.c | 2 -
3736 include/net/9p/9p.h | 14 +-
3737 include/net/9p/client.h | 8 +-
3738 include/net/9p/transport.h | 10 +-
3739 include/trace/events/9p.h | 176 ++++++++++++++
3740 net/9p/client.c | 469 +++++++++++++++++++++++++++-----------
3741 net/9p/protocol.c | 99 +-------
3742 net/9p/protocol.h | 4 +-
3743 net/9p/trans_common.c | 53 ++---
3744 net/9p/trans_common.h | 21 +--
3745 net/9p/trans_virtio.c | 319 +++++++++++++++-----------
3746 14 files changed, 772 insertions(+), 452 deletions(-)
3747 create mode 100644 include/trace/events/9p.h
3748 Merging ubifs/linux-next
3749 $ git merge ubifs/linux-next
3752 $ git merge xfs/master
3753 Resolved 'fs/xfs/xfs_aops.c' using previous resolution.
3754 Resolved 'fs/xfs/xfs_super.c' using previous resolution.
3755 Auto-merging fs/xfs/xfs_aops.c
3756 CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
3757 Auto-merging fs/xfs/xfs_iops.c
3758 Auto-merging fs/xfs/xfs_super.c
3759 CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
3760 Automatic merge failed; fix conflicts and then commit the result.
3762 [master 8bc90d3] Merge remote-tracking branch 'xfs/master'
3763 $ git diff -M --stat --summary HEAD^..
3764 fs/xfs/xfs_aops.c | 118 +--
3765 fs/xfs/xfs_aops.h | 4 +-
3766 fs/xfs/xfs_attr.c | 88 +-
3767 fs/xfs/xfs_attr_leaf.c | 7 +-
3768 fs/xfs/xfs_bmap.c | 2531 +++++++++++++++++++++++-----------------------
3769 fs/xfs/xfs_bmap.h | 318 ++-----
3770 fs/xfs/xfs_btree.c | 3 +-
3771 fs/xfs/xfs_buf.c | 161 ++--
3772 fs/xfs/xfs_buf.h | 15 +-
3773 fs/xfs/xfs_buf_item.c | 4 +-
3774 fs/xfs/xfs_da_btree.c | 43 +-
3775 fs/xfs/xfs_dfrag.c | 6 +-
3776 fs/xfs/xfs_dir2_leaf.c | 6 +-
3777 fs/xfs/xfs_discard.c | 20 +-
3778 fs/xfs/xfs_dquot.c | 30 +-
3779 fs/xfs/xfs_export.c | 12 +-
3780 fs/xfs/xfs_file.c | 168 +++-
3781 fs/xfs/xfs_filestream.c | 4 +-
3782 fs/xfs/xfs_fsops.c | 60 +-
3783 fs/xfs/xfs_ialloc.c | 13 +-
3784 fs/xfs/xfs_iget.c | 2 -
3785 fs/xfs/xfs_inode.c | 33 +-
3786 fs/xfs/xfs_inode.h | 1 -
3787 fs/xfs/xfs_inode_item.c | 4 +-
3788 fs/xfs/xfs_ioctl.c | 2 +-
3789 fs/xfs/xfs_iomap.c | 39 +-
3790 fs/xfs/xfs_iops.c | 14 +-
3791 fs/xfs/xfs_log_recover.c | 18 +-
3792 fs/xfs/xfs_mount.c | 31 +-
3793 fs/xfs/xfs_qm.c | 10 +-
3794 fs/xfs/xfs_qm_syscalls.c | 2 +-
3795 fs/xfs/xfs_rename.c | 8 +-
3796 fs/xfs/xfs_rtalloc.c | 48 +-
3797 fs/xfs/xfs_rw.c | 2 +-
3798 fs/xfs/xfs_super.c | 9 +-
3799 fs/xfs/xfs_sync.c | 14 +-
3800 fs/xfs/xfs_trace.h | 2 +-
3801 fs/xfs/xfs_trans.c | 13 +-
3802 fs/xfs/xfs_trans.h | 8 +-
3803 fs/xfs/xfs_trans_ail.c | 33 +-
3804 fs/xfs/xfs_trans_buf.c | 5 +-
3805 fs/xfs/xfs_trans_inode.c | 25 +-
3806 fs/xfs/xfs_trans_priv.h | 1 +
3807 fs/xfs/xfs_vnodeops.c | 98 +-
3808 44 files changed, 1893 insertions(+), 2140 deletions(-)
3809 Merging vfs/for-next
3810 $ git merge vfs/for-next
3812 Merging vfs-scale/vfs-scale-working
3813 $ git merge vfs-scale/vfs-scale-working
3815 Merging pci/linux-next
3816 $ git merge pci/linux-next
3818 Merging hid/for-next
3819 $ git merge hid/for-next
3820 Auto-merging MAINTAINERS
3821 Merge made by recursive.
3822 .../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 7 +
3824 drivers/hid/Kconfig | 29 +-
3825 drivers/hid/Makefile | 3 +-
3826 drivers/hid/hid-apple.c | 15 +
3827 drivers/hid/hid-axff.c | 36 +-
3828 drivers/hid/hid-core.c | 75 ++-
3829 drivers/hid/hid-debug.c | 5 +
3830 drivers/hid/hid-ids.h | 15 +
3831 drivers/hid/hid-input.c | 11 +
3832 drivers/hid/hid-lg.c | 29 +-
3833 drivers/hid/hid-lg.h | 4 +-
3834 drivers/hid/hid-lg4ff.c | 403 ++++++++-
3835 drivers/hid/hid-lgff.c | 13 -
3836 drivers/hid/hid-logitech-dj.c | 922 ++++++++++++++++++++
3837 drivers/hid/hid-logitech-dj.h | 123 +++
3838 drivers/hid/hid-multitouch.c | 93 ++-
3839 drivers/hid/hid-prodikeys.c | 8 +-
3840 drivers/hid/hid-roccat-kone.c | 63 +-
3841 drivers/hid/hid-roccat-kovaplus.c | 17 +-
3842 drivers/hid/hid-roccat-pyra.c | 23 +-
3843 drivers/hid/hid-sjoy.c | 68 +-
3844 drivers/hid/hid-wiimote.c | 800 +++++++++++++++++-
3845 drivers/hid/hid-zydacron.c | 4 +-
3846 drivers/hid/hidraw.c | 11 +-
3847 drivers/hid/usbhid/hid-quirks.c | 1 -
3848 drivers/hid/usbhid/hiddev.c | 2 +
3849 include/linux/hid.h | 3 +
3850 28 files changed, 2606 insertions(+), 183 deletions(-)
3851 create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
3852 create mode 100644 drivers/hid/hid-logitech-dj.c
3853 create mode 100644 drivers/hid/hid-logitech-dj.h
3855 $ git merge quilt/i2c
3856 Auto-merging drivers/i2c/busses/Kconfig
3857 Merge made by recursive.
3858 drivers/i2c/busses/Kconfig | 2 +-
3859 1 files changed, 1 insertions(+), 1 deletions(-)
3860 Merging bjdooks-i2c/next-i2c
3861 $ git merge bjdooks-i2c/next-i2c
3862 Merge made by recursive.
3863 .../devicetree/bindings/i2c/fsl-imx-i2c.txt | 25 ++++
3864 .../devicetree/bindings/i2c/samsung-i2c.txt | 39 ++++++
3865 arch/arm/plat-mxc/include/mach/i2c.h | 4 -
3866 arch/arm/plat-omap/i2c.c | 27 ++++
3867 drivers/i2c/busses/i2c-imx.c | 46 ++++----
3868 drivers/i2c/busses/i2c-omap.c | 99 ++++++++-------
3869 drivers/i2c/busses/i2c-s3c2410.c | 128 ++++++++++++++++++--
3870 include/linux/i2c-omap.h | 2 +
3871 8 files changed, 289 insertions(+), 81 deletions(-)
3872 create mode 100644 Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt
3873 create mode 100644 Documentation/devicetree/bindings/i2c/samsung-i2c.txt
3874 Merging quilt/jdelvare-hwmon
3875 $ git merge quilt/jdelvare-hwmon
3876 Merge made by recursive.
3877 drivers/hwmon/Kconfig | 15 ++++-
3878 drivers/hwmon/ibmaem.c | 60 ++++++++++--------
3879 drivers/hwmon/lm90.c | 146 +++++++++++++++++++++----------------------
3880 drivers/hwmon/smsc47b397.c | 13 +++--
3881 4 files changed, 126 insertions(+), 108 deletions(-)
3882 Merging hwmon-staging/hwmon-next
3883 $ git merge hwmon-staging/hwmon-next
3884 Auto-merging drivers/hwmon/Kconfig
3885 Merge made by recursive.
3886 Documentation/hwmon/ad7314 | 25 ++
3887 Documentation/hwmon/adm1275 | 40 ++-
3888 Documentation/hwmon/exynos4_tmu | 81 +++++
3889 Documentation/hwmon/ltc2978 | 103 ++++++
3890 Documentation/hwmon/pmbus | 13 +-
3891 Documentation/hwmon/pmbus-core | 283 ++++++++++++++++
3892 Documentation/hwmon/zl6100 | 125 +++++++
3893 drivers/hwmon/Kconfig | 20 ++
3894 drivers/hwmon/Makefile | 2 +
3895 drivers/hwmon/ad7314.c | 186 ++++++++++
3896 drivers/hwmon/exynos4_tmu.c | 524 +++++++++++++++++++++++++++++
3897 drivers/hwmon/f71882fg.c | 231 +++++++------
3898 drivers/hwmon/pmbus/Kconfig | 28 ++-
3899 drivers/hwmon/pmbus/Makefile | 2 +
3900 drivers/hwmon/pmbus/adm1275.c | 159 ++++++++-
3901 drivers/hwmon/pmbus/lm25066.c | 17 +-
3902 drivers/hwmon/pmbus/ltc2978.c | 408 ++++++++++++++++++++++
3903 drivers/hwmon/pmbus/max16064.c | 3 +-
3904 drivers/hwmon/pmbus/max34440.c | 13 +-
3905 drivers/hwmon/pmbus/max8688.c | 9 +-
3906 drivers/hwmon/pmbus/pmbus.c | 10 +-
3907 drivers/hwmon/pmbus/pmbus.h | 23 ++-
3908 drivers/hwmon/pmbus/pmbus_core.c | 85 +++--
3909 drivers/hwmon/pmbus/ucd9000.c | 13 +-
3910 drivers/hwmon/pmbus/ucd9200.c | 5 +-
3911 drivers/hwmon/pmbus/zl6100.c | 256 ++++++++++++++
3912 drivers/hwmon/w83627ehf.c | 62 ++++
3913 include/linux/platform_data/exynos4_tmu.h | 83 +++++
3914 28 files changed, 2593 insertions(+), 216 deletions(-)
3915 create mode 100644 Documentation/hwmon/ad7314
3916 create mode 100644 Documentation/hwmon/exynos4_tmu
3917 create mode 100644 Documentation/hwmon/ltc2978
3918 create mode 100644 Documentation/hwmon/pmbus-core
3919 create mode 100644 Documentation/hwmon/zl6100
3920 create mode 100644 drivers/hwmon/ad7314.c
3921 create mode 100644 drivers/hwmon/exynos4_tmu.c
3922 create mode 100644 drivers/hwmon/pmbus/ltc2978.c
3923 create mode 100644 drivers/hwmon/pmbus/zl6100.c
3924 create mode 100644 include/linux/platform_data/exynos4_tmu.h
3925 Merging quilt/kernel-doc
3926 $ git merge quilt/kernel-doc
3927 Merge made by recursive.
3928 Documentation/CodingStyle | 4 ++--
3929 Documentation/PCI/pci.txt | 4 ++--
3930 Documentation/block/switching-sched.txt | 4 ++--
3931 Documentation/cgroups/cgroups.txt | 4 ++--
3932 Documentation/filesystems/hfs.txt | 9 ++++-----
3933 Documentation/filesystems/inotify.txt | 3 ++-
3934 Documentation/laptops/thinkpad-acpi.txt | 4 ++--
3935 Documentation/leds/leds-class.txt | 4 ++--
3936 Documentation/serial/computone.txt | 2 --
3937 9 files changed, 18 insertions(+), 20 deletions(-)
3938 Merging docs/docs-move
3939 $ git merge docs/docs-move
3940 Auto-merging drivers/gpu/drm/i915/i915_drv.c
3941 Merge made by recursive.
3942 Documentation/DocBook/drm.tmpl | 308 +++++++++++++++++++++------------------
3943 drivers/gpu/drm/i915/i915_drv.c | 4 +-
3944 2 files changed, 170 insertions(+), 142 deletions(-)
3945 Merging v4l-dvb/master
3946 $ git merge v4l-dvb/master
3947 Auto-merging MAINTAINERS
3948 Auto-merging drivers/media/dvb/frontends/a8293.h
3949 Auto-merging drivers/media/rc/ati_remote.c
3950 Auto-merging drivers/media/video/tm6000/tm6000-alsa.c
3951 Auto-merging drivers/media/video/tm6000/tm6000-cards.c
3952 Auto-merging drivers/media/video/tm6000/tm6000-core.c
3953 Auto-merging drivers/media/video/tm6000/tm6000-dvb.c
3954 Auto-merging drivers/media/video/tm6000/tm6000-i2c.c
3955 Auto-merging drivers/media/video/tm6000/tm6000-input.c
3956 Auto-merging drivers/media/video/tm6000/tm6000-regs.h
3957 Auto-merging drivers/media/video/tm6000/tm6000-usb-isoc.h
3958 Auto-merging drivers/media/video/tm6000/tm6000-video.c
3959 Auto-merging drivers/media/video/tm6000/tm6000.h
3960 Auto-merging drivers/misc/altera-stapl/Kconfig
3961 Auto-merging drivers/misc/altera-stapl/altera-jtag.c
3962 Auto-merging drivers/misc/altera-stapl/altera.c
3963 Removing drivers/staging/altera-stapl/Makefile
3964 Removing drivers/staging/tm6000/README
3965 Removing drivers/staging/tm6000/TODO
3966 Removing drivers/staging/tm6000/tm6000-stds.c
3967 Merge made by recursive.
3968 Documentation/DocBook/media/dvb/dvbproperty.xml | 24 +-
3969 Documentation/DocBook/media/dvb/intro.xml | 2 +-
3970 Documentation/DocBook/media/v4l/compat.xml | 8 +
3971 Documentation/DocBook/media/v4l/v4l2.xml | 9 +-
3972 Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 129 +
3973 .../DocBook/media/v4l/vidioc-queryctrl.xml | 9 +
3974 .../DocBook/media/v4l/vidioc-subscribe-event.xml | 123 +-
3975 Documentation/dvb/get_dvb_firmware | 38 +-
3976 Documentation/dvb/it9137.txt | 9 +
3977 Documentation/feature-removal-schedule.txt | 23 -
3978 .../video4linux/CARDLIST.tm6000 | 0
3979 Documentation/video4linux/gspca.txt | 4 +
3980 Documentation/video4linux/omap3isp.txt | 9 +-
3981 Documentation/video4linux/v4l2-controls.txt | 43 +-
3983 drivers/input/misc/Kconfig | 16 -
3984 drivers/input/misc/Makefile | 1 -
3985 drivers/media/common/saa7146_core.c | 74 +-
3986 drivers/media/common/saa7146_fops.c | 118 +-
3987 drivers/media/common/saa7146_hlp.c | 14 +-
3988 drivers/media/common/saa7146_i2c.c | 60 +-
3989 drivers/media/common/saa7146_vbi.c | 48 +-
3990 drivers/media/common/saa7146_video.c | 183 +-
3991 drivers/media/common/tuners/Makefile | 4 +-
3992 drivers/media/common/tuners/mt20xx.c | 24 +-
3993 drivers/media/common/tuners/mxl5005s.c | 22 +-
3994 drivers/media/common/tuners/tda18212.c | 31 +-
3995 drivers/media/common/tuners/tda18271-common.c | 32 +-
3996 drivers/media/common/tuners/tda18271-fe.c | 2 +-
3997 drivers/media/common/tuners/tda18271-priv.h | 39 +-
3998 drivers/media/common/tuners/tda827x.c | 8 +-
3999 drivers/media/common/tuners/tuner-xc2028.c | 18 +-
4000 drivers/media/common/tuners/tuner-xc2028.h | 1 +
4001 drivers/media/dvb/b2c2/Makefile | 4 +-
4002 drivers/media/dvb/bt8xx/Makefile | 8 +-
4003 drivers/media/dvb/ddbridge/Makefile | 8 +-
4004 drivers/media/dvb/ddbridge/ddbridge-core.c | 43 +-
4005 drivers/media/dvb/dm1105/Makefile | 2 +-
4006 drivers/media/dvb/dvb-core/dvb_frontend.c | 95 +-
4007 drivers/media/dvb/dvb-core/dvb_frontend.h | 1 +
4008 drivers/media/dvb/dvb-usb/Kconfig | 28 +
4009 drivers/media/dvb/dvb-usb/Makefile | 15 +-
4010 drivers/media/dvb/dvb-usb/a800.c | 4 +-
4011 drivers/media/dvb/dvb-usb/af9005-fe.c | 2 -
4012 drivers/media/dvb/dvb-usb/af9005.c | 5 +-
4013 drivers/media/dvb/dvb-usb/af9015.c | 70 +-
4014 drivers/media/dvb/dvb-usb/anysee.c | 337 +-
4015 drivers/media/dvb/dvb-usb/anysee.h | 1 +
4016 drivers/media/dvb/dvb-usb/au6610.c | 9 +-
4017 drivers/media/dvb/dvb-usb/az6027.c | 26 +-
4018 drivers/media/dvb/dvb-usb/ce6230.c | 9 +-
4019 drivers/media/dvb/dvb-usb/cinergyT2-core.c | 5 +-
4020 drivers/media/dvb/dvb-usb/cxusb.c | 142 +-
4021 drivers/media/dvb/dvb-usb/dib0700_core.c | 99 +-
4022 drivers/media/dvb/dvb-usb/dib0700_devices.c | 377 +-
4023 drivers/media/dvb/dvb-usb/dibusb-common.c | 27 +-
4024 drivers/media/dvb/dvb-usb/dibusb-mb.c | 31 +-
4025 drivers/media/dvb/dvb-usb/dibusb-mc.c | 3 +
4026 drivers/media/dvb/dvb-usb/digitv.c | 16 +-
4027 drivers/media/dvb/dvb-usb/dtt200u.c | 14 +-
4028 drivers/media/dvb/dvb-usb/dtv5100.c | 11 +-
4029 drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 153 +-
4030 drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 4 +
4031 drivers/media/dvb/dvb-usb/dvb-usb-init.c | 41 +-
4032 drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 28 +-
4033 drivers/media/dvb/dvb-usb/dvb-usb.h | 37 +-
4034 drivers/media/dvb/dvb-usb/dw2102.c | 115 +-
4035 drivers/media/dvb/dvb-usb/ec168.c | 9 +-
4036 drivers/media/dvb/dvb-usb/friio.c | 7 +-
4037 drivers/media/dvb/dvb-usb/gl861.c | 9 +-
4038 drivers/media/dvb/dvb-usb/gp8psk-fe.c | 17 +-
4039 drivers/media/dvb/dvb-usb/gp8psk.c | 5 +-
4040 drivers/media/dvb/dvb-usb/it913x.c | 651 +++
4041 drivers/media/dvb/dvb-usb/lmedm04.c | 60 +-
4042 drivers/media/dvb/dvb-usb/m920x.c | 58 +-
4043 drivers/media/dvb/dvb-usb/mxl111sf-gpio.c | 763 +++
4044 drivers/media/dvb/dvb-usb/mxl111sf-gpio.h | 56 +
4045 drivers/media/dvb/dvb-usb/mxl111sf-i2c.c | 851 ++++
4046 drivers/media/dvb/dvb-usb/mxl111sf-i2c.h | 35 +
4047 drivers/media/dvb/dvb-usb/mxl111sf-phy.c | 342 ++
4048 drivers/media/dvb/dvb-usb/mxl111sf-phy.h | 53 +
4049 drivers/media/dvb/dvb-usb/mxl111sf-reg.h | 179 +
4050 drivers/media/dvb/dvb-usb/mxl111sf-tuner.c | 476 ++
4051 drivers/media/dvb/dvb-usb/mxl111sf-tuner.h | 89 +
4052 drivers/media/dvb/dvb-usb/mxl111sf.c | 864 ++++
4053 drivers/media/dvb/dvb-usb/mxl111sf.h | 158 +
4054 drivers/media/dvb/dvb-usb/nova-t-usb2.c | 4 +-
4055 drivers/media/dvb/dvb-usb/opera1.c | 13 +-
4056 drivers/media/dvb/dvb-usb/pctv452e.c | 1093 +++++
4057 drivers/media/dvb/dvb-usb/technisat-usb2.c | 28 +-
4058 drivers/media/dvb/dvb-usb/ttusb2.c | 407 ++-
4059 drivers/media/dvb/dvb-usb/umt-010.c | 8 +-
4060 drivers/media/dvb/dvb-usb/usb-urb.c | 4 +-
4061 drivers/media/dvb/dvb-usb/vp702x.c | 5 +-
4062 drivers/media/dvb/dvb-usb/vp7045.c | 5 +-
4063 drivers/media/dvb/frontends/Kconfig | 30 +
4064 drivers/media/dvb/frontends/Makefile | 8 +-
4065 drivers/media/dvb/frontends/a8293.c | 184 +
4066 .../tda18212_priv.h => dvb/frontends/a8293.h} | 39 +-
4067 drivers/media/dvb/frontends/cxd2820r.h | 9 -
4068 drivers/media/dvb/frontends/cxd2820r_c.c | 1 -
4069 drivers/media/dvb/frontends/cxd2820r_core.c | 80 +-
4070 drivers/media/dvb/frontends/cxd2820r_priv.h | 1 -
4071 drivers/media/dvb/frontends/cxd2820r_t.c | 1 -
4072 drivers/media/dvb/frontends/cxd2820r_t2.c | 1 -
4073 drivers/media/dvb/frontends/dib0070.c | 37 +-
4074 drivers/media/dvb/frontends/dib0090.c | 70 +-
4075 drivers/media/dvb/frontends/dib7000m.c | 27 +-
4076 drivers/media/dvb/frontends/dib7000p.c | 34 +-
4077 drivers/media/dvb/frontends/dib8000.c | 72 +-
4078 drivers/media/dvb/frontends/dib9000.c | 166 +-
4079 drivers/media/dvb/frontends/dibx000_common.c | 76 +-
4080 drivers/media/dvb/frontends/dibx000_common.h | 1 +
4081 drivers/media/dvb/frontends/drxd_hard.c | 24 +-
4082 drivers/media/dvb/frontends/drxk_hard.c | 10 +-
4083 drivers/media/dvb/frontends/it913x-fe-priv.h | 328 ++
4084 drivers/media/dvb/frontends/it913x-fe.c | 824 ++++
4085 drivers/media/dvb/frontends/it913x-fe.h | 196 +
4086 drivers/media/dvb/frontends/lnbp22.c | 148 +
4087 drivers/media/dvb/frontends/lnbp22.h | 57 +
4088 drivers/media/dvb/frontends/stb0899_drv.c | 6 +-
4089 drivers/media/dvb/frontends/stv0288.c | 29 +-
4090 drivers/media/dvb/frontends/stv090x.c | 35 +-
4091 drivers/media/dvb/frontends/tda10048.c | 37 +-
4092 drivers/media/dvb/frontends/tda10048.h | 8 +
4093 drivers/media/dvb/frontends/tda10071.c | 1269 +++++
4094 drivers/media/dvb/frontends/tda10071.h | 81 +
4095 drivers/media/dvb/frontends/tda10071_priv.h | 122 +
4096 drivers/media/dvb/frontends/tda18271c2dd.c | 4 +-
4097 drivers/media/dvb/mantis/Makefile | 2 +-
4098 drivers/media/dvb/mantis/hopper_cards.c | 6 +-
4099 drivers/media/dvb/mantis/mantis_cards.c | 6 +-
4100 drivers/media/dvb/mantis/mantis_common.h | 5 +-
4101 drivers/media/dvb/mantis/mantis_dma.c | 92 +-
4102 drivers/media/dvb/mantis/mantis_vp1041.c | 1 -
4103 drivers/media/dvb/ngene/Makefile | 8 +-
4104 drivers/media/dvb/pluto2/Makefile | 2 +-
4105 drivers/media/dvb/pt1/Makefile | 2 +-
4106 drivers/media/dvb/siano/Makefile | 4 +-
4107 drivers/media/dvb/ttpci/Makefile | 4 +-
4108 drivers/media/dvb/ttpci/av7110_v4l.c | 32 +-
4109 drivers/media/dvb/ttpci/budget-av.c | 47 +-
4110 drivers/media/dvb/ttpci/budget-ci.c | 1 -
4111 drivers/media/dvb/ttpci/budget-core.c | 2 +
4112 drivers/media/dvb/ttpci/budget.h | 1 +
4113 drivers/media/dvb/ttpci/ttpci-eeprom.c | 29 +
4114 drivers/media/dvb/ttpci/ttpci-eeprom.h | 1 +
4115 drivers/media/dvb/ttusb-budget/Makefile | 2 +-
4116 drivers/media/dvb/ttusb-dec/Makefile | 2 +-
4117 drivers/media/radio/Makefile | 2 +-
4118 drivers/media/radio/radio-si4713.c | 4 -
4119 drivers/media/radio/radio-wl1273.c | 2 +-
4120 drivers/media/radio/si470x/radio-si470x-usb.c | 2 -
4121 drivers/media/radio/wl128x/fmdrv_v4l2.c | 6 +-
4122 drivers/media/rc/Kconfig | 23 +-
4123 drivers/media/rc/Makefile | 1 +
4124 drivers/{input/misc => media/rc}/ati_remote.c | 301 +-
4125 drivers/media/rc/ene_ir.c | 73 +-
4126 drivers/media/rc/ene_ir.h | 19 +-
4127 drivers/media/rc/imon.c | 36 +-
4128 drivers/media/rc/keymaps/Makefile | 3 +
4129 drivers/media/rc/keymaps/rc-ati-x10.c | 104 +
4130 drivers/media/rc/keymaps/rc-medion-x10.c | 117 +
4131 drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 +
4132 drivers/media/rc/keymaps/rc-snapstream-firefly.c | 107 +
4133 drivers/media/rc/mceusb.c | 410 ++-
4134 drivers/media/rc/rc-core-priv.h | 14 +-
4135 drivers/media/rc/rc-main.c | 29 +-
4136 drivers/media/rc/redrat3.c | 7 -
4137 drivers/media/rc/winbond-cir.c | 6 +-
4138 drivers/media/video/Kconfig | 49 +-
4139 drivers/media/video/Makefile | 9 +-
4140 drivers/media/video/adp1653.c | 20 +-
4141 drivers/media/video/atmel-isi.c | 24 +-
4142 drivers/media/video/au0828/Makefile | 8 +-
4143 drivers/media/video/bt819.c | 2 +-
4144 drivers/media/video/bt8xx/Makefile | 6 +-
4145 drivers/media/video/bt8xx/bttv-cards.c | 242 +-
4146 drivers/media/video/bt8xx/bttv-driver.c | 294 +-
4147 drivers/media/video/bt8xx/bttv-gpio.c | 4 +-
4148 drivers/media/video/bt8xx/bttv-i2c.c | 56 +-
4149 drivers/media/video/bt8xx/bttv-input.c | 37 +-
4150 drivers/media/video/bt8xx/bttv-risc.c | 25 +-
4151 drivers/media/video/bt8xx/bttv-vbi.c | 9 +-
4152 drivers/media/video/bt8xx/bttvp.h | 18 +-
4153 drivers/media/video/cx18/Makefile | 6 +-
4154 drivers/media/video/cx18/cx18-driver.h | 5 +-
4155 drivers/media/video/cx18/cx18-fileops.c | 2 -
4156 drivers/media/video/cx18/cx18-ioctl.c | 18 +-
4157 drivers/media/video/cx18/cx18-mailbox.c | 2 +-
4158 drivers/media/video/cx18/cx18-streams.c | 13 +
4159 drivers/media/video/cx231xx/Makefile | 10 +-
4160 drivers/media/video/cx23885/Kconfig | 2 +-
4161 drivers/media/video/cx23885/Makefile | 10 +-
4162 drivers/media/video/cx23885/cx23885-cards.c | 2 +-
4163 drivers/media/video/cx23885/cx23885-dvb.c | 2 +-
4164 drivers/media/video/cx23885/cx23888-ir.c | 12 +-
4165 drivers/media/video/cx25840/Makefile | 2 +-
4166 drivers/media/video/cx25840/cx25840-ir.c | 12 +-
4167 drivers/media/video/cx88/Makefile | 8 +-
4168 drivers/media/video/cx88/cx88-core.c | 3 -
4169 drivers/media/video/cx88/cx88-video.c | 2 +-
4170 drivers/media/video/davinci/vpbe_display.c | 1 -
4171 drivers/media/video/davinci/vpbe_osd.c | 2 +-
4172 drivers/media/video/em28xx/Kconfig | 2 +
4173 drivers/media/video/em28xx/Makefile | 8 +-
4174 drivers/media/video/em28xx/em28xx-cards.c | 155 +-
4175 drivers/media/video/em28xx/em28xx-core.c | 45 +-
4176 drivers/media/video/em28xx/em28xx-dvb.c | 117 +-
4177 drivers/media/video/em28xx/em28xx-input.c | 6 +-
4178 drivers/media/video/em28xx/em28xx-video.c | 1 +
4179 drivers/media/video/em28xx/em28xx.h | 3 +-
4180 drivers/media/video/et61x251/et61x251.h | 66 +-
4181 drivers/media/video/et61x251/et61x251_core.c | 2 +
4182 drivers/media/video/et61x251/et61x251_tas5130d1b.c | 2 +
4183 drivers/media/video/gspca/Kconfig | 10 +
4184 drivers/media/video/gspca/Makefile | 2 +
4185 drivers/media/video/gspca/benq.c | 31 +-
4186 drivers/media/video/gspca/conex.c | 6 +-
4187 drivers/media/video/gspca/cpia1.c | 7 +-
4188 drivers/media/video/gspca/etoms.c | 6 +-
4189 drivers/media/video/gspca/finepix.c | 8 +-
4190 drivers/media/video/gspca/gl860/Makefile | 2 +-
4191 drivers/media/video/gspca/gl860/gl860.c | 8 +-
4192 drivers/media/video/gspca/gspca.c | 287 +-
4193 drivers/media/video/gspca/gspca.h | 22 +-
4194 drivers/media/video/gspca/jeilinj.c | 20 +-
4195 drivers/media/video/gspca/kinect.c | 41 +-
4196 drivers/media/video/gspca/konica.c | 16 +-
4197 drivers/media/video/gspca/m5602/Makefile | 2 +-
4198 drivers/media/video/gspca/m5602/m5602_core.c | 9 +-
4199 drivers/media/video/gspca/m5602/m5602_mt9m111.c | 28 +-
4200 drivers/media/video/gspca/m5602/m5602_ov7660.c | 21 +-
4201 drivers/media/video/gspca/m5602/m5602_ov9650.c | 19 +-
4202 drivers/media/video/gspca/m5602/m5602_po1030.c | 21 +-
4203 drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 35 +-
4204 drivers/media/video/gspca/m5602/m5602_s5k83a.c | 30 +-
4205 drivers/media/video/gspca/mars.c | 6 +-
4206 drivers/media/video/gspca/mr97310a.c | 24 +-
4207 drivers/media/video/gspca/nw80x.c | 9 +-
4208 drivers/media/video/gspca/ov519.c | 41 +-
4209 drivers/media/video/gspca/ov534.c | 12 +-
4210 drivers/media/video/gspca/ov534_9.c | 516 +--
4211 drivers/media/video/gspca/pac207.c | 14 +-
4212 drivers/media/video/gspca/pac7302.c | 15 +-
4213 drivers/media/video/gspca/pac7311.c | 15 +-
4214 drivers/media/video/gspca/se401.c | 46 +-
4215 drivers/media/video/gspca/sn9c2028.c | 14 +-
4216 drivers/media/video/gspca/sn9c20x.c | 76 +-
4217 drivers/media/video/gspca/sonixj.c | 45 +-
4218 drivers/media/video/gspca/spca1528.c | 34 +-
4219 drivers/media/video/gspca/spca500.c | 6 +-
4220 drivers/media/video/gspca/spca501.c | 4 +-
4221 drivers/media/video/gspca/spca505.c | 8 +-
4222 drivers/media/video/gspca/spca508.c | 6 +-
4223 drivers/media/video/gspca/spca561.c | 4 +-
4224 drivers/media/video/gspca/sq905.c | 17 +-
4225 drivers/media/video/gspca/sq905c.c | 10 +-
4226 drivers/media/video/gspca/sq930x.c | 21 +-
4227 drivers/media/video/gspca/stk014.c | 16 +-
4228 drivers/media/video/gspca/stv0680.c | 6 +-
4229 drivers/media/video/gspca/stv06xx/Makefile | 2 +-
4230 drivers/media/video/gspca/stv06xx/stv06xx.c | 18 +-
4231 drivers/media/video/gspca/stv06xx/stv06xx.h | 6 +-
4232 drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 10 +-
4233 drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 4 +-
4234 drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 4 +-
4235 drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 32 +-
4236 drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 56 +-
4237 drivers/media/video/gspca/sunplus.c | 10 +-
4238 drivers/media/video/gspca/t613.c | 12 +-
4239 drivers/media/video/gspca/topro.c | 4989 ++++++++++++++++++++
4240 drivers/media/video/gspca/vc032x.c | 13 +-
4241 drivers/media/video/gspca/vicam.c | 12 +-
4242 drivers/media/video/gspca/w996Xcf.c | 8 +-
4243 drivers/media/video/gspca/xirlink_cit.c | 14 +-
4244 drivers/media/video/gspca/zc3xx.c | 15 +-
4245 drivers/media/video/hdpvr/Makefile | 4 +-
4246 drivers/media/video/hexium_gemini.c | 44 +-
4247 drivers/media/video/hexium_orion.c | 38 +-
4248 drivers/media/video/ivtv/Makefile | 8 +-
4249 drivers/media/video/ivtv/ivtv-ioctl.c | 15 +-
4250 drivers/media/video/m5mols/m5mols_core.c | 6 +-
4251 drivers/media/video/marvell-ccic/mcam-core.c | 12 +-
4252 drivers/media/video/marvell-ccic/mmp-driver.c | 1 +
4253 drivers/media/video/mem2mem_testdev.c | 16 +-
4254 drivers/media/video/mt9m111.c | 9 +-
4255 drivers/media/video/mt9p031.c | 963 ++++
4256 drivers/media/video/mt9t001.c | 835 ++++
4257 drivers/media/video/mx3_camera.c | 4 +-
4258 drivers/media/video/mxb.c | 80 +-
4259 drivers/media/video/noon010pc30.c | 263 +-
4260 drivers/media/video/omap3isp/Makefile | 4 +-
4261 drivers/media/video/omap3isp/isp.c | 6 +-
4262 drivers/media/video/omap3isp/isp.h | 85 +-
4263 drivers/media/video/omap3isp/ispccdc.c | 11 +-
4264 drivers/media/video/omap3isp/ispccp2.c | 4 +-
4265 drivers/media/video/omap3isp/ispqueue.c | 4 +
4266 drivers/media/video/omap3isp/ispvideo.c | 22 +-
4267 drivers/media/video/pvrusb2/Makefile | 8 +-
4268 drivers/media/video/pwc/pwc-if.c | 4 +-
4269 drivers/media/video/pwc/pwc-v4l.c | 136 +-
4270 drivers/media/video/s5p-fimc/Makefile | 2 +-
4271 drivers/media/video/s5p-fimc/fimc-capture.c | 1462 ++++--
4272 drivers/media/video/s5p-fimc/fimc-core.c | 1134 +++---
4273 drivers/media/video/s5p-fimc/fimc-core.h | 221 +-
4274 drivers/media/video/s5p-fimc/fimc-mdevice.c | 858 ++++
4275 drivers/media/video/s5p-fimc/fimc-mdevice.h | 118 +
4276 drivers/media/video/s5p-fimc/fimc-reg.c | 90 +-
4277 drivers/media/video/s5p-fimc/mipi-csis.c | 90 +-
4278 drivers/media/video/s5p-fimc/regs-fimc.h | 9 +-
4279 drivers/media/video/s5p-mfc/s5p_mfc.c | 15 +-
4280 drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 18 +-
4281 drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 36 +-
4282 drivers/media/video/s5p-mfc/s5p_mfc_opr.c | 14 +-
4283 drivers/media/video/s5p-tv/Kconfig | 2 +-
4284 drivers/media/video/s5p-tv/hdmi_drv.c | 15 +-
4285 drivers/media/video/s5p-tv/mixer.h | 2 -
4286 drivers/media/video/s5p-tv/mixer_grp_layer.c | 2 +-
4287 drivers/media/video/s5p-tv/mixer_reg.c | 11 +-
4288 drivers/media/video/s5p-tv/mixer_video.c | 24 +-
4289 drivers/media/video/s5p-tv/mixer_vp_layer.c | 4 +-
4290 drivers/media/video/s5p-tv/regs-hdmi.h | 4 +
4291 drivers/media/video/s5p-tv/regs-mixer.h | 1 +
4292 drivers/media/video/s5p-tv/sdo_drv.c | 1 +
4293 drivers/media/video/saa7115.c | 5 +-
4294 drivers/media/video/saa7134/Makefile | 8 +-
4295 drivers/media/video/saa7164/Makefile | 10 +-
4296 drivers/media/video/saa7164/saa7164-cards.c | 128 +
4297 drivers/media/video/saa7164/saa7164-dvb.c | 2 +
4298 drivers/media/video/saa7164/saa7164.h | 2 +
4299 drivers/media/video/sh_mobile_ceu_camera.c | 6 +-
4300 drivers/media/video/sr030pc30.c | 6 -
4301 drivers/media/video/stk-webcam.c | 29 +-
4302 drivers/media/video/tlg2300/Makefile | 8 +-
4303 drivers/{staging => media/video}/tm6000/Kconfig | 0
4304 drivers/{staging => media/video}/tm6000/Makefile | 0
4305 .../{staging => media/video}/tm6000/tm6000-alsa.c | 9 +-
4306 .../{staging => media/video}/tm6000/tm6000-cards.c | 44 +-
4307 .../{staging => media/video}/tm6000/tm6000-core.c | 108 +-
4308 .../{staging => media/video}/tm6000/tm6000-dvb.c | 18 +-
4309 .../{staging => media/video}/tm6000/tm6000-i2c.c | 21 +-
4310 .../{staging => media/video}/tm6000/tm6000-input.c | 2 +-
4311 .../{staging => media/video}/tm6000/tm6000-regs.h | 6 +-
4312 drivers/media/video/tm6000/tm6000-stds.c | 659 +++
4313 .../video}/tm6000/tm6000-usb-isoc.h | 2 +-
4314 .../{staging => media/video}/tm6000/tm6000-video.c | 122 +-
4315 drivers/{staging => media/video}/tm6000/tm6000.h | 15 +-
4316 drivers/media/video/tvaudio.c | 9 +-
4317 drivers/media/video/tvp7002.c | 14 +-
4318 drivers/media/video/usbvision/Makefile | 4 +-
4319 drivers/media/video/uvc/uvc_driver.c | 13 +
4320 drivers/media/video/uvc/uvc_v4l2.c | 54 +-
4321 drivers/media/video/uvc/uvc_video.c | 17 +-
4322 drivers/media/video/uvc/uvcvideo.h | 104 +-
4323 drivers/media/video/v4l2-ctrls.c | 104 +-
4324 drivers/media/video/v4l2-ioctl.c | 517 +--
4325 drivers/media/video/v4l2-mem2mem.c | 18 +-
4326 drivers/media/video/v4l2-subdev.c | 19 +
4327 drivers/media/video/videobuf2-core.c | 205 +-
4328 drivers/media/video/videobuf2-dma-contig.c | 16 +-
4329 drivers/media/video/videobuf2-dma-sg.c | 6 -
4330 drivers/media/video/videobuf2-memops.c | 6 +-
4331 drivers/media/video/vivi.c | 23 +-
4332 drivers/media/video/vpx3220.c | 2 +-
4333 drivers/media/video/zr364xx.c | 3 +
4334 drivers/misc/Kconfig | 1 +
4335 drivers/misc/Makefile | 1 +
4336 drivers/{staging => misc}/altera-stapl/Kconfig | 2 +
4337 drivers/misc/altera-stapl/Makefile | 3 +
4338 .../{staging => misc}/altera-stapl/altera-comp.c | 0
4339 .../{staging => misc}/altera-stapl/altera-exprt.h | 0
4340 .../{staging => misc}/altera-stapl/altera-jtag.c | 2 +-
4341 .../{staging => misc}/altera-stapl/altera-jtag.h | 0
4342 .../{staging => misc}/altera-stapl/altera-lpt.c | 0
4343 drivers/{staging => misc}/altera-stapl/altera.c | 2 +-
4344 drivers/staging/Kconfig | 4 -
4345 drivers/staging/Makefile | 2 -
4346 drivers/staging/altera-stapl/Makefile | 3 -
4347 drivers/staging/dt3155v4l/dt3155v4l.c | 4 +-
4348 drivers/staging/tm6000/README | 22 -
4349 drivers/staging/tm6000/TODO | 8 -
4350 drivers/staging/tm6000/tm6000-stds.c | 679 ---
4351 include/linux/dvb/frontend.h | 1 +
4352 include/linux/dvb/version.h | 2 +-
4353 include/linux/omap3isp.h | 2 -
4354 include/linux/usb/Kbuild | 1 +
4355 include/linux/videodev2.h | 13 +-
4356 include/media/m5mols.h | 4 +-
4357 include/media/mt9p031.h | 19 +
4358 include/media/mt9t001.h | 8 +
4359 include/media/omap3isp.h | 140 +
4360 include/media/rc-core.h | 7 +-
4361 include/media/rc-map.h | 3 +
4362 include/media/s5p_fimc.h | 18 +-
4363 include/media/saa7146.h | 36 +-
4364 include/media/v4l2-chip-ident.h | 3 -
4365 include/media/v4l2-ctrls.h | 15 +-
4366 include/media/v4l2-mediabus.h | 12 +-
4367 include/media/videobuf2-core.h | 23 +-
4368 include/media/videobuf2-dma-contig.h | 6 +-
4369 .../staging/altera-stapl => include/misc}/altera.h | 0
4370 402 files changed, 26444 insertions(+), 6479 deletions(-)
4371 create mode 100644 Documentation/dvb/it9137.txt
4372 rename drivers/staging/tm6000/CARDLIST => Documentation/video4linux/CARDLIST.tm6000 (100%)
4373 create mode 100644 drivers/media/dvb/dvb-usb/it913x.c
4374 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-gpio.c
4375 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-gpio.h
4376 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-i2c.c
4377 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-i2c.h
4378 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-phy.c
4379 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-phy.h
4380 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-reg.h
4381 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-tuner.c
4382 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-tuner.h
4383 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.c
4384 create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.h
4385 create mode 100644 drivers/media/dvb/dvb-usb/pctv452e.c
4386 create mode 100644 drivers/media/dvb/frontends/a8293.c
4387 rename drivers/media/{common/tuners/tda18212_priv.h => dvb/frontends/a8293.h} (58%)
4388 create mode 100644 drivers/media/dvb/frontends/it913x-fe-priv.h
4389 create mode 100644 drivers/media/dvb/frontends/it913x-fe.c
4390 create mode 100644 drivers/media/dvb/frontends/it913x-fe.h
4391 create mode 100644 drivers/media/dvb/frontends/lnbp22.c
4392 create mode 100644 drivers/media/dvb/frontends/lnbp22.h
4393 create mode 100644 drivers/media/dvb/frontends/tda10071.c
4394 create mode 100644 drivers/media/dvb/frontends/tda10071.h
4395 create mode 100644 drivers/media/dvb/frontends/tda10071_priv.h
4396 rename drivers/{input/misc => media/rc}/ati_remote.c (77%)
4397 create mode 100644 drivers/media/rc/keymaps/rc-ati-x10.c
4398 create mode 100644 drivers/media/rc/keymaps/rc-medion-x10.c
4399 create mode 100644 drivers/media/rc/keymaps/rc-snapstream-firefly.c
4400 create mode 100644 drivers/media/video/gspca/topro.c
4401 create mode 100644 drivers/media/video/mt9p031.c
4402 create mode 100644 drivers/media/video/mt9t001.c
4403 create mode 100644 drivers/media/video/s5p-fimc/fimc-mdevice.c
4404 create mode 100644 drivers/media/video/s5p-fimc/fimc-mdevice.h
4405 rename drivers/{staging => media/video}/tm6000/Kconfig (100%)
4406 rename drivers/{staging => media/video}/tm6000/Makefile (100%)
4407 rename drivers/{staging => media/video}/tm6000/tm6000-alsa.c (97%)
4408 rename drivers/{staging => media/video}/tm6000/tm6000-cards.c (97%)
4409 rename drivers/{staging => media/video}/tm6000/tm6000-core.c (91%)
4410 rename drivers/{staging => media/video}/tm6000/tm6000-dvb.c (95%)
4411 rename drivers/{staging => media/video}/tm6000/tm6000-i2c.c (95%)
4412 rename drivers/{staging => media/video}/tm6000/tm6000-input.c (99%)
4413 rename drivers/{staging => media/video}/tm6000/tm6000-regs.h (99%)
4414 create mode 100644 drivers/media/video/tm6000/tm6000-stds.c
4415 rename drivers/{staging => media/video}/tm6000/tm6000-usb-isoc.h (97%)
4416 rename drivers/{staging => media/video}/tm6000/tm6000-video.c (96%)
4417 rename drivers/{staging => media/video}/tm6000/tm6000.h (98%)
4418 rename drivers/{staging => misc}/altera-stapl/Kconfig (77%)
4419 create mode 100644 drivers/misc/altera-stapl/Makefile
4420 rename drivers/{staging => misc}/altera-stapl/altera-comp.c (100%)
4421 rename drivers/{staging => misc}/altera-stapl/altera-exprt.h (100%)
4422 rename drivers/{staging => misc}/altera-stapl/altera-jtag.c (99%)
4423 rename drivers/{staging => misc}/altera-stapl/altera-jtag.h (100%)
4424 rename drivers/{staging => misc}/altera-stapl/altera-lpt.c (100%)
4425 rename drivers/{staging => misc}/altera-stapl/altera.c (99%)
4426 delete mode 100644 drivers/staging/altera-stapl/Makefile
4427 delete mode 100644 drivers/staging/tm6000/README
4428 delete mode 100644 drivers/staging/tm6000/TODO
4429 delete mode 100644 drivers/staging/tm6000/tm6000-stds.c
4430 create mode 100644 include/media/mt9p031.h
4431 create mode 100644 include/media/mt9t001.h
4432 create mode 100644 include/media/omap3isp.h
4433 rename {drivers/staging/altera-stapl => include/misc}/altera.h (100%)
4434 Merging kbuild/for-next
4435 $ git merge kbuild/for-next
4436 Auto-merging Makefile
4437 Auto-merging scripts/checkpatch.pl
4438 Merge made by recursive.
4440 scripts/Makefile.build | 2 +-
4441 scripts/Makefile.lib | 4 ++
4442 scripts/basic/fixdep.c | 1 +
4443 scripts/checkpatch.pl | 14 ++++++
4444 scripts/extract-vmlinux | 62 ++++++++++++++++++++++++
4445 scripts/kconfig/Makefile | 28 +----------
4446 scripts/kconfig/confdata.c | 49 ++++++++++++++-----
4447 scripts/kconfig/lxdialog/textbox.c | 3 +-
4448 scripts/kconfig/mconf.c | 86 ++++++++++++++++++++-------------
4449 scripts/kconfig/menu.c | 13 ++---
4450 scripts/kconfig/nconf.c | 23 ++++-----
4451 scripts/kconfig/nconf.gui.c | 59 ++++++++++++++++++-----
4452 scripts/kconfig/nconf.h | 2 +-
4453 scripts/kconfig/streamline_config.pl | 22 +++++++-
4454 scripts/tags.sh | 4 +-
4455 16 files changed, 258 insertions(+), 117 deletions(-)
4456 create mode 100755 scripts/extract-vmlinux
4457 Merging kconfig/for-next
4458 $ git merge kconfig/for-next
4460 Merge made by recursive.
4462 $ git merge ide/master
4465 $ git merge libata/NEXT
4466 Merge made by recursive.
4467 drivers/ata/libata-eh.c | 5 ++---
4468 drivers/ata/sata_sil24.c | 4 ++--
4469 2 files changed, 4 insertions(+), 5 deletions(-)
4470 Merging infiniband/for-next
4471 $ git merge infiniband/for-next
4472 Merge made by recursive.
4473 drivers/infiniband/core/cma.c | 52 ++++++++++++++++++--------
4474 drivers/infiniband/core/mad.c | 3 +
4475 drivers/infiniband/core/ucm.c | 2 +-
4476 drivers/infiniband/core/ucma.c | 2 +-
4477 drivers/infiniband/core/user_mad.c | 5 +-
4478 drivers/infiniband/core/uverbs_main.c | 3 +-
4479 drivers/infiniband/hw/amso1100/c2_provider.c | 5 +--
4480 drivers/infiniband/hw/cxgb4/device.c | 41 ++++++++++++++++----
4481 drivers/infiniband/hw/ehca/ehca_eq.c | 4 +-
4482 drivers/infiniband/hw/mthca/mthca_mr.c | 2 +-
4483 drivers/infiniband/hw/qib/qib.h | 4 ++
4484 drivers/infiniband/hw/qib/qib_file_ops.c | 2 +
4485 drivers/infiniband/hw/qib/qib_init.c | 1 +
4486 drivers/infiniband/hw/qib/qib_sysfs.c | 3 +-
4487 drivers/net/mlx4/eq.c | 2 +-
4488 drivers/net/mlx4/mr.c | 2 +-
4489 drivers/net/mlx4/port.c | 30 ++++++++------
4490 17 files changed, 108 insertions(+), 55 deletions(-)
4492 $ git merge acpi/acpi
4494 Merging idle-test/idle-test
4495 $ git merge idle-test/idle-test
4497 Merging powertools/tools-test
4498 $ git merge powertools/tools-test
4500 Merging cpupowerutils/master
4501 $ git merge cpupowerutils/master
4503 Merging ieee1394/for-next
4504 $ git merge ieee1394/for-next
4505 Merge made by recursive.
4506 drivers/firewire/ohci.c | 203 +++++++++++++++++++++++++++++++++++--
4507 drivers/firewire/sbp2.c | 256 +++++++++++++++++++++--------------------------
4508 2 files changed, 305 insertions(+), 154 deletions(-)
4509 Merging ubi/linux-next
4510 $ git merge ubi/linux-next
4513 $ git merge dlm/next
4515 Merging swiotlb/master
4516 $ git merge swiotlb/master
4517 Merge made by recursive.
4519 $ git merge ibft/master
4520 Merge made by recursive.
4522 $ git merge scsi/master
4523 Auto-merging drivers/s390/cio/qdio_main.c
4524 Auto-merging drivers/scsi/Kconfig
4525 Auto-merging drivers/scsi/Makefile
4526 Auto-merging drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
4527 Auto-merging drivers/scsi/fcoe/fcoe.c
4528 Auto-merging drivers/scsi/libfc/fc_exch.c
4529 Auto-merging drivers/scsi/libfc/fc_fcp.c
4530 Auto-merging drivers/scsi/libsas/sas_expander.c
4531 Auto-merging drivers/scsi/qla2xxx/qla_isr.c
4532 Auto-merging drivers/scsi/qla2xxx/qla_os.c
4533 Auto-merging drivers/scsi/qla4xxx/Kconfig
4534 Merge made by recursive.
4535 Documentation/ABI/testing/sysfs-block | 13 +
4536 Documentation/scsi/bnx2fc.txt | 75 +
4537 arch/s390/include/asm/qdio.h | 5 +
4538 block/genhd.c | 71 +
4539 drivers/ata/libata-core.c | 1 +
4540 drivers/ata/libata-scsi.c | 44 +-
4541 drivers/infiniband/ulp/iser/iscsi_iser.c | 80 +-
4542 drivers/message/fusion/mptbase.c | 92 ++-
4543 drivers/message/fusion/mptbase.h | 72 +-
4544 drivers/message/fusion/mptsas.c | 47 +-
4545 drivers/message/fusion/mptscsih.c | 18 +-
4546 drivers/message/fusion/mptscsih.h | 1 +
4547 drivers/s390/cio/qdio_main.c | 11 +-
4548 drivers/s390/cio/qdio_setup.c | 1 +
4549 drivers/s390/scsi/zfcp_dbf.c | 36 +
4550 drivers/s390/scsi/zfcp_def.h | 7 +
4551 drivers/s390/scsi/zfcp_ext.h | 1 +
4552 drivers/s390/scsi/zfcp_fsf.c | 80 +-
4553 drivers/s390/scsi/zfcp_qdio.c | 58 +-
4554 drivers/s390/scsi/zfcp_qdio.h | 66 +-
4555 drivers/s390/scsi/zfcp_scsi.c | 15 +-
4556 drivers/scsi/Kconfig | 14 +-
4557 drivers/scsi/Makefile | 1 +
4558 drivers/scsi/aic94xx/aic94xx_scb.c | 1 +
4559 drivers/scsi/be2iscsi/be_iscsi.c | 60 +-
4560 drivers/scsi/be2iscsi/be_iscsi.h | 2 +
4561 drivers/scsi/be2iscsi/be_main.c | 101 +-
4562 drivers/scsi/be2iscsi/be_main.h | 3 +
4563 drivers/scsi/bnx2fc/bnx2fc.h | 3 +-
4564 drivers/scsi/bnx2fc/bnx2fc_els.c | 26 +-
4565 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 204 ++-
4566 drivers/scsi/bnx2fc/bnx2fc_hwi.c | 16 +-
4567 drivers/scsi/bnx2fc/bnx2fc_io.c | 32 +-
4568 drivers/scsi/bnx2fc/bnx2fc_tgt.c | 23 +-
4569 drivers/scsi/bnx2i/bnx2i_iscsi.c | 80 +-
4570 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 20 +-
4571 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 20 +-
4572 drivers/scsi/cxgbi/libcxgbi.c | 56 +
4573 drivers/scsi/cxgbi/libcxgbi.h | 1 +
4574 drivers/scsi/device_handler/scsi_dh.c | 61 +-
4575 drivers/scsi/device_handler/scsi_dh_alua.c | 92 +-
4576 drivers/scsi/device_handler/scsi_dh_rdac.c | 6 +-
4577 drivers/scsi/fcoe/fcoe.c | 82 +-
4578 drivers/scsi/fcoe/fcoe.h | 11 +-
4579 drivers/scsi/fcoe/fcoe_transport.c | 72 +
4580 drivers/scsi/ipr.c | 17 +-
4581 drivers/scsi/ipr.h | 1 +
4582 drivers/scsi/isci/host.c | 69 +
4583 drivers/scsi/isci/host.h | 15 +
4584 drivers/scsi/isci/init.c | 3 +
4585 drivers/scsi/isci/isci.h | 2 +-
4586 drivers/scsi/isci/phy.c | 11 +
4587 drivers/scsi/isci/port.c | 2 +-
4588 drivers/scsi/isci/port_config.c | 2 +-
4589 drivers/scsi/isci/registers.h | 122 +--
4590 drivers/scsi/isci/remote_device.c | 24 +
4591 drivers/scsi/isci/remote_device.h | 9 +
4592 drivers/scsi/isci/request.c | 380 +++++-
4593 drivers/scsi/isci/request.h | 31 +-
4594 drivers/scsi/isci/sas.h | 2 -
4595 drivers/scsi/isci/task.c | 29 +-
4596 drivers/scsi/isci/task.h | 19 +
4597 drivers/scsi/iscsi_tcp.c | 83 +-
4598 drivers/scsi/libfc/fc_exch.c | 11 +-
4599 drivers/scsi/libfc/fc_fcp.c | 2 -
4600 drivers/scsi/libiscsi.c | 9 -
4601 drivers/scsi/libsas/sas_expander.c | 22 +-
4602 drivers/scsi/libsas/sas_host_smp.c | 103 ++-
4603 drivers/scsi/libsas/sas_init.c | 43 +-
4604 drivers/scsi/libsas/sas_scsi_host.c | 147 +-
4605 drivers/scsi/lpfc/lpfc_attr.c | 42 +-
4606 drivers/scsi/lpfc/lpfc_els.c | 11 +-
4607 drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
4608 drivers/scsi/lpfc/lpfc_hw4.h | 2 +
4609 drivers/scsi/lpfc/lpfc_init.c | 63 +-
4610 drivers/scsi/lpfc/lpfc_scsi.c | 11 +-
4611 drivers/scsi/lpfc/lpfc_sli.c | 13 +-
4612 drivers/scsi/lpfc/lpfc_version.h | 2 +-
4613 drivers/scsi/mac_esp.c | 9 -
4614 drivers/scsi/mpt2sas/mpt2sas_base.c | 447 +++++--
4615 drivers/scsi/mpt2sas/mpt2sas_base.h | 46 +-
4616 drivers/scsi/mpt2sas/mpt2sas_ctl.c | 28 +
4617 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 2 +
4618 drivers/scsi/mpt2sas/mpt2sas_transport.c | 2 +-
4619 drivers/scsi/mvsas/mv_94xx.c | 35 +
4620 drivers/scsi/mvsas/mv_defs.h | 2 +
4621 drivers/scsi/mvsas/mv_init.c | 13 +-
4622 drivers/scsi/mvsas/mv_sas.c | 79 +-
4623 drivers/scsi/mvsas/mv_sas.h | 4 +-
4624 drivers/scsi/mvumi.c | 2018 +++++++++++++++++++++++++
4625 drivers/scsi/mvumi.h | 505 +++++++
4626 drivers/scsi/pm8001/pm8001_hwi.c | 73 +-
4627 drivers/scsi/pm8001/pm8001_init.c | 4 +-
4628 drivers/scsi/pm8001/pm8001_sas.c | 93 +-
4629 drivers/scsi/pm8001/pm8001_sas.h | 2 -
4630 drivers/scsi/qla2xxx/qla_attr.c | 111 +-
4631 drivers/scsi/qla2xxx/qla_bsg.c | 152 ++
4632 drivers/scsi/qla2xxx/qla_bsg.h | 42 +
4633 drivers/scsi/qla2xxx/qla_dbg.c | 6 +-
4634 drivers/scsi/qla2xxx/qla_def.h | 9 +-
4635 drivers/scsi/qla2xxx/qla_gbl.h | 18 +
4636 drivers/scsi/qla2xxx/qla_init.c | 36 +-
4637 drivers/scsi/qla2xxx/qla_isr.c | 5 +
4638 drivers/scsi/qla2xxx/qla_mbx.c | 127 ++
4639 drivers/scsi/qla2xxx/qla_nx.c | 970 ++++++++++++-
4640 drivers/scsi/qla2xxx/qla_nx.h | 255 ++++-
4641 drivers/scsi/qla2xxx/qla_os.c | 46 +-
4642 drivers/scsi/qla4xxx/Kconfig | 1 +
4643 drivers/scsi/qla4xxx/Makefile | 2 +-
4644 drivers/scsi/qla4xxx/ql4_attr.c | 76 +
4645 drivers/scsi/qla4xxx/ql4_bsg.c | 513 +++++++
4646 drivers/scsi/qla4xxx/ql4_bsg.h | 19 +
4647 drivers/scsi/qla4xxx/ql4_def.h | 201 ++-
4648 drivers/scsi/qla4xxx/ql4_fw.h | 192 +++-
4649 drivers/scsi/qla4xxx/ql4_glbl.h | 71 +-
4650 drivers/scsi/qla4xxx/ql4_init.c | 786 ++---------
4651 drivers/scsi/qla4xxx/ql4_iocb.c | 68 +-
4652 drivers/scsi/qla4xxx/ql4_isr.c | 83 +-
4653 drivers/scsi/qla4xxx/ql4_mbx.c | 752 +++++++++--
4654 drivers/scsi/qla4xxx/ql4_nvram.c | 21 +
4655 drivers/scsi/qla4xxx/ql4_nx.c | 9 +
4656 drivers/scsi/qla4xxx/ql4_os.c | 2199 ++++++++++++++++++++++++----
4657 drivers/scsi/scsi_error.c | 12 +-
4658 drivers/scsi/scsi_sysfs.c | 38 +
4659 drivers/scsi/scsi_transport_iscsi.c | 683 ++++++++--
4660 drivers/scsi/scsi_transport_sas.c | 10 +-
4661 drivers/scsi/sd.c | 7 +-
4662 include/linux/genhd.h | 4 +
4663 include/linux/libata.h | 2 +
4664 include/scsi/iscsi_if.h | 134 ++-
4665 include/scsi/libfc.h | 76 +-
4666 include/scsi/libfcoe.h | 3 +
4667 include/scsi/libsas.h | 52 +-
4668 include/scsi/sas.h | 24 +-
4669 include/scsi/scsi_bsg_iscsi.h | 110 ++
4670 include/scsi/scsi_device.h | 6 +
4671 include/scsi/scsi_host.h | 16 +-
4672 include/scsi/scsi_transport_iscsi.h | 45 +-
4673 138 files changed, 11643 insertions(+), 2796 deletions(-)
4674 create mode 100644 Documentation/scsi/bnx2fc.txt
4675 create mode 100644 drivers/scsi/mvumi.c
4676 create mode 100644 drivers/scsi/mvumi.h
4677 create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.c
4678 create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.h
4679 create mode 100644 include/scsi/scsi_bsg_iscsi.h
4680 Merging iscsi-target/for-next
4681 $ git merge iscsi-target/for-next
4683 Merging slave-dma/next
4684 $ git merge slave-dma/next
4685 Auto-merging drivers/tty/serial/sh-sci.c
4686 Merge made by recursive.
4687 drivers/dma/amba-pl08x.c | 381 ++++++++++++++++++++++++-------------------
4688 drivers/dma/at_hdmac.c | 5 +-
4689 drivers/dma/dw_dmac.c | 5 +-
4690 drivers/dma/imx-dma.c | 1 +
4691 drivers/dma/imx-sdma.c | 1 +
4692 drivers/dma/intel_mid_dma.c | 2 -
4693 drivers/dma/mpc512x_dma.c | 1 -
4694 drivers/dma/pch_dma.c | 2 -
4695 drivers/dma/pl330.c | 2 -
4696 drivers/dma/shdma.c | 129 ++++++++++-----
4697 drivers/dma/shdma.h | 7 +
4698 drivers/dma/timb_dma.c | 3 +-
4699 drivers/tty/serial/sh-sci.c | 25 +--
4700 include/linux/amba/pl08x.h | 22 ++-
4701 include/linux/serial_sci.h | 2 -
4702 15 files changed, 341 insertions(+), 247 deletions(-)
4703 Merging async_tx/next
4704 $ git merge async_tx/next
4707 $ git merge net/master
4708 Auto-merging Documentation/networking/ip-sysctl.txt
4709 Auto-merging MAINTAINERS
4710 Auto-merging arch/mips/Kconfig
4711 Auto-merging arch/powerpc/Kconfig
4712 CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
4713 Auto-merging arch/powerpc/configs/ppc40x_defconfig
4714 Auto-merging arch/powerpc/platforms/40x/Kconfig
4715 Auto-merging arch/s390/include/asm/qdio.h
4716 Removing drivers/net/arm/Kconfig
4717 Removing drivers/net/arm/Makefile
4718 Removing drivers/net/benet/Kconfig
4719 Removing drivers/net/bna/bfa_ioc_ct.c
4720 Removing drivers/net/bna/bfi_ctreg.h
4721 Removing drivers/net/bna/bfi_ll.h
4722 Removing drivers/net/bna/bna_ctrl.c
4723 Removing drivers/net/bna/bna_hw.h
4724 Removing drivers/net/bna/bna_txrx.c
4725 Auto-merging drivers/net/bonding/bond_main.c
4726 Auto-merging drivers/net/cris/eth_v10.c
4727 Auto-merging drivers/net/ethernet/3com/3c501.c
4728 Auto-merging drivers/net/ethernet/3com/3c509.c
4729 Auto-merging drivers/net/ethernet/3com/3c515.c
4730 Auto-merging drivers/net/ethernet/3com/3c574_cs.c
4731 Auto-merging drivers/net/ethernet/3com/3c589_cs.c
4732 Auto-merging drivers/net/ethernet/3com/3c59x.c
4733 Auto-merging drivers/net/ethernet/3com/typhoon.c
4734 Auto-merging drivers/net/ethernet/8390/3c503.c
4735 Auto-merging drivers/net/ethernet/8390/8390.c
4736 Auto-merging drivers/net/ethernet/8390/8390p.c
4737 Auto-merging drivers/net/ethernet/8390/ac3200.c
4738 Auto-merging drivers/net/ethernet/8390/ax88796.c
4739 Auto-merging drivers/net/ethernet/8390/axnet_cs.c
4740 Auto-merging drivers/net/ethernet/8390/e2100.c
4741 Auto-merging drivers/net/ethernet/8390/etherh.c
4742 Auto-merging drivers/net/ethernet/8390/hp-plus.c
4743 Auto-merging drivers/net/ethernet/8390/hydra.c
4744 Auto-merging drivers/net/ethernet/8390/mac8390.c
4745 Auto-merging drivers/net/ethernet/8390/ne-h8300.c
4746 Auto-merging drivers/net/ethernet/8390/ne2k-pci.c
4747 Auto-merging drivers/net/ethernet/8390/pcnet_cs.c
4748 Auto-merging drivers/net/ethernet/8390/smc-mca.c
4749 Auto-merging drivers/net/ethernet/8390/smc-ultra.c
4750 Auto-merging drivers/net/ethernet/8390/smc-ultra32.c
4751 Auto-merging drivers/net/ethernet/8390/wd.c
4752 Auto-merging drivers/net/ethernet/8390/zorro8390.c
4753 Auto-merging drivers/net/ethernet/adaptec/starfire.c
4754 Auto-merging drivers/net/ethernet/adi/bfin_mac.c
4755 Auto-merging drivers/net/ethernet/aeroflex/greth.c
4756 Auto-merging drivers/net/ethernet/alteon/acenic.c
4757 Auto-merging drivers/net/ethernet/amd/a2065.c
4758 Auto-merging drivers/net/ethernet/amd/am79c961a.c
4759 Auto-merging drivers/net/ethernet/amd/amd8111e.c
4760 Auto-merging drivers/net/ethernet/amd/ariadne.c
4761 Auto-merging drivers/net/ethernet/amd/atarilance.c
4762 Auto-merging drivers/net/ethernet/amd/au1000_eth.c
4763 Auto-merging drivers/net/ethernet/amd/declance.c
4764 Auto-merging drivers/net/ethernet/amd/depca.c
4765 Auto-merging drivers/net/ethernet/amd/depca.h
4766 Auto-merging drivers/net/ethernet/amd/hplance.c
4767 Auto-merging drivers/net/ethernet/amd/lance.c
4768 Auto-merging drivers/net/ethernet/amd/mvme147.c
4769 Auto-merging drivers/net/ethernet/amd/ni65.c
4770 Auto-merging drivers/net/ethernet/amd/nmclan_cs.c
4771 Auto-merging drivers/net/ethernet/amd/pcnet32.c
4772 Auto-merging drivers/net/ethernet/amd/sun3lance.c
4773 Auto-merging drivers/net/ethernet/amd/sunlance.c
4774 Auto-merging drivers/net/ethernet/apple/bmac.c
4775 Auto-merging drivers/net/ethernet/apple/cs89x0.c
4776 Auto-merging drivers/net/ethernet/apple/mac89x0.c
4777 Auto-merging drivers/net/ethernet/apple/mace.c
4778 Auto-merging drivers/net/ethernet/apple/macmace.c
4779 Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c
4780 Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e_main.c
4781 Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
4782 Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c
4783 Auto-merging drivers/net/ethernet/broadcom/b44.c
4784 Auto-merging drivers/net/ethernet/broadcom/bcm63xx_enet.c
4785 Auto-merging drivers/net/ethernet/broadcom/bnx2.c
4786 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
4787 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
4788 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
4789 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
4790 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
4791 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
4792 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
4793 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
4794 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
4795 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
4796 Auto-merging drivers/net/ethernet/broadcom/cnic.c
4797 Auto-merging drivers/net/ethernet/broadcom/cnic.h
4798 Auto-merging drivers/net/ethernet/broadcom/cnic_defs.h
4799 Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c
4800 Auto-merging drivers/net/ethernet/broadcom/tg3.c
4801 Auto-merging drivers/net/ethernet/broadcom/tg3.h
4802 Auto-merging drivers/net/ethernet/brocade/bna/Makefile
4803 Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c
4804 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h
4805 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
4806 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
4807 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c
4808 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h
4809 Auto-merging drivers/net/ethernet/brocade/bna/bfi.h
4810 Auto-merging drivers/net/ethernet/brocade/bna/bna.h
4811 Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h
4812 Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
4813 Auto-merging drivers/net/ethernet/brocade/bna/bnad.h
4814 Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c
4815 Auto-merging drivers/net/ethernet/brocade/bna/cna.h
4816 Auto-merging drivers/net/ethernet/brocade/bna/cna_fwimg.c
4817 Auto-merging drivers/net/ethernet/cadence/at91_ether.c
4818 Auto-merging drivers/net/ethernet/cadence/macb.c
4819 Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c
4820 Auto-merging drivers/net/ethernet/chelsio/cxgb/sge.c
4821 Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
4822 Auto-merging drivers/net/ethernet/chelsio/cxgb3/sge.c
4823 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
4824 Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
4825 Auto-merging drivers/net/ethernet/cisco/enic/enic.h
4826 Auto-merging drivers/net/ethernet/cisco/enic/enic_dev.h
4827 Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c
4828 Auto-merging drivers/net/ethernet/cisco/enic/enic_pp.c
4829 Auto-merging drivers/net/ethernet/cisco/enic/enic_pp.h
4830 Auto-merging drivers/net/ethernet/cisco/enic/vnic_dev.c
4831 Auto-merging drivers/net/ethernet/cisco/enic/vnic_dev.h
4832 Auto-merging drivers/net/ethernet/davicom/dm9000.c
4833 Auto-merging drivers/net/ethernet/dec/ewrk3.c
4834 Auto-merging drivers/net/ethernet/dec/tulip/Kconfig
4835 Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c
4836 Auto-merging drivers/net/ethernet/dec/tulip/de4x5.c
4837 Auto-merging drivers/net/ethernet/dec/tulip/de4x5.h
4838 Auto-merging drivers/net/ethernet/dec/tulip/dmfe.c
4839 Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
4840 Auto-merging drivers/net/ethernet/dec/tulip/uli526x.c
4841 Auto-merging drivers/net/ethernet/dec/tulip/winbond-840.c
4842 Auto-merging drivers/net/ethernet/dlink/de620.c
4843 Auto-merging drivers/net/ethernet/dlink/dl2k.c
4844 Auto-merging drivers/net/ethernet/dlink/dl2k.h
4845 Auto-merging drivers/net/ethernet/dlink/sundance.c
4846 Auto-merging drivers/net/ethernet/emulex/benet/be.h
4847 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c
4848 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
4849 Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c
4850 Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h
4851 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
4852 Auto-merging drivers/net/ethernet/ethoc.c
4853 Auto-merging drivers/net/ethernet/fealnx.c
4854 Auto-merging drivers/net/ethernet/freescale/fec.c
4855 Auto-merging drivers/net/ethernet/freescale/fec_mpc52xx.c
4856 Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig
4857 Auto-merging drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
4858 Auto-merging drivers/net/ethernet/freescale/gianfar.c
4859 Auto-merging drivers/net/ethernet/freescale/gianfar_ethtool.c
4860 Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
4861 Auto-merging drivers/net/ethernet/fujitsu/at1700.c
4862 Auto-merging drivers/net/ethernet/fujitsu/eth16i.c
4863 Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c
4864 Auto-merging drivers/net/ethernet/hp/hp100.c
4865 Auto-merging drivers/net/ethernet/i825xx/3c505.c
4866 Auto-merging drivers/net/ethernet/i825xx/3c523.c
4867 Auto-merging drivers/net/ethernet/i825xx/3c527.c
4868 Auto-merging drivers/net/ethernet/i825xx/82596.c
4869 Auto-merging drivers/net/ethernet/i825xx/eepro.c
4870 Auto-merging drivers/net/ethernet/i825xx/eexpress.c
4871 Auto-merging drivers/net/ethernet/i825xx/ether1.c
4872 Auto-merging drivers/net/ethernet/i825xx/lib82596.c
4873 Auto-merging drivers/net/ethernet/i825xx/lp486e.c
4874 Auto-merging drivers/net/ethernet/i825xx/ni52.c
4875 Auto-merging drivers/net/ethernet/i825xx/sun3_82586.c
4876 Auto-merging drivers/net/ethernet/i825xx/znet.c
4877 Auto-merging drivers/net/ethernet/ibm/ehea/ehea.h
4878 Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c
4879 Auto-merging drivers/net/ethernet/ibm/emac/Kconfig
4880 Auto-merging drivers/net/ethernet/ibm/emac/core.c
4881 Auto-merging drivers/net/ethernet/ibm/emac/core.h
4882 Auto-merging drivers/net/ethernet/ibm/emac/debug.h
4883 Auto-merging drivers/net/ethernet/ibm/emac/mal.c
4884 Auto-merging drivers/net/ethernet/ibm/emac/mal.h
4885 Auto-merging drivers/net/ethernet/ibm/emac/rgmii.h
4886 Auto-merging drivers/net/ethernet/ibm/emac/tah.h
4887 Auto-merging drivers/net/ethernet/ibm/emac/zmii.h
4888 Auto-merging drivers/net/ethernet/ibm/ibmveth.c
4889 Auto-merging drivers/net/ethernet/ibm/iseries_veth.c
4890 Auto-merging drivers/net/ethernet/icplus/ipg.c
4891 Auto-merging drivers/net/ethernet/intel/e100.c
4892 Auto-merging drivers/net/ethernet/intel/e1000/e1000.h
4893 Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
4894 Auto-merging drivers/net/ethernet/intel/e1000e/80003es2lan.c
4895 Auto-merging drivers/net/ethernet/intel/e1000e/82571.c
4896 Auto-merging drivers/net/ethernet/intel/e1000e/Makefile
4897 Auto-merging drivers/net/ethernet/intel/e1000e/e1000.h
4898 Auto-merging drivers/net/ethernet/intel/e1000e/ethtool.c
4899 Auto-merging drivers/net/ethernet/intel/e1000e/ich8lan.c
4900 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
4901 Auto-merging drivers/net/ethernet/intel/igb/e1000_mac.c
4902 Auto-merging drivers/net/ethernet/intel/igb/e1000_phy.c
4903 Auto-merging drivers/net/ethernet/intel/igb/igb.h
4904 Auto-merging drivers/net/ethernet/intel/igb/igb_ethtool.c
4905 Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
4906 Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c
4907 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb.h
4908 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_ee.c
4909 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_ee.h
4910 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
4911 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_hw.c
4912 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_hw.h
4913 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c
4914 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_osdep.h
4915 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_param.c
4916 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe.h
4917 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
4918 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
4919 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
4920 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
4921 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
4922 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
4923 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
4924 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
4925 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
4926 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
4927 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
4928 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
4929 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
4930 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
4931 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
4932 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
4933 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
4934 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
4935 Auto-merging drivers/net/ethernet/intel/ixgbevf/ethtool.c
4936 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
4937 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
4938 Auto-merging drivers/net/ethernet/jme.c
4939 Auto-merging drivers/net/ethernet/jme.h
4940 Auto-merging drivers/net/ethernet/korina.c
4941 Auto-merging drivers/net/ethernet/lantiq_etop.c
4942 Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c
4943 Auto-merging drivers/net/ethernet/marvell/skge.c
4944 Auto-merging drivers/net/ethernet/marvell/sky2.c
4945 Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
4946 Auto-merging drivers/net/ethernet/micrel/ks8695net.c
4947 Auto-merging drivers/net/ethernet/micrel/ksz884x.c
4948 Auto-merging drivers/net/ethernet/microchip/enc28j60.c
4949 Auto-merging drivers/net/ethernet/mipsnet.c
4950 Auto-merging drivers/net/ethernet/myricom/myri10ge/myri10ge.c
4951 Auto-merging drivers/net/ethernet/natsemi/ibmlana.c
4952 Auto-merging drivers/net/ethernet/natsemi/jazzsonic.c
4953 Auto-merging drivers/net/ethernet/natsemi/macsonic.c
4954 Auto-merging drivers/net/ethernet/natsemi/natsemi.c
4955 Auto-merging drivers/net/ethernet/natsemi/ns83820.c
4956 Auto-merging drivers/net/ethernet/natsemi/xtsonic.c
4957 Auto-merging drivers/net/ethernet/neterion/s2io.c
4958 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-config.c
4959 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-config.h
4960 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
4961 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-traffic.c
4962 Auto-merging drivers/net/ethernet/netx-eth.c
4963 Auto-merging drivers/net/ethernet/nuvoton/w90p910_ether.c
4964 Auto-merging drivers/net/ethernet/nvidia/forcedeth.c
4965 Auto-merging drivers/net/ethernet/octeon/Kconfig
4966 Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
4967 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
4968 Auto-merging drivers/net/ethernet/packetengines/hamachi.c
4969 Auto-merging drivers/net/ethernet/packetengines/yellowfin.c
4970 Auto-merging drivers/net/ethernet/pasemi/pasemi_mac.c
4971 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h
4972 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
4973 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
4974 Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
4975 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
4976 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
4977 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
4978 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
4979 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
4980 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
4981 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
4982 Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c
4983 Auto-merging drivers/net/ethernet/racal/ni5010.c
4984 Auto-merging drivers/net/ethernet/rdc/r6040.c
4985 Auto-merging drivers/net/ethernet/realtek/8139cp.c
4986 Auto-merging drivers/net/ethernet/realtek/8139too.c
4987 Auto-merging drivers/net/ethernet/realtek/atp.c
4988 Auto-merging drivers/net/ethernet/realtek/r8169.c
4989 Auto-merging drivers/net/ethernet/realtek/sc92031.c
4990 Auto-merging drivers/net/ethernet/renesas/sh_eth.c
4991 Auto-merging drivers/net/ethernet/renesas/sh_eth.h
4992 Auto-merging drivers/net/ethernet/seeq/ether3.c
4993 Auto-merging drivers/net/ethernet/seeq/seeq8005.c
4994 Auto-merging drivers/net/ethernet/seeq/sgiseeq.c
4995 Auto-merging drivers/net/ethernet/sfc/Kconfig
4996 Auto-merging drivers/net/ethernet/sfc/efx.c
4997 Auto-merging drivers/net/ethernet/sfc/efx.h
4998 Auto-merging drivers/net/ethernet/sfc/ethtool.c
4999 Auto-merging drivers/net/ethernet/sfc/falcon.c
5000 Auto-merging drivers/net/ethernet/sfc/nic.h
5001 Auto-merging drivers/net/ethernet/sfc/rx.c
5002 Auto-merging drivers/net/ethernet/sfc/siena.c
5003 Auto-merging drivers/net/ethernet/sfc/tx.c
5004 Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c
5005 Auto-merging drivers/net/ethernet/sis/sis190.c
5006 Auto-merging drivers/net/ethernet/sis/sis900.c
5007 Auto-merging drivers/net/ethernet/smsc/epic100.c
5008 Auto-merging drivers/net/ethernet/smsc/smc911x.c
5009 Auto-merging drivers/net/ethernet/smsc/smc9194.c
5010 Auto-merging drivers/net/ethernet/smsc/smc91c92_cs.c
5011 Auto-merging drivers/net/ethernet/smsc/smc91x.c
5012 Auto-merging drivers/net/ethernet/smsc/smsc911x.c
5013 Auto-merging drivers/net/ethernet/smsc/smsc9420.c
5014 Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
5015 Auto-merging drivers/net/ethernet/stmicro/stmmac/Makefile
5016 Auto-merging drivers/net/ethernet/stmicro/stmmac/common.h
5017 Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
5018 Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
5019 Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
5020 Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
5021 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac.h
5022 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
5023 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
5024 Auto-merging drivers/net/ethernet/sun/cassini.c
5025 Auto-merging drivers/net/ethernet/sun/niu.c
5026 Auto-merging drivers/net/ethernet/sun/sunbmac.c
5027 Auto-merging drivers/net/ethernet/sun/sunbmac.h
5028 Auto-merging drivers/net/ethernet/sun/sungem.c
5029 Auto-merging drivers/net/ethernet/sun/sunhme.c
5030 Auto-merging drivers/net/ethernet/sun/sunqe.c
5031 Auto-merging drivers/net/ethernet/sun/sunvnet.c
5032 Auto-merging drivers/net/ethernet/tehuti/tehuti.c
5033 Auto-merging drivers/net/ethernet/ti/cpmac.c
5034 Auto-merging drivers/net/ethernet/ti/davinci_emac.c
5035 Auto-merging drivers/net/ethernet/ti/tlan.c
5036 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
5037 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
5038 Auto-merging drivers/net/ethernet/toshiba/spider_net.c
5039 Auto-merging drivers/net/ethernet/toshiba/spider_net.h
5040 Auto-merging drivers/net/ethernet/toshiba/tc35815.c
5041 Auto-merging drivers/net/ethernet/tundra/tsi108_eth.c
5042 Auto-merging drivers/net/ethernet/via/via-rhine.c
5043 Auto-merging drivers/net/ethernet/via/via-velocity.c
5044 Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c
5045 Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c
5046 Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig
5047 Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
5048 Auto-merging drivers/net/fddi/defxx.c
5049 Auto-merging drivers/net/fddi/skfp/h/cmtdef.h
5050 Auto-merging drivers/net/fddi/skfp/h/hwmtm.h
5051 Auto-merging drivers/net/fddi/skfp/h/sba.h
5052 Auto-merging drivers/net/fddi/skfp/h/skfbiinc.h
5053 Auto-merging drivers/net/fddi/skfp/h/smc.h
5054 Auto-merging drivers/net/fddi/skfp/h/targethw.h
5055 Auto-merging drivers/net/fddi/skfp/h/targetos.h
5056 Auto-merging drivers/net/fddi/skfp/skfddi.c
5057 Removing drivers/net/ibm_newemac/Makefile
5058 Auto-merging drivers/net/macvlan.c
5059 Removing drivers/net/octeon/Makefile
5060 Removing drivers/net/pci-skeleton.c
5061 Removing drivers/net/pcmcia/Kconfig
5062 Removing drivers/net/pcmcia/Makefile
5063 Auto-merging drivers/net/phy/dp83640.c
5064 Auto-merging drivers/net/slip/slip.c
5065 Auto-merging drivers/net/slip/slip.h
5066 Auto-merging drivers/net/tokenring/ibmtr_cs.c
5067 Removing drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
5068 Removing drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
5069 Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
5070 Removing drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
5071 Auto-merging drivers/s390/cio/qdio_main.c
5072 CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
5073 Auto-merging drivers/s390/cio/qdio_setup.c
5074 Auto-merging drivers/s390/net/lcs.c
5075 Auto-merging drivers/scsi/bnx2fc/bnx2fc.h
5076 Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c
5077 Auto-merging drivers/scsi/fcoe/fcoe.c
5078 Auto-merging drivers/scsi/fcoe/fcoe_transport.c
5079 Auto-merging drivers/staging/Kconfig
5080 Auto-merging drivers/staging/Makefile
5081 Removing drivers/staging/ath6kl/Kconfig
5082 Removing drivers/staging/ath6kl/Makefile
5083 Removing drivers/staging/ath6kl/TODO
5084 Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h
5085 Removing drivers/staging/ath6kl/bmi/src/bmi.c
5086 Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h
5087 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
5088 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
5089 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
5090 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c
5091 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h
5092 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
5093 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
5094 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
5095 Removing drivers/staging/ath6kl/htc2/htc.c
5096 Removing drivers/staging/ath6kl/htc2/htc_debug.h
5097 Removing drivers/staging/ath6kl/htc2/htc_internal.h
5098 Removing drivers/staging/ath6kl/htc2/htc_recv.c
5099 Removing drivers/staging/ath6kl/htc2/htc_send.c
5100 Removing drivers/staging/ath6kl/htc2/htc_services.c
5101 Removing drivers/staging/ath6kl/include/a_config.h
5102 Removing drivers/staging/ath6kl/include/a_debug.h
5103 Removing drivers/staging/ath6kl/include/a_drv.h
5104 Removing drivers/staging/ath6kl/include/a_drv_api.h
5105 Removing drivers/staging/ath6kl/include/a_osapi.h
5106 Removing drivers/staging/ath6kl/include/aggr_recv_api.h
5107 Removing drivers/staging/ath6kl/include/ar3kconfig.h
5108 Removing drivers/staging/ath6kl/include/ar6000_api.h
5109 Removing drivers/staging/ath6kl/include/ar6000_diag.h
5110 Removing drivers/staging/ath6kl/include/ar6kap_common.h
5111 Removing drivers/staging/ath6kl/include/athbtfilter.h
5112 Removing drivers/staging/ath6kl/include/bmi.h
5113 Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
5114 Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h
5115 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
5116 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
5117 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
5118 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
5119 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
5120 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
5121 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
5122 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
5123 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
5124 Removing drivers/staging/ath6kl/include/common/athdefs.h
5125 Removing drivers/staging/ath6kl/include/common/bmi_msg.h
5126 Removing drivers/staging/ath6kl/include/common/cnxmgmt.h
5127 Removing drivers/staging/ath6kl/include/common/dbglog.h
5128 Removing drivers/staging/ath6kl/include/common/dbglog_id.h
5129 Removing drivers/staging/ath6kl/include/common/discovery.h
5130 Removing drivers/staging/ath6kl/include/common/epping_test.h
5131 Removing drivers/staging/ath6kl/include/common/gmboxif.h
5132 Removing drivers/staging/ath6kl/include/common/gpio_reg.h
5133 Removing drivers/staging/ath6kl/include/common/htc.h
5134 Removing drivers/staging/ath6kl/include/common/htc_services.h
5135 Removing drivers/staging/ath6kl/include/common/pkt_log.h
5136 Removing drivers/staging/ath6kl/include/common/roaming.h
5137 Removing drivers/staging/ath6kl/include/common/targaddrs.h
5138 Removing drivers/staging/ath6kl/include/common/testcmd.h
5139 Removing drivers/staging/ath6kl/include/common/tlpm.h
5140 Removing drivers/staging/ath6kl/include/common/wlan_defs.h
5141 Removing drivers/staging/ath6kl/include/common/wmi.h
5142 Removing drivers/staging/ath6kl/include/common/wmix.h
5143 Removing drivers/staging/ath6kl/include/common_drv.h
5144 Removing drivers/staging/ath6kl/include/dbglog_api.h
5145 Removing drivers/staging/ath6kl/include/dl_list.h
5146 Removing drivers/staging/ath6kl/include/dset_api.h
5147 Removing drivers/staging/ath6kl/include/hci_transport_api.h
5148 Removing drivers/staging/ath6kl/include/hif.h
5149 Removing drivers/staging/ath6kl/include/host_version.h
5150 Removing drivers/staging/ath6kl/include/htc_api.h
5151 Removing drivers/staging/ath6kl/include/htc_packet.h
5152 Removing drivers/staging/ath6kl/include/wlan_api.h
5153 Removing drivers/staging/ath6kl/include/wmi_api.h
5154 Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c
5155 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
5156 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
5157 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
5158 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
5159 Removing drivers/staging/ath6kl/miscdrv/common_drv.c
5160 Removing drivers/staging/ath6kl/miscdrv/credit_dist.c
5161 Removing drivers/staging/ath6kl/miscdrv/miscdrv.h
5162 Removing drivers/staging/ath6kl/os/linux/ar6000_drv.c
5163 Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c
5164 Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
5165 Removing drivers/staging/ath6kl/os/linux/cfg80211.c
5166 Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c
5167 Removing drivers/staging/ath6kl/os/linux/hci_bridge.c
5168 Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
5169 Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
5170 Removing drivers/staging/ath6kl/os/linux/inResolved 'drivers/s390/cio/qdio_main.c' using previous resolution.
5171 Resolved 'net/batman-adv/soft-interface.c' using previous resolution.
5172 clude/ar6xapi_linux.h
5173 Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
5174 Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h
5175 Removing drivers/staging/ath6kl/os/linux/include/config_linux.h
5176 Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h
5177 Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
5178 Removing drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
5179 Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h
5180 Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h
5181 Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
5182 Removing drivers/staging/ath6kl/os/linux/netbuf.c
5183 Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h
5184 Removing drivers/staging/ath6kl/reorder/rcv_aggr.c
5185 Removing drivers/staging/ath6kl/wlan/include/ieee80211.h
5186 Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h
5187 Removing drivers/staging/ath6kl/wlan/src/wlan_node.c
5188 Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
5189 Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c
5190 Removing drivers/staging/ath6kl/wmi/wmi.c
5191 Removing drivers/staging/ath6kl/wmi/wmi_host.h
5192 Auto-merging include/linux/pci.h
5193 Auto-merging include/linux/sh_eth.h
5194 Auto-merging include/linux/sungem_phy.h
5195 Auto-merging include/net/nfc/nfc.h
5196 Removing net/batman-adv/aggregation.c
5197 Removing net/batman-adv/aggregation.h
5198 Auto-merging net/batman-adv/soft-interface.c
5199 CONFLICT (content): Merge conflict in net/batman-adv/soft-interface.c
5200 Auto-merging net/bridge/br_device.c
5201 Auto-merging net/ipv4/tcp_input.c
5202 Auto-merging net/ipv4/tcp_ipv4.c
5203 Auto-merging net/ipv6/tcp_ipv6.c
5204 Auto-merging net/packet/af_packet.c
5205 Removing net/rds/xlist.h
5206 Automatic merge failed; fix conflicts and then commit the result.
5207 $ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
5208 arch/powerpc/configs/40x/hcu4_defconfig: needs merge
5209 drivers/s390/cio/qdio_main.c: needs merge
5210 net/batman-adv/soft-interface.c: needs merge
5211 rm 'arch/powerpc/configs/40x/hcu4_defconfig'
5213 [master b8f66d9] Merge remote-tracking branch 'net/master'
5214 $ git diff -M --stat --summary HEAD^..
5215 Documentation/ABI/testing/sysfs-class-net-mesh | 8 +
5216 .../devicetree/bindings/net/can/fsl-flexcan.txt | 63 +-
5217 Documentation/devicetree/bindings/net/smsc911x.txt | 38 +
5218 Documentation/networking/batman-adv.txt | 8 +-
5219 Documentation/networking/ip-sysctl.txt | 17 +-
5220 Documentation/networking/netdevices.txt | 4 +-
5221 Documentation/networking/stmmac.txt | 33 +-
5222 MAINTAINERS | 214 +-
5223 arch/cris/arch-v10/drivers/Kconfig | 1 +
5224 arch/cris/arch-v32/drivers/Kconfig | 1 +
5225 arch/ia64/hp/sim/simeth.c | 2 +-
5226 arch/mips/Kconfig | 8 +-
5227 arch/mips/bcm47xx/Kconfig | 31 +
5228 arch/mips/bcm47xx/Makefile | 3 +-
5229 arch/mips/bcm47xx/gpio.c | 82 +-
5230 arch/mips/bcm47xx/irq.c | 12 +
5231 arch/mips/bcm47xx/nvram.c | 29 +-
5232 arch/mips/bcm47xx/serial.c | 46 +-
5233 arch/mips/bcm47xx/setup.c | 90 +-
5234 arch/mips/bcm47xx/time.c | 16 +-
5235 arch/mips/bcm47xx/wgt634u.c | 14 +-
5236 arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 26 +-
5237 arch/mips/include/asm/mach-bcm47xx/gpio.h | 108 +-
5238 arch/mips/pci/pci-bcm47xx.c | 6 +
5239 arch/mips/txx9/generic/setup_tx4939.c | 2 +-
5240 arch/powerpc/Kconfig | 2 +
5241 arch/powerpc/boot/dts/p1010rdb.dts | 10 +-
5242 arch/powerpc/boot/dts/p1010si.dtsi | 10 +-
5243 arch/powerpc/configs/40x/acadia_defconfig | 11 +-
5244 arch/powerpc/configs/40x/ep405_defconfig | 5 +-
5245 arch/powerpc/configs/40x/kilauea_defconfig | 9 +-
5246 arch/powerpc/configs/40x/makalu_defconfig | 9 +-
5247 arch/powerpc/configs/40x/walnut_defconfig | 5 +-
5248 arch/powerpc/configs/44x/arches_defconfig | 9 +-
5249 arch/powerpc/configs/44x/bamboo_defconfig | 5 +-
5250 arch/powerpc/configs/44x/bluestone_defconfig | 9 +-
5251 arch/powerpc/configs/44x/canyonlands_defconfig | 9 +-
5252 arch/powerpc/configs/44x/ebony_defconfig | 5 +-
5253 arch/powerpc/configs/44x/eiger_defconfig | 9 +-
5254 arch/powerpc/configs/44x/icon_defconfig | 5 +-
5255 arch/powerpc/configs/44x/katmai_defconfig | 5 +-
5256 arch/powerpc/configs/44x/redwood_defconfig | 11 +-
5257 arch/powerpc/configs/44x/sam440ep_defconfig | 5 +-
5258 arch/powerpc/configs/44x/sequoia_defconfig | 5 +-
5259 arch/powerpc/configs/44x/taishan_defconfig | 5 +-
5260 arch/powerpc/configs/44x/warp_defconfig | 5 +-
5261 arch/powerpc/configs/ppc40x_defconfig | 5 +-
5262 arch/powerpc/configs/ppc44x_defconfig | 5 +-
5263 arch/powerpc/platforms/40x/Kconfig | 12 +-
5264 arch/powerpc/platforms/44x/Kconfig | 54 +-
5265 arch/powerpc/platforms/cell/Kconfig | 8 +-
5266 arch/s390/include/asm/qdio.h | 78 +-
5267 arch/um/drivers/net_kern.c | 2 +-
5268 arch/xtensa/platforms/iss/network.c | 2 +-
5269 drivers/atm/eni.c | 3 +-
5270 drivers/atm/iphase.c | 265 +-
5271 drivers/atm/iphase.h | 391 +-
5272 drivers/bcma/Kconfig | 13 +
5273 drivers/bcma/Makefile | 2 +
5274 drivers/bcma/bcma_private.h | 16 +
5275 drivers/bcma/core.c | 2 +
5276 drivers/bcma/driver_chipcommon.c | 53 +
5277 drivers/bcma/driver_chipcommon_pmu.c | 191 +-
5278 drivers/bcma/driver_mips.c | 256 +
5279 drivers/bcma/driver_pci.c | 16 +-
5280 drivers/bcma/host_soc.c | 183 +
5281 drivers/bcma/main.c | 70 +-
5282 drivers/bcma/scan.c | 348 +-
5283 drivers/bcma/sprom.c | 15 +
5284 drivers/connector/cn_proc.c | 26 +
5285 drivers/infiniband/hw/amso1100/c2.c | 8 +-
5286 drivers/infiniband/hw/cxgb3/Makefile | 2 +-
5287 drivers/infiniband/hw/cxgb4/Makefile | 2 +-
5288 drivers/infiniband/hw/mlx4/Kconfig | 3 +-
5289 drivers/infiniband/hw/nes/nes_nic.c | 23 +-
5290 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 5 +-
5291 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 5 +-
5292 drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +-
5293 drivers/media/dvb/dvb-core/dvb_net.c | 2 +-
5294 drivers/net/Kconfig | 3448 +----------
5295 drivers/net/Makefile | 326 +-
5296 drivers/net/appletalk/cops.c | 2 +-
5297 drivers/net/appletalk/ltpc.c | 2 +-
5298 drivers/net/arcnet/Kconfig | 14 +-
5299 drivers/net/arcnet/Makefile | 1 +
5300 drivers/net/arcnet/com20020.c | 2 +-
5301 drivers/net/{pcmcia => arcnet}/com20020_cs.c | 0
5302 drivers/net/arm/Kconfig | 74 -
5303 drivers/net/arm/Makefile | 14 -
5304 drivers/net/benet/Kconfig | 6 -
5305 drivers/net/bna/bfa_ioc_ct.c | 516 --
5306 drivers/net/bna/bfi_ctreg.h | 646 --
5307 drivers/net/bna/bfi_ll.h | 438 --
5308 drivers/net/bna/bna_ctrl.c | 3076 ----------
5309 drivers/net/bna/bna_hw.h | 1490 -----
5310 drivers/net/bna/bna_txrx.c | 4185 -------------
5311 drivers/net/bonding/bond_main.c | 68 +-
5312 drivers/net/bonding/bonding.h | 1 -
5313 drivers/net/caif/caif_hsi.c | 9 +-
5314 drivers/net/caif/caif_spi.c | 4 -
5315 drivers/net/can/dev.c | 14 +-
5316 drivers/net/can/flexcan.c | 189 +-
5317 drivers/net/can/mscan/mscan.c | 26 +-
5318 drivers/net/can/sja1000/Kconfig | 14 +
5319 drivers/net/can/sja1000/Makefile | 2 +
5320 drivers/net/can/sja1000/ems_pcmcia.c | 331 +
5321 drivers/net/can/sja1000/peak_pci.c | 291 +
5322 drivers/net/cris/eth_v10.c | 2 +-
5323 drivers/net/dummy.c | 2 +-
5324 drivers/net/{ => ethernet/3com}/3c501.c | 2 +-
5325 drivers/net/{ => ethernet/3com}/3c501.h | 0
5326 drivers/net/{ => ethernet/3com}/3c509.c | 2 +-
5327 drivers/net/{ => ethernet/3com}/3c515.c | 2 +-
5328 drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c | 2 +-
5329 drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c | 2 +-
5330 drivers/net/{ => ethernet/3com}/3c59x.c | 11 +-
5331 drivers/net/ethernet/3com/Kconfig | 122 +
5332 drivers/net/ethernet/3com/Makefile | 11 +
5333 drivers/net/{ => ethernet/3com}/typhoon.c | 5 +-
5334 drivers/net/{ => ethernet/3com}/typhoon.h | 0
5335 drivers/net/{ => ethernet/8390}/3c503.c | 2 +-
5336 drivers/net/{ => ethernet/8390}/3c503.h | 0
5337 drivers/net/{ => ethernet/8390}/8390.c | 2 +-
5338 drivers/net/{ => ethernet/8390}/8390.h | 0
5339 drivers/net/{ => ethernet/8390}/8390p.c | 2 +-
5340 drivers/net/ethernet/8390/Kconfig | 337 +
5341 drivers/net/ethernet/8390/Makefile | 29 +
5342 drivers/net/{ => ethernet/8390}/ac3200.c | 2 +-
5343 drivers/net/{ => ethernet/8390}/apne.c | 0
5344 drivers/net/{ => ethernet/8390}/ax88796.c | 2 +-
5345 drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c | 4 +-
5346 drivers/net/{ => ethernet/8390}/e2100.c | 2 +-
5347 drivers/net/{ => ethernet/8390}/es3210.c | 0
5348 drivers/net/{arm => ethernet/8390}/etherh.c | 4 +-
5349 drivers/net/{ => ethernet/8390}/hp-plus.c | 2 +-
5350 drivers/net/{ => ethernet/8390}/hp.c | 0
5351 drivers/net/{ => ethernet/8390}/hydra.c | 2 +-
5352 drivers/net/{ => ethernet/8390}/lib8390.c | 0
5353 drivers/net/{ => ethernet/8390}/lne390.c | 0
5354 drivers/net/{ => ethernet/8390}/mac8390.c | 2 +-
5355 drivers/net/{ => ethernet/8390}/ne-h8300.c | 2 +-
5356 drivers/net/{ => ethernet/8390}/ne.c | 0
5357 drivers/net/{ => ethernet/8390}/ne2.c | 0
5358 drivers/net/{ => ethernet/8390}/ne2k-pci.c | 2 +-
5359 drivers/net/{ => ethernet/8390}/ne3210.c | 0
5360 drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c | 4 +-
5361 drivers/net/{ => ethernet/8390}/smc-mca.c | 2 +-
5362 drivers/net/{ => ethernet/8390}/smc-ultra.c | 2 +-
5363 drivers/net/{ => ethernet/8390}/smc-ultra32.c | 2 +-
5364 drivers/net/{ => ethernet/8390}/stnic.c | 0
5365 drivers/net/{ => ethernet/8390}/wd.c | 2 +-
5366 drivers/net/{ => ethernet/8390}/zorro8390.c | 2 +-
5367 drivers/net/ethernet/Kconfig | 177 +
5368 drivers/net/ethernet/Makefile | 74 +
5369 drivers/net/ethernet/adaptec/Kconfig | 36 +
5370 drivers/net/ethernet/adaptec/Makefile | 5 +
5371 drivers/net/{ => ethernet/adaptec}/starfire.c | 7 +-
5372 drivers/net/ethernet/adi/Kconfig | 69 +
5373 drivers/net/ethernet/adi/Makefile | 5 +
5374 drivers/net/{ => ethernet/adi}/bfin_mac.c | 2 +-
5375 drivers/net/{ => ethernet/adi}/bfin_mac.h | 0
5376 drivers/net/ethernet/aeroflex/Kconfig | 11 +
5377 drivers/net/ethernet/aeroflex/Makefile | 5 +
5378 drivers/net/{ => ethernet/aeroflex}/greth.c | 14 +-
5379 drivers/net/{ => ethernet/aeroflex}/greth.h | 0
5380 drivers/net/ethernet/alteon/Kconfig | 48 +
5381 drivers/net/ethernet/alteon/Makefile | 5 +
5382 drivers/net/{ => ethernet/alteon}/acenic.c | 8 +-
5383 drivers/net/{ => ethernet/alteon}/acenic.h | 0
5384 drivers/net/{ => ethernet/amd}/7990.c | 0
5385 drivers/net/{ => ethernet/amd}/7990.h | 0
5386 drivers/net/ethernet/amd/Kconfig | 195 +
5387 drivers/net/ethernet/amd/Makefile | 20 +
5388 drivers/net/{ => ethernet/amd}/a2065.c | 2 +-
5389 drivers/net/{ => ethernet/amd}/a2065.h | 0
5390 drivers/net/{arm => ethernet/amd}/am79c961a.c | 2 +-
5391 drivers/net/{arm => ethernet/amd}/am79c961a.h | 0
5392 drivers/net/{ => ethernet/amd}/amd8111e.c | 2 +-
5393 drivers/net/{ => ethernet/amd}/amd8111e.h | 0
5394 drivers/net/{ => ethernet/amd}/ariadne.c | 2 +-
5395 drivers/net/{ => ethernet/amd}/ariadne.h | 0
5396 drivers/net/{ => ethernet/amd}/atarilance.c | 2 +-
5397 drivers/net/{ => ethernet/amd}/au1000_eth.c | 2 +-
5398 drivers/net/{ => ethernet/amd}/au1000_eth.h | 0
5399 drivers/net/{ => ethernet/amd}/declance.c | 2 +-
5400 drivers/net/{ => ethernet/amd}/depca.c | 2 +-
5401 drivers/net/{ => ethernet/amd}/depca.h | 2 -
5402 drivers/net/{ => ethernet/amd}/hplance.c | 2 +-
5403 drivers/net/{ => ethernet/amd}/hplance.h | 0
5404 drivers/net/{ => ethernet/amd}/lance.c | 2 +-
5405 drivers/net/{ => ethernet/amd}/mvme147.c | 2 +-
5406 drivers/net/{ => ethernet/amd}/ni65.c | 2 +-
5407 drivers/net/{ => ethernet/amd}/ni65.h | 0
5408 drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c | 2 +-
5409 drivers/net/{ => ethernet/amd}/pcnet32.c | 204 +-
5410 drivers/net/{ => ethernet/amd}/sun3lance.c | 2 +-
5411 drivers/net/{ => ethernet/amd}/sunlance.c | 2 +-
5412 drivers/net/ethernet/apple/Kconfig | 97 +
5413 drivers/net/ethernet/apple/Makefile | 9 +
5414 drivers/net/{ => ethernet/apple}/bmac.c | 2 +-
5415 drivers/net/{ => ethernet/apple}/bmac.h | 0
5416 drivers/net/{ => ethernet/apple}/cs89x0.c | 2 +-
5417 drivers/net/{ => ethernet/apple}/cs89x0.h | 0
5418 drivers/net/{ => ethernet/apple}/mac89x0.c | 2 +-
5419 drivers/net/{ => ethernet/apple}/mace.c | 2 +-
5420 drivers/net/{ => ethernet/apple}/mace.h | 0
5421 drivers/net/{ => ethernet/apple}/macmace.c | 11 +-
5422 drivers/net/ethernet/atheros/Kconfig | 70 +
5423 drivers/net/ethernet/atheros/Makefile | 8 +
5424 drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
5425 drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
5426 .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
5427 .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
5428 .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
5429 .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 11 +-
5430 drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
5431 drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
5432 .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
5433 .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
5434 .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
5435 .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 13 +-
5436 .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
5437 drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
5438 drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 7 +-
5439 drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
5440 drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 2 +-
5441 drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
5442 drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
5443 drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
5444 drivers/net/ethernet/broadcom/Kconfig | 122 +
5445 drivers/net/ethernet/broadcom/Makefile | 11 +
5446 drivers/net/{ => ethernet/broadcom}/b44.c | 2 +-
5447 drivers/net/{ => ethernet/broadcom}/b44.h | 0
5448 drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c | 2 +-
5449 drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h | 0
5450 drivers/net/{ => ethernet/broadcom}/bnx2.c | 77 +-
5451 drivers/net/{ => ethernet/broadcom}/bnx2.h | 0
5452 drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0
5453 drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile | 0
5454 drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 67 +-
5455 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 53 +-
5456 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 10 +-
5457 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 5 +-
5458 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0
5459 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h | 0
5460 .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c | 25 +-
5461 .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h | 0
5462 .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0
5463 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 2 +
5464 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h | 0
5465 .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h | 0
5466 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c | 150 +-
5467 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h | 0
5468 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c | 81 +-
5469 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0
5470 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c | 67 +-
5471 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h | 0
5472 .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c | 46 +-
5473 .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h | 0
5474 drivers/net/{ => ethernet/broadcom}/cnic.c | 35 +-
5475 drivers/net/{ => ethernet/broadcom}/cnic.h | 4 +-
5476 drivers/net/{ => ethernet/broadcom}/cnic_defs.h | 1 +
5477 drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0
5478 drivers/net/{ => ethernet/broadcom}/sb1250-mac.c | 2 +-
5479 drivers/net/{ => ethernet/broadcom}/tg3.c | 1553 +++---
5480 drivers/net/{ => ethernet/broadcom}/tg3.h | 3 +
5481 drivers/net/ethernet/brocade/Kconfig | 23 +
5482 drivers/net/ethernet/brocade/Makefile | 5 +
5483 drivers/net/ethernet/brocade/bna/Kconfig | 17 +
5484 drivers/net/{ => ethernet/brocade}/bna/Makefile | 5 +-
5485 drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c | 5 -
5486 drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h | 0
5487 drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h | 0
5488 drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h | 64 +-
5489 .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h | 8 +-
5490 .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h | 69 +-
5491 .../{ => ethernet/brocade}/bna/bfa_defs_status.h | 0
5492 drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c | 459 +-
5493 drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h | 68 +-
5494 drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | 878 +++
5495 drivers/net/ethernet/brocade/bna/bfa_msgq.c | 669 ++
5496 drivers/net/ethernet/brocade/bna/bfa_msgq.h | 130 +
5497 drivers/net/{ => ethernet/brocade}/bna/bfi.h | 257 +-
5498 drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h | 0
5499 drivers/net/ethernet/brocade/bna/bfi_enet.h | 901 +++
5500 drivers/net/ethernet/brocade/bna/bfi_reg.h | 452 ++
5501 drivers/net/{ => ethernet/brocade}/bna/bna.h | 351 +-
5502 drivers/net/ethernet/brocade/bna/bna_enet.c | 2144 +++++++
5503 drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 422 ++
5504 drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 3798 ++++++++++++
5505 drivers/net/{ => ethernet/brocade}/bna/bna_types.h | 656 +--
5506 drivers/net/{ => ethernet/brocade}/bna/bnad.c | 1176 +++--
5507 drivers/net/{ => ethernet/brocade}/bna/bnad.h | 101 +-
5508 .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c | 486 +--
5509 drivers/net/{ => ethernet/brocade}/bna/cna.h | 43 +-
5510 drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c | 48 +-
5511 drivers/net/ethernet/cadence/Kconfig | 45 +
5512 drivers/net/ethernet/cadence/Makefile | 6 +
5513 drivers/net/{arm => ethernet/cadence}/at91_ether.c | 2 +-
5514 drivers/net/{arm => ethernet/cadence}/at91_ether.h | 0
5515 drivers/net/{ => ethernet/cadence}/macb.c | 2 +-
5516 drivers/net/{ => ethernet/cadence}/macb.h | 0
5517 drivers/net/ethernet/chelsio/Kconfig | 107 +
5518 drivers/net/ethernet/chelsio/Makefile | 8 +
5519 .../{chelsio => ethernet/chelsio/cxgb}/Makefile | 0
5520 .../{chelsio => ethernet/chelsio/cxgb}/common.h | 0
5521 .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0
5522 .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h | 0
5523 .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c | 2 +-
5524 .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h | 0
5525 .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c | 0
5526 .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h | 0
5527 .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h | 0
5528 .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0
5529 .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c | 0
5530 .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h | 0
5531 .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c | 0
5532 .../{chelsio => ethernet/chelsio/cxgb}/my3126.c | 0
5533 .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c | 0
5534 .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h | 0
5535 .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c | 5 +-
5536 .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h | 0
5537 .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c | 0
5538 .../chelsio/cxgb}/suni1x10gexp_regs.h | 0
5539 .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c | 0
5540 .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h | 0
5541 .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c | 0
5542 .../chelsio/cxgb}/vsc7326_reg.h | 0
5543 drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile | 0
5544 drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h | 0
5545 drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c | 0
5546 drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0
5547 drivers/net/{ => ethernet/chelsio}/cxgb3/common.h | 0
5548 .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h | 0
5549 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0
5550 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h | 0
5551 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 2 +-
5552 .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c | 0
5553 .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h | 0
5554 .../chelsio}/cxgb3/firmware_exports.h | 0
5555 drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0
5556 drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0
5557 drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0
5558 drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h | 0
5559 drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c | 6 +-
5560 .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0
5561 drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0
5562 drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0
5563 drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0
5564 drivers/net/{ => ethernet/chelsio}/cxgb3/version.h | 0
5565 drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0
5566 drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0
5567 drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile | 0
5568 drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0
5569 .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 5 +-
5570 .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0
5571 drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0
5572 drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0
5573 drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c | 0
5574 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0
5575 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0
5576 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0
5577 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0
5578 .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0
5579 .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile | 0
5580 .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0
5581 .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c | 2 +
5582 drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0
5583 .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h | 0
5584 .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h | 0
5585 .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0
5586 drivers/net/ethernet/cirrus/Kconfig | 30 +
5587 drivers/net/ethernet/cirrus/Makefile | 5 +
5588 drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c | 0
5589 drivers/net/ethernet/cisco/Kconfig | 23 +
5590 drivers/net/ethernet/cisco/Makefile | 5 +
5591 drivers/net/ethernet/cisco/enic/Kconfig | 9 +
5592 drivers/net/{ => ethernet/cisco}/enic/Makefile | 0
5593 drivers/net/{ => ethernet/cisco}/enic/cq_desc.h | 0
5594 .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h | 0
5595 drivers/net/{ => ethernet/cisco}/enic/enic.h | 15 +-
5596 drivers/net/{ => ethernet/cisco}/enic/enic_dev.c | 0
5597 drivers/net/{ => ethernet/cisco}/enic/enic_dev.h | 19 +
5598 drivers/net/{ => ethernet/cisco}/enic/enic_main.c | 192 +-
5599 drivers/net/{ => ethernet/cisco}/enic/enic_pp.c | 192 +-
5600 drivers/net/{ => ethernet/cisco}/enic/enic_pp.h | 15 +-
5601 drivers/net/{ => ethernet/cisco}/enic/enic_res.c | 0
5602 drivers/net/{ => ethernet/cisco}/enic/enic_res.h | 0
5603 .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h | 0
5604 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c | 0
5605 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h | 0
5606 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c | 28 +-
5607 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h | 2 +
5608 .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h | 0
5609 drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h | 0
5610 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c | 0
5611 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h | 0
5612 drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h | 0
5613 .../net/{ => ethernet/cisco}/enic/vnic_resource.h | 0
5614 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c | 0
5615 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h | 0
5616 drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h | 0
5617 drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h | 0
5618 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c | 0
5619 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h | 0
5620 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c | 0
5621 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h | 0
5622 .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h | 0
5623 drivers/net/ethernet/davicom/Kconfig | 24 +
5624 drivers/net/ethernet/davicom/Makefile | 5 +
5625 drivers/net/{ => ethernet/davicom}/dm9000.c | 13 +-
5626 drivers/net/{ => ethernet/davicom}/dm9000.h | 0
5627 drivers/net/ethernet/dec/Kconfig | 37 +
5628 drivers/net/ethernet/dec/Makefile | 6 +
5629 drivers/net/{ => ethernet/dec}/ewrk3.c | 2 +-
5630 drivers/net/{ => ethernet/dec}/ewrk3.h | 0
5631 drivers/net/{ => ethernet/dec}/tulip/21142.c | 0
5632 drivers/net/{ => ethernet/dec}/tulip/Kconfig | 21 +-
5633 drivers/net/{ => ethernet/dec}/tulip/Makefile | 0
5634 drivers/net/{ => ethernet/dec}/tulip/de2104x.c | 2 +-
5635 drivers/net/{ => ethernet/dec}/tulip/de4x5.c | 2 +-
5636 drivers/net/{ => ethernet/dec}/tulip/de4x5.h | 2 -
5637 drivers/net/{ => ethernet/dec}/tulip/dmfe.c | 2 +-
5638 drivers/net/{ => ethernet/dec}/tulip/eeprom.c | 0
5639 drivers/net/{ => ethernet/dec}/tulip/interrupt.c | 0
5640 drivers/net/{ => ethernet/dec}/tulip/media.c | 0
5641 drivers/net/{ => ethernet/dec}/tulip/pnic.c | 0
5642 drivers/net/{ => ethernet/dec}/tulip/pnic2.c | 0
5643 drivers/net/{ => ethernet/dec}/tulip/timer.c | 0
5644 drivers/net/{ => ethernet/dec}/tulip/tulip.h | 0
5645 drivers/net/{ => ethernet/dec}/tulip/tulip_core.c | 2 +-
5646 drivers/net/{ => ethernet/dec}/tulip/uli526x.c | 2 +-
5647 drivers/net/{ => ethernet/dec}/tulip/winbond-840.c | 2 +-
5648 drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c | 0
5649 drivers/net/ethernet/dlink/Kconfig | 86 +
5650 drivers/net/ethernet/dlink/Makefile | 8 +
5651 drivers/net/{ => ethernet/dlink}/de600.c | 0
5652 drivers/net/{ => ethernet/dlink}/de600.h | 0
5653 drivers/net/{ => ethernet/dlink}/de620.c | 2 +-
5654 drivers/net/{ => ethernet/dlink}/de620.h | 0
5655 drivers/net/{ => ethernet/dlink}/dl2k.c | 107 +-
5656 drivers/net/{ => ethernet/dlink}/dl2k.h | 110 +-
5657 drivers/net/{ => ethernet/dlink}/sundance.c | 2 +-
5658 drivers/net/{ => ethernet}/dnet.c | 0
5659 drivers/net/{ => ethernet}/dnet.h | 0
5660 drivers/net/ethernet/emulex/Kconfig | 23 +
5661 drivers/net/ethernet/emulex/Makefile | 5 +
5662 drivers/net/ethernet/emulex/benet/Kconfig | 6 +
5663 drivers/net/{ => ethernet/emulex}/benet/Makefile | 0
5664 drivers/net/{ => ethernet/emulex}/benet/be.h | 132 +-
5665 drivers/net/{ => ethernet/emulex}/benet/be_cmds.c | 241 +-
5666 drivers/net/{ => ethernet/emulex}/benet/be_cmds.h | 94 +-
5667 .../net/{ => ethernet/emulex}/benet/be_ethtool.c | 168 +-
5668 drivers/net/{ => ethernet/emulex}/benet/be_hw.h | 21 +-
5669 drivers/net/{ => ethernet/emulex}/benet/be_main.c | 550 +-
5670 drivers/net/{ => ethernet}/ethoc.c | 2 +-
5671 drivers/net/ethernet/faraday/Kconfig | 40 +
5672 drivers/net/ethernet/faraday/Makefile | 6 +
5673 drivers/net/{ => ethernet/faraday}/ftgmac100.c | 0
5674 drivers/net/{ => ethernet/faraday}/ftgmac100.h | 0
5675 drivers/net/{ => ethernet/faraday}/ftmac100.c | 0
5676 drivers/net/{ => ethernet/faraday}/ftmac100.h | 0
5677 drivers/net/{ => ethernet}/fealnx.c | 2 +-
5678 drivers/net/ethernet/freescale/Kconfig | 88 +
5679 drivers/net/ethernet/freescale/Makefile | 18 +
5680 drivers/net/{ => ethernet/freescale}/fec.c | 117 +-
5681 drivers/net/{ => ethernet/freescale}/fec.h | 0
5682 drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c | 2 +-
5683 drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h | 0
5684 .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c | 0
5685 .../net/{ => ethernet/freescale}/fs_enet/Kconfig | 3 +-
5686 .../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
5687 drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
5688 .../freescale}/fs_enet/fs_enet-main.c | 2 +-
5689 .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
5690 .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
5691 .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
5692 .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
5693 .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
5694 .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
5695 drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
5696 drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
5697 drivers/net/{ => ethernet/freescale}/gianfar.c | 12 +-
5698 drivers/net/{ => ethernet/freescale}/gianfar.h | 0
5699 .../net/{ => ethernet/freescale}/gianfar_ethtool.c | 5 +-
5700 drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
5701 .../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
5702 drivers/net/{ => ethernet/freescale}/ucc_geth.c | 12 +-
5703 drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
5704 .../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
5705 drivers/net/ethernet/fujitsu/Kconfig | 54 +
5706 drivers/net/ethernet/fujitsu/Makefile | 7 +
5707 drivers/net/{ => ethernet/fujitsu}/at1700.c | 2 +-
5708 drivers/net/{ => ethernet/fujitsu}/eth16i.c | 2 +-
5709 .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c | 2 +-
5710 drivers/net/ethernet/hp/Kconfig | 32 +
5711 drivers/net/ethernet/hp/Makefile | 5 +
5712 drivers/net/{ => ethernet/hp}/hp100.c | 4 +-
5713 drivers/net/{ => ethernet/hp}/hp100.h | 0
5714 drivers/net/{ => ethernet/i825xx}/3c505.c | 2 +-
5715 drivers/net/{ => ethernet/i825xx}/3c505.h | 0
5716 drivers/net/{ => ethernet/i825xx}/3c507.c | 0
5717 drivers/net/{ => ethernet/i825xx}/3c523.c | 2 +-
5718 drivers/net/{ => ethernet/i825xx}/3c523.h | 0
5719 drivers/net/{ => ethernet/i825xx}/3c527.c | 2 +-
5720 drivers/net/{ => ethernet/i825xx}/3c527.h | 0
5721 drivers/net/{ => ethernet/i825xx}/82596.c | 2 +-
5722 drivers/net/ethernet/i825xx/Kconfig | 183 +
5723 drivers/net/ethernet/i825xx/Makefile | 20 +
5724 drivers/net/{ => ethernet/i825xx}/eepro.c | 2 +-
5725 drivers/net/{ => ethernet/i825xx}/eexpress.c | 2 +-
5726 drivers/net/{ => ethernet/i825xx}/eexpress.h | 0
5727 drivers/net/{arm => ethernet/i825xx}/ether1.c | 2 +-
5728 drivers/net/{arm => ethernet/i825xx}/ether1.h | 0
5729 drivers/net/{ => ethernet/i825xx}/lasi_82596.c | 0
5730 drivers/net/{ => ethernet/i825xx}/lib82596.c | 2 +-
5731 drivers/net/{ => ethernet/i825xx}/lp486e.c | 2 +-
5732 drivers/net/{ => ethernet/i825xx}/ni52.c | 2 +-
5733 drivers/net/{ => ethernet/i825xx}/ni52.h | 0
5734 drivers/net/{ => ethernet/i825xx}/sni_82596.c | 0
5735 drivers/net/{ => ethernet/i825xx}/sun3_82586.c | 2 +-
5736 drivers/net/{ => ethernet/i825xx}/sun3_82586.h | 0
5737 drivers/net/{ => ethernet/i825xx}/znet.c | 2 +-
5738 drivers/net/ethernet/ibm/Kconfig | 48 +
5739 drivers/net/ethernet/ibm/Makefile | 8 +
5740 drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
5741 drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 1 +
5742 drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
5743 drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
5744 drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 61 +-
5745 drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
5746 drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
5747 drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
5748 drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
5749 .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig | 40 +-
5750 drivers/net/ethernet/ibm/emac/Makefile | 11 +
5751 .../net/{ibm_newemac => ethernet/ibm/emac}/core.c | 16 +-
5752 .../net/{ibm_newemac => ethernet/ibm/emac}/core.h | 16 +-
5753 .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c | 0
5754 .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h | 2 +-
5755 .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h | 0
5756 .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c | 6 +-
5757 .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h | 4 +-
5758 .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c | 0
5759 .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h | 0
5760 .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c | 0
5761 .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h | 4 +-
5762 .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c | 0
5763 .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h | 4 +-
5764 .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c | 0
5765 .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h | 4 +-
5766 drivers/net/{ => ethernet/ibm}/ibmveth.c | 7 +-
5767 drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
5768 drivers/net/{ => ethernet/ibm}/iseries_veth.c | 2 +-
5769 drivers/net/ethernet/icplus/Kconfig | 14 +
5770 drivers/net/ethernet/icplus/Makefile | 5 +
5771 drivers/net/{ => ethernet/icplus}/ipg.c | 199 +-
5772 drivers/net/{ => ethernet/icplus}/ipg.h | 0
5773 drivers/net/ethernet/intel/Kconfig | 222 +
5774 drivers/net/ethernet/intel/Makefile | 12 +
5775 drivers/net/{ => ethernet/intel}/e100.c | 2 +-
5776 drivers/net/{ => ethernet/intel}/e1000/Makefile | 0
5777 drivers/net/{ => ethernet/intel}/e1000/e1000.h | 2 +
5778 .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c | 0
5779 drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c | 0
5780 drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h | 0
5781 .../net/{ => ethernet/intel}/e1000/e1000_main.c | 42 +-
5782 .../net/{ => ethernet/intel}/e1000/e1000_osdep.h | 0
5783 .../net/{ => ethernet/intel}/e1000/e1000_param.c | 0
5784 .../intel/e1000e/80003es2lan.c} | 9 +-
5785 drivers/net/{ => ethernet/intel}/e1000e/82571.c | 25 +-
5786 drivers/net/{ => ethernet/intel}/e1000e/Makefile | 2 +-
5787 drivers/net/{ => ethernet/intel}/e1000e/defines.h | 0
5788 drivers/net/{ => ethernet/intel}/e1000e/e1000.h | 34 +-
5789 drivers/net/{ => ethernet/intel}/e1000e/ethtool.c | 97 +-
5790 drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0
5791 drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c | 46 +-
5792 drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0
5793 drivers/net/{ => ethernet/intel}/e1000e/netdev.c | 257 +-
5794 drivers/net/{ => ethernet/intel}/e1000e/param.c | 0
5795 drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0
5796 drivers/net/{ => ethernet/intel}/igb/Makefile | 0
5797 drivers/net/{ => ethernet/intel}/igb/e1000_82575.c | 0
5798 drivers/net/{ => ethernet/intel}/igb/e1000_82575.h | 0
5799 .../net/{ => ethernet/intel}/igb/e1000_defines.h | 0
5800 drivers/net/{ => ethernet/intel}/igb/e1000_hw.h | 0
5801 drivers/net/{ => ethernet/intel}/igb/e1000_mac.c | 9 +-
5802 drivers/net/{ => ethernet/intel}/igb/e1000_mac.h | 0
5803 drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c | 0
5804 drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h | 0
5805 drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c | 0
5806 drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h | 0
5807 drivers/net/{ => ethernet/intel}/igb/e1000_phy.c | 6 +
5808 drivers/net/{ => ethernet/intel}/igb/e1000_phy.h | 0
5809 drivers/net/{ => ethernet/intel}/igb/e1000_regs.h | 0
5810 drivers/net/{ => ethernet/intel}/igb/igb.h | 117 +-
5811 drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c | 15 +-
5812 drivers/net/{ => ethernet/intel}/igb/igb_main.c | 533 +-
5813 drivers/net/{ => ethernet/intel}/igbvf/Makefile | 0
5814 drivers/net/{ => ethernet/intel}/igbvf/defines.h | 0
5815 drivers/net/{ => ethernet/intel}/igbvf/ethtool.c | 0
5816 drivers/net/{ => ethernet/intel}/igbvf/igbvf.h | 0
5817 drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0
5818 drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0
5819 drivers/net/{ => ethernet/intel}/igbvf/netdev.c | 7 +-
5820 drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0
5821 drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0
5822 drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0
5823 drivers/net/{ => ethernet/intel}/ixgb/Makefile | 0
5824 drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 2 +
5825 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 2 +-
5826 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 4 +-
5827 .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 98 +-
5828 drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 2 +-
5829 drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 4 +-
5830 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0
5831 drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c | 74 +-
5832 drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h | 1 +
5833 drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c | 18 +-
5834 drivers/net/{ => ethernet/intel}/ixgbe/Makefile | 0
5835 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h | 77 +-
5836 .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 43 +-
5837 .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 147 +-
5838 .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c | 172 +-
5839 .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h | 2 +-
5840 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 58 +-
5841 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 7 +-
5842 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c | 9 +-
5843 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h | 0
5844 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c | 56 +-
5845 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h | 2 +-
5846 .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 161 +-
5847 .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c | 217 +-
5848 .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 15 +-
5849 .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0
5850 .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c | 2092 +++----
5851 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0
5852 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0
5853 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 33 +-
5854 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0
5855 .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 207 +-
5856 .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 5 +
5857 .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h | 78 +-
5858 .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 92 +-
5859 drivers/net/{ => ethernet/intel}/ixgbevf/Makefile | 0
5860 drivers/net/{ => ethernet/intel}/ixgbevf/defines.h | 0
5861 drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c | 46 -
5862 drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h | 8 +-
5863 .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c | 101 +-
5864 drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c | 0
5865 drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h | 0
5866 drivers/net/{ => ethernet/intel}/ixgbevf/regs.h | 0
5867 drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0
5868 drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0
5869 drivers/net/{ => ethernet}/jme.c | 7 +-
5870 drivers/net/{ => ethernet}/jme.h | 1 -
5871 drivers/net/{ => ethernet}/korina.c | 3 +-
5872 drivers/net/{ => ethernet}/lantiq_etop.c | 2 +-
5873 drivers/net/ethernet/marvell/Kconfig | 111 +
5874 drivers/net/ethernet/marvell/Makefile | 8 +
5875 drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 10 +-
5876 drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0
5877 drivers/net/{ => ethernet/marvell}/skge.c | 78 +-
5878 drivers/net/{ => ethernet/marvell}/skge.h | 0
5879 drivers/net/{ => ethernet/marvell}/sky2.c | 102 +-
5880 drivers/net/{ => ethernet/marvell}/sky2.h | 0
5881 drivers/net/ethernet/mellanox/Kconfig | 23 +
5882 drivers/net/ethernet/mellanox/Makefile | 5 +
5883 drivers/net/ethernet/mellanox/mlx4/Kconfig | 27 +
5884 drivers/net/{ => ethernet/mellanox}/mlx4/Makefile | 0
5885 drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c | 0
5886 drivers/net/{ => ethernet/mellanox}/mlx4/catas.c | 0
5887 drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c | 0
5888 drivers/net/{ => ethernet/mellanox}/mlx4/cq.c | 0
5889 drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c | 0
5890 .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c | 0
5891 drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c | 0
5892 .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c | 2 +-
5893 drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c | 0
5894 drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h | 0
5895 .../{ => ethernet/mellanox}/mlx4/en_resources.c | 0
5896 drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c | 0
5897 .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c | 0
5898 drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c | 0
5899 drivers/net/{ => ethernet/mellanox}/mlx4/eq.c | 0
5900 drivers/net/{ => ethernet/mellanox}/mlx4/fw.c | 0
5901 drivers/net/{ => ethernet/mellanox}/mlx4/fw.h | 0
5902 drivers/net/{ => ethernet/mellanox}/mlx4/icm.c | 0
5903 drivers/net/{ => ethernet/mellanox}/mlx4/icm.h | 0
5904 drivers/net/{ => ethernet/mellanox}/mlx4/intf.c | 0
5905 drivers/net/{ => ethernet/mellanox}/mlx4/main.c | 0
5906 drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c | 0
5907 drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h | 0
5908 drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h | 0
5909 drivers/net/{ => ethernet/mellanox}/mlx4/mr.c | 0
5910 drivers/net/{ => ethernet/mellanox}/mlx4/pd.c | 0
5911 drivers/net/{ => ethernet/mellanox}/mlx4/port.c | 0
5912 drivers/net/{ => ethernet/mellanox}/mlx4/profile.c | 0
5913 drivers/net/{ => ethernet/mellanox}/mlx4/qp.c | 0
5914 drivers/net/{ => ethernet/mellanox}/mlx4/reset.c | 0
5915 drivers/net/{ => ethernet/mellanox}/mlx4/sense.c | 0
5916 drivers/net/{ => ethernet/mellanox}/mlx4/srq.c | 0
5917 drivers/net/ethernet/micrel/Kconfig | 69 +
5918 drivers/net/ethernet/micrel/Makefile | 9 +
5919 drivers/net/{arm => ethernet/micrel}/ks8695net.c | 2 +-
5920 drivers/net/{arm => ethernet/micrel}/ks8695net.h | 0
5921 drivers/net/{ => ethernet/micrel}/ks8842.c | 0
5922 drivers/net/{ => ethernet/micrel}/ks8851.c | 0
5923 drivers/net/{ => ethernet/micrel}/ks8851.h | 0
5924 drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
5925 drivers/net/{ => ethernet/micrel}/ksz884x.c | 3 +-
5926 drivers/net/ethernet/microchip/Kconfig | 38 +
5927 drivers/net/ethernet/microchip/Makefile | 5 +
5928 drivers/net/{ => ethernet/microchip}/enc28j60.c | 2 +-
5929 drivers/net/{ => ethernet/microchip}/enc28j60_hw.h | 0
5930 drivers/net/{ => ethernet}/mipsnet.c | 2 +-
5931 drivers/net/ethernet/myricom/Kconfig | 47 +
5932 drivers/net/ethernet/myricom/Makefile | 5 +
5933 .../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
5934 .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 14 +-
5935 .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
5936 .../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
5937 drivers/net/ethernet/natsemi/Kconfig | 83 +
5938 drivers/net/ethernet/natsemi/Makefile | 10 +
5939 drivers/net/{ => ethernet/natsemi}/ibmlana.c | 2 +-
5940 drivers/net/{ => ethernet/natsemi}/ibmlana.h | 0
5941 drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 2 +-
5942 drivers/net/{ => ethernet/natsemi}/macsonic.c | 11 +-
5943 drivers/net/{ => ethernet/natsemi}/natsemi.c | 2 +-
5944 drivers/net/{ => ethernet/natsemi}/ns83820.c | 7 +-
5945 drivers/net/{ => ethernet/natsemi}/sonic.c | 0
5946 drivers/net/{ => ethernet/natsemi}/sonic.h | 0
5947 drivers/net/{ => ethernet/natsemi}/xtsonic.c | 2 +-
5948 drivers/net/ethernet/neterion/Kconfig | 55 +
5949 drivers/net/ethernet/neterion/Makefile | 6 +
5950 drivers/net/{ => ethernet/neterion}/s2io-regs.h | 0
5951 drivers/net/{ => ethernet/neterion}/s2io.c | 10 +-
5952 drivers/net/{ => ethernet/neterion}/s2io.h | 0
5953 drivers/net/{ => ethernet/neterion}/vxge/Makefile | 0
5954 .../net/{ => ethernet/neterion}/vxge/vxge-config.c | 11 +-
5955 .../net/{ => ethernet/neterion}/vxge/vxge-config.h | 4 +-
5956 .../{ => ethernet/neterion}/vxge/vxge-ethtool.c | 0
5957 .../{ => ethernet/neterion}/vxge/vxge-ethtool.h | 0
5958 .../net/{ => ethernet/neterion}/vxge/vxge-main.c | 20 +-
5959 .../net/{ => ethernet/neterion}/vxge/vxge-main.h | 0
5960 .../net/{ => ethernet/neterion}/vxge/vxge-reg.h | 0
5961 .../{ => ethernet/neterion}/vxge/vxge-traffic.c | 12 +-
5962 .../{ => ethernet/neterion}/vxge/vxge-traffic.h | 0
5963 .../{ => ethernet/neterion}/vxge/vxge-version.h | 0
5964 drivers/net/{ => ethernet}/netx-eth.c | 2 +-
5965 drivers/net/ethernet/nuvoton/Kconfig | 31 +
5966 drivers/net/ethernet/nuvoton/Makefile | 5 +
5967 .../net/{arm => ethernet/nuvoton}/w90p910_ether.c | 2 +-
5968 drivers/net/ethernet/nvidia/Kconfig | 32 +
5969 drivers/net/ethernet/nvidia/Makefile | 5 +
5970 drivers/net/{ => ethernet/nvidia}/forcedeth.c | 18 +-
5971 drivers/net/{ => ethernet}/octeon/Kconfig | 6 +-
5972 drivers/net/ethernet/octeon/Makefile | 5 +
5973 drivers/net/{ => ethernet}/octeon/octeon_mgmt.c | 4 +-
5974 drivers/net/ethernet/oki-semi/Kconfig | 23 +
5975 drivers/net/ethernet/oki-semi/Makefile | 5 +
5976 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 22 +
5977 .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile | 0
5978 .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h | 0
5979 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c | 0
5980 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h | 0
5981 .../oki-semi}/pch_gbe/pch_gbe_ethtool.c | 0
5982 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c | 3 +-
5983 .../oki-semi}/pch_gbe/pch_gbe_param.c | 0
5984 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c | 0
5985 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h | 0
5986 drivers/net/ethernet/packetengines/Kconfig | 47 +
5987 drivers/net/ethernet/packetengines/Makefile | 6 +
5988 drivers/net/{ => ethernet/packetengines}/hamachi.c | 2 +-
5989 .../net/{ => ethernet/packetengines}/yellowfin.c | 2 +-
5990 drivers/net/ethernet/pasemi/Kconfig | 30 +
5991 drivers/net/ethernet/pasemi/Makefile | 5 +
5992 drivers/net/{ => ethernet/pasemi}/pasemi_mac.c | 7 +-
5993 drivers/net/{ => ethernet/pasemi}/pasemi_mac.h | 0
5994 .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c | 0
5995 drivers/net/ethernet/qlogic/Kconfig | 54 +
5996 drivers/net/ethernet/qlogic/Makefile | 8 +
5997 drivers/net/{ => ethernet/qlogic}/netxen/Makefile | 0
5998 .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h | 10 +-
5999 .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c | 0
6000 .../qlogic}/netxen/netxen_nic_ethtool.c | 0
6001 .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h | 0
6002 .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c | 0
6003 .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h | 0
6004 .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c | 8 +-
6005 .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c | 172 +-
6006 drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 8 +-
6007 drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0
6008 drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile | 0
6009 drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 32 +-
6010 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 312 +-
6011 .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c | 53 +-
6012 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 4 +-
6013 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 4 +-
6014 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c | 21 +-
6015 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c | 179 +-
6016 drivers/net/{ => ethernet/qlogic}/qlge/Makefile | 0
6017 drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0
6018 drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0
6019 .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0
6020 drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c | 20 +-
6021 drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0
6022 drivers/net/ethernet/racal/Kconfig | 33 +
6023 drivers/net/ethernet/racal/Makefile | 5 +
6024 drivers/net/{ => ethernet/racal}/ni5010.c | 2 +-
6025 drivers/net/{ => ethernet/racal}/ni5010.h | 0
6026 drivers/net/ethernet/rdc/Kconfig | 35 +
6027 drivers/net/ethernet/rdc/Makefile | 5 +
6028 drivers/net/{ => ethernet/rdc}/r6040.c | 2 +-
6029 drivers/net/{ => ethernet/realtek}/8139cp.c | 5 +-
6030 drivers/net/{ => ethernet/realtek}/8139too.c | 2 +-
6031 drivers/net/ethernet/realtek/Kconfig | 130 +
6032 drivers/net/ethernet/realtek/Makefile | 9 +
6033 drivers/net/{ => ethernet/realtek}/atp.c | 2 +-
6034 drivers/net/{ => ethernet/realtek}/atp.h | 0
6035 drivers/net/{ => ethernet/realtek}/r8169.c | 491 ++-
6036 drivers/net/{ => ethernet/realtek}/sc92031.c | 10 +-
6037 drivers/net/ethernet/renesas/Kconfig | 19 +
6038 drivers/net/ethernet/renesas/Makefile | 5 +
6039 drivers/net/{ => ethernet/renesas}/sh_eth.c | 44 +-
6040 drivers/net/{ => ethernet/renesas}/sh_eth.h | 17 +-
6041 drivers/net/{ => ethernet}/s6gmac.c | 0
6042 drivers/net/ethernet/seeq/Kconfig | 47 +
6043 drivers/net/ethernet/seeq/Makefile | 7 +
6044 drivers/net/{arm => ethernet/seeq}/ether3.c | 2 +-
6045 drivers/net/{arm => ethernet/seeq}/ether3.h | 0
6046 drivers/net/{ => ethernet/seeq}/seeq8005.c | 2 +-
6047 drivers/net/{ => ethernet/seeq}/seeq8005.h | 0
6048 drivers/net/{ => ethernet/seeq}/sgiseeq.c | 2 +-
6049 drivers/net/{ => ethernet/seeq}/sgiseeq.h | 0
6050 drivers/net/{ => ethernet}/sfc/Kconfig | 4 +-
6051 drivers/net/{ => ethernet}/sfc/Makefile | 0
6052 drivers/net/{ => ethernet}/sfc/bitfield.h | 0
6053 drivers/net/{ => ethernet}/sfc/efx.c | 46 +-
6054 drivers/net/{ => ethernet}/sfc/efx.h | 7 +-
6055 drivers/net/{ => ethernet}/sfc/enum.h | 0
6056 drivers/net/{ => ethernet}/sfc/ethtool.c | 107 +-
6057 drivers/net/{ => ethernet}/sfc/falcon.c | 2 +
6058 drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0
6059 drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0
6060 drivers/net/{ => ethernet}/sfc/filter.c | 0
6061 drivers/net/{ => ethernet}/sfc/filter.h | 0
6062 drivers/net/{ => ethernet}/sfc/io.h | 0
6063 drivers/net/{ => ethernet}/sfc/mac.h | 0
6064 drivers/net/{ => ethernet}/sfc/mcdi.c | 0
6065 drivers/net/{ => ethernet}/sfc/mcdi.h | 0
6066 drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0
6067 drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0
6068 drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0
6069 drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0
6070 drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0
6071 drivers/net/{ => ethernet}/sfc/mtd.c | 0
6072 drivers/net/{ => ethernet}/sfc/net_driver.h | 0
6073 drivers/net/{ => ethernet}/sfc/nic.c | 0
6074 drivers/net/{ => ethernet}/sfc/nic.h | 3 +-
6075 drivers/net/{ => ethernet}/sfc/phy.h | 0
6076 drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0
6077 drivers/net/{ => ethernet}/sfc/regs.h | 0
6078 drivers/net/{ => ethernet}/sfc/rx.c | 2 +-
6079 drivers/net/{ => ethernet}/sfc/selftest.c | 0
6080 drivers/net/{ => ethernet}/sfc/selftest.h | 0
6081 drivers/net/{ => ethernet}/sfc/siena.c | 2 +
6082 drivers/net/{ => ethernet}/sfc/spi.h | 0
6083 drivers/net/{ => ethernet}/sfc/tenxpress.c | 0
6084 drivers/net/{ => ethernet}/sfc/tx.c | 13 +-
6085 drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0
6086 drivers/net/{ => ethernet}/sfc/workarounds.h | 0
6087 drivers/net/ethernet/sgi/Kconfig | 36 +
6088 drivers/net/ethernet/sgi/Makefile | 6 +
6089 drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 2 +-
6090 drivers/net/{ => ethernet/sgi}/meth.c | 0
6091 drivers/net/{ => ethernet/sgi}/meth.h | 0
6092 drivers/net/ethernet/sis/Kconfig | 53 +
6093 drivers/net/ethernet/sis/Makefile | 6 +
6094 drivers/net/{ => ethernet/sis}/sis190.c | 2 +-
6095 drivers/net/{ => ethernet/sis}/sis900.c | 2 +-
6096 drivers/net/{ => ethernet/sis}/sis900.h | 0
6097 drivers/net/ethernet/smsc/Kconfig | 137 +
6098 drivers/net/ethernet/smsc/Makefile | 11 +
6099 drivers/net/{ => ethernet/smsc}/epic100.c | 2 +-
6100 drivers/net/{ => ethernet/smsc}/smc911x.c | 2 +-
6101 drivers/net/{ => ethernet/smsc}/smc911x.h | 0
6102 drivers/net/{ => ethernet/smsc}/smc9194.c | 2 +-
6103 drivers/net/{ => ethernet/smsc}/smc9194.h | 0
6104 .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c | 2 +-
6105 drivers/net/{ => ethernet/smsc}/smc91x.c | 2 +-
6106 drivers/net/{ => ethernet/smsc}/smc91x.h | 0
6107 drivers/net/{ => ethernet/smsc}/smsc911x.c | 89 +-
6108 drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
6109 drivers/net/{ => ethernet/smsc}/smsc9420.c | 2 +-
6110 drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
6111 drivers/net/ethernet/stmicro/Kconfig | 23 +
6112 drivers/net/ethernet/stmicro/Makefile | 5 +
6113 drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig | 23 +-
6114 drivers/net/{ => ethernet/stmicro}/stmmac/Makefile | 3 +-
6115 drivers/net/{ => ethernet/stmicro}/stmmac/common.h | 46 +-
6116 drivers/net/{ => ethernet/stmicro}/stmmac/descs.h | 0
6117 .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h | 0
6118 .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h | 0
6119 .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c | 11 +-
6120 .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c | 14 +-
6121 .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c | 12 +-
6122 .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c | 0
6123 .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h | 1 +
6124 .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c | 0
6125 .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c | 0
6126 drivers/net/ethernet/stmicro/stmmac/mmc.h | 131 +
6127 drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 265 +
6128 .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c | 0
6129 drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h | 5 +-
6130 .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c | 144 +-
6131 .../{ => ethernet/stmicro}/stmmac/stmmac_main.c | 305 +-
6132 .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c | 0
6133 .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c | 0
6134 .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h | 0
6135 drivers/net/ethernet/sun/Kconfig | 88 +
6136 drivers/net/ethernet/sun/Makefile | 11 +
6137 drivers/net/{ => ethernet/sun}/cassini.c | 17 +-
6138 drivers/net/{ => ethernet/sun}/cassini.h | 0
6139 drivers/net/{ => ethernet/sun}/niu.c | 18 +-
6140 drivers/net/{ => ethernet/sun}/niu.h | 0
6141 drivers/net/{ => ethernet/sun}/sunbmac.c | 33 +-
6142 drivers/net/{ => ethernet/sun}/sunbmac.h | 17 -
6143 drivers/net/{ => ethernet/sun}/sungem.c | 12 +-
6144 drivers/net/{ => ethernet/sun}/sungem.h | 0
6145 drivers/net/{ => ethernet/sun}/sunhme.c | 7 +-
6146 drivers/net/{ => ethernet/sun}/sunhme.h | 0
6147 drivers/net/{ => ethernet/sun}/sunqe.c | 2 +-
6148 drivers/net/{ => ethernet/sun}/sunqe.h | 0
6149 drivers/net/{ => ethernet/sun}/sunvnet.c | 2 +-
6150 drivers/net/{ => ethernet/sun}/sunvnet.h | 0
6151 drivers/net/ethernet/tehuti/Kconfig | 27 +
6152 drivers/net/ethernet/tehuti/Makefile | 5 +
6153 drivers/net/{ => ethernet/tehuti}/tehuti.c | 16 +-
6154 drivers/net/{ => ethernet/tehuti}/tehuti.h | 0
6155 drivers/net/ethernet/ti/Kconfig | 77 +
6156 drivers/net/ethernet/ti/Makefile | 9 +
6157 drivers/net/{ => ethernet/ti}/cpmac.c | 2 +-
6158 drivers/net/{ => ethernet/ti}/davinci_cpdma.c | 0
6159 drivers/net/{ => ethernet/ti}/davinci_cpdma.h | 0
6160 drivers/net/{ => ethernet/ti}/davinci_emac.c | 2 +-
6161 drivers/net/{ => ethernet/ti}/davinci_mdio.c | 0
6162 drivers/net/{ => ethernet/ti}/tlan.c | 2 +-
6163 drivers/net/{ => ethernet/ti}/tlan.h | 0
6164 drivers/net/ethernet/tile/Kconfig | 15 +
6165 drivers/net/{ => ethernet}/tile/Makefile | 0
6166 drivers/net/{ => ethernet}/tile/tilepro.c | 0
6167 drivers/net/ethernet/toshiba/Kconfig | 57 +
6168 drivers/net/ethernet/toshiba/Makefile | 10 +
6169 drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c | 2 +-
6170 drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h | 0
6171 .../{ => ethernet/toshiba}/ps3_gelic_wireless.c | 2 +-
6172 .../{ => ethernet/toshiba}/ps3_gelic_wireless.h | 0
6173 drivers/net/{ => ethernet/toshiba}/spider_net.c | 6 +-
6174 drivers/net/{ => ethernet/toshiba}/spider_net.h | 2 +-
6175 .../{ => ethernet/toshiba}/spider_net_ethtool.c | 0
6176 drivers/net/{ => ethernet/toshiba}/tc35815.c | 2 +-
6177 drivers/net/ethernet/tundra/Kconfig | 29 +
6178 drivers/net/ethernet/tundra/Makefile | 5 +
6179 drivers/net/{ => ethernet/tundra}/tsi108_eth.c | 9 +-
6180 drivers/net/{ => ethernet/tundra}/tsi108_eth.h | 0
6181 drivers/net/ethernet/via/Kconfig | 59 +
6182 drivers/net/ethernet/via/Makefile | 6 +
6183 drivers/net/{ => ethernet/via}/via-rhine.c | 2 +-
6184 drivers/net/{ => ethernet/via}/via-velocity.c | 155 +-
6185 drivers/net/{ => ethernet/via}/via-velocity.h | 0
6186 drivers/net/ethernet/xilinx/Kconfig | 36 +
6187 drivers/net/ethernet/xilinx/Makefile | 7 +
6188 drivers/net/{ => ethernet/xilinx}/ll_temac.h | 0
6189 drivers/net/{ => ethernet/xilinx}/ll_temac_main.c | 1 -
6190 drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c | 0
6191 .../net/{ => ethernet/xilinx}/xilinx_emaclite.c | 0
6192 drivers/net/ethernet/xircom/Kconfig | 31 +
6193 drivers/net/ethernet/xircom/Makefile | 5 +
6194 .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c | 2 +-
6195 drivers/net/ethernet/xscale/Kconfig | 32 +
6196 drivers/net/ethernet/xscale/Makefile | 6 +
6197 drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig | 2 +-
6198 drivers/net/{ => ethernet/xscale}/ixp2000/Makefile | 0
6199 drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c | 0
6200 drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h | 0
6201 .../net/{ => ethernet/xscale}/ixp2000/enp2611.c | 0
6202 .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c | 0
6203 .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h | 0
6204 .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc | 0
6205 .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode | 0
6206 .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc | 0
6207 .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode | 0
6208 drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c | 0
6209 drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h | 0
6210 .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h | 0
6211 drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c | 0
6212 drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h | 0
6213 drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c | 2 +-
6214 drivers/net/fddi/Kconfig | 77 +
6215 drivers/net/fddi/Makefile | 6 +
6216 drivers/net/{ => fddi}/defxx.c | 2 +-
6217 drivers/net/{ => fddi}/defxx.h | 0
6218 drivers/net/{ => fddi}/skfp/Makefile | 0
6219 drivers/net/{ => fddi}/skfp/cfm.c | 0
6220 drivers/net/{ => fddi}/skfp/drvfbi.c | 0
6221 drivers/net/{ => fddi}/skfp/ecm.c | 0
6222 drivers/net/{ => fddi}/skfp/ess.c | 0
6223 drivers/net/{ => fddi}/skfp/fplustm.c | 0
6224 drivers/net/{ => fddi}/skfp/h/cmtdef.h | 4 +-
6225 drivers/net/{ => fddi}/skfp/h/fddi.h | 0
6226 drivers/net/{ => fddi}/skfp/h/fddimib.h | 0
6227 drivers/net/{ => fddi}/skfp/h/fplustm.h | 0
6228 drivers/net/{ => fddi}/skfp/h/hwmtm.h | 2 +-
6229 drivers/net/{ => fddi}/skfp/h/mbuf.h | 0
6230 drivers/net/{ => fddi}/skfp/h/osdef1st.h | 0
6231 drivers/net/{ => fddi}/skfp/h/sba.h | 4 +-
6232 drivers/net/{ => fddi}/skfp/h/sba_def.h | 0
6233 drivers/net/{ => fddi}/skfp/h/skfbi.h | 0
6234 drivers/net/{ => fddi}/skfp/h/skfbiinc.h | 2 +-
6235 drivers/net/{ => fddi}/skfp/h/smc.h | 14 +-
6236 drivers/net/{ => fddi}/skfp/h/smt.h | 0
6237 drivers/net/{ => fddi}/skfp/h/smt_p.h | 0
6238 drivers/net/{ => fddi}/skfp/h/smtstate.h | 0
6239 drivers/net/{ => fddi}/skfp/h/supern_2.h | 0
6240 drivers/net/{ => fddi}/skfp/h/targethw.h | 6 +-
6241 drivers/net/{ => fddi}/skfp/h/targetos.h | 2 +-
6242 drivers/net/{ => fddi}/skfp/h/types.h | 0
6243 drivers/net/{ => fddi}/skfp/hwmtm.c | 0
6244 drivers/net/{ => fddi}/skfp/hwt.c | 0
6245 drivers/net/{ => fddi}/skfp/pcmplc.c | 0
6246 drivers/net/{ => fddi}/skfp/pmf.c | 0
6247 drivers/net/{ => fddi}/skfp/queue.c | 0
6248 drivers/net/{ => fddi}/skfp/rmt.c | 0
6249 drivers/net/{ => fddi}/skfp/skfddi.c | 2 +-
6250 drivers/net/{ => fddi}/skfp/smt.c | 0
6251 drivers/net/{ => fddi}/skfp/smtdef.c | 0
6252 drivers/net/{ => fddi}/skfp/smtinit.c | 0
6253 drivers/net/{ => fddi}/skfp/smttimer.c | 0
6254 drivers/net/{ => fddi}/skfp/srf.c | 0
6255 drivers/net/hippi/Kconfig | 39 +
6256 drivers/net/hippi/Makefile | 5 +
6257 drivers/net/{ => hippi}/rrunner.c | 0
6258 drivers/net/{ => hippi}/rrunner.h | 0
6259 drivers/net/ibm_newemac/Makefile | 11 -
6260 drivers/net/irda/sh_irda.c | 124 +-
6261 drivers/net/macvlan.c | 5 +-
6262 drivers/net/macvtap.c | 12 +-
6263 drivers/net/octeon/Makefile | 2 -
6264 drivers/net/pci-skeleton.c | 1923 ------
6265 drivers/net/pcmcia/Kconfig | 123 -
6266 drivers/net/pcmcia/Makefile | 16 -
6267 drivers/net/phy/Kconfig | 2 +-
6268 drivers/net/phy/dp83640.c | 205 +-
6269 drivers/net/phy/icplus.c | 93 +-
6270 drivers/net/phy/phy_device.c | 4 +-
6271 drivers/net/plip/Kconfig | 38 +
6272 drivers/net/plip/Makefile | 5 +
6273 drivers/net/{ => plip}/plip.c | 0
6274 drivers/net/ppp/Kconfig | 175 +
6275 drivers/net/ppp/Makefile | 13 +
6276 drivers/net/{ => ppp}/bsd_comp.c | 0
6277 drivers/net/{ => ppp}/ppp_async.c | 0
6278 drivers/net/{ => ppp}/ppp_deflate.c | 0
6279 drivers/net/{ => ppp}/ppp_generic.c | 0
6280 drivers/net/{ => ppp}/ppp_mppe.c | 0
6281 drivers/net/{ => ppp}/ppp_mppe.h | 0
6282 drivers/net/{ => ppp}/ppp_synctty.c | 0
6283 drivers/net/{ => ppp}/pppoe.c | 0
6284 drivers/net/{ => ppp}/pppox.c | 0
6285 drivers/net/{ => ppp}/pptp.c | 0
6286 drivers/net/slip/Kconfig | 79 +
6287 drivers/net/slip/Makefile | 6 +
6288 drivers/net/{ => slip}/slhc.c | 0
6289 drivers/net/{ => slip}/slip.c | 29 +-
6290 drivers/net/{ => slip}/slip.h | 9 -
6291 drivers/net/sungem_phy.c | 7 +-
6292 drivers/net/tokenring/3c359.c | 2 +-
6293 drivers/net/tokenring/Kconfig | 15 +-
6294 drivers/net/tokenring/Makefile | 21 +-
6295 drivers/net/tokenring/ibmtr.c | 2 +-
6296 drivers/net/{pcmcia => tokenring}/ibmtr_cs.c | 2 +-
6297 drivers/net/tokenring/lanstreamer.c | 2 +-
6298 drivers/net/tokenring/olympic.c | 2 +-
6299 drivers/net/tokenring/smctr.c | 2 +-
6300 drivers/net/tokenring/tms380tr.c | 2 +-
6301 drivers/net/tun.c | 2 +-
6302 drivers/net/usb/Kconfig | 3 +
6303 drivers/net/usb/asix.c | 409 +-
6304 drivers/net/usb/catc.c | 2 +-
6305 drivers/net/usb/dm9601.c | 2 +-
6306 drivers/net/usb/int51x1.c | 2 +-
6307 drivers/net/usb/kaweth.c | 2 +-
6308 drivers/net/usb/lg-vl600.c | 19 +
6309 drivers/net/usb/mcs7830.c | 2 +-
6310 drivers/net/usb/pegasus.c | 2 +-
6311 drivers/net/usb/rtl8150.c | 113 +-
6312 drivers/net/usb/smsc75xx.c | 2 +-
6313 drivers/net/usb/smsc95xx.c | 2 +-
6314 drivers/net/usb/usbnet.c | 6 +
6315 drivers/net/virtio_net.c | 16 +-
6316 drivers/net/vmxnet3/vmxnet3_drv.c | 10 +-
6317 drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 +-
6318 drivers/net/wan/hdlc_ppp.c | 14 +-
6319 drivers/net/wan/hdlc_x25.c | 16 +-
6320 drivers/net/wan/lapbether.c | 3 +-
6321 drivers/net/wan/sbni.c | 2 +-
6322 drivers/net/wan/x25_asy.c | 3 +-
6323 drivers/net/wireless/adm8211.c | 3 +-
6324 drivers/net/wireless/airo.c | 4 +-
6325 drivers/net/wireless/ath/Kconfig | 1 +
6326 drivers/net/wireless/ath/Makefile | 1 +
6327 drivers/net/wireless/ath/ath.h | 51 +-
6328 drivers/net/wireless/ath/ath5k/ahb.c | 4 +-
6329 drivers/net/wireless/ath/ath5k/ani.c | 1 -
6330 drivers/net/wireless/ath/ath5k/ani.h | 4 +
6331 drivers/net/wireless/ath/ath5k/ath5k.h | 98 +-
6332 drivers/net/wireless/ath/ath5k/attach.c | 18 +-
6333 drivers/net/wireless/ath/ath5k/base.c | 31 +-
6334 drivers/net/wireless/ath/ath5k/base.h | 55 +-
6335 drivers/net/wireless/ath/ath5k/caps.c | 2 +-
6336 drivers/net/wireless/ath/ath5k/debug.c | 15 +-
6337 drivers/net/wireless/ath/ath5k/desc.c | 1 -
6338 drivers/net/wireless/ath/ath5k/dma.c | 1 -
6339 drivers/net/wireless/ath/ath5k/eeprom.c | 10 +-
6340 drivers/net/wireless/ath/ath5k/gpio.c | 1 -
6341 drivers/net/wireless/ath/ath5k/initvals.c | 1 -
6342 drivers/net/wireless/ath/ath5k/led.c | 1 -
6343 drivers/net/wireless/ath/ath5k/mac80211-ops.c | 11 +-
6344 drivers/net/wireless/ath/ath5k/pci.c | 4 +-
6345 drivers/net/wireless/ath/ath5k/pcu.c | 5 +-
6346 drivers/net/wireless/ath/ath5k/phy.c | 91 +-
6347 drivers/net/wireless/ath/ath5k/qcu.c | 10 +-
6348 drivers/net/wireless/ath/ath5k/reset.c | 79 +-
6349 drivers/net/wireless/ath/ath5k/rfkill.c | 2 +-
6350 drivers/net/wireless/ath/ath5k/sysfs.c | 1 -
6351 drivers/net/wireless/ath/ath5k/trace.h | 3 +-
6352 drivers/net/wireless/ath/ath6kl/Kconfig | 15 +
6353 drivers/net/wireless/ath/ath6kl/Makefile | 35 +
6354 drivers/net/wireless/ath/ath6kl/bmi.c | 692 +++
6355 drivers/net/wireless/ath/ath6kl/bmi.h | 250 +
6356 drivers/net/wireless/ath/ath6kl/cfg80211.c | 1538 +++++
6357 drivers/net/wireless/ath/ath6kl/cfg80211.h | 39 +
6358 drivers/net/wireless/ath/ath6kl/common.h | 180 +
6359 drivers/net/wireless/ath/ath6kl/core.h | 544 ++
6360 drivers/net/wireless/ath/ath6kl/debug.c | 150 +
6361 drivers/net/wireless/ath/ath6kl/debug.h | 105 +
6362 drivers/net/wireless/ath/ath6kl/hif-ops.h | 72 +
6363 drivers/net/wireless/ath/ath6kl/hif.h | 207 +
6364 drivers/net/wireless/ath/ath6kl/htc.c | 2457 ++++++++
6365 drivers/net/wireless/ath/ath6kl/htc.h | 607 ++
6366 drivers/net/wireless/ath/ath6kl/htc_hif.c | 641 ++
6367 drivers/net/wireless/ath/ath6kl/htc_hif.h | 92 +
6368 drivers/net/wireless/ath/ath6kl/init.c | 1303 ++++
6369 drivers/net/wireless/ath/ath6kl/main.c | 1337 ++++
6370 drivers/net/wireless/ath/ath6kl/node.c | 234 +
6371 drivers/net/wireless/ath/ath6kl/sdio.c | 912 +++
6372 drivers/net/wireless/ath/ath6kl/target.h | 331 +
6373 drivers/net/wireless/ath/ath6kl/txrx.c | 1457 +++++
6374 drivers/net/wireless/ath/ath6kl/wmi.c | 2743 +++++++++
6375 drivers/net/wireless/ath/ath6kl/wmi.h | 2018 ++++++
6376 drivers/net/wireless/ath/ath9k/ahb.c | 2 +-
6377 drivers/net/wireless/ath/ath9k/ani.c | 12 +-
6378 drivers/net/wireless/ath/ath9k/ani.h | 6 +-
6379 drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 131 +-
6380 drivers/net/wireless/ath/ath9k/ar5008_phy.c | 32 +-
6381 drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 266 +-
6382 drivers/net/wireless/ath/ath9k/ar9002_calib.c | 1 +
6383 drivers/net/wireless/ath/ath9k/ar9002_hw.c | 56 +-
6384 drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 3403 ++++++-----
6385 drivers/net/wireless/ath/ath9k/ar9002_mac.c | 257 +-
6386 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 192 +-
6387 drivers/net/wireless/ath/ath9k/ar9003_calib.c | 36 +-
6388 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 269 +-
6389 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 3 +-
6390 drivers/net/wireless/ath/ath9k/ar9003_hw.c | 610 ++-
6391 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 374 +-
6392 drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 15 +-
6393 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 32 +-
6394 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 102 +-
6395 .../net/wireless/ath/ath9k/ar9480_1p0_initvals.h | 1833 ++++++
6396 .../net/wireless/ath/ath9k/ar9480_2p0_initvals.h | 1928 ++++++
6397 .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 1673 +++++
6398 drivers/net/wireless/ath/ath9k/ath9k.h | 31 +-
6399 drivers/net/wireless/ath/ath9k/beacon.c | 74 +-
6400 drivers/net/wireless/ath/ath9k/calib.c | 18 +-
6401 drivers/net/wireless/ath/ath9k/calib.h | 1 +
6402 drivers/net/wireless/ath/ath9k/common.c | 26 +
6403 drivers/net/wireless/ath/ath9k/common.h | 1 +
6404 drivers/net/wireless/ath/ath9k/debug.c | 474 ++-
6405 drivers/net/wireless/ath/ath9k/debug.h | 55 +-
6406 drivers/net/wireless/ath/ath9k/eeprom.c | 7 +-
6407 drivers/net/wireless/ath/ath9k/eeprom.h | 2 +
6408 drivers/net/wireless/ath/ath9k/eeprom_4k.c | 243 +-
6409 drivers/net/wireless/ath/ath9k/eeprom_9287.c | 134 +-
6410 drivers/net/wireless/ath/ath9k/eeprom_def.c | 196 +-
6411 drivers/net/wireless/ath/ath9k/gpio.c | 4 +
6412 drivers/net/wireless/ath/ath9k/htc.h | 3 -
6413 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 29 +-
6414 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 30 +-
6415 drivers/net/wireless/ath/ath9k/hw-ops.h | 71 +-
6416 drivers/net/wireless/ath/ath9k/hw.c | 132 +-
6417 drivers/net/wireless/ath/ath9k/hw.h | 46 +-
6418 drivers/net/wireless/ath/ath9k/init.c | 79 +-
6419 drivers/net/wireless/ath/ath9k/mac.c | 49 +-
6420 drivers/net/wireless/ath/ath9k/mac.h | 51 +-
6421 drivers/net/wireless/ath/ath9k/main.c | 602 +-
6422 drivers/net/wireless/ath/ath9k/pci.c | 57 +-
6423 drivers/net/wireless/ath/ath9k/rc.c | 38 +-
6424 drivers/net/wireless/ath/ath9k/rc.h | 6 -
6425 drivers/net/wireless/ath/ath9k/recv.c | 53 +-
6426 drivers/net/wireless/ath/ath9k/reg.h | 82 +-
6427 drivers/net/wireless/ath/ath9k/xmit.c | 841 ++--
6428 drivers/net/wireless/ath/carl9170/Kconfig | 14 +
6429 drivers/net/wireless/ath/carl9170/carl9170.h | 24 +
6430 drivers/net/wireless/ath/carl9170/cmd.c | 34 +
6431 drivers/net/wireless/ath/carl9170/cmd.h | 1 +
6432 drivers/net/wireless/ath/carl9170/fw.c | 3 +
6433 drivers/net/wireless/ath/carl9170/fwcmd.h | 11 +
6434 drivers/net/wireless/ath/carl9170/main.c | 232 +-
6435 drivers/net/wireless/ath/carl9170/phy.c | 16 +-
6436 drivers/net/wireless/ath/carl9170/version.h | 4 +-
6437 drivers/net/wireless/ath/main.c | 8 +-
6438 drivers/net/wireless/ath/regd.h | 2 +-
6439 drivers/net/wireless/ath/regd_common.h | 2 +-
6440 drivers/net/wireless/b43/Kconfig | 22 +-
6441 drivers/net/wireless/b43/b43.h | 65 +-
6442 drivers/net/wireless/b43/bus.c | 2 +
6443 drivers/net/wireless/b43/dma.c | 157 +-
6444 drivers/net/wireless/b43/dma.h | 16 +-
6445 drivers/net/wireless/b43/main.c | 130 +-
6446 drivers/net/wireless/b43/phy_common.c | 32 +
6447 drivers/net/wireless/b43/phy_common.h | 2 +
6448 drivers/net/wireless/b43/phy_ht.c | 205 +
6449 drivers/net/wireless/b43/phy_ht.h | 19 +
6450 drivers/net/wireless/b43/phy_lcn.c | 853 +++-
6451 drivers/net/wireless/b43/phy_lcn.h | 19 +-
6452 drivers/net/wireless/b43/phy_n.c | 583 ++-
6453 drivers/net/wireless/b43/phy_n.h | 4 +
6454 drivers/net/wireless/b43/pio.c | 12 +-
6455 drivers/net/wireless/b43/radio_2055.c | 1 +
6456 drivers/net/wireless/b43/radio_2056.c | 2 +
6457 drivers/net/wireless/b43/radio_2056.h | 26 -
6458 drivers/net/wireless/b43/radio_2059.c | 2 +
6459 drivers/net/wireless/b43/tables_nphy.c | 1 +
6460 drivers/net/wireless/b43/tables_phy_ht.c | 86 +
6461 drivers/net/wireless/b43/tables_phy_ht.h | 4 +
6462 drivers/net/wireless/b43/tables_phy_lcn.c | 690 +++
6463 drivers/net/wireless/b43/tables_phy_lcn.h | 18 +
6464 drivers/net/wireless/b43/xmit.c | 120 +-
6465 drivers/net/wireless/b43/xmit.h | 62 +-
6466 drivers/net/wireless/b43legacy/b43legacy.h | 5 -
6467 drivers/net/wireless/b43legacy/dma.c | 374 +-
6468 drivers/net/wireless/b43legacy/dma.h | 107 -
6469 drivers/net/wireless/b43legacy/main.c | 8 +-
6470 drivers/net/wireless/hostap/hostap_main.c | 6 +-
6471 drivers/net/wireless/ipw2x00/ipw2200.c | 3 +-
6472 drivers/net/wireless/iwlegacy/iwl-3945-led.c | 1 -
6473 drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 1 -
6474 drivers/net/wireless/iwlegacy/iwl-3945.c | 1 -
6475 drivers/net/wireless/iwlegacy/iwl-4965-led.c | 1 -
6476 drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 1 -
6477 drivers/net/wireless/iwlegacy/iwl-4965.c | 1 -
6478 drivers/net/wireless/iwlegacy/iwl-core.c | 3 +-
6479 drivers/net/wireless/iwlegacy/iwl-core.h | 3 +-
6480 drivers/net/wireless/iwlegacy/iwl-led.c | 1 -
6481 drivers/net/wireless/iwlegacy/iwl3945-base.c | 1 -
6482 drivers/net/wireless/iwlegacy/iwl4965-base.c | 1 -
6483 drivers/net/wireless/iwlwifi/Kconfig | 17 -
6484 drivers/net/wireless/iwlwifi/Makefile | 23 +-
6485 drivers/net/wireless/iwlwifi/iwl-1000.c | 57 +-
6486 drivers/net/wireless/iwlwifi/iwl-2000.c | 82 +-
6487 drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 4 +-
6488 drivers/net/wireless/iwlwifi/iwl-5000.c | 86 +-
6489 drivers/net/wireless/iwlwifi/iwl-6000.c | 83 +-
6490 drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 133 +-
6491 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 299 -
6492 drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 17 +-
6493 drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1118 +----
6494 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 110 +-
6495 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 94 +-
6496 drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 84 +-
6497 drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 82 +-
6498 drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 1 -
6499 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 958 ++--
6500 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 118 +-
6501 drivers/net/wireless/iwlwifi/iwl-agn.c | 1384 ++---
6502 drivers/net/wireless/iwlwifi/iwl-agn.h | 85 +-
6503 drivers/net/wireless/iwlwifi/iwl-bus.h | 90 +-
6504 drivers/net/wireless/iwlwifi/iwl-cfg.h | 115 +
6505 drivers/net/wireless/iwlwifi/iwl-commands.h | 55 +-
6506 drivers/net/wireless/iwlwifi/iwl-core.c | 329 +-
6507 drivers/net/wireless/iwlwifi/iwl-core.h | 158 +-
6508 drivers/net/wireless/iwlwifi/iwl-csr.h | 18 +
6509 drivers/net/wireless/iwlwifi/iwl-debug.h | 40 +-
6510 drivers/net/wireless/iwlwifi/iwl-debugfs.c | 430 +-
6511 drivers/net/wireless/iwlwifi/iwl-dev.h | 555 +--
6512 drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +
6513 drivers/net/wireless/iwlwifi/iwl-eeprom.c | 306 +-
6514 drivers/net/wireless/iwlwifi/iwl-eeprom.h | 11 +-
6515 drivers/net/wireless/iwlwifi/iwl-fh.h | 20 +-
6516 drivers/net/wireless/iwlwifi/iwl-helpers.h | 114 +-
6517 drivers/net/wireless/iwlwifi/iwl-io.c | 192 +-
6518 drivers/net/wireless/iwlwifi/iwl-io.h | 61 +-
6519 drivers/net/wireless/iwlwifi/iwl-led.c | 13 +-
6520 drivers/net/wireless/iwlwifi/iwl-pci.c | 47 +-
6521 drivers/net/wireless/iwlwifi/iwl-power.c | 19 +-
6522 drivers/net/wireless/iwlwifi/iwl-prph.h | 4 +-
6523 drivers/net/wireless/iwlwifi/iwl-rx.c | 220 +-
6524 drivers/net/wireless/iwlwifi/iwl-scan.c | 760 ++-
6525 drivers/net/wireless/iwlwifi/iwl-shared.h | 536 ++
6526 drivers/net/wireless/iwlwifi/iwl-sta.c | 143 +-
6527 drivers/net/wireless/iwlwifi/iwl-sta.h | 9 +-
6528 drivers/net/wireless/iwlwifi/iwl-sv-open.c | 22 +-
6529 drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h | 82 -
6530 drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 436 ++
6531 drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 1436 +++++
6532 .../{iwl-trans-tx-pcie.c => iwl-trans-pcie-tx.c} | 682 ++-
6533 drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 1989 ++++++
6534 drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c | 979 ---
6535 drivers/net/wireless/iwlwifi/iwl-trans.c | 1115 +----
6536 drivers/net/wireless/iwlwifi/iwl-trans.h | 278 +-
6537 drivers/net/wireless/libertas/README | 25 -
6538 drivers/net/wireless/libertas/cfg.c | 102 +-
6539 drivers/net/wireless/libertas/cfg.h | 1 +
6540 drivers/net/wireless/libertas/cmd.c | 6 +-
6541 drivers/net/wireless/libertas/decl.h | 4 +
6542 drivers/net/wireless/libertas/dev.h | 29 +-
6543 drivers/net/wireless/libertas/ethtool.c | 1 +
6544 drivers/net/wireless/libertas/if_sdio.c | 277 +-
6545 drivers/net/wireless/libertas/if_spi.c | 4 -
6546 drivers/net/wireless/libertas/if_usb.c | 34 +-
6547 drivers/net/wireless/libertas/main.c | 182 +-
6548 drivers/net/wireless/libertas/mesh.c | 79 +-
6549 drivers/net/wireless/libertas/mesh.h | 27 +-
6550 drivers/net/wireless/libertas/rx.c | 1 +
6551 drivers/net/wireless/libertas/tx.c | 1 +
6552 drivers/net/wireless/mac80211_hwsim.c | 6 +
6553 drivers/net/wireless/mwifiex/cfg80211.c | 216 +-
6554 drivers/net/wireless/mwifiex/cmdevt.c | 3 +
6555 drivers/net/wireless/mwifiex/fw.h | 15 +-
6556 drivers/net/wireless/mwifiex/init.c | 21 -
6557 drivers/net/wireless/mwifiex/ioctl.h | 5 +-
6558 drivers/net/wireless/mwifiex/join.c | 35 +-
6559 drivers/net/wireless/mwifiex/main.c | 6 +-
6560 drivers/net/wireless/mwifiex/main.h | 55 +-
6561 drivers/net/wireless/mwifiex/scan.c | 1591 +----
6562 drivers/net/wireless/mwifiex/sta_event.c | 9 +-
6563 drivers/net/wireless/mwifiex/sta_ioctl.c | 237 +-
6564 drivers/net/wireless/mwl8k.c | 11 +-
6565 drivers/net/wireless/orinoco/main.c | 2 +-
6566 drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
6567 drivers/net/wireless/orinoco/wext.c | 1 +
6568 drivers/net/wireless/p54/eeprom.c | 26 +-
6569 drivers/net/wireless/p54/fwio.c | 2 +
6570 drivers/net/wireless/p54/main.c | 113 +-
6571 drivers/net/wireless/p54/p54.h | 18 +
6572 drivers/net/wireless/p54/p54spi.c | 2 +-
6573 drivers/net/wireless/p54/txrx.c | 70 +
6574 drivers/net/wireless/ray_cs.c | 2 +-
6575 drivers/net/wireless/rndis_wlan.c | 4 +-
6576 drivers/net/wireless/rt2x00/rt2400pci.c | 44 +-
6577 drivers/net/wireless/rt2x00/rt2500pci.c | 42 +-
6578 drivers/net/wireless/rt2x00/rt2800.h | 3 +
6579 drivers/net/wireless/rt2x00/rt2800lib.c | 193 +-
6580 drivers/net/wireless/rt2x00/rt2800lib.h | 7 +-
6581 drivers/net/wireless/rt2x00/rt2800pci.c | 61 +-
6582 drivers/net/wireless/rt2x00/rt2800usb.c | 7 +-
6583 drivers/net/wireless/rt2x00/rt2x00.h | 30 +
6584 drivers/net/wireless/rt2x00/rt2x00dev.c | 22 +-
6585 drivers/net/wireless/rt2x00/rt2x00mac.c | 50 +-
6586 drivers/net/wireless/rt2x00/rt2x00queue.c | 7 +-
6587 drivers/net/wireless/rt2x00/rt2x00queue.h | 5 +-
6588 drivers/net/wireless/rt2x00/rt61pci.c | 36 +-
6589 drivers/net/wireless/rt2x00/rt73usb.c | 2 +-
6590 drivers/net/wireless/rtl818x/rtl8180/dev.c | 5 +-
6591 drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +-
6592 drivers/net/wireless/rtlwifi/base.c | 161 +
6593 drivers/net/wireless/rtlwifi/base.h | 2 +
6594 drivers/net/wireless/rtlwifi/core.c | 8 +-
6595 drivers/net/wireless/rtlwifi/debug.c | 6 +-
6596 drivers/net/wireless/rtlwifi/pci.c | 37 +-
6597 drivers/net/wireless/rtlwifi/pci.h | 26 -
6598 drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 139 -
6599 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 42 +-
6600 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 116 +-
6601 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 6 -
6602 drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 4 +-
6603 drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 6 -
6604 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 +-
6605 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 28 +-
6606 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 23 +-
6607 drivers/net/wireless/rtlwifi/rtl8192de/def.h | 35 -
6608 drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 42 +-
6609 drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 121 +-
6610 drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 6 -
6611 drivers/net/wireless/rtlwifi/rtl8192se/def.h | 41 +-
6612 drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 44 +-
6613 drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 126 +-
6614 drivers/net/wireless/rtlwifi/wifi.h | 41 +
6615 drivers/net/wireless/wl1251/cmd.h | 2 +-
6616 drivers/net/wireless/wl1251/wl12xx_80211.h | 2 +-
6617 drivers/net/wireless/wl12xx/Kconfig | 10 -
6618 drivers/net/wireless/wl12xx/Makefile | 6 +-
6619 drivers/net/wireless/wl12xx/acx.c | 362 +-
6620 drivers/net/wireless/wl12xx/acx.h | 412 +-
6621 drivers/net/wireless/wl12xx/boot.c | 47 +-
6622 drivers/net/wireless/wl12xx/boot.h | 3 +-
6623 drivers/net/wireless/wl12xx/cmd.c | 823 ++-
6624 drivers/net/wireless/wl12xx/cmd.h | 334 +-
6625 drivers/net/wireless/wl12xx/conf.h | 381 +-
6626 drivers/net/wireless/wl12xx/debugfs.c | 105 +-
6627 drivers/net/wireless/wl12xx/event.c | 43 +-
6628 drivers/net/wireless/wl12xx/event.h | 80 +-
6629 drivers/net/wireless/wl12xx/init.c | 113 +-
6630 drivers/net/wireless/wl12xx/io.h | 1 -
6631 drivers/net/wireless/wl12xx/main.c | 1294 +++--
6632 drivers/net/wireless/wl12xx/ps.c | 12 +-
6633 drivers/net/wireless/wl12xx/reg.h | 75 -
6634 drivers/net/wireless/wl12xx/rx.c | 69 +-
6635 drivers/net/wireless/wl12xx/rx.h | 18 +-
6636 drivers/net/wireless/wl12xx/scan.c | 200 +-
6637 drivers/net/wireless/wl12xx/scan.h | 31 +-
6638 drivers/net/wireless/wl12xx/sdio.c | 4 +-
6639 drivers/net/wireless/wl12xx/sdio_test.c | 17 +-
6640 drivers/net/wireless/wl12xx/spi.c | 4 +-
6641 drivers/net/wireless/wl12xx/tx.c | 192 +-
6642 drivers/net/wireless/wl12xx/tx.h | 26 +-
6643 drivers/net/wireless/wl12xx/wl12xx.h | 167 +-
6644 drivers/net/wireless/wl12xx/wl12xx_80211.h | 27 +-
6645 drivers/net/wireless/wl3501_cs.c | 2 +-
6646 drivers/net/wireless/zd1201.c | 2 +-
6647 drivers/net/wireless/zd1211rw/zd_mac.c | 2 +-
6648 drivers/net/xen-netback/netback.c | 54 +-
6649 drivers/net/xen-netfront.c | 34 +-
6650 drivers/nfc/Kconfig | 11 +
6651 drivers/nfc/Makefile | 1 +
6652 drivers/nfc/nfcwilink.c | 342 ++
6653 drivers/nfc/pn533.c | 21 +-
6654 drivers/s390/cio/qdio.h | 38 +-
6655 drivers/s390/cio/qdio_debug.c | 3 +
6656 drivers/s390/cio/qdio_main.c | 208 +-
6657 drivers/s390/cio/qdio_setup.c | 83 +-
6658 drivers/s390/cio/qdio_thinint.c | 88 +-
6659 drivers/s390/net/lcs.c | 2 +-
6660 drivers/s390/net/qeth_core.h | 50 +-
6661 drivers/s390/net/qeth_core_main.c | 780 +++-
6662 drivers/s390/net/qeth_l2_main.c | 4 +-
6663 drivers/s390/net/qeth_l3.h | 4 +
6664 drivers/s390/net/qeth_l3_main.c | 92 +-
6665 drivers/s390/net/qeth_l3_sys.c | 110 +-
6666 drivers/scsi/bnx2fc/Kconfig | 3 +-
6667 drivers/scsi/bnx2fc/bnx2fc.h | 4 +-
6668 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 6 +-
6669 drivers/scsi/bnx2i/Kconfig | 3 +-
6670 drivers/scsi/bnx2i/bnx2i.h | 2 +-
6671 drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +-
6672 drivers/scsi/cxgbi/cxgb3i/Kconfig | 3 +-
6673 drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +-
6674 drivers/scsi/cxgbi/cxgb4i/Kconfig | 3 +-
6675 drivers/scsi/fcoe/fcoe.c | 6 +-
6676 drivers/scsi/fcoe/fcoe_transport.c | 5 +-
6677 drivers/ssb/main.c | 24 +-
6678 drivers/staging/Kconfig | 2 -
6679 drivers/staging/Makefile | 1 -
6680 drivers/staging/ath6kl/Kconfig | 158 -
6681 drivers/staging/ath6kl/Makefile | 122 -
6682 drivers/staging/ath6kl/TODO | 25 -
6683 drivers/staging/ath6kl/bmi/include/bmi_internal.h | 54 -
6684 drivers/staging/ath6kl/bmi/src/bmi.c | 1010 ---
6685 .../staging/ath6kl/hif/common/hif_sdio_common.h | 87 -
6686 .../hif/sdio/linux_sdio/include/hif_internal.h | 131 -
6687 .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 1273 ----
6688 .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 393 --
6689 drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 1479 -----
6690 drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 401 --
6691 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 783 ---
6692 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 755 ---
6693 .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 1284 ----
6694 drivers/staging/ath6kl/htc2/htc.c | 575 --
6695 drivers/staging/ath6kl/htc2/htc_debug.h | 38 -
6696 drivers/staging/ath6kl/htc2/htc_internal.h | 211 -
6697 drivers/staging/ath6kl/htc2/htc_recv.c | 1572 -----
6698 drivers/staging/ath6kl/htc2/htc_send.c | 1018 ---
6699 drivers/staging/ath6kl/htc2/htc_services.c | 450 --
6700 drivers/staging/ath6kl/include/a_config.h | 31 -
6701 drivers/staging/ath6kl/include/a_debug.h | 195 -
6702 drivers/staging/ath6kl/include/a_drv.h | 32 -
6703 drivers/staging/ath6kl/include/a_drv_api.h | 204 -
6704 drivers/staging/ath6kl/include/a_osapi.h | 32 -
6705 drivers/staging/ath6kl/include/aggr_recv_api.h | 140 -
6706 drivers/staging/ath6kl/include/ar3kconfig.h | 65 -
6707 drivers/staging/ath6kl/include/ar6000_api.h | 32 -
6708 drivers/staging/ath6kl/include/ar6000_diag.h | 48 -
6709 drivers/staging/ath6kl/include/ar6kap_common.h | 44 -
6710 drivers/staging/ath6kl/include/athbtfilter.h | 135 -
6711 drivers/staging/ath6kl/include/bmi.h | 134 -
6712 .../ath6kl/include/common/AR6002/AR6K_version.h | 52 -
6713 .../staging/ath6kl/include/common/AR6002/addrs.h | 90 -
6714 .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h | 40 -
6715 .../include/common/AR6002/hw4.0/hw/apb_map.h | 40 -
6716 .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 24 -
6717 .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 552 --
6718 .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h | 471 --
6719 .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h | 589 --
6720 .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 187 -
6721 .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h | 162 -
6722 .../include/common/AR6002/hw4.0/hw/uart_reg.h | 40 -
6723 drivers/staging/ath6kl/include/common/athdefs.h | 75 -
6724 drivers/staging/ath6kl/include/common/bmi_msg.h | 233 -
6725 drivers/staging/ath6kl/include/common/cnxmgmt.h | 36 -
6726 drivers/staging/ath6kl/include/common/dbglog.h | 126 -
6727 drivers/staging/ath6kl/include/common/dbglog_id.h | 558 --
6728 drivers/staging/ath6kl/include/common/discovery.h | 75 -
6729 .../staging/ath6kl/include/common/epping_test.h | 111 -
6730 drivers/staging/ath6kl/include/common/gmboxif.h | 70 -
6731 drivers/staging/ath6kl/include/common/gpio_reg.h | 9 -
6732 drivers/staging/ath6kl/include/common/htc.h | 227 -
6733 .../staging/ath6kl/include/common/htc_services.h | 52 -
6734 drivers/staging/ath6kl/include/common/pkt_log.h | 45 -
6735 drivers/staging/ath6kl/include/common/roaming.h | 41 -
6736 drivers/staging/ath6kl/include/common/targaddrs.h | 395 --
6737 drivers/staging/ath6kl/include/common/testcmd.h | 185 -
6738 drivers/staging/ath6kl/include/common/tlpm.h | 38 -
6739 drivers/staging/ath6kl/include/common/wlan_defs.h | 79 -
6740 drivers/staging/ath6kl/include/common/wmi.h | 3220 ----------
6741 drivers/staging/ath6kl/include/common/wmix.h | 271 -
6742 drivers/staging/ath6kl/include/common_drv.h | 104 -
6743 drivers/staging/ath6kl/include/dbglog_api.h | 52 -
6744 drivers/staging/ath6kl/include/dl_list.h | 153 -
6745 drivers/staging/ath6kl/include/dset_api.h | 65 -
6746 drivers/staging/ath6kl/include/hci_transport_api.h | 259 -
6747 drivers/staging/ath6kl/include/hif.h | 456 --
6748 drivers/staging/ath6kl/include/host_version.h | 52 -
6749 drivers/staging/ath6kl/include/htc_api.h | 575 --
6750 drivers/staging/ath6kl/include/htc_packet.h | 227 -
6751 drivers/staging/ath6kl/include/wlan_api.h | 128 -
6752 drivers/staging/ath6kl/include/wmi_api.h | 441 --
6753 drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 565 --
6754 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 572 --
6755 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 75 -
6756 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 969 ---
6757 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 113 -
6758 drivers/staging/ath6kl/miscdrv/common_drv.c | 910 ---
6759 drivers/staging/ath6kl/miscdrv/credit_dist.c | 417 --
6760 drivers/staging/ath6kl/miscdrv/miscdrv.h | 42 -
6761 drivers/staging/ath6kl/os/linux/ar6000_drv.c | 6267 -------------------
6762 drivers/staging/ath6kl/os/linux/ar6000_pm.c | 626 --
6763 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 455 --
6764 drivers/staging/ath6kl/os/linux/cfg80211.c | 1892 ------
6765 .../staging/ath6kl/os/linux/export_hci_transport.c | 124 -
6766 drivers/staging/ath6kl/os/linux/hci_bridge.c | 1141 ----
6767 .../staging/ath6kl/os/linux/include/ar6000_drv.h | 776 ---
6768 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h | 36 -
6769 .../ath6kl/os/linux/include/ar6xapi_linux.h | 190 -
6770 .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
6771 drivers/staging/ath6kl/os/linux/include/cfg80211.h | 61 -
6772 .../staging/ath6kl/os/linux/include/config_linux.h | 51 -
6773 .../staging/ath6kl/os/linux/include/debug_linux.h | 50 -
6774 .../ath6kl/os/linux/include/export_hci_transport.h | 76 -
6775 .../ath6kl/os/linux/include/ieee80211_ioctl.h | 177 -
6776 .../staging/ath6kl/os/linux/include/osapi_linux.h | 339 -
6777 .../staging/ath6kl/os/linux/include/wlan_config.h | 108 -
6778 .../ath6kl/os/linux/include/wmi_filter_linux.h | 300 -
6779 drivers/staging/ath6kl/os/linux/netbuf.c | 231 -
6780 drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 117 -
6781 drivers/staging/ath6kl/reorder/rcv_aggr.c | 661 --
6782 drivers/staging/ath6kl/wlan/include/ieee80211.h | 397 --
6783 .../staging/ath6kl/wlan/include/ieee80211_node.h | 93 -
6784 drivers/staging/ath6kl/wlan/src/wlan_node.c | 636 --
6785 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 199 -
6786 drivers/staging/ath6kl/wlan/src/wlan_utils.c | 58 -
6787 drivers/staging/ath6kl/wmi/wmi.c | 6444 --------------------
6788 drivers/staging/ath6kl/wmi/wmi_host.h | 102 -
6789 drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 +-
6790 drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 12 +-
6791 drivers/staging/et131x/et1310_tx.c | 12 +-
6792 drivers/staging/et131x/et131x_netdev.c | 2 +-
6793 drivers/staging/hv/netvsc_drv.c | 4 +-
6794 drivers/staging/octeon/ethernet.c | 12 +-
6795 drivers/staging/rtl8187se/r8180_core.c | 2 +-
6796 drivers/staging/rtl8192e/r8192E_core.c | 2 +-
6797 drivers/staging/rtl8192u/r8192U_core.c | 2 +-
6798 drivers/staging/slicoss/slicoss.c | 2 +-
6799 drivers/staging/vt6655/device_main.c | 2 +-
6800 drivers/staging/vt6656/main_usb.c | 2 +-
6801 drivers/staging/winbond/wbusb.c | 2 +-
6802 drivers/staging/wlags49_h2/wl_netdev.c | 2 +-
6803 drivers/staging/wlan-ng/p80211netdev.c | 2 +-
6804 drivers/watchdog/bcm47xx_wdt.c | 27 +-
6805 drivers/xen/xen-pciback/xenbus.c | 2 +
6806 include/linux/atalk.h | 3 +-
6807 include/linux/ax25.h | 2 +-
6808 include/linux/bcma/bcma.h | 9 +-
6809 include/linux/bcma/bcma_driver_chipcommon.h | 94 +
6810 include/linux/bcma/bcma_driver_mips.h | 51 +
6811 include/linux/bcma/bcma_soc.h | 16 +
6812 include/linux/caif/caif_socket.h | 7 +-
6813 include/linux/can.h | 2 +-
6814 include/linux/can/Kbuild | 1 +
6815 include/linux/can/bcm.h | 1 +
6816 include/linux/can/gw.h | 164 +
6817 include/linux/cn_proc.h | 11 +
6818 include/linux/ethtool.h | 180 +-
6819 include/linux/ieee80211.h | 71 +-
6820 include/linux/if.h | 1 +
6821 include/linux/if_ether.h | 1 +
6822 include/linux/if_packet.h | 119 +
6823 include/linux/if_pppol2tp.h | 2 +-
6824 include/linux/if_pppox.h | 9 +-
6825 include/linux/in.h | 2 +-
6826 include/linux/ip6_tunnel.h | 2 +
6827 include/linux/ipx.h | 2 +-
6828 include/linux/irda.h | 9 +-
6829 include/linux/l2tp.h | 7 +-
6830 include/linux/lapb.h | 3 +-
6831 include/linux/llc.h | 10 +-
6832 include/linux/mii.h | 210 +-
6833 include/linux/net_tstamp.h | 9 +
6834 include/linux/netdevice.h | 13 +-
6835 include/linux/netfilter/xt_connlimit.h | 1 +
6836 include/linux/netfilter/xt_conntrack.h | 1 +
6837 include/linux/netfilter/xt_iprange.h | 1 +
6838 include/linux/netfilter_arp/arp_tables.h | 14 +-
6839 include/linux/netfilter_decnet.h | 3 +
6840 include/linux/netfilter_ipv4.h | 3 +
6841 include/linux/netfilter_ipv4/ip_tables.h | 20 +-
6842 include/linux/netfilter_ipv6.h | 3 +
6843 include/linux/netfilter_ipv6/ip6_tables.h | 22 +-
6844 include/linux/netlink.h | 2 +-
6845 include/linux/netrom.h | 2 +
6846 include/linux/nfc.h | 8 +
6847 include/linux/nl80211.h | 192 +-
6848 include/linux/pci.h | 2 +
6849 include/linux/phonet.h | 5 +-
6850 include/linux/rose.h | 7 +-
6851 {arch/sh/include/asm => include/linux}/sh_eth.h | 2 +-
6852 include/linux/skbuff.h | 181 +-
6853 include/linux/ssb/ssb.h | 2 +-
6854 include/linux/ssb/ssb_regs.h | 40 +
6855 {drivers/net => include/linux}/sungem_phy.h | 2 +-
6856 include/linux/sysctl.h | 2 +-
6857 include/linux/tcp.h | 7 +-
6858 include/linux/tipc_config.h | 4 +
6859 include/linux/un.h | 4 +-
6860 include/linux/x25.h | 3 +-
6861 include/net/addrconf.h | 2 +-
6862 include/net/bluetooth/hci.h | 10 +
6863 include/net/bluetooth/hci_core.h | 25 +-
6864 include/net/bluetooth/l2cap.h | 8 +-
6865 include/net/bluetooth/mgmt.h | 16 +
6866 include/net/bluetooth/smp.h | 17 +
6867 include/net/cfg80211-wext.h | 55 +
6868 include/net/cfg80211.h | 353 +-
6869 include/net/dst.h | 9 +-
6870 include/net/if_inet6.h | 1 +
6871 include/net/iucv/af_iucv.h | 52 +
6872 include/net/iucv/iucv.h | 36 +-
6873 include/net/lapb.h | 2 +-
6874 include/net/lib80211.h | 3 -
6875 include/net/mac80211.h | 55 +-
6876 include/net/nfc/nci.h | 313 +
6877 include/net/nfc/nci_core.h | 184 +
6878 include/net/{ => nfc}/nfc.h | 11 +-
6879 include/net/regulatory.h | 16 +-
6880 include/net/scm.h | 5 +-
6881 include/net/sctp/structs.h | 1 +
6882 include/net/sock.h | 15 +-
6883 include/net/tcp.h | 8 +-
6884 include/rdma/ib_addr.h | 6 +-
6886 kernel/sysctl_binary.c | 2 +-
6887 net/802/garp.c | 4 +-
6888 net/802/stp.c | 4 +-
6889 net/8021q/vlan.c | 2 +-
6890 net/8021q/vlan_dev.c | 4 +-
6891 net/atm/lec.c | 2 +-
6892 net/batman-adv/Makefile | 2 +-
6893 net/batman-adv/aggregation.c | 293 -
6894 net/batman-adv/aggregation.h | 46 -
6895 net/batman-adv/bat_iv_ogm.c | 1170 ++++
6896 net/batman-adv/bat_ogm.h | 35 +
6897 net/batman-adv/bat_sysfs.c | 2 +
6898 net/batman-adv/bitarray.c | 6 +-
6899 net/batman-adv/gateway_client.c | 10 +-
6900 net/batman-adv/hard-interface.c | 88 +-
6901 net/batman-adv/hard-interface.h | 1 +
6902 net/batman-adv/hash.h | 25 +-
6903 net/batman-adv/main.c | 4 +-
6904 net/batman-adv/main.h | 8 +-
6905 net/batman-adv/originator.c | 21 +-
6906 net/batman-adv/packet.h | 19 +-
6907 net/batman-adv/routing.c | 669 +--
6908 net/batman-adv/routing.h | 17 +-
6909 net/batman-adv/send.c | 313 +-
6910 net/batman-adv/send.h | 9 +-
6911 net/batman-adv/soft-interface.c | 34 +-
6912 net/batman-adv/translation-table.c | 199 +-
6913 net/batman-adv/translation-table.h | 21 +-
6914 net/batman-adv/types.h | 5 +-
6915 net/batman-adv/unicast.c | 6 +-
6916 net/batman-adv/unicast.h | 2 +-
6917 net/batman-adv/vis.c | 10 +-
6918 net/bluetooth/bnep/netdev.c | 2 +-
6919 net/bluetooth/hci_conn.c | 2 +-
6920 net/bluetooth/hci_core.c | 57 +-
6921 net/bluetooth/hci_event.c | 16 +-
6922 net/bluetooth/hci_sock.c | 18 +-
6923 net/bluetooth/hci_sysfs.c | 2 +
6924 net/bluetooth/hidp/core.c | 3 +
6925 net/bluetooth/l2cap_core.c | 18 +-
6926 net/bluetooth/mgmt.c | 212 +-
6927 net/bluetooth/smp.c | 421 +-
6928 net/bridge/br_device.c | 4 +-
6929 net/bridge/br_fdb.c | 23 +-
6930 net/bridge/br_if.c | 41 +-
6931 net/bridge/br_input.c | 33 +-
6932 net/bridge/br_private.h | 7 +
6933 net/bridge/br_sysfs_br.c | 34 +
6934 net/bridge/netfilter/ebtable_broute.c | 4 +-
6935 net/caif/cfcnfg.c | 38 +-
6936 net/caif/cfctrl.c | 23 +-
6937 net/caif/cfdbgl.c | 7 +-
6938 net/caif/cfdgml.c | 7 +-
6939 net/caif/cffrml.c | 7 +-
6940 net/caif/cfmuxl.c | 6 +-
6941 net/caif/cfrfml.c | 7 +-
6942 net/caif/cfserl.c | 7 +-
6943 net/caif/cfsrvl.c | 8 +-
6944 net/caif/cfutill.c | 7 +-
6945 net/caif/cfveil.c | 7 +-
6946 net/caif/cfvidl.c | 7 +-
6947 net/can/Kconfig | 11 +
6948 net/can/Makefile | 3 +
6949 net/can/af_can.c | 4 +-
6950 net/can/gw.c | 959 +++
6951 net/core/datagram.c | 8 +-
6952 net/core/dev.c | 163 +-
6953 net/core/dev_addr_lists.c | 4 +-
6954 net/core/dst.c | 15 +-
6955 net/core/ethtool.c | 20 +-
6956 net/core/fib_rules.c | 4 +-
6957 net/core/filter.c | 2 +-
6958 net/core/kmap_skb.h | 2 +-
6959 net/core/link_watch.c | 9 +-
6960 net/core/neighbour.c | 40 +-
6961 net/core/net-sysfs.c | 12 +-
6962 net/core/netpoll.c | 4 +-
6963 net/core/pktgen.c | 3 +-
6964 net/core/rtnetlink.c | 1 -
6965 net/core/scm.c | 10 +-
6966 net/core/skbuff.c | 31 +-
6967 net/core/sock.c | 16 +-
6968 net/core/user_dma.c | 2 +-
6969 net/dccp/ccids/ccid2.c | 84 +-
6970 net/dccp/ccids/ccid2.h | 6 +
6971 net/dccp/dccp.h | 1 +
6972 net/dccp/feat.c | 202 +-
6973 net/dccp/feat.h | 1 +
6974 net/dccp/proto.c | 1 -
6975 net/decnet/dn_dev.c | 6 +-
6976 net/dsa/slave.c | 3 -
6977 net/ieee802154/6lowpan.c | 891 +++
6978 net/ieee802154/6lowpan.h | 212 +
6979 net/ieee802154/Kconfig | 6 +
6980 net/ieee802154/Makefile | 8 +-
6981 net/ipv4/devinet.c | 6 +-
6982 net/ipv4/fib_trie.c | 12 +-
6983 net/ipv4/gre.c | 4 +-
6984 net/ipv4/igmp.c | 12 +-
6985 net/ipv4/inet_lro.c | 2 +-
6986 net/ipv4/ip_output.c | 7 +-
6987 net/ipv4/ipip.c | 10 +-
6988 net/ipv4/ipmr.c | 8 +-
6989 net/ipv4/netfilter/nf_nat_amanda.c | 4 +-
6990 net/ipv4/netfilter/nf_nat_core.c | 24 +-
6991 net/ipv4/netfilter/nf_nat_ftp.c | 4 +-
6992 net/ipv4/netfilter/nf_nat_h323.c | 36 +-
6993 net/ipv4/netfilter/nf_nat_irc.c | 4 +-
6994 net/ipv4/netfilter/nf_nat_pptp.c | 16 +-
6995 net/ipv4/netfilter/nf_nat_sip.c | 28 +-
6996 net/ipv4/netfilter/nf_nat_snmp_basic.c | 4 +-
6997 net/ipv4/netfilter/nf_nat_standalone.c | 6 +-
6998 net/ipv4/netfilter/nf_nat_tftp.c | 4 +-
6999 net/ipv4/route.c | 14 +-
7000 net/ipv4/tcp.c | 56 +-
7001 net/ipv4/tcp_input.c | 85 +-
7002 net/ipv4/tcp_ipv4.c | 8 +-
7003 net/ipv4/tcp_output.c | 72 +-
7004 net/ipv4/udp.c | 11 +-
7005 net/ipv6/addrconf.c | 81 +-
7006 net/ipv6/exthdrs.c | 7 +-
7007 net/ipv6/icmp.c | 25 +-
7008 net/ipv6/inet6_connection_sock.c | 9 +-
7009 net/ipv6/ip6_output.c | 7 +-
7010 net/ipv6/ip6_tunnel.c | 54 +-
7011 net/ipv6/ndisc.c | 31 +-
7012 net/ipv6/raw.c | 8 +-
7013 net/ipv6/sit.c | 12 +-
7014 net/ipv6/tcp_ipv6.c | 8 +-
7015 net/ipv6/udp.c | 4 +-
7016 net/irda/irlan/irlan_eth.c | 2 +-
7017 net/iucv/Kconfig | 14 +-
7018 net/iucv/af_iucv.c | 868 +++-
7019 net/iucv/iucv.c | 23 +
7020 net/lapb/lapb_iface.c | 29 +-
7021 net/mac80211/Kconfig | 13 +
7022 net/mac80211/agg-rx.c | 23 +-
7023 net/mac80211/agg-tx.c | 62 +-
7024 net/mac80211/cfg.c | 99 +-
7025 net/mac80211/debugfs.c | 71 +-
7026 net/mac80211/debugfs_netdev.c | 59 +-
7027 net/mac80211/driver-ops.h | 58 +-
7028 net/mac80211/driver-trace.h | 40 +-
7029 net/mac80211/ht.c | 6 +-
7030 net/mac80211/ibss.c | 12 +-
7031 net/mac80211/ieee80211_i.h | 73 +-
7032 net/mac80211/iface.c | 22 +-
7033 net/mac80211/main.c | 1 +
7034 net/mac80211/mesh.c | 267 +-
7035 net/mac80211/mesh.h | 42 +-
7036 net/mac80211/mesh_hwmp.c | 168 +-
7037 net/mac80211/mesh_pathtbl.c | 481 ++-
7038 net/mac80211/mesh_plink.c | 251 +-
7039 net/mac80211/mlme.c | 104 +-
7040 net/mac80211/rate.c | 29 +-
7041 net/mac80211/rc80211_minstrel_ht.c | 11 +-
7042 net/mac80211/rx.c | 83 +-
7043 net/mac80211/scan.c | 3 +-
7044 net/mac80211/spectmgmt.c | 6 +-
7045 net/mac80211/sta_info.c | 347 +-
7046 net/mac80211/sta_info.h | 35 +-
7047 net/mac80211/status.c | 60 +-
7048 net/mac80211/tx.c | 60 +-
7049 net/mac80211/util.c | 204 +-
7050 net/mac80211/wme.c | 16 +-
7051 net/mac80211/wme.h | 3 +-
7052 net/mac80211/work.c | 8 +-
7053 net/netfilter/core.c | 4 +-
7054 net/netfilter/nf_conntrack_core.c | 12 +-
7055 net/netfilter/nf_conntrack_ecache.c | 8 +-
7056 net/netfilter/nf_conntrack_extend.c | 4 +-
7057 net/netfilter/nf_conntrack_helper.c | 6 +-
7058 net/netfilter/nf_conntrack_netlink.c | 6 +-
7059 net/netfilter/nf_log.c | 10 +-
7060 net/netfilter/nf_queue.c | 6 +-
7061 net/netfilter/nfnetlink.c | 6 +-
7062 net/netlabel/netlabel_domainhash.c | 6 +-
7063 net/netlabel/netlabel_unlabeled.c | 6 +-
7064 net/netlink/af_netlink.c | 7 +-
7065 net/nfc/Kconfig | 2 +
7066 net/nfc/Makefile | 1 +
7067 net/nfc/core.c | 83 +-
7068 net/nfc/nci/Kconfig | 10 +
7069 net/nfc/nci/Makefile | 7 +
7070 net/nfc/nci/core.c | 797 +++
7071 net/nfc/nci/data.c | 247 +
7072 net/nfc/nci/lib.c | 94 +
7073 net/nfc/nci/ntf.c | 258 +
7074 net/nfc/nci/rsp.c | 226 +
7075 net/nfc/netlink.c | 56 +
7076 net/nfc/nfc.h | 6 +-
7077 net/nfc/rawsock.c | 13 +-
7078 net/packet/af_packet.c | 946 +++-
7079 net/phonet/af_phonet.c | 4 +-
7080 net/phonet/pn_dev.c | 6 +-
7081 net/phonet/socket.c | 6 +-
7082 net/rds/Kconfig | 1 +
7083 net/rds/ib_rdma.c | 112 +-
7084 net/rds/xlist.h | 80 -
7085 net/rfkill/core.c | 2 +-
7086 net/rfkill/rfkill-regulator.c | 1 -
7087 net/sched/sch_sfb.c | 13 +-
7088 net/sctp/associola.c | 1 +
7089 net/sctp/outqueue.c | 4 +
7090 net/sctp/sm_make_chunk.c | 1 +
7091 net/sctp/sm_statefuns.c | 5 +
7093 net/sunrpc/auth_gss/auth_gss.c | 4 +-
7094 net/tipc/bcast.c | 111 +-
7095 net/tipc/bcast.h | 1 -
7096 net/tipc/bearer.c | 8 +-
7097 net/tipc/bearer.h | 4 +-
7098 net/tipc/config.h | 1 -
7099 net/tipc/discover.c | 6 -
7100 net/tipc/eth_media.c | 32 +-
7101 net/tipc/link.c | 111 +-
7102 net/tipc/link.h | 1 +
7103 net/tipc/name_distr.c | 35 +-
7104 net/tipc/net.c | 11 -
7105 net/tipc/node.c | 45 +-
7106 net/tipc/node.h | 10 +-
7107 net/tipc/socket.c | 51 +-
7108 net/tipc/subscr.c | 3 +-
7109 net/tipc/subscr.h | 6 -
7110 net/unix/af_unix.c | 24 +-
7111 net/wireless/core.c | 2 +-
7112 net/wireless/core.h | 6 +-
7113 net/wireless/lib80211.c | 15 +-
7114 net/wireless/lib80211_crypt_ccmp.c | 2 -
7115 net/wireless/lib80211_crypt_tkip.c | 4 -
7116 net/wireless/lib80211_crypt_wep.c | 4 -
7117 net/wireless/mesh.c | 3 +
7118 net/wireless/mlme.c | 16 +-
7119 net/wireless/nl80211.c | 294 +-
7120 net/wireless/nl80211.h | 4 +
7121 net/wireless/reg.c | 47 +-
7122 net/wireless/reg.h | 2 +
7123 net/wireless/scan.c | 28 +
7124 net/wireless/sme.c | 19 +-
7125 net/wireless/util.c | 189 +-
7126 net/wireless/wext-compat.c | 137 +-
7127 net/wireless/wext-compat.h | 8 +
7128 net/wireless/wext-sme.c | 3 +-
7129 net/xfrm/xfrm_ipcomp.c | 11 +-
7130 net/xfrm/xfrm_user.c | 4 +-
7131 virt/kvm/assigned-dev.c | 2 +
7132 virt/kvm/iommu.c | 4 +
7133 1918 files changed, 88676 insertions(+), 97784 deletions(-)
7134 create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
7135 create mode 100644 arch/mips/bcm47xx/Kconfig
7136 create mode 100644 drivers/bcma/driver_mips.c
7137 create mode 100644 drivers/bcma/host_soc.c
7138 rename drivers/net/{pcmcia => arcnet}/com20020_cs.c (100%)
7139 delete mode 100644 drivers/net/arm/Kconfig
7140 delete mode 100644 drivers/net/arm/Makefile
7141 delete mode 100644 drivers/net/benet/Kconfig
7142 delete mode 100644 drivers/net/bna/bfa_ioc_ct.c
7143 delete mode 100644 drivers/net/bna/bfi_ctreg.h
7144 delete mode 100644 drivers/net/bna/bfi_ll.h
7145 delete mode 100644 drivers/net/bna/bna_ctrl.c
7146 delete mode 100644 drivers/net/bna/bna_hw.h
7147 delete mode 100644 drivers/net/bna/bna_txrx.c
7148 create mode 100644 drivers/net/can/sja1000/ems_pcmcia.c
7149 create mode 100644 drivers/net/can/sja1000/peak_pci.c
7150 rename drivers/net/{ => ethernet/3com}/3c501.c (99%)
7151 rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
7152 rename drivers/net/{ => ethernet/3com}/3c509.c (99%)
7153 rename drivers/net/{ => ethernet/3com}/3c515.c (99%)
7154 rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (99%)
7155 rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (99%)
7156 rename drivers/net/{ => ethernet/3com}/3c59x.c (99%)
7157 create mode 100644 drivers/net/ethernet/3com/Kconfig
7158 create mode 100644 drivers/net/ethernet/3com/Makefile
7159 rename drivers/net/{ => ethernet/3com}/typhoon.c (99%)
7160 rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
7161 rename drivers/net/{ => ethernet/8390}/3c503.c (99%)
7162 rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
7163 rename drivers/net/{ => ethernet/8390}/8390.c (97%)
7164 rename drivers/net/{ => ethernet/8390}/8390.h (100%)
7165 rename drivers/net/{ => ethernet/8390}/8390p.c (97%)
7166 create mode 100644 drivers/net/ethernet/8390/Kconfig
7167 create mode 100644 drivers/net/ethernet/8390/Makefile
7168 rename drivers/net/{ => ethernet/8390}/ac3200.c (99%)
7169 rename drivers/net/{ => ethernet/8390}/apne.c (100%)
7170 rename drivers/net/{ => ethernet/8390}/ax88796.c (99%)
7171 rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
7172 rename drivers/net/{ => ethernet/8390}/e2100.c (99%)
7173 rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
7174 rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
7175 rename drivers/net/{ => ethernet/8390}/hp-plus.c (99%)
7176 rename drivers/net/{ => ethernet/8390}/hp.c (100%)
7177 rename drivers/net/{ => ethernet/8390}/hydra.c (99%)
7178 rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
7179 rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
7180 rename drivers/net/{ => ethernet/8390}/mac8390.c (99%)
7181 rename drivers/net/{ => ethernet/8390}/ne-h8300.c (99%)
7182 rename drivers/net/{ => ethernet/8390}/ne.c (100%)
7183 rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
7184 rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (99%)
7185 rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
7186 rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
7187 rename drivers/net/{ => ethernet/8390}/smc-mca.c (99%)
7188 rename drivers/net/{ => ethernet/8390}/smc-ultra.c (99%)
7189 rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (99%)
7190 rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
7191 rename drivers/net/{ => ethernet/8390}/wd.c (99%)
7192 rename drivers/net/{ => ethernet/8390}/zorro8390.c (99%)
7193 create mode 100644 drivers/net/ethernet/Kconfig
7194 create mode 100644 drivers/net/ethernet/Makefile
7195 create mode 100644 drivers/net/ethernet/adaptec/Kconfig
7196 create mode 100644 drivers/net/ethernet/adaptec/Makefile
7197 rename drivers/net/{ => ethernet/adaptec}/starfire.c (99%)
7198 create mode 100644 drivers/net/ethernet/adi/Kconfig
7199 create mode 100644 drivers/net/ethernet/adi/Makefile
7200 rename drivers/net/{ => ethernet/adi}/bfin_mac.c (99%)
7201 rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
7202 create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
7203 create mode 100644 drivers/net/ethernet/aeroflex/Makefile
7204 rename drivers/net/{ => ethernet/aeroflex}/greth.c (99%)
7205 rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
7206 create mode 100644 drivers/net/ethernet/alteon/Kconfig
7207 create mode 100644 drivers/net/ethernet/alteon/Makefile
7208 rename drivers/net/{ => ethernet/alteon}/acenic.c (99%)
7209 rename drivers/net/{ => ethernet/alteon}/acenic.h (100%)
7210 rename drivers/net/{ => ethernet/amd}/7990.c (100%)
7211 rename drivers/net/{ => ethernet/amd}/7990.h (100%)
7212 create mode 100644 drivers/net/ethernet/amd/Kconfig
7213 create mode 100644 drivers/net/ethernet/amd/Makefile
7214 rename drivers/net/{ => ethernet/amd}/a2065.c (99%)
7215 rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
7216 rename drivers/net/{arm => ethernet/amd}/am79c961a.c (99%)
7217 rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
7218 rename drivers/net/{ => ethernet/amd}/amd8111e.c (99%)
7219 rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
7220 rename drivers/net/{ => ethernet/amd}/ariadne.c (99%)
7221 rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
7222 rename drivers/net/{ => ethernet/amd}/atarilance.c (99%)
7223 rename drivers/net/{ => ethernet/amd}/au1000_eth.c (99%)
7224 rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
7225 rename drivers/net/{ => ethernet/amd}/declance.c (99%)
7226 rename drivers/net/{ => ethernet/amd}/depca.c (99%)
7227 rename drivers/net/{ => ethernet/amd}/depca.h (99%)
7228 rename drivers/net/{ => ethernet/amd}/hplance.c (99%)
7229 rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
7230 rename drivers/net/{ => ethernet/amd}/lance.c (99%)
7231 rename drivers/net/{ => ethernet/amd}/mvme147.c (99%)
7232 rename drivers/net/{ => ethernet/amd}/ni65.c (99%)
7233 rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
7234 rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (99%)
7235 rename drivers/net/{ => ethernet/amd}/pcnet32.c (94%)
7236 rename drivers/net/{ => ethernet/amd}/sun3lance.c (99%)
7237 rename drivers/net/{ => ethernet/amd}/sunlance.c (99%)
7238 create mode 100644 drivers/net/ethernet/apple/Kconfig
7239 create mode 100644 drivers/net/ethernet/apple/Makefile
7240 rename drivers/net/{ => ethernet/apple}/bmac.c (99%)
7241 rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
7242 rename drivers/net/{ => ethernet/apple}/cs89x0.c (99%)
7243 rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
7244 rename drivers/net/{ => ethernet/apple}/mac89x0.c (99%)
7245 rename drivers/net/{ => ethernet/apple}/mace.c (99%)
7246 rename drivers/net/{ => ethernet/apple}/mace.h (100%)
7247 rename drivers/net/{ => ethernet/apple}/macmace.c (98%)
7248 create mode 100644 drivers/net/ethernet/atheros/Kconfig
7249 create mode 100644 drivers/net/ethernet/atheros/Makefile
7250 rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
7251 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
7252 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
7253 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
7254 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
7255 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (99%)
7256 rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
7257 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
7258 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
7259 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
7260 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
7261 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (99%)
7262 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
7263 rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
7264 rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (99%)
7265 rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
7266 rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (99%)
7267 rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
7268 rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
7269 rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
7270 create mode 100644 drivers/net/ethernet/broadcom/Kconfig
7271 create mode 100644 drivers/net/ethernet/broadcom/Makefile
7272 rename drivers/net/{ => ethernet/broadcom}/b44.c (99%)
7273 rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
7274 rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (99%)
7275 rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
7276 rename drivers/net/{ => ethernet/broadcom}/bnx2.c (99%)
7277 rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
7278 rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
7279 rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
7280 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (98%)
7281 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (98%)
7282 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (99%)
7283 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (99%)
7284 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
7285 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
7286 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (98%)
7287 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
7288 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
7289 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (99%)
7290 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
7291 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
7292 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (99%)
7293 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
7294 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (99%)
7295 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
7296 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (98%)
7297 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
7298 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (98%)
7299 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
7300 rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
7301 rename drivers/net/{ => ethernet/broadcom}/cnic.h (99%)
7302 rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (99%)
7303 rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
7304 rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (99%)
7305 rename drivers/net/{ => ethernet/broadcom}/tg3.c (98%)
7306 rename drivers/net/{ => ethernet/broadcom}/tg3.h (99%)
7307 create mode 100644 drivers/net/ethernet/brocade/Kconfig
7308 create mode 100644 drivers/net/ethernet/brocade/Makefile
7309 create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
7310 rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%)
7311 rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (97%)
7312 rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
7313 rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
7314 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (81%)
7315 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (94%)
7316 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (73%)
7317 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
7318 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (85%)
7319 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (84%)
7320 create mode 100644 drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
7321 create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c
7322 create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h
7323 rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (65%)
7324 rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
7325 create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h
7326 create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h
7327 rename drivers/net/{ => ethernet/brocade}/bna/bna.h (66%)
7328 create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c
7329 create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h
7330 create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c
7331 rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%)
7332 rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (76%)
7333 rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (74%)
7334 rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (66%)
7335 rename drivers/net/{ => ethernet/brocade}/bna/cna.h (62%)
7336 rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (53%)
7337 create mode 100644 drivers/net/ethernet/cadence/Kconfig
7338 create mode 100644 drivers/net/ethernet/cadence/Makefile
7339 rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (99%)
7340 rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
7341 rename drivers/net/{ => ethernet/cadence}/macb.c (99%)
7342 rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
7343 create mode 100644 drivers/net/ethernet/chelsio/Kconfig
7344 create mode 100644 drivers/net/ethernet/chelsio/Makefile
7345 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
7346 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
7347 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
7348 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
7349 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (99%)
7350 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
7351 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
7352 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
7353 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
7354 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
7355 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
7356 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
7357 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
7358 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
7359 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
7360 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
7361 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (99%)
7362 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
7363 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
7364 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
7365 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
7366 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
7367 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
7368 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
7369 rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
7370 rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
7371 rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
7372 rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
7373 rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
7374 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
7375 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
7376 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
7377 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (99%)
7378 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
7379 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
7380 rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
7381 rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
7382 rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
7383 rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
7384 rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
7385 rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (99%)
7386 rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
7387 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
7388 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
7389 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
7390 rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
7391 rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
7392 rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
7393 rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
7394 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
7395 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (99%)
7396 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
7397 rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
7398 rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
7399 rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
7400 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
7401 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
7402 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
7403 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
7404 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
7405 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
7406 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
7407 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (99%)
7408 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
7409 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
7410 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
7411 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
7412 create mode 100644 drivers/net/ethernet/cirrus/Kconfig
7413 create mode 100644 drivers/net/ethernet/cirrus/Makefile
7414 rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
7415 create mode 100644 drivers/net/ethernet/cisco/Kconfig
7416 create mode 100644 drivers/net/ethernet/cisco/Makefile
7417 create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
7418 rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
7419 rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
7420 rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
7421 rename drivers/net/{ => ethernet/cisco}/enic/enic.h (90%)
7422 rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
7423 rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (78%)
7424 rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (94%)
7425 rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (52%)
7426 rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (68%)
7427 rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
7428 rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
7429 rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
7430 rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
7431 rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
7432 rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (97%)
7433 rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (97%)
7434 rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
7435 rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
7436 rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
7437 rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
7438 rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
7439 rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
7440 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
7441 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
7442 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
7443 rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
7444 rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
7445 rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
7446 rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
7447 rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
7448 rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
7449 create mode 100644 drivers/net/ethernet/davicom/Kconfig
7450 create mode 100644 drivers/net/ethernet/davicom/Makefile
7451 rename drivers/net/{ => ethernet/davicom}/dm9000.c (99%)
7452 rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
7453 create mode 100644 drivers/net/ethernet/dec/Kconfig
7454 create mode 100644 drivers/net/ethernet/dec/Makefile
7455 rename drivers/net/{ => ethernet/dec}/ewrk3.c (99%)
7456 rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
7457 rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
7458 rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%)
7459 rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
7460 rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (99%)
7461 rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (99%)
7462 rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (99%)
7463 rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (99%)
7464 rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
7465 rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
7466 rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
7467 rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
7468 rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
7469 rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
7470 rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
7471 rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (99%)
7472 rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (99%)
7473 rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (99%)
7474 rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
7475 create mode 100644 drivers/net/ethernet/dlink/Kconfig
7476 create mode 100644 drivers/net/ethernet/dlink/Makefile
7477 rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
7478 rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
7479 rename drivers/net/{ => ethernet/dlink}/de620.c (99%)
7480 rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
7481 rename drivers/net/{ => ethernet/dlink}/dl2k.c (95%)
7482 rename drivers/net/{ => ethernet/dlink}/dl2k.h (81%)
7483 rename drivers/net/{ => ethernet/dlink}/sundance.c (99%)
7484 rename drivers/net/{ => ethernet}/dnet.c (100%)
7485 rename drivers/net/{ => ethernet}/dnet.h (100%)
7486 create mode 100644 drivers/net/ethernet/emulex/Kconfig
7487 create mode 100644 drivers/net/ethernet/emulex/Makefile
7488 create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
7489 rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
7490 rename drivers/net/{ => ethernet/emulex}/benet/be.h (84%)
7491 rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (93%)
7492 rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%)
7493 rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (84%)
7494 rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%)
7495 rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (90%)
7496 rename drivers/net/{ => ethernet}/ethoc.c (99%)
7497 create mode 100644 drivers/net/ethernet/faraday/Kconfig
7498 create mode 100644 drivers/net/ethernet/faraday/Makefile
7499 rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
7500 rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
7501 rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
7502 rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
7503 rename drivers/net/{ => ethernet}/fealnx.c (99%)
7504 create mode 100644 drivers/net/ethernet/freescale/Kconfig
7505 create mode 100644 drivers/net/ethernet/freescale/Makefile
7506 rename drivers/net/{ => ethernet/freescale}/fec.c (93%)
7507 rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
7508 rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (99%)
7509 rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
7510 rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
7511 rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (89%)
7512 rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
7513 rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
7514 rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (99%)
7515 rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
7516 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
7517 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
7518 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
7519 rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
7520 rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
7521 rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
7522 rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
7523 rename drivers/net/{ => ethernet/freescale}/gianfar.c (99%)
7524 rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
7525 rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (99%)
7526 rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
7527 rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
7528 rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%)
7529 rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
7530 rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
7531 create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
7532 create mode 100644 drivers/net/ethernet/fujitsu/Makefile
7533 rename drivers/net/{ => ethernet/fujitsu}/at1700.c (99%)
7534 rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (99%)
7535 rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (99%)
7536 create mode 100644 drivers/net/ethernet/hp/Kconfig
7537 create mode 100644 drivers/net/ethernet/hp/Makefile
7538 rename drivers/net/{ => ethernet/hp}/hp100.c (99%)
7539 rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
7540 rename drivers/net/{ => ethernet/i825xx}/3c505.c (99%)
7541 rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
7542 rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
7543 rename drivers/net/{ => ethernet/i825xx}/3c523.c (99%)
7544 rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
7545 rename drivers/net/{ => ethernet/i825xx}/3c527.c (99%)
7546 rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
7547 rename drivers/net/{ => ethernet/i825xx}/82596.c (99%)
7548 create mode 100644 drivers/net/ethernet/i825xx/Kconfig
7549 create mode 100644 drivers/net/ethernet/i825xx/Makefile
7550 rename drivers/net/{ => ethernet/i825xx}/eepro.c (99%)
7551 rename drivers/net/{ => ethernet/i825xx}/eexpress.c (99%)
7552 rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
7553 rename drivers/net/{arm => ethernet/i825xx}/ether1.c (99%)
7554 rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
7555 rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
7556 rename drivers/net/{ => ethernet/i825xx}/lib82596.c (99%)
7557 rename drivers/net/{ => ethernet/i825xx}/lp486e.c (99%)
7558 rename drivers/net/{ => ethernet/i825xx}/ni52.c (99%)
7559 rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
7560 rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
7561 rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (99%)
7562 rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
7563 rename drivers/net/{ => ethernet/i825xx}/znet.c (99%)
7564 create mode 100644 drivers/net/ethernet/ibm/Kconfig
7565 create mode 100644 drivers/net/ethernet/ibm/Makefile
7566 rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
7567 rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (99%)
7568 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
7569 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
7570 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (99%)
7571 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
7572 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
7573 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
7574 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
7575 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
7576 create mode 100644 drivers/net/ethernet/ibm/emac/Makefile
7577 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (99%)
7578 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (97%)
7579 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
7580 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (98%)
7581 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
7582 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (99%)
7583 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (99%)
7584 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
7585 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
7586 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
7587 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (96%)
7588 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
7589 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (97%)
7590 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
7591 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (96%)
7592 rename drivers/net/{ => ethernet/ibm}/ibmveth.c (99%)
7593 rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
7594 rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (99%)
7595 create mode 100644 drivers/net/ethernet/icplus/Kconfig
7596 create mode 100644 drivers/net/ethernet/icplus/Makefile
7597 rename drivers/net/{ => ethernet/icplus}/ipg.c (92%)
7598 rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
7599 create mode 100644 drivers/net/ethernet/intel/Kconfig
7600 create mode 100644 drivers/net/ethernet/intel/Makefile
7601 rename drivers/net/{ => ethernet/intel}/e100.c (99%)
7602 rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
7603 rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (99%)
7604 rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
7605 rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
7606 rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
7607 rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (99%)
7608 rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
7609 rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
7610 rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (99%)
7611 rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (98%)
7612 rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
7613 rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
7614 rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (97%)
7615 rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (96%)
7616 rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
7617 rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (99%)
7618 rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
7619 rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (96%)
7620 rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
7621 rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
7622 rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
7623 rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
7624 rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
7625 rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
7626 rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
7627 rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (99%)
7628 rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
7629 rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
7630 rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
7631 rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
7632 rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
7633 rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (99%)
7634 rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
7635 rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
7636 rename drivers/net/{ => ethernet/intel}/igb/igb.h (87%)
7637 rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (99%)
7638 rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (95%)
7639 rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
7640 rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
7641 rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
7642 rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
7643 rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
7644 rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
7645 rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (99%)
7646 rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
7647 rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
7648 rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
7649 rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
7650 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (98%)
7651 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (99%)
7652 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (97%)
7653 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (90%)
7654 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (99%)
7655 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (99%)
7656 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
7657 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (97%)
7658 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (98%)
7659 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (97%)
7660 rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
7661 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (92%)
7662 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (97%)
7663 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (95%)
7664 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (97%)
7665 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (99%)
7666 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (84%)
7667 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (95%)
7668 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (97%)
7669 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
7670 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (88%)
7671 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (98%)
7672 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (90%)
7673 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (94%)
7674 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (98%)
7675 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
7676 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (86%)
7677 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
7678 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
7679 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (98%)
7680 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
7681 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (78%)
7682 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (90%)
7683 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (97%)
7684 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (91%)
7685 rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
7686 rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
7687 rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (94%)
7688 rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (98%)
7689 rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (97%)
7690 rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
7691 rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
7692 rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
7693 rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
7694 rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
7695 rename drivers/net/{ => ethernet}/jme.c (99%)
7696 rename drivers/net/{ => ethernet}/jme.h (99%)
7697 rename drivers/net/{ => ethernet}/korina.c (99%)
7698 rename drivers/net/{ => ethernet}/lantiq_etop.c (99%)
7699 create mode 100644 drivers/net/ethernet/marvell/Kconfig
7700 create mode 100644 drivers/net/ethernet/marvell/Makefile
7701 rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (99%)
7702 rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
7703 rename drivers/net/{ => ethernet/marvell}/skge.c (98%)
7704 rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
7705 rename drivers/net/{ => ethernet/marvell}/sky2.c (98%)
7706 rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
7707 create mode 100644 drivers/net/ethernet/mellanox/Kconfig
7708 create mode 100644 drivers/net/ethernet/mellanox/Makefile
7709 create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
7710 rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
7711 rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
7712 rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
7713 rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
7714 rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
7715 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
7716 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
7717 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
7718 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (99%)
7719 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
7720 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
7721 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
7722 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
7723 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
7724 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
7725 rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
7726 rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
7727 rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
7728 rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
7729 rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
7730 rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
7731 rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
7732 rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
7733 rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
7734 rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
7735 rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
7736 rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
7737 rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
7738 rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
7739 rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
7740 rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
7741 rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
7742 rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
7743 create mode 100644 drivers/net/ethernet/micrel/Kconfig
7744 create mode 100644 drivers/net/ethernet/micrel/Makefile
7745 rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (99%)
7746 rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
7747 rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
7748 rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
7749 rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
7750 rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
7751 rename drivers/net/{ => ethernet/micrel}/ksz884x.c (99%)
7752 create mode 100644 drivers/net/ethernet/microchip/Kconfig
7753 create mode 100644 drivers/net/ethernet/microchip/Makefile
7754 rename drivers/net/{ => ethernet/microchip}/enc28j60.c (99%)
7755 rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
7756 rename drivers/net/{ => ethernet}/mipsnet.c (99%)
7757 create mode 100644 drivers/net/ethernet/myricom/Kconfig
7758 create mode 100644 drivers/net/ethernet/myricom/Makefile
7759 rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
7760 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (99%)
7761 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
7762 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
7763 create mode 100644 drivers/net/ethernet/natsemi/Kconfig
7764 create mode 100644 drivers/net/ethernet/natsemi/Makefile
7765 rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (99%)
7766 rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%)
7767 rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (99%)
7768 rename drivers/net/{ => ethernet/natsemi}/macsonic.c (98%)
7769 rename drivers/net/{ => ethernet/natsemi}/natsemi.c (99%)
7770 rename drivers/net/{ => ethernet/natsemi}/ns83820.c (99%)
7771 rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
7772 rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
7773 rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (99%)
7774 create mode 100644 drivers/net/ethernet/neterion/Kconfig
7775 create mode 100644 drivers/net/ethernet/neterion/Makefile
7776 rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
7777 rename drivers/net/{ => ethernet/neterion}/s2io.c (99%)
7778 rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
7779 rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
7780 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (99%)
7781 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (99%)
7782 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
7783 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
7784 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (99%)
7785 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
7786 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
7787 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (99%)
7788 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
7789 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
7790 rename drivers/net/{ => ethernet}/netx-eth.c (99%)
7791 create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
7792 create mode 100644 drivers/net/ethernet/nuvoton/Makefile
7793 rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (99%)
7794 create mode 100644 drivers/net/ethernet/nvidia/Kconfig
7795 create mode 100644 drivers/net/ethernet/nvidia/Makefile
7796 rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (99%)
7797 rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
7798 create mode 100644 drivers/net/ethernet/octeon/Makefile
7799 rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (99%)
7800 create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
7801 create mode 100644 drivers/net/ethernet/oki-semi/Makefile
7802 create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
7803 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
7804 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
7805 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
7806 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
7807 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
7808 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (99%)
7809 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
7810 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
7811 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
7812 create mode 100644 drivers/net/ethernet/packetengines/Kconfig
7813 create mode 100644 drivers/net/ethernet/packetengines/Makefile
7814 rename drivers/net/{ => ethernet/packetengines}/hamachi.c (99%)
7815 rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (99%)
7816 create mode 100644 drivers/net/ethernet/pasemi/Kconfig
7817 create mode 100644 drivers/net/ethernet/pasemi/Makefile
7818 rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (99%)
7819 rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
7820 rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
7821 create mode 100644 drivers/net/ethernet/qlogic/Kconfig
7822 create mode 100644 drivers/net/ethernet/qlogic/Makefile
7823 rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
7824 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%)
7825 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
7826 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
7827 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
7828 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
7829 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
7830 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%)
7831 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (94%)
7832 rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%)
7833 rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
7834 rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
7835 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (98%)
7836 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (82%)
7837 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (96%)
7838 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (99%)
7839 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%)
7840 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (98%)
7841 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (95%)
7842 rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
7843 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
7844 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
7845 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
7846 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (99%)
7847 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
7848 create mode 100644 drivers/net/ethernet/racal/Kconfig
7849 create mode 100644 drivers/net/ethernet/racal/Makefile
7850 rename drivers/net/{ => ethernet/racal}/ni5010.c (99%)
7851 rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
7852 create mode 100644 drivers/net/ethernet/rdc/Kconfig
7853 create mode 100644 drivers/net/ethernet/rdc/Makefile
7854 rename drivers/net/{ => ethernet/rdc}/r6040.c (99%)
7855 rename drivers/net/{ => ethernet/realtek}/8139cp.c (99%)
7856 rename drivers/net/{ => ethernet/realtek}/8139too.c (99%)
7857 create mode 100644 drivers/net/ethernet/realtek/Kconfig
7858 create mode 100644 drivers/net/ethernet/realtek/Makefile
7859 rename drivers/net/{ => ethernet/realtek}/atp.c (99%)
7860 rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
7861 rename drivers/net/{ => ethernet/realtek}/r8169.c (91%)
7862 rename drivers/net/{ => ethernet/realtek}/sc92031.c (98%)
7863 create mode 100644 drivers/net/ethernet/renesas/Kconfig
7864 create mode 100644 drivers/net/ethernet/renesas/Makefile
7865 rename drivers/net/{ => ethernet/renesas}/sh_eth.c (98%)
7866 rename drivers/net/{ => ethernet/renesas}/sh_eth.h (97%)
7867 rename drivers/net/{ => ethernet}/s6gmac.c (100%)
7868 create mode 100644 drivers/net/ethernet/seeq/Kconfig
7869 create mode 100644 drivers/net/ethernet/seeq/Makefile
7870 rename drivers/net/{arm => ethernet/seeq}/ether3.c (99%)
7871 rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
7872 rename drivers/net/{ => ethernet/seeq}/seeq8005.c (99%)
7873 rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
7874 rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (99%)
7875 rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
7876 rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
7877 rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
7878 rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
7879 rename drivers/net/{ => ethernet}/sfc/efx.c (98%)
7880 rename drivers/net/{ => ethernet}/sfc/efx.h (95%)
7881 rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
7882 rename drivers/net/{ => ethernet}/sfc/ethtool.c (91%)
7883 rename drivers/net/{ => ethernet}/sfc/falcon.c (99%)
7884 rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
7885 rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
7886 rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
7887 rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
7888 rename drivers/net/{ => ethernet}/sfc/io.h (100%)
7889 rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
7890 rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
7891 rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
7892 rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
7893 rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
7894 rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
7895 rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
7896 rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
7897 rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
7898 rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
7899 rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
7900 rename drivers/net/{ => ethernet}/sfc/nic.h (99%)
7901 rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
7902 rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
7903 rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
7904 rename drivers/net/{ => ethernet}/sfc/rx.c (99%)
7905 rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
7906 rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
7907 rename drivers/net/{ => ethernet}/sfc/siena.c (99%)
7908 rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
7909 rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
7910 rename drivers/net/{ => ethernet}/sfc/tx.c (99%)
7911 rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
7912 rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
7913 create mode 100644 drivers/net/ethernet/sgi/Kconfig
7914 create mode 100644 drivers/net/ethernet/sgi/Makefile
7915 rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (99%)
7916 rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
7917 rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
7918 create mode 100644 drivers/net/ethernet/sis/Kconfig
7919 create mode 100644 drivers/net/ethernet/sis/Makefile
7920 rename drivers/net/{ => ethernet/sis}/sis190.c (99%)
7921 rename drivers/net/{ => ethernet/sis}/sis900.c (99%)
7922 rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
7923 create mode 100644 drivers/net/ethernet/smsc/Kconfig
7924 create mode 100644 drivers/net/ethernet/smsc/Makefile
7925 rename drivers/net/{ => ethernet/smsc}/epic100.c (99%)
7926 rename drivers/net/{ => ethernet/smsc}/smc911x.c (99%)
7927 rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
7928 rename drivers/net/{ => ethernet/smsc}/smc9194.c (99%)
7929 rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
7930 rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (99%)
7931 rename drivers/net/{ => ethernet/smsc}/smc91x.c (99%)
7932 rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
7933 rename drivers/net/{ => ethernet/smsc}/smsc911x.c (96%)
7934 rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
7935 rename drivers/net/{ => ethernet/smsc}/smsc9420.c (99%)
7936 rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
7937 create mode 100644 drivers/net/ethernet/stmicro/Kconfig
7938 create mode 100644 drivers/net/ethernet/stmicro/Makefile
7939 rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (80%)
7940 rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (68%)
7941 rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (89%)
7942 rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
7943 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
7944 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
7945 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (96%)
7946 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (95%)
7947 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (91%)
7948 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
7949 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (98%)
7950 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
7951 rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
7952 create mode 100644 drivers/net/ethernet/stmicro/stmmac/mmc.h
7953 create mode 100644 drivers/net/ethernet/stmicro/stmmac/mmc_core.c
7954 rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
7955 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (95%)
7956 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (66%)
7957 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (84%)
7958 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
7959 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
7960 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
7961 create mode 100644 drivers/net/ethernet/sun/Kconfig
7962 create mode 100644 drivers/net/ethernet/sun/Makefile
7963 rename drivers/net/{ => ethernet/sun}/cassini.c (99%)
7964 rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
7965 rename drivers/net/{ => ethernet/sun}/niu.c (99%)
7966 rename drivers/net/{ => ethernet/sun}/niu.h (100%)
7967 rename drivers/net/{ => ethernet/sun}/sunbmac.c (97%)
7968 rename drivers/net/{ => ethernet/sun}/sunbmac.h (95%)
7969 rename drivers/net/{ => ethernet/sun}/sungem.c (99%)
7970 rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
7971 rename drivers/net/{ => ethernet/sun}/sunhme.c (99%)
7972 rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
7973 rename drivers/net/{ => ethernet/sun}/sunqe.c (99%)
7974 rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
7975 rename drivers/net/{ => ethernet/sun}/sunvnet.c (99%)
7976 rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
7977 create mode 100644 drivers/net/ethernet/tehuti/Kconfig
7978 create mode 100644 drivers/net/ethernet/tehuti/Makefile
7979 rename drivers/net/{ => ethernet/tehuti}/tehuti.c (99%)
7980 rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
7981 create mode 100644 drivers/net/ethernet/ti/Kconfig
7982 create mode 100644 drivers/net/ethernet/ti/Makefile
7983 rename drivers/net/{ => ethernet/ti}/cpmac.c (99%)
7984 rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
7985 rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
7986 rename drivers/net/{ => ethernet/ti}/davinci_emac.c (99%)
7987 rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
7988 rename drivers/net/{ => ethernet/ti}/tlan.c (99%)
7989 rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
7990 create mode 100644 drivers/net/ethernet/tile/Kconfig
7991 rename drivers/net/{ => ethernet}/tile/Makefile (100%)
7992 rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
7993 create mode 100644 drivers/net/ethernet/toshiba/Kconfig
7994 create mode 100644 drivers/net/ethernet/toshiba/Makefile
7995 rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (99%)
7996 rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
7997 rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (99%)
7998 rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
7999 rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%)
8000 rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
8001 rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
8002 rename drivers/net/{ => ethernet/toshiba}/tc35815.c (99%)
8003 create mode 100644 drivers/net/ethernet/tundra/Kconfig
8004 create mode 100644 drivers/net/ethernet/tundra/Makefile
8005 rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (99%)
8006 rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
8007 create mode 100644 drivers/net/ethernet/via/Kconfig
8008 create mode 100644 drivers/net/ethernet/via/Makefile
8009 rename drivers/net/{ => ethernet/via}/via-rhine.c (99%)
8010 rename drivers/net/{ => ethernet/via}/via-velocity.c (97%)
8011 rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
8012 create mode 100644 drivers/net/ethernet/xilinx/Kconfig
8013 create mode 100644 drivers/net/ethernet/xilinx/Makefile
8014 rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
8015 rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (99%)
8016 rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
8017 rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
8018 create mode 100644 drivers/net/ethernet/xircom/Kconfig
8019 create mode 100644 drivers/net/ethernet/xircom/Makefile
8020 rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (99%)
8021 create mode 100644 drivers/net/ethernet/xscale/Kconfig
8022 create mode 100644 drivers/net/ethernet/xscale/Makefile
8023 rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%)
8024 rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
8025 rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
8026 rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
8027 rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
8028 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
8029 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
8030 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
8031 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
8032 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
8033 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
8034 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
8035 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
8036 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
8037 rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
8038 rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
8039 rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (99%)
8040 create mode 100644 drivers/net/fddi/Kconfig
8041 create mode 100644 drivers/net/fddi/Makefile
8042 rename drivers/net/{ => fddi}/defxx.c (99%)
8043 rename drivers/net/{ => fddi}/defxx.h (100%)
8044 rename drivers/net/{ => fddi}/skfp/Makefile (100%)
8045 rename drivers/net/{ => fddi}/skfp/cfm.c (100%)
8046 rename drivers/net/{ => fddi}/skfp/drvfbi.c (100%)
8047 rename drivers/net/{ => fddi}/skfp/ecm.c (100%)
8048 rename drivers/net/{ => fddi}/skfp/ess.c (100%)
8049 rename drivers/net/{ => fddi}/skfp/fplustm.c (100%)
8050 rename drivers/net/{ => fddi}/skfp/h/cmtdef.h (99%)
8051 rename drivers/net/{ => fddi}/skfp/h/fddi.h (100%)
8052 rename drivers/net/{ => fddi}/skfp/h/fddimib.h (100%)
8053 rename drivers/net/{ => fddi}/skfp/h/fplustm.h (100%)
8054 rename drivers/net/{ => fddi}/skfp/h/hwmtm.h (99%)
8055 rename drivers/net/{ => fddi}/skfp/h/mbuf.h (100%)
8056 rename drivers/net/{ => fddi}/skfp/h/osdef1st.h (100%)
8057 rename drivers/net/{ => fddi}/skfp/h/sba.h (98%)
8058 rename drivers/net/{ => fddi}/skfp/h/sba_def.h (100%)
8059 rename drivers/net/{ => fddi}/skfp/h/skfbi.h (100%)
8060 rename drivers/net/{ => fddi}/skfp/h/skfbiinc.h (99%)
8061 rename drivers/net/{ => fddi}/skfp/h/smc.h (98%)
8062 rename drivers/net/{ => fddi}/skfp/h/smt.h (100%)
8063 rename drivers/net/{ => fddi}/skfp/h/smt_p.h (100%)
8064 rename drivers/net/{ => fddi}/skfp/h/smtstate.h (100%)
8065 rename drivers/net/{ => fddi}/skfp/h/supern_2.h (100%)
8066 rename drivers/net/{ => fddi}/skfp/h/targethw.h (98%)
8067 rename drivers/net/{ => fddi}/skfp/h/targetos.h (99%)
8068 rename drivers/net/{ => fddi}/skfp/h/types.h (100%)
8069 rename drivers/net/{ => fddi}/skfp/hwmtm.c (100%)
8070 rename drivers/net/{ => fddi}/skfp/hwt.c (100%)
8071 rename drivers/net/{ => fddi}/skfp/pcmplc.c (100%)
8072 rename drivers/net/{ => fddi}/skfp/pmf.c (100%)
8073 rename drivers/net/{ => fddi}/skfp/queue.c (100%)
8074 rename drivers/net/{ => fddi}/skfp/rmt.c (100%)
8075 rename drivers/net/{ => fddi}/skfp/skfddi.c (99%)
8076 rename drivers/net/{ => fddi}/skfp/smt.c (100%)
8077 rename drivers/net/{ => fddi}/skfp/smtdef.c (100%)
8078 rename drivers/net/{ => fddi}/skfp/smtinit.c (100%)
8079 rename drivers/net/{ => fddi}/skfp/smttimer.c (100%)
8080 rename drivers/net/{ => fddi}/skfp/srf.c (100%)
8081 create mode 100644 drivers/net/hippi/Kconfig
8082 create mode 100644 drivers/net/hippi/Makefile
8083 rename drivers/net/{ => hippi}/rrunner.c (100%)
8084 rename drivers/net/{ => hippi}/rrunner.h (100%)
8085 delete mode 100644 drivers/net/ibm_newemac/Makefile
8086 delete mode 100644 drivers/net/octeon/Makefile
8087 delete mode 100644 drivers/net/pci-skeleton.c
8088 delete mode 100644 drivers/net/pcmcia/Kconfig
8089 delete mode 100644 drivers/net/pcmcia/Makefile
8090 create mode 100644 drivers/net/plip/Kconfig
8091 create mode 100644 drivers/net/plip/Makefile
8092 rename drivers/net/{ => plip}/plip.c (100%)
8093 create mode 100644 drivers/net/ppp/Kconfig
8094 create mode 100644 drivers/net/ppp/Makefile
8095 rename drivers/net/{ => ppp}/bsd_comp.c (100%)
8096 rename drivers/net/{ => ppp}/ppp_async.c (100%)
8097 rename drivers/net/{ => ppp}/ppp_deflate.c (100%)
8098 rename drivers/net/{ => ppp}/ppp_generic.c (100%)
8099 rename drivers/net/{ => ppp}/ppp_mppe.c (100%)
8100 rename drivers/net/{ => ppp}/ppp_mppe.h (100%)
8101 rename drivers/net/{ => ppp}/ppp_synctty.c (100%)
8102 rename drivers/net/{ => ppp}/pppoe.c (100%)
8103 rename drivers/net/{ => ppp}/pppox.c (100%)
8104 rename drivers/net/{ => ppp}/pptp.c (100%)
8105 create mode 100644 drivers/net/slip/Kconfig
8106 create mode 100644 drivers/net/slip/Makefile
8107 rename drivers/net/{ => slip}/slhc.c (100%)
8108 rename drivers/net/{ => slip}/slip.c (98%)
8109 rename drivers/net/{ => slip}/slip.h (94%)
8110 rename drivers/net/{pcmcia => tokenring}/ibmtr_cs.c (99%)
8111 create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig
8112 create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile
8113 create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c
8114 create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h
8115 create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c
8116 create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h
8117 create mode 100644 drivers/net/wireless/ath/ath6kl/common.h
8118 create mode 100644 drivers/net/wireless/ath/ath6kl/core.h
8119 create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c
8120 create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h
8121 create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h
8122 create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h
8123 create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c
8124 create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h
8125 create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c
8126 create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
8127 create mode 100644 drivers/net/wireless/ath/ath6kl/init.c
8128 create mode 100644 drivers/net/wireless/ath/ath6kl/main.c
8129 create mode 100644 drivers/net/wireless/ath/ath6kl/node.c
8130 create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c
8131 create mode 100644 drivers/net/wireless/ath/ath6kl/target.h
8132 create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c
8133 create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c
8134 create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h
8135 create mode 100644 drivers/net/wireless/ath/ath9k/ar9480_1p0_initvals.h
8136 create mode 100644 drivers/net/wireless/ath/ath9k/ar9480_2p0_initvals.h
8137 create mode 100644 drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
8138 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
8139 create mode 100644 drivers/net/wireless/iwlwifi/iwl-cfg.h
8140 create mode 100644 drivers/net/wireless/iwlwifi/iwl-shared.h
8141 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
8142 create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
8143 create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
8144 rename drivers/net/wireless/iwlwifi/{iwl-trans-tx-pcie.c => iwl-trans-pcie-tx.c} (53%)
8145 create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
8146 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
8147 create mode 100644 drivers/nfc/nfcwilink.c
8148 delete mode 100644 drivers/staging/ath6kl/Kconfig
8149 delete mode 100644 drivers/staging/ath6kl/Makefile
8150 delete mode 100644 drivers/staging/ath6kl/TODO
8151 delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
8152 delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
8153 delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
8154 delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
8155 delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
8156 delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
8157 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
8158 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
8159 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
8160 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
8161 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
8162 delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
8163 delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
8164 delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
8165 delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
8166 delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
8167 delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
8168 delete mode 100644 drivers/staging/ath6kl/include/a_config.h
8169 delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
8170 delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
8171 delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
8172 delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
8173 delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
8174 delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
8175 delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
8176 delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
8177 delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
8178 delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
8179 delete mode 100644 drivers/staging/ath6kl/include/bmi.h
8180 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
8181 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
8182 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
8183 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
8184 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
8185 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
8186 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
8187 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
8188 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
8189 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
8190 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
8191 delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
8192 delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
8193 delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
8194 delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
8195 delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
8196 delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
8197 delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
8198 delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
8199 delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
8200 delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
8201 delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
8202 delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
8203 delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
8204 delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
8205 delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
8206 delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
8207 delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
8208 delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
8209 delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
8210 delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
8211 delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
8212 delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
8213 delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
8214 delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
8215 delete mode 100644 drivers/staging/ath6kl/include/hif.h
8216 delete mode 100644 drivers/staging/ath6kl/include/host_version.h
8217 delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
8218 delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
8219 delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
8220 delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
8221 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
8222 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
8223 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
8224 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
8225 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
8226 delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
8227 delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
8228 delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
8229 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
8230 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
8231 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
8232 delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
8233 delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
8234 delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
8235 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
8236 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
8237 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
8238 delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
8239 delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
8240 delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
8241 delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
8242 delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
8243 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
8244 delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
8245 delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
8246 delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
8247 delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
8248 delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
8249 delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
8250 delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
8251 delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
8252 delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
8253 delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
8254 delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
8255 delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
8256 delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h
8257 create mode 100644 include/linux/bcma/bcma_driver_mips.h
8258 create mode 100644 include/linux/bcma/bcma_soc.h
8259 create mode 100644 include/linux/can/gw.h
8260 rename {arch/sh/include/asm => include/linux}/sh_eth.h (90%)
8261 rename {drivers/net => include/linux}/sungem_phy.h (98%)
8262 create mode 100644 include/net/cfg80211-wext.h
8263 create mode 100644 include/net/nfc/nci.h
8264 create mode 100644 include/net/nfc/nci_core.h
8265 rename include/net/{ => nfc}/nfc.h (94%)
8266 delete mode 100644 net/batman-adv/aggregation.c
8267 delete mode 100644 net/batman-adv/aggregation.h
8268 create mode 100644 net/batman-adv/bat_iv_ogm.c
8269 create mode 100644 net/batman-adv/bat_ogm.h
8270 create mode 100644 net/can/gw.c
8271 create mode 100644 net/ieee802154/6lowpan.c
8272 create mode 100644 net/ieee802154/6lowpan.h
8273 create mode 100644 net/nfc/nci/Kconfig
8274 create mode 100644 net/nfc/nci/Makefile
8275 create mode 100644 net/nfc/nci/core.c
8276 create mode 100644 net/nfc/nci/data.c
8277 create mode 100644 net/nfc/nci/lib.c
8278 create mode 100644 net/nfc/nci/ntf.c
8279 create mode 100644 net/nfc/nci/rsp.c
8280 delete mode 100644 net/rds/xlist.h
8281 Merging wireless/master
8282 $ git merge wireless/master
8283 Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
8284 Auto-merging Documentation/feature-removal-schedule.txt
8285 CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
8286 Removing drivers/net/wireless/ath/ath6kl/node.c
8287 Auto-merging drivers/net/wireless/libertas/main.c
8288 Auto-merging drivers/net/wireless/mwifiex/main.c
8289 Auto-merging include/linux/if_ether.h
8290 Auto-merging net/mac80211/agg-rx.c
8291 Auto-merging net/mac80211/cfg.c
8292 Auto-merging net/mac80211/ibss.c
8293 Auto-merging net/mac80211/iface.c
8294 Auto-merging net/mac80211/sta_info.c
8295 Automatic merge failed; fix conflicts and then commit the result.
8297 [master a890405] Merge remote-tracking branch 'wireless/master'
8298 $ git diff -M --stat --summary HEAD^..
8299 Documentation/DocBook/80211.tmpl | 11 +-
8300 Documentation/feature-removal-schedule.txt | 8 +
8301 drivers/bluetooth/btusb.c | 6 +-
8302 drivers/net/wireless/Makefile | 2 +-
8303 drivers/net/wireless/at76c50x-usb.c | 18 +-
8304 drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +-
8305 drivers/net/wireless/ath/ath6kl/Makefile | 4 +-
8306 drivers/net/wireless/ath/ath6kl/bmi.c | 23 +-
8307 drivers/net/wireless/ath/ath6kl/bmi.h | 4 +-
8308 drivers/net/wireless/ath/ath6kl/cfg80211.c | 894 ++++++++++++-----
8309 drivers/net/wireless/ath/ath6kl/common.h | 83 --
8310 drivers/net/wireless/ath/ath6kl/core.h | 145 +++-
8311 drivers/net/wireless/ath/ath6kl/debug.c | 784 +++++++++++++++
8312 drivers/net/wireless/ath/ath6kl/debug.h | 49 +-
8313 drivers/net/wireless/ath/ath6kl/hif-ops.h | 5 +
8314 drivers/net/wireless/ath/ath6kl/hif.h | 1 +
8315 drivers/net/wireless/ath/ath6kl/htc.c | 271 +++---
8316 drivers/net/wireless/ath/ath6kl/init.c | 794 ++++++++++++----
8317 drivers/net/wireless/ath/ath6kl/main.c | 448 ++++++---
8318 drivers/net/wireless/ath/ath6kl/node.c | 234 -----
8319 drivers/net/wireless/ath/ath6kl/sdio.c | 79 ++-
8320 drivers/net/wireless/ath/ath6kl/target.h | 41 +-
8321 drivers/net/wireless/ath/ath6kl/testmode.c | 167 ++++
8322 drivers/net/wireless/ath/ath6kl/testmode.h | 36 +
8323 drivers/net/wireless/ath/ath6kl/txrx.c | 61 +-
8324 drivers/net/wireless/ath/ath6kl/wmi.c | 1126 +++++++++++++++-------
8325 drivers/net/wireless/ath/ath6kl/wmi.h | 350 ++++++-
8326 drivers/net/wireless/ath/ath9k/ath9k.h | 3 +-
8327 drivers/net/wireless/ath/ath9k/eeprom.h | 7 +-
8328 drivers/net/wireless/ath/ath9k/gpio.c | 7 +-
8329 drivers/net/wireless/ath/ath9k/hif_usb.c | 1 +
8330 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 10 +-
8331 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 3 +-
8332 drivers/net/wireless/ath/ath9k/hw.c | 11 +-
8333 drivers/net/wireless/ath/ath9k/main.c | 6 +-
8334 drivers/net/wireless/ath/ath9k/rc.c | 6 -
8335 drivers/net/wireless/ath/ath9k/recv.c | 23 +-
8336 drivers/net/wireless/ath/ath9k/xmit.c | 19 +-
8337 drivers/net/wireless/ath/carl9170/main.c | 3 +-
8338 drivers/net/wireless/b43/main.c | 3 +-
8339 drivers/net/wireless/b43legacy/main.c | 3 +-
8340 drivers/net/wireless/iwlegacy/iwl-4965-tx.c | 2 +-
8341 drivers/net/wireless/iwlegacy/iwl-core.c | 3 +-
8342 drivers/net/wireless/iwlegacy/iwl-core.h | 3 +-
8343 drivers/net/wireless/iwlwifi/Kconfig | 22 +-
8344 drivers/net/wireless/iwlwifi/Makefile | 40 +-
8345 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 3 -
8346 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 2 +-
8347 drivers/net/wireless/iwlwifi/iwl-agn.c | 1 +
8348 drivers/net/wireless/iwlwifi/iwl-core.c | 5 +-
8349 drivers/net/wireless/iwlwifi/iwl-core.h | 3 +-
8350 drivers/net/wireless/iwlwifi/iwl-shared.h | 2 +-
8351 drivers/net/wireless/libertas/dev.h | 1 +
8352 drivers/net/wireless/libertas/main.c | 35 +
8353 drivers/net/wireless/mac80211_hwsim.c | 3 +-
8354 drivers/net/wireless/mwifiex/11n_aggr.c | 2 -
8355 drivers/net/wireless/mwifiex/11n_aggr.h | 1 +
8356 drivers/net/wireless/mwifiex/cfg80211.c | 176 +++-
8357 drivers/net/wireless/mwifiex/cfg80211.h | 3 +-
8358 drivers/net/wireless/mwifiex/decl.h | 8 -
8359 drivers/net/wireless/mwifiex/init.c | 2 +-
8360 drivers/net/wireless/mwifiex/main.c | 266 +----
8361 drivers/net/wireless/mwifiex/main.h | 19 +-
8362 drivers/net/wireless/mwifiex/sta_ioctl.c | 46 +-
8363 drivers/net/wireless/mwifiex/wmm.c | 32 +-
8364 drivers/net/wireless/mwl8k.c | 5 +-
8365 drivers/net/wireless/p54/main.c | 3 +-
8366 drivers/net/wireless/p54/txrx.c | 2 +-
8367 drivers/net/wireless/rt2x00/rt2400pci.c | 5 +-
8368 drivers/net/wireless/rt2x00/rt2800lib.c | 5 +-
8369 drivers/net/wireless/rt2x00/rt2800lib.h | 3 +-
8370 drivers/net/wireless/rt2x00/rt2x00.h | 3 +-
8371 drivers/net/wireless/rt2x00/rt2x00mac.c | 3 +-
8372 drivers/net/wireless/rt2x00/rt61pci.c | 5 +-
8373 drivers/net/wireless/rt2x00/rt73usb.c | 5 +-
8374 drivers/net/wireless/rtl818x/rtl8187/dev.c | 3 +-
8375 drivers/net/wireless/rtlwifi/core.c | 3 +-
8376 drivers/net/wireless/rtlwifi/usb.c | 40 -
8377 drivers/net/wireless/rtlwifi/wifi.h | 8 +-
8378 drivers/net/wireless/wl1251/main.c | 3 +-
8379 drivers/net/wireless/wl12xx/main.c | 3 +-
8380 drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 7 +-
8381 include/linux/ieee80211.h | 85 ++
8382 include/linux/if_ether.h | 1 +
8383 include/linux/nl80211.h | 44 +
8384 include/linux/rfkill-gpio.h | 4 +
8385 include/net/bluetooth/l2cap.h | 3 +-
8386 include/net/cfg80211.h | 29 +
8387 include/net/ieee80211_radiotap.h | 1 +
8388 include/net/mac80211.h | 229 +++++-
8389 net/bluetooth/af_bluetooth.c | 30 +-
8390 net/bluetooth/bnep/core.c | 5 +-
8391 net/bluetooth/cmtp/core.c | 5 +-
8392 net/bluetooth/hci_conn.c | 14 +-
8393 net/bluetooth/hci_event.c | 20 +-
8394 net/bluetooth/hidp/core.c | 10 +-
8395 net/bluetooth/l2cap_core.c | 255 ++----
8396 net/bluetooth/rfcomm/core.c | 5 +-
8397 net/mac80211/Kconfig | 12 +
8398 net/mac80211/agg-rx.c | 2 +-
8399 net/mac80211/agg-tx.c | 2 +-
8400 net/mac80211/cfg.c | 380 +++++++-
8401 net/mac80211/debugfs_sta.c | 37 +-
8402 net/mac80211/driver-ops.h | 33 +-
8403 net/mac80211/driver-trace.h | 77 ++
8404 net/mac80211/ht.c | 2 +-
8405 net/mac80211/ibss.c | 4 +-
8406 net/mac80211/ieee80211_i.h | 16 +-
8407 net/mac80211/iface.c | 4 +-
8408 net/mac80211/key.c | 4 +-
8409 net/mac80211/main.c | 18 +
8410 net/mac80211/mesh.c | 58 --
8411 net/mac80211/mesh.h | 4 -
8412 net/mac80211/mesh_plink.c | 12 +-
8413 net/mac80211/mlme.c | 34 +-
8414 net/mac80211/pm.c | 2 +-
8415 net/mac80211/rate.c | 8 +-
8416 net/mac80211/rc80211_minstrel_ht.c | 2 +
8417 net/mac80211/rx.c | 118 ++-
8418 net/mac80211/sta_info.c | 636 ++++++++++---
8419 net/mac80211/sta_info.h | 136 ++--
8420 net/mac80211/status.c | 54 +-
8421 net/mac80211/tx.c | 187 +++--
8422 net/mac80211/util.c | 76 ++-
8423 net/mac80211/wme.c | 4 +-
8424 net/rfkill/rfkill-gpio.c | 11 +
8425 net/wireless/nl80211.c | 109 ++-
8426 net/wireless/util.c | 5 +-
8427 128 files changed, 6628 insertions(+), 2696 deletions(-)
8428 delete mode 100644 drivers/net/wireless/ath/ath6kl/node.c
8429 create mode 100644 drivers/net/wireless/ath/ath6kl/testmode.c
8430 create mode 100644 drivers/net/wireless/ath/ath6kl/testmode.h
8431 Merging bluetooth/master
8432 $ git merge bluetooth/master
8433 Resolved 'net/bluetooth/hci_core.c' using previous resolution.
8434 Resolved 'net/bluetooth/l2cap_core.c' using previous resolution.
8435 Resolved 'net/bluetooth/mgmt.c' using previous resolution.
8436 Resolved 'net/bluetooth/smp.c' using previous resolution.
8437 Auto-merging net/bluetooth/hci_core.c
8438 CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
8439 Auto-merging net/bluetooth/l2cap_core.c
8440 CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
8441 Auto-merging net/bluetooth/mgmt.c
8442 CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
8443 Auto-merging net/bluetooth/smp.c
8444 CONFLICT (content): Merge conflict in net/bluetooth/smp.c
8445 Automatic merge failed; fix conflicts and then commit the result.
8447 [master 79684ff] Merge remote-tracking branch 'bluetooth/master'
8448 $ git diff -M --stat --summary HEAD^..
8450 $ git merge mtd/master
8452 Merging l2-mtd/master
8453 $ git merge l2-mtd/master
8454 Resolved 'arch/arm/mach-at91/board-afeb-9260v1.c' using previous resolution.
8455 Resolved 'arch/arm/mach-at91/board-neocore926.c' using previous resolution.
8456 Resolved 'arch/arm/mach-at91/board-rm9200dk.c' using previous resolution.
8457 Resolved 'arch/arm/mach-at91/board-sam9g20ek.c' using previous resolution.
8458 Resolved 'arch/arm/mach-at91/board-sam9m10g45ek.c' using previous resolution.
8459 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
8460 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
8461 Auto-merging arch/arm/mach-at91/board-cam60.c
8462 Auto-merging arch/arm/mach-at91/board-cap9adk.c
8463 Auto-merging arch/arm/mach-at91/board-kb9202.c
8464 Auto-merging arch/arm/mach-at91/board-neocore926.c
8465 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
8466 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
8467 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
8468 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
8469 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
8470 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
8471 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
8472 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
8473 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
8474 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
8475 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
8476 CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
8477 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
8478 Auto-merging arch/arm/mach-at91/board-snapper9260.c
8479 CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
8480 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
8481 Auto-merging arch/arm/mach-at91/board-yl-9200.c
8482 Auto-merging arch/arm/mach-at91/include/mach/board.h
8483 Auto-merging arch/arm/mach-davinci/board-da830-evm.c
8484 Auto-merging arch/arm/mach-davinci/board-da850-evm.c
8485 Auto-merging arch/arm/mach-davinci/board-dm355-evm.c
8486 Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c
8487 Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
8488 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
8489 Auto-merging arch/arm/mach-davinci/board-mityomapl138.c
8490 Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c
8491 Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c
8492 Auto-merging arch/arm/mach-ep93xx/ts72xx.c
8493 Auto-merging arch/arm/mach-mmp/aspenite.c
8494 Auto-merging arch/arm/mach-orion5x/ts78xx-setup.c
8495 Auto-merging arch/arm/mach-pxa/cm-x300.c
8496 Auto-merging arch/arm/mach-pxa/littleton.c
8497 Auto-merging arch/arm/mach-pxa/raumfeld.c
8498 Auto-merging arch/arm/mach-pxa/zylonite.c
8499 Removing drivers/mtd/maps/ceiva.c
8500 Removing drivers/mtd/maps/edb7312.c
8501 Auto-merging drivers/mtd/nand/Kconfig
8502 Auto-merging drivers/mtd/nand/atmel_nand.c
8503 Auto-merging drivers/mtd/nand/au1550nd.c
8504 Removing drivers/mtd/nand/edb7312.c
8505 Auto-merging drivers/mtd/onenand/omap2.c
8506 Automatic merge failed; fix conflicts and then commit the result.
8507 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c
8508 arch/arm/mach-at91/board-afeb-9260v1.c: needs merge
8509 arch/arm/mach-at91/board-neocore926.c: needs merge
8510 arch/arm/mach-at91/board-rm9200dk.c: needs merge
8511 arch/arm/mach-at91/board-sam9g20ek.c: needs merge
8512 arch/arm/mach-at91/board-sam9m10g45ek.c: needs merge
8513 arch/arm/mach-at91/board-usb-a9260.c: needs merge
8514 rm 'arch/arm/mach-at91/board-usb-a9260.c'
8516 [master ea661b9] Merge remote-tracking branch 'l2-mtd/master'
8517 $ git diff -M --stat --summary HEAD^..
8518 Documentation/DocBook/mtdnand.tmpl | 19 +-
8519 .../devicetree/bindings/mtd/atmel-dataflash.txt | 14 +
8520 arch/arm/mach-at91/board-afeb-9260v1.c | 9 +-
8521 arch/arm/mach-at91/board-cam60.c | 9 +-
8522 arch/arm/mach-at91/board-cap9adk.c | 9 +-
8523 arch/arm/mach-at91/board-kb9202.c | 9 +-
8524 arch/arm/mach-at91/board-neocore926.c | 9 +-
8525 arch/arm/mach-at91/board-qil-a9260.c | 9 +-
8526 arch/arm/mach-at91/board-rm9200dk.c | 9 +-
8527 arch/arm/mach-at91/board-sam9-l9260.c | 9 +-
8528 arch/arm/mach-at91/board-sam9260ek.c | 9 +-
8529 arch/arm/mach-at91/board-sam9261ek.c | 9 +-
8530 arch/arm/mach-at91/board-sam9263ek.c | 9 +-
8531 arch/arm/mach-at91/board-sam9g20ek.c | 9 +-
8532 arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +-
8533 arch/arm/mach-at91/board-sam9rlek.c | 9 +-
8534 arch/arm/mach-at91/board-snapper9260.c | 10 +-
8535 arch/arm/mach-at91/board-usb-a926x.c | 9 +-
8536 arch/arm/mach-at91/board-yl-9200.c | 9 +-
8537 arch/arm/mach-at91/include/mach/board.h | 3 +-
8538 arch/arm/mach-davinci/board-da830-evm.c | 2 +-
8539 arch/arm/mach-davinci/board-da850-evm.c | 2 +-
8540 arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
8541 arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
8542 arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
8543 arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
8544 arch/arm/mach-davinci/board-mityomapl138.c | 3 +-
8545 arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
8546 arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +-
8547 arch/arm/mach-davinci/include/mach/nand.h | 4 +-
8548 arch/arm/mach-ep93xx/ts72xx.c | 23 +-
8549 arch/arm/mach-mmp/aspenite.c | 5 +-
8550 arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
8551 arch/arm/mach-pxa/cm-x300.c | 5 +-
8552 arch/arm/mach-pxa/colibri-pxa3xx.c | 5 +-
8553 arch/arm/mach-pxa/littleton.c | 5 +-
8554 arch/arm/mach-pxa/mxm8x10.c | 9 +-
8555 arch/arm/mach-pxa/raumfeld.c | 5 +-
8556 arch/arm/mach-pxa/zylonite.c | 5 +-
8557 arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 20 +-
8558 arch/avr32/boards/atngw100/setup.c | 8 +-
8559 arch/avr32/boards/atstk1000/atstk1002.c | 9 +-
8560 arch/avr32/mach-at32ap/include/mach/board.h | 3 +-
8561 arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +-
8562 arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +-
8563 drivers/mtd/Kconfig | 16 +-
8564 drivers/mtd/Makefile | 2 +-
8565 drivers/mtd/afs.c | 4 +-
8566 drivers/mtd/ar7part.c | 2 +-
8567 drivers/mtd/chips/cfi_cmdset_0002.c | 31 +-
8568 drivers/mtd/chips/fwh_lock.h | 3 +-
8569 drivers/mtd/chips/jedec_probe.c | 34 +-
8570 drivers/mtd/cmdlinepart.c | 7 +-
8571 drivers/mtd/devices/doc2000.c | 17 +-
8572 drivers/mtd/devices/doc2001.c | 11 +-
8573 drivers/mtd/devices/doc2001plus.c | 11 +-
8574 drivers/mtd/devices/docecc.c | 2 +-
8575 drivers/mtd/devices/lart.c | 18 +-
8576 drivers/mtd/devices/m25p80.c | 85 +-
8577 drivers/mtd/devices/mtd_dataflash.c | 91 +-
8578 drivers/mtd/devices/sst25l.c | 42 +-
8579 drivers/mtd/ftl.c | 40 +-
8580 drivers/mtd/inftlcore.c | 69 +-
8581 drivers/mtd/inftlmount.c | 116 +-
8582 drivers/mtd/maps/Kconfig | 26 -
8583 drivers/mtd/maps/Makefile | 2 -
8584 drivers/mtd/maps/bfin-async-flash.c | 16 +-
8585 drivers/mtd/maps/ceiva.c | 341 ----
8586 drivers/mtd/maps/dc21285.c | 9 +-
8587 drivers/mtd/maps/edb7312.c | 134 --
8588 drivers/mtd/maps/gpio-addr-flash.c | 16 +-
8589 drivers/mtd/maps/h720x-flash.c | 23 +-
8590 drivers/mtd/maps/impa7.c | 28 +-
8591 drivers/mtd/maps/intel_vr_nor.c | 7 +-
8592 drivers/mtd/maps/ixp2000.c | 11 +-
8593 drivers/mtd/maps/ixp4xx.c | 29 +-
8594 drivers/mtd/maps/lantiq-flash.c | 17 +-
8595 drivers/mtd/maps/latch-addr-flash.c | 24 +-
8596 drivers/mtd/maps/pcmciamtd.c | 124 +-
8597 drivers/mtd/maps/physmap.c | 38 +-
8598 drivers/mtd/maps/physmap_of.c | 80 +-
8599 drivers/mtd/maps/plat-ram.c | 23 +-
8600 drivers/mtd/maps/pxa2xx-flash.c | 20 +-
8601 drivers/mtd/maps/rbtx4939-flash.c | 24 +-
8602 drivers/mtd/maps/sa1100-flash.c | 30 +-
8603 drivers/mtd/maps/solutionengine.c | 30 +-
8604 drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +-
8605 drivers/mtd/mtdblock.c | 18 +-
8606 drivers/mtd/mtdchar.c | 162 ++-
8607 drivers/mtd/mtdconcat.c | 10 +-
8608 drivers/mtd/mtdcore.c | 70 +-
8609 drivers/mtd/mtdcore.h | 3 +
8610 drivers/mtd/mtdoops.c | 2 +-
8611 drivers/mtd/mtdpart.c | 62 +-
8612 drivers/mtd/mtdsuper.c | 20 +-
8613 drivers/mtd/mtdswap.c | 31 +-
8614 drivers/mtd/nand/Kconfig | 27 +-
8615 drivers/mtd/nand/Makefile | 2 +-
8616 drivers/mtd/nand/atmel_nand.c | 74 +-
8617 drivers/mtd/nand/au1550nd.c | 29 +-
8618 drivers/mtd/nand/autcpu12.c | 4 +-
8619 drivers/mtd/nand/bcm_umi_nand.c | 57 +-
8620 drivers/mtd/nand/cafe_nand.c | 21 +-
8621 drivers/mtd/nand/cmx270_nand.c | 23 +-
8622 drivers/mtd/nand/cs553x_nand.c | 15 +-
8623 drivers/mtd/nand/davinci_nand.c | 39 +-
8624 drivers/mtd/nand/denali.c | 6 +-
8625 drivers/mtd/nand/diskonchip.c | 8 +-
8626 drivers/mtd/nand/edb7312.c | 203 ---
8627 drivers/mtd/nand/fsl_elbc_nand.c | 75 +-
8628 drivers/mtd/nand/fsl_upm.c | 16 +-
8629 drivers/mtd/nand/fsmc_nand.c | 77 +-
8630 drivers/mtd/nand/gpmi-nand/Makefile | 3 +
8631 drivers/mtd/nand/gpmi-nand/bch-regs.h | 84 +
8632 drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 1057 +++++++++++++
8633 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 1619 ++++++++++++++++++++
8634 drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 273 ++++
8635 drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 172 +++
8636 drivers/mtd/nand/h1910.c | 19 +-
8637 drivers/mtd/nand/jz4740_nand.c | 18 +-
8638 drivers/mtd/nand/mpc5121_nfc.c | 22 +-
8639 drivers/mtd/nand/mxc_nand.c | 37 +-
8640 drivers/mtd/nand/nand_base.c | 1105 +++++++-------
8641 drivers/mtd/nand/nand_bbt.c | 692 ++++-----
8642 drivers/mtd/nand/nand_bch.c | 4 +-
8643 drivers/mtd/nand/nand_ecc.c | 10 +-
8644 drivers/mtd/nand/nandsim.c | 4 +-
8645 drivers/mtd/nand/ndfc.c | 22 +-
8646 drivers/mtd/nand/nomadik_nand.c | 1 +
8647 drivers/mtd/nand/nuc900_nand.c | 1 +
8648 drivers/mtd/nand/omap2.c | 22 +-
8649 drivers/mtd/nand/orion_nand.c | 16 +-
8650 drivers/mtd/nand/pasemi_nand.c | 3 +-
8651 drivers/mtd/nand/plat_nand.c | 25 +-
8652 drivers/mtd/nand/ppchameleonevb.c | 47 +-
8653 drivers/mtd/nand/pxa3xx_nand.c | 471 ++++---
8654 drivers/mtd/nand/r852.c | 6 +-
8655 drivers/mtd/nand/rtc_from4.c | 5 +-
8656 drivers/mtd/nand/s3c2410.c | 27 +-
8657 drivers/mtd/nand/sharpsl.c | 13 +-
8658 drivers/mtd/nand/sm_common.c | 2 +-
8659 drivers/mtd/nand/socrates_nand.c | 28 +-
8660 drivers/mtd/nand/tmio_nand.c | 17 +-
8661 drivers/mtd/nand/txx9ndfmc.c | 8 +-
8662 drivers/mtd/nftlcore.c | 37 +-
8663 drivers/mtd/nftlmount.c | 26 +-
8664 drivers/mtd/ofpart.c | 112 ++-
8665 drivers/mtd/onenand/generic.c | 14 +-
8666 drivers/mtd/onenand/omap2.c | 16 +-
8667 drivers/mtd/onenand/onenand_base.c | 114 +-
8668 drivers/mtd/onenand/onenand_bbt.c | 8 +-
8669 drivers/mtd/onenand/samsung.c | 13 +-
8670 drivers/mtd/redboot.c | 13 +-
8671 drivers/mtd/sm_ftl.c | 26 +-
8672 drivers/mtd/ssfdc.c | 46 +-
8673 drivers/mtd/tests/mtd_oobtest.c | 24 +-
8674 drivers/mtd/tests/mtd_pagetest.c | 28 +-
8675 drivers/mtd/tests/mtd_readtest.c | 5 +-
8676 drivers/mtd/tests/mtd_speedtest.c | 8 +-
8677 drivers/mtd/tests/mtd_stresstest.c | 2 +-
8678 drivers/mtd/tests/mtd_subpagetest.c | 8 +-
8679 drivers/mtd/tests/mtd_torturetest.c | 2 +-
8680 drivers/mtd/ubi/eba.c | 2 +-
8681 drivers/mtd/ubi/io.c | 24 +-
8682 drivers/mtd/ubi/kapi.c | 2 +-
8683 drivers/mtd/ubi/misc.c | 2 +-
8684 drivers/mtd/ubi/scan.c | 4 +-
8685 drivers/mtd/ubi/vtbl.c | 2 +-
8686 drivers/staging/spectra/lld_mtd.c | 6 +-
8687 fs/jffs2/scan.c | 4 +-
8688 fs/jffs2/wbuf.c | 9 +-
8689 include/linux/mtd/bbm.h | 39 +-
8690 include/linux/mtd/mtd.h | 82 +-
8691 include/linux/mtd/nand.h | 92 +-
8692 include/linux/mtd/onenand.h | 4 +
8693 include/linux/mtd/partitions.h | 46 +-
8694 include/linux/mtd/physmap.h | 17 -
8695 include/mtd/mtd-abi.h | 122 ++-
8696 178 files changed, 5862 insertions(+), 3991 deletions(-)
8697 create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
8698 delete mode 100644 drivers/mtd/maps/ceiva.c
8699 delete mode 100644 drivers/mtd/maps/edb7312.c
8700 delete mode 100644 drivers/mtd/nand/edb7312.c
8701 create mode 100644 drivers/mtd/nand/gpmi-nand/Makefile
8702 create mode 100644 drivers/mtd/nand/gpmi-nand/bch-regs.h
8703 create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-lib.c
8704 create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.c
8705 create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.h
8706 create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-regs.h
8707 Merging crypto/master
8708 $ git merge crypto/master
8709 Auto-merging arch/x86/include/asm/cpufeature.h
8710 Auto-merging crypto/blowfish_common.c
8711 Merge made by recursive.
8712 .../devicetree/bindings/crypto/picochip-spacc.txt | 23 +
8713 arch/x86/crypto/Makefile | 10 +
8714 arch/x86/crypto/aes_glue.c | 1 +
8715 arch/x86/crypto/blowfish-x86_64-asm_64.S | 392 ++++++++++++++
8716 arch/x86/crypto/blowfish_glue.c | 487 +++++++++++++++++
8717 arch/x86/crypto/sha1_ssse3_asm.S | 558 ++++++++++++++++++++
8718 arch/x86/crypto/sha1_ssse3_glue.c | 240 +++++++++
8719 arch/x86/include/asm/cpufeature.h | 3 +
8720 crypto/Kconfig | 35 ++
8721 crypto/Makefile | 3 +-
8722 crypto/{blowfish.c => blowfish_common.c} | 98 +----
8723 crypto/blowfish_generic.c | 142 +++++
8724 crypto/cryptd.c | 2 +-
8725 crypto/sha1_generic.c | 9 +-
8726 crypto/tcrypt.c | 4 +
8727 drivers/crypto/n2_core.c | 4 +-
8728 drivers/crypto/padlock-aes.c | 4 +-
8729 drivers/crypto/picoxcell_crypto.c | 121 ++---
8730 include/crypto/blowfish.h | 23 +
8731 include/crypto/sha.h | 5 +
8732 20 files changed, 2002 insertions(+), 162 deletions(-)
8733 create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt
8734 create mode 100644 arch/x86/crypto/blowfish-x86_64-asm_64.S
8735 create mode 100644 arch/x86/crypto/blowfish_glue.c
8736 create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S
8737 create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c
8738 rename crypto/{blowfish.c => blowfish_common.c} (87%)
8739 create mode 100644 crypto/blowfish_generic.c
8740 create mode 100644 include/crypto/blowfish.h
8741 Merging sound/for-next
8742 $ git merge sound/for-next
8743 Resolved 'arch/mips/alchemy/devboards/db1x00/platform.c' using previous resolution.
8744 Resolved 'sound/mips/Kconfig' using previous resolution.
8745 Auto-merging arch/arm/mach-ep93xx/edb93xx.c
8746 Auto-merging arch/arm/mach-ep93xx/simone.c
8747 Auto-merging arch/arm/mach-ep93xx/snappercl15.c
8748 Auto-merging arch/arm/mach-omap2/devices.c
8749 Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
8750 Auto-merging arch/arm/plat-omap/devices.c
8751 Auto-merging arch/mips/alchemy/devboards/db1200/platform.c
8752 Auto-merging arch/mips/alchemy/devboards/db1x00/platform.c
8753 CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
8754 Auto-merging drivers/base/regmap/regmap.c
8755 Auto-merging include/linux/regulator/consumer.h
8756 Auto-merging sound/mips/Kconfig
8757 CONFLICT (content): Merge conflict in sound/mips/Kconfig
8758 Removing sound/pci/hda/alc268_quirks.c
8759 Removing sound/pci/hda/alc269_quirks.c
8760 Removing sound/pci/hda/alc662_quirks.c
8761 Removing sound/pci/hda/alc680_quirks.c
8762 Removing sound/pci/hda/alc861_quirks.c
8763 Removing sound/pci/hda/alc861vd_quirks.c
8764 Auto-merging sound/soc/au1x/Kconfig
8765 Removing sound/soc/omap/mcpdm.c
8766 Removing sound/soc/omap/mcpdm.h
8767 Auto-merging sound/soc/samsung/ac97.c
8768 Removing sound/usb/urb.c
8769 Removing sound/usb/urb.h
8770 Automatic merge failed; fix conflicts and then commit the result.
8772 [master 5a42e6d] Merge remote-tracking branch 'sound/for-next'
8773 $ git diff -M --stat --summary HEAD^..
8774 Documentation/DocBook/writing-an-alsa-driver.tmpl | 36 +-
8775 .../bindings/sound/soc/codecs/fsl-sgtl5000.txt | 11 +
8776 Documentation/devicetree/bindings/sound/wm8510.txt | 18 +
8777 Documentation/devicetree/bindings/sound/wm8523.txt | 16 +
8778 Documentation/devicetree/bindings/sound/wm8580.txt | 16 +
8779 Documentation/devicetree/bindings/sound/wm8711.txt | 18 +
8780 Documentation/devicetree/bindings/sound/wm8728.txt | 18 +
8781 Documentation/devicetree/bindings/sound/wm8731.txt | 18 +
8782 Documentation/devicetree/bindings/sound/wm8737.txt | 18 +
8783 Documentation/devicetree/bindings/sound/wm8741.txt | 18 +
8784 Documentation/devicetree/bindings/sound/wm8750.txt | 18 +
8785 Documentation/devicetree/bindings/sound/wm8753.txt | 18 +
8786 Documentation/devicetree/bindings/sound/wm8770.txt | 16 +
8787 Documentation/devicetree/bindings/sound/wm8776.txt | 18 +
8788 Documentation/devicetree/bindings/sound/wm8804.txt | 18 +
8789 Documentation/sound/alsa/ALSA-Configuration.txt | 6 +
8790 Documentation/sound/alsa/HD-Audio-Controls.txt | 16 +
8791 Documentation/sound/alsa/HD-Audio-Models.txt | 67 +-
8792 Documentation/sound/alsa/HD-Audio.txt | 53 +-
8793 arch/arm/mach-ep93xx/edb93xx.c | 6 +
8794 arch/arm/mach-ep93xx/simone.c | 13 +-
8795 arch/arm/mach-ep93xx/snappercl15.c | 13 +-
8796 arch/arm/mach-omap2/board-rx51-peripherals.c | 1 -
8797 arch/arm/mach-omap2/devices.c | 33 +
8798 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
8799 arch/arm/plat-omap/devices.c | 36 -
8800 arch/mips/alchemy/devboards/db1200/platform.c | 16 +
8801 arch/mips/alchemy/devboards/db1x00/platform.c | 47 +
8802 drivers/base/regmap/regmap.c | 9 +
8803 drivers/input/misc/twl6040-vibra.c | 2 +-
8804 drivers/mfd/twl6040-core.c | 38 +-
8805 drivers/mfd/wm8994-core.c | 27 +
8806 drivers/regulator/core.c | 59 +
8807 include/linux/input.h | 1 +
8808 include/linux/mfd/twl6040.h | 21 +-
8809 include/linux/mfd/wm8994/core.h | 1 +
8810 include/linux/mfd/wm8994/registers.h | 88 +
8811 include/linux/regmap.h | 52 +
8812 include/linux/regulator/consumer.h | 7 +
8813 include/linux/regulator/driver.h | 3 +
8814 include/linux/usb/ch9.h | 17 +-
8815 include/sound/adau1373.h | 34 +
8816 include/sound/initval.h | 2 +-
8817 include/sound/jack.h | 1 +
8818 include/sound/mpu401.h | 7 +-
8819 include/sound/pcm.h | 4 +
8820 include/sound/saif.h | 16 +
8821 include/sound/soc-dai.h | 37 +-
8822 include/sound/soc-dapm.h | 8 +
8823 include/sound/soc.h | 21 +-
8824 include/sound/tpa6130a2-plat.h | 6 -
8825 include/sound/wm1250-ev1.h | 27 +
8826 include/sound/wm5100.h | 59 +
8827 include/trace/events/asoc.h | 25 +
8828 sound/aoa/codecs/onyx.c | 4 +-
8829 sound/arm/aaci.c | 2 +-
8830 sound/arm/pxa2xx-ac97-lib.c | 2 +-
8831 sound/core/control.c | 4 +-
8832 sound/core/jack.c | 1 +
8833 sound/core/oss/mixer_oss.c | 2 +-
8834 sound/core/pcm_lib.c | 26 +
8835 sound/core/pcm_native.c | 7 +-
8836 sound/drivers/aloop.c | 13 +-
8837 sound/drivers/ml403-ac97cr.c | 4 +-
8838 sound/drivers/mpu401/mpu401.c | 3 +-
8839 sound/drivers/mpu401/mpu401_uart.c | 20 +-
8840 sound/drivers/mtpav.c | 2 +-
8841 sound/drivers/serial-u16550.c | 2 +-
8842 sound/firewire/isight.c | 1 -
8843 sound/firewire/speakers.c | 5 +-
8844 sound/isa/ad1816a/ad1816a.c | 2 +-
8845 sound/isa/ad1816a/ad1816a_lib.c | 2 +-
8846 sound/isa/als100.c | 1 -
8847 sound/isa/azt2320.c | 3 +-
8848 sound/isa/cmi8330.c | 2 +-
8849 sound/isa/cs423x/cs4231.c | 1 -
8850 sound/isa/cs423x/cs4236.c | 3 +-
8851 sound/isa/es1688/es1688.c | 2 +-
8852 sound/isa/es1688/es1688_lib.c | 2 +-
8853 sound/isa/es18xx.c | 6 +-
8854 sound/isa/galaxy/galaxy.c | 3 +-
8855 sound/isa/gus/gus_main.c | 2 +-
8856 sound/isa/gus/gusextreme.c | 3 +-
8857 sound/isa/gus/gusmax.c | 2 +-
8858 sound/isa/gus/interwave.c | 2 +-
8859 sound/isa/msnd/msnd_pinnacle.c | 2 +-
8860 sound/isa/opl3sa2.c | 7 +-
8861 sound/isa/opti9xx/miro.c | 3 +-
8862 sound/isa/opti9xx/opti92x-ad1848.c | 4 +-
8863 sound/isa/sb/jazz16.c | 1 -
8864 sound/isa/sb/sb16.c | 5 +-
8865 sound/isa/sb/sb_common.c | 2 +-
8866 sound/isa/sc6000.c | 3 +-
8867 sound/isa/sscape.c | 3 +-
8868 sound/isa/wavefront/wavefront.c | 5 +-
8869 sound/isa/wss/wss_lib.c | 2 +-
8870 sound/mips/Kconfig | 5 +-
8871 sound/mips/au1x00.c | 4 +-
8872 sound/oss/sound_timer.c | 2 +-
8873 sound/pci/als4000.c | 5 +-
8874 sound/pci/au88x0/au88x0_mpu401.c | 6 +-
8875 sound/pci/azt3328.c | 5 +-
8876 sound/pci/cmipci.c | 5 +-
8877 sound/pci/ctxfi/ctpcm.c | 2 +-
8878 sound/pci/ctxfi/ctsrc.c | 2 +-
8879 sound/pci/ctxfi/ctvmem.h | 2 +-
8880 sound/pci/emu10k1/emupcm.c | 5 +
8881 sound/pci/es1938.c | 5 +-
8882 sound/pci/es1968.c | 5 +-
8883 sound/pci/fm801.c | 20 +-
8884 sound/pci/hda/Makefile | 3 +
8885 sound/pci/hda/alc260_quirks.c | 304 --
8886 sound/pci/hda/alc262_quirks.c | 530 +--
8887 sound/pci/hda/alc268_quirks.c | 636 ---
8888 sound/pci/hda/alc269_quirks.c | 674 ---
8889 sound/pci/hda/alc662_quirks.c | 1408 ------
8890 sound/pci/hda/alc680_quirks.c | 222 -
8891 sound/pci/hda/alc861_quirks.c | 725 ---
8892 sound/pci/hda/alc861vd_quirks.c | 605 ---
8893 sound/pci/hda/alc880_quirks.c | 17 +-
8894 sound/pci/hda/alc882_quirks.c | 85 +-
8895 sound/pci/hda/alc_quirks.c | 13 +
8896 sound/pci/hda/hda_codec.c | 104 +-
8897 sound/pci/hda/hda_eld.c | 39 +-
8898 sound/pci/hda/hda_hwdep.c | 6 +-
8899 sound/pci/hda/hda_intel.c | 225 +-
8900 sound/pci/hda/hda_local.h | 29 +-
8901 sound/pci/hda/hda_proc.c | 12 +-
8902 sound/pci/hda/hda_trace.h | 117 +
8903 sound/pci/hda/patch_analog.c | 176 +-
8904 sound/pci/hda/patch_conexant.c | 93 +-
8905 sound/pci/hda/patch_hdmi.c | 99 +-
8906 sound/pci/hda/patch_realtek.c | 1071 +++--
8907 sound/pci/hda/patch_sigmatel.c | 32 +-
8908 sound/pci/hda/patch_via.c | 68 +-
8909 sound/pci/ice1712/ice1712.c | 10 +-
8910 sound/pci/maestro3.c | 4 +-
8911 sound/pci/oxygen/oxygen_lib.c | 6 +-
8912 sound/pci/oxygen/xonar_pcm179x.c | 1 +
8913 sound/pci/riptide/riptide.c | 2 +-
8914 sound/pci/rme9652/hdspm.c | 153 +-
8915 sound/pci/sis7019.c | 4 +-
8916 sound/pci/sonicvibes.c | 7 +-
8917 sound/pci/trident/trident.c | 5 +-
8918 sound/pci/via82xx.c | 13 +-
8919 sound/pci/ymfpci/ymfpci.c | 5 +-
8920 sound/pci/ymfpci/ymfpci_main.c | 32 +-
8921 sound/ppc/keywest.c | 1 -
8922 sound/ppc/snd_ps3.c | 2 +-
8923 sound/soc/Kconfig | 3 +
8924 sound/soc/Makefile | 1 +
8925 sound/soc/atmel/playpaq_wm8510.c | 5 +-
8926 sound/soc/au1x/Kconfig | 28 +
8927 sound/soc/au1x/Makefile | 10 +
8928 sound/soc/au1x/ac97c.c | 363 ++
8929 sound/soc/au1x/db1000.c | 75 +
8930 sound/soc/au1x/db1200.c | 64 +-
8931 sound/soc/au1x/dbdma2.c | 91 +-
8932 sound/soc/au1x/dma.c | 377 ++
8933 sound/soc/au1x/i2sc.c | 346 ++
8934 sound/soc/au1x/psc-ac97.c | 48 +-
8935 sound/soc/au1x/psc-i2s.c | 42 +-
8936 sound/soc/au1x/psc.h | 16 +-
8937 sound/soc/blackfin/Kconfig | 13 +
8938 sound/soc/blackfin/Makefile | 2 +
8939 sound/soc/blackfin/bf5xx-ac97-pcm.c | 2 +-
8940 sound/soc/blackfin/bf5xx-i2s-pcm.c | 2 +-
8941 sound/soc/blackfin/bfin-eval-adau1373.c | 202 +
8942 sound/soc/codecs/88pm860x-codec.c | 14 +-
8943 sound/soc/codecs/Kconfig | 12 +
8944 sound/soc/codecs/Makefile | 6 +
8945 sound/soc/codecs/ad193x.c | 65 +-
8946 sound/soc/codecs/ad193x.h | 34 +-
8947 sound/soc/codecs/ad1980.c | 11 +-
8948 sound/soc/codecs/adau1373.c | 1414 ++++++
8949 sound/soc/codecs/adau1373.h | 29 +
8950 sound/soc/codecs/adau1701.c | 3 +-
8951 sound/soc/codecs/adav80x.c | 3 +-
8952 sound/soc/codecs/ak4671.c | 2 -
8953 sound/soc/codecs/alc5623.c | 4 -
8954 sound/soc/codecs/cs4270.c | 6 +-
8955 sound/soc/codecs/cs4271.c | 5 -
8956 sound/soc/codecs/cs42l51.c | 6 +-
8957 sound/soc/codecs/max98088.c | 36 +-
8958 sound/soc/codecs/max98095.c | 34 +-
8959 sound/soc/codecs/rt5631.c | 1775 +++++++
8960 sound/soc/codecs/rt5631.h | 701 +++
8961 sound/soc/codecs/sgtl5000.c | 8 +
8962 sound/soc/codecs/sn95031.c | 16 +-
8963 sound/soc/codecs/ssm2602.c | 77 +-
8964 sound/soc/codecs/ssm2602.h | 6 +-
8965 sound/soc/codecs/sta32x.c | 21 +-
8966 sound/soc/codecs/tlv320aic3x.c | 16 +-
8967 sound/soc/codecs/tlv320dac33.c | 8 +-
8968 sound/soc/codecs/tpa6130a2.c | 13 +-
8969 sound/soc/codecs/twl6040.c | 570 +--
8970 sound/soc/codecs/twl6040.h | 13 +
8971 sound/soc/codecs/wl1273.c | 1 -
8972 sound/soc/codecs/wm1250-ev1.c | 140 +-
8973 sound/soc/codecs/wm5100-tables.c | 1530 ++++++
8974 sound/soc/codecs/wm5100.c | 2644 ++++++++++
8975 sound/soc/codecs/wm5100.h | 5146 ++++++++++++++++++++
8976 sound/soc/codecs/wm8510.c | 8 +
8977 sound/soc/codecs/wm8523.c | 35 +-
8978 sound/soc/codecs/wm8580.c | 9 +-
8979 sound/soc/codecs/wm8711.c | 19 +-
8980 sound/soc/codecs/wm8728.c | 13 +-
8981 sound/soc/codecs/wm8731.c | 10 +
8982 sound/soc/codecs/wm8737.c | 10 +
8983 sound/soc/codecs/wm8741.c | 137 +-
8984 sound/soc/codecs/wm8750.c | 14 +-
8985 sound/soc/codecs/wm8753.c | 13 +-
8986 sound/soc/codecs/wm8770.c | 8 +
8987 sound/soc/codecs/wm8776.c | 51 +-
8988 sound/soc/codecs/wm8782.c | 2 +-
8989 sound/soc/codecs/wm8804.c | 9 +
8990 sound/soc/codecs/wm8904.c | 2 -
8991 sound/soc/codecs/wm8940.c | 3 -
8992 sound/soc/codecs/wm8960.c | 3 -
8993 sound/soc/codecs/wm8962.c | 201 +-
8994 sound/soc/codecs/wm8971.c | 27 +-
8995 sound/soc/codecs/wm8978.c | 3 -
8996 sound/soc/codecs/wm8988.c | 15 +-
8997 sound/soc/codecs/wm8993.c | 7 +-
8998 sound/soc/codecs/wm8994-tables.c | 16 +-
8999 sound/soc/codecs/wm8994.c | 364 ++-
9000 sound/soc/codecs/wm8994.h | 2 +
9001 sound/soc/codecs/wm8995.c | 22 +-
9002 sound/soc/codecs/wm8996.c | 319 +-
9003 sound/soc/codecs/wm9081.c | 7 +-
9004 sound/soc/codecs/wm9090.c | 6 +-
9005 sound/soc/codecs/wm_hubs.c | 48 +-
9006 sound/soc/codecs/wm_hubs.h | 3 +-
9007 sound/soc/davinci/davinci-i2s.c | 5 +-
9008 sound/soc/davinci/davinci-mcasp.c | 20 +-
9009 sound/soc/davinci/davinci-pcm.c | 123 +-
9010 sound/soc/ep93xx/edb93xx.c | 60 +-
9011 sound/soc/ep93xx/ep93xx-ac97.c | 2 +-
9012 sound/soc/ep93xx/ep93xx-pcm.c | 1 +
9013 sound/soc/ep93xx/simone.c | 64 +-
9014 sound/soc/ep93xx/snappercl15.c | 53 +-
9015 sound/soc/fsl/fsl_dma.c | 1 -
9016 sound/soc/fsl/fsl_ssi.c | 206 +-
9017 sound/soc/fsl/mpc8610_hpcd.c | 2 +-
9018 sound/soc/fsl/p1022_ds.c | 4 +-
9019 sound/soc/imx/Kconfig | 1 +
9020 sound/soc/imx/imx-pcm-fiq.c | 11 +-
9021 sound/soc/imx/imx-ssi.c | 8 +-
9022 sound/soc/jz4740/jz4740-pcm.c | 2 +-
9023 sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
9024 sound/soc/mid-x86/mfld_machine.c | 2 -
9025 sound/soc/mid-x86/sst_platform.c | 19 +-
9026 sound/soc/mxs/Kconfig | 20 +
9027 sound/soc/mxs/Makefile | 10 +
9028 sound/soc/mxs/mxs-pcm.c | 359 ++
9029 sound/soc/mxs/mxs-pcm.h | 43 +
9030 sound/soc/mxs/mxs-saif.c | 797 +++
9031 sound/soc/mxs/mxs-saif.h | 134 +
9032 sound/soc/mxs/mxs-sgtl5000.c | 173 +
9033 sound/soc/nuc900/nuc900-pcm.c | 5 +-
9034 sound/soc/omap/Makefile | 2 +-
9035 sound/soc/omap/am3517evm.c | 22 +-
9036 sound/soc/omap/igep0020.c | 23 +-
9037 sound/soc/omap/mcpdm.c | 470 --
9038 sound/soc/omap/mcpdm.h | 153 -
9039 sound/soc/omap/n810.c | 19 +-
9040 sound/soc/omap/omap-mcbsp.c | 24 +-
9041 sound/soc/omap/omap-mcpdm.c | 481 ++-
9042 sound/soc/omap/omap-mcpdm.h | 107 +
9043 sound/soc/omap/omap-pcm.c | 8 +
9044 sound/soc/omap/omap3evm.c | 23 +-
9045 sound/soc/omap/omap3pandora.c | 20 +-
9046 sound/soc/omap/osk5912.c | 23 +-
9047 sound/soc/omap/overo.c | 23 +-
9048 sound/soc/omap/rx51.c | 20 +-
9049 sound/soc/omap/sdp3430.c | 70 +-
9050 sound/soc/omap/sdp4430.c | 22 +-
9051 sound/soc/omap/zoom2.c | 70 +-
9052 sound/soc/pxa/magician.c | 3 +-
9053 sound/soc/pxa/raumfeld.c | 4 +-
9054 sound/soc/pxa/spitz.c | 2 +-
9055 sound/soc/pxa/z2.c | 2 +-
9056 sound/soc/s6000/s6000-pcm.c | 1 -
9057 sound/soc/samsung/Kconfig | 12 +-
9058 sound/soc/samsung/ac97.c | 4 +-
9059 sound/soc/samsung/i2s.c | 2 +-
9060 sound/soc/samsung/jive_wm8750.c | 2 +-
9061 sound/soc/samsung/pcm.c | 2 +-
9062 sound/soc/samsung/s3c-i2s-v2.c | 1 +
9063 sound/soc/samsung/s3c2412-i2s.c | 6 +-
9064 sound/soc/samsung/s3c24xx-i2s.c | 6 +-
9065 sound/soc/samsung/s3c24xx_simtec.c | 2 +-
9066 sound/soc/samsung/s3c24xx_uda134x.c | 8 +-
9067 sound/soc/samsung/smartq_wm8987.c | 2 +-
9068 sound/soc/samsung/smdk_wm8580.c | 6 +-
9069 sound/soc/samsung/smdk_wm8580pcm.c | 4 +-
9070 sound/soc/samsung/spdif.c | 4 +-
9071 sound/soc/samsung/speyside.c | 10 +-
9072 sound/soc/samsung/speyside_wm8962.c | 41 +-
9073 sound/soc/sh/fsi.c | 12 +-
9074 sound/soc/sh/ssi.c | 2 +-
9075 sound/soc/soc-cache.c | 7 -
9076 sound/soc/soc-core.c | 47 +-
9077 sound/soc/soc-dapm.c | 158 +-
9078 sound/soc/soc-io.c | 357 +--
9079 sound/soc/soc-pcm.c | 42 +-
9080 sound/soc/tegra/tegra_i2s.c | 2 +-
9081 sound/soc/tegra/tegra_spdif.c | 5 +-
9082 sound/soc/txx9/txx9aclc-ac97.c | 2 +-
9083 sound/soc/txx9/txx9aclc-generic.c | 2 +-
9084 sound/sparc/amd7930.c | 2 +-
9085 sound/usb/6fire/firmware.c | 25 +-
9086 sound/usb/Makefile | 12 +-
9087 sound/usb/card.c | 4 +-
9088 sound/usb/card.h | 2 +
9089 sound/usb/clock.c | 12 +-
9090 sound/usb/endpoint.c | 1199 ++++--
9091 sound/usb/endpoint.h | 20 +-
9092 sound/usb/format.c | 4 +-
9093 sound/usb/helper.c | 4 +-
9094 sound/usb/helper.h | 2 +-
9095 sound/usb/midi.c | 27 +
9096 sound/usb/mixer.c | 19 +-
9097 sound/usb/mixer_quirks.c | 10 +-
9098 sound/usb/pcm.c | 34 +-
9099 sound/usb/pcm.h | 3 +
9100 sound/usb/quirks-table.h | 25 +
9101 sound/usb/quirks.c | 16 +-
9102 sound/usb/stream.c | 452 ++
9103 sound/usb/stream.h | 12 +
9104 sound/usb/urb.c | 941 ----
9105 sound/usb/urb.h | 21 -
9106 sound/usb/usbaudio.h | 1 +
9107 333 files changed, 23480 insertions(+), 10217 deletions(-)
9108 create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
9109 create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
9110 create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
9111 create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
9112 create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
9113 create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
9114 create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
9115 create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
9116 create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
9117 create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
9118 create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
9119 create mode 100644 Documentation/devicetree/bindings/sound/wm8770.txt
9120 create mode 100644 Documentation/devicetree/bindings/sound/wm8776.txt
9121 create mode 100644 Documentation/devicetree/bindings/sound/wm8804.txt
9122 create mode 100644 include/sound/adau1373.h
9123 create mode 100644 include/sound/saif.h
9124 create mode 100644 include/sound/wm1250-ev1.h
9125 create mode 100644 include/sound/wm5100.h
9126 delete mode 100644 sound/pci/hda/alc268_quirks.c
9127 delete mode 100644 sound/pci/hda/alc269_quirks.c
9128 delete mode 100644 sound/pci/hda/alc662_quirks.c
9129 delete mode 100644 sound/pci/hda/alc680_quirks.c
9130 delete mode 100644 sound/pci/hda/alc861_quirks.c
9131 delete mode 100644 sound/pci/hda/alc861vd_quirks.c
9132 create mode 100644 sound/pci/hda/hda_trace.h
9133 create mode 100644 sound/soc/au1x/ac97c.c
9134 create mode 100644 sound/soc/au1x/db1000.c
9135 create mode 100644 sound/soc/au1x/dma.c
9136 create mode 100644 sound/soc/au1x/i2sc.c
9137 create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
9138 create mode 100644 sound/soc/codecs/adau1373.c
9139 create mode 100644 sound/soc/codecs/adau1373.h
9140 create mode 100644 sound/soc/codecs/rt5631.c
9141 create mode 100644 sound/soc/codecs/rt5631.h
9142 create mode 100644 sound/soc/codecs/wm5100-tables.c
9143 create mode 100644 sound/soc/codecs/wm5100.c
9144 create mode 100644 sound/soc/codecs/wm5100.h
9145 create mode 100644 sound/soc/mxs/Kconfig
9146 create mode 100644 sound/soc/mxs/Makefile
9147 create mode 100644 sound/soc/mxs/mxs-pcm.c
9148 create mode 100644 sound/soc/mxs/mxs-pcm.h
9149 create mode 100644 sound/soc/mxs/mxs-saif.c
9150 create mode 100644 sound/soc/mxs/mxs-saif.h
9151 create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
9152 delete mode 100644 sound/soc/omap/mcpdm.c
9153 delete mode 100644 sound/soc/omap/mcpdm.h
9154 create mode 100644 sound/soc/omap/omap-mcpdm.h
9155 create mode 100644 sound/usb/stream.c
9156 create mode 100644 sound/usb/stream.h
9157 delete mode 100644 sound/usb/urb.c
9158 delete mode 100644 sound/usb/urb.h
9159 Merging sound-asoc/for-next
9160 $ git merge sound-asoc/for-next
9161 Merge made by recursive.
9162 drivers/regulator/core.c | 9 ++-
9163 include/sound/soc-dapm.h | 3 +
9164 include/sound/soc.h | 85 ++++++++-------
9165 sound/soc/codecs/ak4671.c | 2 -
9166 sound/soc/codecs/cs4270.c | 8 +-
9167 sound/soc/codecs/cs42l51.c | 9 +-
9168 sound/soc/codecs/lm4857.c | 2 +-
9169 sound/soc/codecs/tlv320aic23.c | 14 +--
9170 sound/soc/codecs/tlv320aic32x4.c | 4 +-
9171 sound/soc/codecs/twl4030.c | 48 ++------
9172 sound/soc/codecs/twl6040.c | 76 ++++----------
9173 sound/soc/codecs/wm8350.c | 43 +++-----
9174 sound/soc/codecs/wm8523.c | 1 -
9175 sound/soc/codecs/wm8580.c | 38 +++-----
9176 sound/soc/codecs/wm8711.c | 4 +-
9177 sound/soc/codecs/wm8750.c | 26 ++---
9178 sound/soc/codecs/wm8962.c | 21 ++--
9179 sound/soc/codecs/wm8971.c | 2 +-
9180 sound/soc/codecs/wm8974.c | 2 +-
9181 sound/soc/codecs/wm8988.c | 1 -
9182 sound/soc/codecs/wm8990.c | 36 ++++---
9183 sound/soc/codecs/wm8991.c | 2 +-
9184 sound/soc/codecs/wm8994.c | 2 +-
9185 sound/soc/codecs/wm9090.c | 1 -
9186 sound/soc/codecs/wm_hubs.c | 20 +---
9187 sound/soc/imx/imx-pcm-fiq.c | 1 -
9188 sound/soc/imx/imx-ssi.c | 1 -
9189 sound/soc/imx/imx-ssi.h | 6 -
9190 sound/soc/soc-core.c | 163 ++++++----------------------
9191 sound/soc/soc-dapm.c | 217 +++++++++++++++++++++++++++-----------
9192 sound/soc/soc-jack.c | 2 +
9193 31 files changed, 378 insertions(+), 471 deletions(-)
9194 Merging cpufreq/next
9195 $ git merge cpufreq/next
9196 Merge made by recursive.
9197 Documentation/cpu-freq/governors.txt | 2 +-
9198 drivers/cpufreq/cpufreq_ondemand.c | 2 +-
9199 drivers/cpufreq/db8500-cpufreq.c | 7 +-
9200 drivers/cpufreq/e_powersaver.c | 135 +++++++++++++++++++++++++++++++---
9201 drivers/cpufreq/exynos4210-cpufreq.c | 129 +++++++++++++++++++++++++++++++-
9202 5 files changed, 254 insertions(+), 21 deletions(-)
9204 $ git merge quilt/rr
9205 Auto-merging drivers/net/virtio_net.c
9206 Merge made by recursive.
9207 arch/x86/lguest/boot.c | 10 ++++
9208 drivers/char/virtio_console.c | 120 +++++++++++++++++++++++++++--------------
9209 drivers/lguest/core.c | 2 +-
9210 drivers/net/virtio_net.c | 14 ++---
9211 include/linux/virtio.h | 4 +-
9212 include/linux/virtio_config.h | 3 +
9213 include/linux/virtio_ring.h | 6 +-
9214 kernel/kmod.c | 4 +-
9215 8 files changed, 106 insertions(+), 57 deletions(-)
9217 $ git merge input/next
9218 Removing Documentation/ABI/testing/sysfs-wacom
9219 Auto-merging drivers/input/keyboard/adp5588-keys.c
9220 Auto-merging drivers/input/misc/Kconfig
9221 Auto-merging drivers/input/misc/Makefile
9222 Auto-merging drivers/input/misc/twl6040-vibra.c
9223 Auto-merging drivers/input/tablet/wacom_sys.c
9224 Auto-merging drivers/input/touchscreen/wacom_w8001.c
9225 Auto-merging include/linux/input.h
9226 Merge made by recursive.
9227 Documentation/ABI/testing/sysfs-driver-wacom | 72 +++
9228 Documentation/ABI/testing/sysfs-wacom | 10 -
9229 Documentation/input/elantech.txt | 295 +++++++++++-
9230 Documentation/input/multi-touch-protocol.txt | 14 +
9231 drivers/input/input-mt.c | 1 +
9232 drivers/input/input-polldev.c | 6 +-
9233 drivers/input/keyboard/adp5588-keys.c | 2 +-
9234 drivers/input/keyboard/davinci_keyscan.c | 2 +-
9235 drivers/input/keyboard/ep93xx_keypad.c | 2 +-
9236 drivers/input/keyboard/gpio_keys.c | 24 +-
9237 drivers/input/keyboard/imx_keypad.c | 2 +-
9238 drivers/input/keyboard/jornada720_kbd.c | 2 +-
9239 drivers/input/keyboard/matrix_keypad.c | 1 -
9240 drivers/input/keyboard/pxa27x_keypad.c | 2 +-
9241 drivers/input/keyboard/pxa930_rotary.c | 2 +-
9242 drivers/input/keyboard/tc3589x-keypad.c | 2 +-
9243 drivers/input/keyboard/tegra-kbc.c | 85 ++--
9244 drivers/input/keyboard/w90p910_keypad.c | 2 +-
9245 drivers/input/misc/Kconfig | 45 ++-
9246 drivers/input/misc/Makefile | 4 +-
9247 drivers/input/misc/ad714x-i2c.c | 4 +-
9248 drivers/input/misc/bma150.c | 691 ++++++++++++++++++++++++++
9249 drivers/input/misc/ixp4xx-beeper.c | 2 +-
9250 drivers/input/misc/pm8xxx-vibrator.c | 296 +++++++++++
9251 drivers/input/misc/twl6040-vibra.c | 2 +-
9252 drivers/input/mouse/elantech.c | 664 ++++++++++++++++++++++---
9253 drivers/input/mouse/elantech.h | 57 ++-
9254 drivers/input/mouse/pxa930_trkball.c | 2 +-
9255 drivers/input/mouse/synaptics.c | 527 ++++++++++++++++++--
9256 drivers/input/mouse/synaptics.h | 27 +-
9257 drivers/input/mouse/synaptics_i2c.c | 2 +-
9258 drivers/input/tablet/wacom.h | 10 +-
9259 drivers/input/tablet/wacom_sys.c | 356 ++++++++++++--
9260 drivers/input/touchscreen/Kconfig | 12 +
9261 drivers/input/touchscreen/Makefile | 1 +
9262 drivers/input/touchscreen/atmel_tsadcc.c | 2 +-
9263 drivers/input/touchscreen/h3600_ts_input.c | 4 +-
9264 drivers/input/touchscreen/hp680_ts_input.c | 2 +-
9265 drivers/input/touchscreen/jornada720_ts.c | 2 +-
9266 drivers/input/touchscreen/lpc32xx_ts.c | 2 +-
9267 drivers/input/touchscreen/penmount.c | 199 +++++++-
9268 drivers/input/touchscreen/s3c2410_ts.c | 2 +-
9269 drivers/input/touchscreen/tsc2007.c | 194 ++++----
9270 drivers/input/touchscreen/tsc40.c | 184 +++++++
9271 drivers/input/touchscreen/w90p910_ts.c | 2 +-
9272 drivers/input/touchscreen/wacom_w8001.c | 29 +-
9273 include/linux/bma150.h | 46 ++
9274 include/linux/input.h | 1 +
9275 include/linux/input/adxl34x.h | 21 +-
9276 include/linux/serio.h | 1 +
9277 50 files changed, 3503 insertions(+), 416 deletions(-)
9278 create mode 100644 Documentation/ABI/testing/sysfs-driver-wacom
9279 delete mode 100644 Documentation/ABI/testing/sysfs-wacom
9280 create mode 100644 drivers/input/misc/bma150.c
9281 create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
9282 create mode 100644 drivers/input/touchscreen/tsc40.c
9283 create mode 100644 include/linux/bma150.h
9284 Merging input-mt/next
9285 $ git merge input-mt/next
9287 Merging lsm/for-next
9288 $ git merge lsm/for-next
9290 Merging block/for-next
9291 $ git merge block/for-next
9292 Auto-merging block/blk-core.c
9293 Auto-merging block/blk-sysfs.c
9294 Auto-merging block/genhd.c
9295 Auto-merging drivers/md/md.c
9296 Auto-merging drivers/md/md.h
9297 Auto-merging drivers/md/multipath.c
9298 Auto-merging drivers/md/raid1.c
9299 Auto-merging drivers/md/raid10.c
9300 Auto-merging drivers/md/raid5.c
9301 Auto-merging fs/block_dev.c
9302 Auto-merging include/linux/genhd.h
9303 Merge made by recursive.
9304 .../ABI/testing/sysfs-bus-pci-devices-cciss | 7 +
9305 Documentation/blockdev/cciss.txt | 10 +
9306 arch/m68k/emu/nfblock.c | 3 +-
9307 arch/powerpc/sysdev/axonram.c | 8 +-
9308 block/blk-core.c | 261 +-
9309 block/blk-sysfs.c | 6 +-
9310 block/elevator.c | 2 +-
9311 block/genhd.c | 4 +-
9312 block/ioctl.c | 2 +-
9313 drivers/block/Kconfig | 2 +
9314 drivers/block/Makefile | 1 +
9315 drivers/block/aoe/aoeblk.c | 14 +-
9316 drivers/block/brd.c | 4 +-
9317 drivers/block/cciss.c | 69 +-
9318 drivers/block/cciss.h | 1 +
9319 drivers/block/cpqarray.c | 2 +-
9320 drivers/block/drbd/drbd_int.h | 2 +-
9321 drivers/block/drbd/drbd_req.c | 8 +-
9322 drivers/block/loop.c | 116 +-
9323 drivers/block/mtip32xx/Kconfig | 9 +
9324 drivers/block/mtip32xx/Makefile | 5 +
9325 drivers/block/mtip32xx/mtip32xx.c | 3567 ++++++++++++++++++++
9326 drivers/block/mtip32xx/mtip32xx.h | 408 +++
9327 drivers/block/nbd.c | 69 +-
9328 drivers/block/pktcdvd.c | 11 +-
9329 drivers/block/ps3vram.c | 6 +-
9330 drivers/block/umem.c | 4 +-
9331 drivers/md/dm.c | 25 +-
9332 drivers/md/faulty.c | 14 +-
9333 drivers/md/linear.c | 17 +-
9334 drivers/md/md.c | 12 +-
9335 drivers/md/md.h | 2 +-
9336 drivers/md/multipath.c | 8 +-
9337 drivers/md/raid0.c | 22 +-
9338 drivers/md/raid1.c | 8 +-
9339 drivers/md/raid10.c | 19 +-
9340 drivers/md/raid5.c | 8 +-
9341 drivers/s390/block/dcssblk.c | 7 +-
9342 drivers/s390/block/xpram.c | 5 +-
9343 drivers/staging/zram/zram_drv.c | 8 +-
9344 fs/block_dev.c | 2 +-
9345 include/linux/blkdev.h | 27 +-
9346 include/linux/genhd.h | 6 +-
9347 include/linux/loop.h | 1 +
9348 44 files changed, 4449 insertions(+), 343 deletions(-)
9349 create mode 100644 drivers/block/mtip32xx/Kconfig
9350 create mode 100644 drivers/block/mtip32xx/Makefile
9351 create mode 100644 drivers/block/mtip32xx/mtip32xx.c
9352 create mode 100644 drivers/block/mtip32xx/mtip32xx.h
9353 Merging quilt/device-mapper
9354 $ git merge quilt/device-mapper
9355 Recorded preimage for 'drivers/md/dm-table.c'
9356 Auto-merging drivers/md/dm-table.c
9357 CONFLICT (content): Merge conflict in drivers/md/dm-table.c
9358 Auto-merging drivers/md/dm.c
9359 Auto-merging include/linux/device-mapper.h
9360 Automatic merge failed; fix conflicts and then commit the result.
9362 Recorded resolution for 'drivers/md/dm-table.c'.
9363 [master 632c25c] Merge branch 'quilt/device-mapper'
9364 $ git diff -M --stat --summary HEAD^..
9365 Documentation/device-mapper/persistent-data.txt | 84 +
9366 Documentation/device-mapper/thin-provisioning.txt | 275 +++
9367 drivers/md/Kconfig | 9 +
9368 drivers/md/Makefile | 3 +
9369 drivers/md/dm-kcopyd.c | 31 +-
9370 drivers/md/dm-table.c | 52 +
9371 drivers/md/dm-thin-metadata.c | 1406 ++++++++++++
9372 drivers/md/dm-thin-metadata.h | 168 ++
9373 drivers/md/dm-thin.c | 2280 ++++++++++++++++++++
9374 drivers/md/dm.c | 12 +-
9375 drivers/md/persistent-data/Kconfig | 7 +
9376 drivers/md/persistent-data/Makefile | 9 +
9377 drivers/md/persistent-data/dm-block-manager.c | 998 +++++++++
9378 drivers/md/persistent-data/dm-block-manager.h | 134 ++
9379 drivers/md/persistent-data/dm-btree-internal.h | 133 ++
9380 drivers/md/persistent-data/dm-btree-remove.c | 571 +++++
9381 drivers/md/persistent-data/dm-btree-spine.c | 222 ++
9382 drivers/md/persistent-data/dm-btree.c | 861 ++++++++
9383 drivers/md/persistent-data/dm-btree.h | 158 ++
9384 .../persistent-data/dm-persistent-data-internal.h | 20 +
9385 drivers/md/persistent-data/dm-space-map-common.h | 94 +
9386 drivers/md/persistent-data/dm-space-map-disk.c | 663 ++++++
9387 drivers/md/persistent-data/dm-space-map-disk.h | 25 +
9388 drivers/md/persistent-data/dm-space-map-metadata.c | 956 ++++++++
9389 drivers/md/persistent-data/dm-space-map-metadata.h | 33 +
9390 drivers/md/persistent-data/dm-space-map.h | 118 +
9391 .../md/persistent-data/dm-transaction-manager.c | 414 ++++
9392 .../md/persistent-data/dm-transaction-manager.h | 130 ++
9393 include/linux/device-mapper.h | 35 +-
9394 include/linux/dm-kcopyd.h | 4 +
9395 30 files changed, 9891 insertions(+), 14 deletions(-)
9396 create mode 100644 Documentation/device-mapper/persistent-data.txt
9397 create mode 100644 Documentation/device-mapper/thin-provisioning.txt
9398 create mode 100644 drivers/md/dm-thin-metadata.c
9399 create mode 100644 drivers/md/dm-thin-metadata.h
9400 create mode 100644 drivers/md/dm-thin.c
9401 create mode 100644 drivers/md/persistent-data/Kconfig
9402 create mode 100644 drivers/md/persistent-data/Makefile
9403 create mode 100644 drivers/md/persistent-data/dm-block-manager.c
9404 create mode 100644 drivers/md/persistent-data/dm-block-manager.h
9405 create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
9406 create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
9407 create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
9408 create mode 100644 drivers/md/persistent-data/dm-btree.c
9409 create mode 100644 drivers/md/persistent-data/dm-btree.h
9410 create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
9411 create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
9412 create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
9413 create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
9414 create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
9415 create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
9416 create mode 100644 drivers/md/persistent-data/dm-space-map.h
9417 create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
9418 create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
9419 Merging embedded/master
9420 $ git merge embedded/master
9422 Merging firmware/master
9423 $ git merge firmware/master
9425 Merging pcmcia/master
9426 $ git merge pcmcia/master
9428 Merging battery/master
9429 $ git merge battery/master
9430 Merge made by recursive.
9431 .../bindings/power_supply/olpc_battery.txt | 5 +
9432 drivers/power/ds2780_battery.c | 2 +-
9433 drivers/power/max17042_battery.c | 17 ++--
9434 drivers/power/max8903_charger.c | 2 +-
9435 drivers/power/max8997_charger.c | 1 +
9436 drivers/power/max8998_charger.c | 2 +
9437 drivers/power/olpc_battery.c | 79 ++++++++++++++-----
9438 drivers/power/pda_power.c | 74 ++++++++++++++++--
9439 drivers/power/power_supply_sysfs.c | 4 +-
9440 drivers/power/wm831x_power.c | 44 +++++++----
9441 drivers/power/z2_battery.c | 2 +-
9442 include/linux/pda_power.h | 2 +
9443 12 files changed, 175 insertions(+), 59 deletions(-)
9444 create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
9446 $ git merge leds/for-mm
9447 Resolved 'drivers/leds/Kconfig' using previous resolution.
9448 Auto-merging drivers/leds/Kconfig
9449 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
9450 Automatic merge failed; fix conflicts and then commit the result.
9452 [master f6fad29] Merge remote-tracking branch 'leds/for-mm'
9453 $ git diff -M --stat --summary HEAD^..
9454 Merging backlight/for-mm
9455 $ git merge backlight/for-mm
9457 Merging mmc/mmc-next
9458 $ git merge mmc/mmc-next
9459 Resolved 'drivers/mmc/core/core.c' using previous resolution.
9460 Resolved 'drivers/mmc/core/sd.c' using previous resolution.
9461 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
9462 Auto-merging arch/arm/mach-shmobile/board-ag5evm.c
9463 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
9464 Auto-merging drivers/mmc/card/block.c
9465 Auto-merging drivers/mmc/core/core.c
9466 CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
9467 Auto-merging drivers/mmc/core/host.c
9468 Auto-merging drivers/mmc/core/sd.c
9469 CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
9470 Auto-merging drivers/mmc/host/Kconfig
9471 Auto-merging drivers/mmc/host/at91_mci.c
9472 Auto-merging drivers/mmc/host/mmci.c
9473 Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
9474 Auto-merging drivers/mmc/host/sdhci-s3c.c
9475 Auto-merging drivers/mmc/host/sdhci-tegra.c
9476 Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
9477 Automatic merge failed; fix conflicts and then commit the result.
9479 [master d5b835c] Merge remote-tracking branch 'mmc/mmc-next'
9480 $ git diff -M --stat --summary HEAD^..
9481 .../devicetree/bindings/mmc/nvidia-sdhci.txt | 27 +
9482 Documentation/fault-injection/fault-injection.txt | 8 +-
9483 arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
9484 arch/arm/mach-msm/devices-msm7x00.c | 24 -
9485 arch/arm/mach-msm/devices-qsd8x50.c | 24 -
9486 arch/arm/mach-msm/include/mach/mmc.h | 9 +-
9487 arch/arm/mach-shmobile/board-ag5evm.c | 6 +
9488 arch/arm/mach-shmobile/board-mackerel.c | 6 +
9489 drivers/mmc/card/block.c | 223 ++++--
9490 drivers/mmc/card/mmc_test.c | 30 +
9491 drivers/mmc/card/queue.c | 2 +-
9492 drivers/mmc/core/core.c | 172 ++++-
9493 drivers/mmc/core/core.h | 1 +
9494 drivers/mmc/core/debugfs.c | 27 +
9495 drivers/mmc/core/host.c | 11 +
9496 drivers/mmc/core/mmc.c | 120 +++-
9497 drivers/mmc/core/mmc_ops.c | 4 +-
9498 drivers/mmc/core/quirks.c | 11 +
9499 drivers/mmc/core/sd.c | 3 +-
9500 drivers/mmc/core/sd_ops.c | 8 +-
9501 drivers/mmc/core/sdio.c | 3 +-
9502 drivers/mmc/core/sdio_ops.c | 9 +-
9503 drivers/mmc/host/Kconfig | 16 +-
9504 drivers/mmc/host/at91_mci.c | 6 +-
9505 drivers/mmc/host/atmel-mci-regs.h | 220 +++---
9506 drivers/mmc/host/atmel-mci.c | 823 +++++++++++++-------
9507 drivers/mmc/host/dw_mmc.c | 36 +-
9508 drivers/mmc/host/dw_mmc.h | 2 +-
9509 drivers/mmc/host/mmci.c | 2 +-
9510 drivers/mmc/host/msm_sdcc.c | 78 ++-
9511 drivers/mmc/host/msm_sdcc.h | 6 +-
9512 drivers/mmc/host/omap_hsmmc.c | 5 +-
9513 drivers/mmc/host/sdhci-esdhc-imx.c | 80 ++-
9514 drivers/mmc/host/sdhci-of-esdhc.c | 18 +-
9515 drivers/mmc/host/sdhci-pci.c | 74 ++
9516 drivers/mmc/host/sdhci-pxav2.c | 4 +-
9517 drivers/mmc/host/sdhci-s3c.c | 28 +-
9518 drivers/mmc/host/sdhci-spear.c | 2 -
9519 drivers/mmc/host/sdhci-tegra.c | 54 +-
9520 drivers/mmc/host/sdhci.c | 9 +
9521 drivers/mmc/host/sdhci.h | 2 +-
9522 drivers/mmc/host/sh_mmcif.c | 20 +-
9523 drivers/mmc/host/sh_mobile_sdhi.c | 98 ++-
9524 drivers/mmc/host/tmio_mmc.c | 4 +-
9525 drivers/mmc/host/tmio_mmc.h | 7 +
9526 drivers/mmc/host/tmio_mmc_pio.c | 149 +++--
9527 include/linux/atmel-mci.h | 4 +-
9528 include/linux/atmel_pdc.h | 2 +
9529 include/linux/mmc/card.h | 8 +
9530 include/linux/mmc/core.h | 3 +
9531 include/linux/mmc/host.h | 20 +
9532 include/linux/mmc/mmc.h | 18 +
9533 include/linux/mmc/sh_mmcif.h | 4 +-
9534 include/linux/mmc/sh_mobile_sdhi.h | 4 +
9535 lib/Kconfig.debug | 11 +
9536 lib/fault-inject.c | 5 +-
9537 56 files changed, 1859 insertions(+), 693 deletions(-)
9538 create mode 100644 Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
9539 Merging kgdb/kgdb-next
9540 $ git merge kgdb/kgdb-next
9541 Merge made by recursive.
9542 Merging slab/for-next
9543 $ git merge slab/for-next
9544 Merge made by recursive.
9545 Documentation/vm/00-INDEX | 2 -
9546 Documentation/vm/slub.txt | 2 +-
9547 include/linux/mm_types.h | 14 +-
9548 include/linux/slub_def.h | 4 +
9550 mm/slub.c | 558 +++++++++++++++++++++++++++++++--------------
9551 tools/slub/slabinfo.c | 8 +
9552 7 files changed, 425 insertions(+), 182 deletions(-)
9553 Merging uclinux/for-next
9554 $ git merge uclinux/for-next
9557 $ git merge md/for-next
9558 Recorded preimage for 'drivers/md/faulty.c'
9559 Recorded preimage for 'drivers/md/linear.c'
9560 Recorded preimage for 'drivers/md/md.c'
9561 Recorded preimage for 'drivers/md/md.h'
9562 Recorded preimage for 'drivers/md/multipath.c'
9563 Recorded preimage for 'drivers/md/raid0.c'
9564 Recorded preimage for 'drivers/md/raid1.c'
9565 Recorded preimage for 'drivers/md/raid5.c'
9566 Auto-merging drivers/md/dm-raid.c
9567 Auto-merging drivers/md/faulty.c
9568 CONFLICT (content): Merge conflict in drivers/md/faulty.c
9569 Auto-merging drivers/md/linear.c
9570 CONFLICT (content): Merge conflict in drivers/md/linear.c
9571 Auto-merging drivers/md/md.c
9572 CONFLICT (content): Merge conflict in drivers/md/md.c
9573 Auto-merging drivers/md/md.h
9574 CONFLICT (content): Merge conflict in drivers/md/md.h
9575 Auto-merging drivers/md/multipath.c
9576 CONFLICT (content): Merge conflict in drivers/md/multipath.c
9577 Auto-merging drivers/md/raid0.c
9578 CONFLICT (content): Merge conflict in drivers/md/raid0.c
9579 Auto-merging drivers/md/raid1.c
9580 CONFLICT (content): Merge conflict in drivers/md/raid1.c
9581 Auto-merging drivers/md/raid10.c
9582 CONFLICT (content): Merge conflict in drivers/md/raid10.c
9583 Auto-merging drivers/md/raid5.c
9584 CONFLICT (content): Merge conflict in drivers/md/raid5.c
9585 Automatic merge failed; fix conflicts and then commit the result.
9587 Recorded resolution for 'drivers/md/faulty.c'.
9588 Recorded resolution for 'drivers/md/linear.c'.
9589 Recorded resolution for 'drivers/md/md.c'.
9590 Recorded resolution for 'drivers/md/md.h'.
9591 Recorded resolution for 'drivers/md/multipath.c'.
9592 Recorded resolution for 'drivers/md/raid0.c'.
9593 Recorded resolution for 'drivers/md/raid1.c'.
9594 Recorded resolution for 'drivers/md/raid10.c'.
9595 Recorded resolution for 'drivers/md/raid5.c'.
9596 [master bbe522c] Merge remote-tracking branch 'md/for-next'
9597 $ git diff -M --stat --summary HEAD^..
9598 drivers/md/bitmap.c | 154 +++++++-------
9599 drivers/md/bitmap.h | 12 +-
9600 drivers/md/dm-raid.c | 6 +-
9601 drivers/md/faulty.c | 36 ++--
9602 drivers/md/linear.c | 44 ++--
9603 drivers/md/linear.h | 12 +-
9604 drivers/md/md.c | 586 ++++++++++++++++++++++++------------------------
9605 drivers/md/md.h | 145 ++++++------
9606 drivers/md/multipath.c | 62 +++---
9607 drivers/md/multipath.h | 10 +-
9608 drivers/md/raid0.c | 189 +++++++---------
9609 drivers/md/raid0.h | 10 +-
9610 drivers/md/raid1.c | 309 +++++++++++++-------------
9611 drivers/md/raid1.h | 84 +++++---
9612 drivers/md/raid10.c | 254 +++++++++++-----------
9613 drivers/md/raid10.h | 20 +-
9614 drivers/md/raid5.c | 352 +++++++++++++----------------
9615 drivers/md/raid5.h | 20 +-
9616 18 files changed, 1113 insertions(+), 1192 deletions(-)
9617 $ git reset --hard HEAD^
9618 HEAD is now at 56e135a Merge remote-tracking branch 'slab/for-next'
9619 Merging refs/next/20111006/md
9620 $ git merge refs/next/20111006/md
9621 Auto-merging drivers/md/md.c
9622 Auto-merging drivers/md/md.h
9623 Merge made by recursive.
9624 drivers/md/bitmap.c | 71 +++++++++++++++++++++++++++-----------------------
9625 drivers/md/md.c | 8 ++++-
9626 drivers/md/md.h | 2 +-
9627 3 files changed, 45 insertions(+), 36 deletions(-)
9628 Merging mfd/for-next
9629 $ git merge mfd/for-next
9630 Resolved 'arch/arm/mach-u300/include/mach/irqs.h' using previous resolution.
9631 Auto-merging arch/arm/mach-imx/mach-mx27_3ds.c
9632 Auto-merging arch/arm/mach-imx/mach-mx31_3ds.c
9633 Auto-merging arch/arm/mach-imx/mach-mx31lite.c
9634 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
9635 Auto-merging arch/arm/mach-imx/mach-pcm038.c
9636 Auto-merging arch/arm/mach-mx5/mx51_efika.c
9637 Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
9638 Auto-merging arch/arm/mach-u300/include/mach/irqs.h
9639 CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
9640 Auto-merging arch/arm/mach-ux500/board-u5500.c
9641 Auto-merging drivers/gpio/Kconfig
9642 Auto-merging drivers/i2c/busses/Kconfig
9643 Auto-merging drivers/input/misc/Kconfig
9644 Auto-merging drivers/input/misc/Makefile
9645 Removing drivers/mfd/ab3550-core.c
9646 Auto-merging drivers/mfd/menelaus.c
9647 Auto-merging drivers/mfd/wm8994-core.c
9648 Auto-merging include/linux/mfd/wm8994/core.h
9649 Automatic merge failed; fix conflicts and then commit the result.
9651 [master ed78e29] Merge remote-tracking branch 'mfd/for-next'
9652 $ git diff -M --stat --summary HEAD^..
9653 arch/arm/mach-imx/mach-mx27_3ds.c | 3 +-
9654 arch/arm/mach-imx/mach-mx31_3ds.c | 2 +-
9655 arch/arm/mach-imx/mach-mx31lite.c | 3 +-
9656 arch/arm/mach-imx/mach-mx31moboard.c | 15 +-
9657 arch/arm/mach-imx/mach-pcm038.c | 3 +-
9658 arch/arm/mach-mx5/mx51_efika.c | 2 +-
9659 arch/arm/mach-omap2/Kconfig | 1 -
9660 arch/arm/mach-omap2/board-omap3beagle.c | 9 +-
9661 arch/arm/mach-u300/i2c.c | 51 +--
9662 arch/arm/mach-u300/include/mach/irqs.h | 10 +-
9663 arch/arm/mach-ux500/board-u5500.c | 29 +-
9664 arch/x86/include/asm/intel_scu_ipc.h | 22 +
9665 arch/x86/platform/mrst/mrst.c | 174 ++++-
9666 drivers/gpio/Kconfig | 3 +-
9667 drivers/hwmon/mc13783-adc.c | 12 +-
9668 drivers/i2c/busses/Kconfig | 1 -
9669 drivers/input/misc/Kconfig | 10 +
9670 drivers/input/misc/Makefile | 1 +
9671 drivers/input/misc/mc13783-pwrbutton.c | 282 ++++++
9672 drivers/input/touchscreen/mc13783_ts.c | 34 +-
9673 drivers/leds/leds-asic3.c | 35 +-
9674 drivers/leds/leds-mc13783.c | 60 +-
9675 drivers/media/radio/Kconfig | 1 -
9676 drivers/mfd/Kconfig | 64 +-
9677 drivers/mfd/Makefile | 4 +-
9678 drivers/mfd/aat2870-core.c | 2 +-
9679 drivers/mfd/ab3100-core.c | 2 +-
9680 drivers/mfd/ab3550-core.c | 1380 -----------------------------
9681 drivers/mfd/ab5500-core.c | 1439 +++++++++++++++++++++++++++++++
9682 drivers/mfd/ab5500-core.h | 87 ++
9683 drivers/mfd/ab5500-debugfs.c | 806 +++++++++++++++++
9684 drivers/mfd/ab5500-debugfs.h | 22 +
9685 drivers/mfd/ab8500-gpadc.c | 56 +-
9686 drivers/mfd/asic3.c | 26 +-
9687 drivers/mfd/da903x.c | 2 +-
9688 drivers/mfd/intel_msic.c | 501 +++++++++++
9689 drivers/mfd/jz4740-adc.c | 2 +-
9690 drivers/mfd/max8997.c | 27 +-
9691 drivers/mfd/mc13xxx-core.c | 116 ++--
9692 drivers/mfd/menelaus.c | 2 +-
9693 drivers/mfd/pcf50633-core.c | 114 +--
9694 drivers/mfd/tc3589x.c | 2 +
9695 drivers/mfd/timberdale.c | 9 +-
9696 drivers/mfd/tps65912-core.c | 6 +-
9697 drivers/mfd/twl-core.c | 2 +-
9698 drivers/mfd/twl4030-irq.c | 342 +++-----
9699 drivers/mfd/twl4030-madc.c | 22 +
9700 drivers/mfd/twl6030-irq.c | 75 ++-
9701 drivers/mfd/wm831x-core.c | 11 +
9702 drivers/mfd/wm831x-i2c.c | 8 +
9703 drivers/mfd/wm831x-irq.c | 24 +-
9704 drivers/mfd/wm831x-spi.c | 8 +
9705 drivers/mfd/wm8994-core.c | 53 ++
9706 drivers/regulator/mc13783-regulator.c | 6 +-
9707 include/linux/i2c/twl4030-madc.h | 4 +
9708 include/linux/mfd/ab5500/ab5500.h | 140 +++
9709 include/linux/mfd/ab8500/gpadc.h | 5 +-
9710 include/linux/mfd/abx500.h | 52 +--
9711 include/linux/mfd/intel_msic.h | 456 ++++++++++
9712 include/linux/mfd/max8997-private.h | 1 -
9713 include/linux/mfd/mc13783.h | 111 ---
9714 include/linux/mfd/mc13xxx.h | 38 +-
9715 include/linux/mfd/pcf50633/core.h | 3 +-
9716 include/linux/mfd/wm831x/core.h | 4 +
9717 include/linux/mfd/wm831x/pdata.h | 3 +
9718 include/linux/mfd/wm8994/core.h | 2 +
9719 include/linux/mfd/wm8994/pdata.h | 7 +
9720 67 files changed, 4690 insertions(+), 2119 deletions(-)
9721 create mode 100644 drivers/input/misc/mc13783-pwrbutton.c
9722 delete mode 100644 drivers/mfd/ab3550-core.c
9723 create mode 100644 drivers/mfd/ab5500-core.c
9724 create mode 100644 drivers/mfd/ab5500-core.h
9725 create mode 100644 drivers/mfd/ab5500-debugfs.c
9726 create mode 100644 drivers/mfd/ab5500-debugfs.h
9727 create mode 100644 drivers/mfd/intel_msic.c
9728 create mode 100644 include/linux/mfd/ab5500/ab5500.h
9729 create mode 100644 include/linux/mfd/intel_msic.h
9730 Merging hdlc/hdlc-next
9731 $ git merge hdlc/hdlc-next
9733 Merging drm/drm-next
9734 $ git merge drm/drm-next
9736 Merging fbdev/fbdev-next
9737 $ git merge fbdev/fbdev-next
9738 Resolved 'drivers/video/Kconfig' using previous resolution.
9739 Auto-merging MAINTAINERS
9740 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
9741 Auto-merging drivers/video/Kconfig
9742 CONFLICT (content): Merge conflict in drivers/video/Kconfig
9743 Auto-merging drivers/video/atmel_lcdfb.c
9744 Auto-merging drivers/video/backlight/adp8870_bl.c
9745 Removing drivers/video/sh_mobile_meram.h
9746 Automatic merge failed; fix conflicts and then commit the result.
9748 [master 49d6b1b] Merge remote-tracking branch 'fbdev/fbdev-next'
9749 $ git diff -M --stat --summary HEAD^..
9750 Documentation/fb/udlfb.txt | 39 +-
9752 arch/arm/mach-shmobile/board-mackerel.c | 1 +
9753 arch/powerpc/platforms/512x/mpc512x_shared.c | 24 +-
9754 arch/powerpc/platforms/85xx/p1022_ds.c | 47 +-
9755 arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 55 +-
9756 arch/powerpc/sysdev/fsl_soc.h | 25 +-
9757 drivers/staging/xgifb/XGI_main_26.c | 22 +-
9758 drivers/video/68328fb.c | 4 +-
9759 drivers/video/Kconfig | 34 +-
9760 drivers/video/Makefile | 2 +
9761 drivers/video/acornfb.c | 5 +-
9762 drivers/video/arkfb.c | 9 +-
9763 drivers/video/atmel_lcdfb.c | 15 +-
9764 drivers/video/aty/radeon_base.c | 10 +-
9765 drivers/video/au1100fb.c | 181 +--
9766 drivers/video/au1100fb.h | 6 +-
9767 drivers/video/au1200fb.c | 299 ++---
9768 drivers/video/backlight/adp8860_bl.c | 1 -
9769 drivers/video/backlight/adp8870_bl.c | 1 -
9770 drivers/video/bf54x-lq043fb.c | 2 +-
9771 drivers/video/bfin-lq035q1-fb.c | 2 +-
9772 drivers/video/bfin-t350mcqb-fb.c | 2 +-
9773 drivers/video/bfin_adv7393fb.c | 2 +-
9774 drivers/video/carminefb.c | 6 +-
9775 drivers/video/controlfb.c | 2 +-
9776 drivers/video/da8xx-fb.c | 186 +++-
9777 drivers/video/fb-puv3.c | 4 +-
9778 drivers/video/fb_defio.c | 3 +-
9779 drivers/video/fbmem.c | 3 -
9780 drivers/video/fbmon.c | 21 +-
9781 drivers/video/fbsysfs.c | 3 +
9782 drivers/video/fsl-diu-fb.c | 992 +++++++-------
9783 drivers/video/g364fb.c | 5 +-
9784 drivers/video/grvga.c | 579 ++++++++
9785 drivers/video/gxt4500.c | 4 +-
9786 drivers/video/hgafb.c | 4 +-
9787 drivers/video/imsttfb.c | 2 +-
9788 drivers/video/intelfb/intelfbhw.c | 6 +-
9789 drivers/video/mb862xx/mb862xx-i2c.c | 2 +-
9790 drivers/video/mb862xx/mb862xxfbdrv.c | 6 +-
9791 drivers/video/modedb.c | 444 +++---
9792 drivers/video/msm/mddi.c | 2 +-
9793 drivers/video/msm/mdp.c | 6 +-
9794 drivers/video/mx3fb.c | 19 +-
9795 drivers/video/mxsfb.c | 1 +
9796 drivers/video/neofb.c | 4 +-
9797 drivers/video/nuc900fb.c | 3 +-
9798 drivers/video/omap2/displays/panel-taal.c | 2 +-
9799 drivers/video/platinumfb.c | 2 +-
9800 drivers/video/pm2fb.c | 6 +-
9801 drivers/video/pm3fb.c | 6 +-
9802 drivers/video/ps3fb.c | 2 +-
9803 drivers/video/pxa3xx-gcu.c | 4 +-
9804 drivers/video/pxafb.c | 2 +-
9805 drivers/video/s3c-fb.c | 117 ++-
9806 drivers/video/s3c2410fb.c | 3 +-
9807 drivers/video/s3fb.c | 9 +-
9808 drivers/video/sa1100fb.c | 3 +-
9809 drivers/video/savage/savagefb_driver.c | 16 +-
9810 drivers/video/sh_mobile_hdmi.c | 47 +-
9811 drivers/video/sh_mobile_lcdcfb.c | 1162 ++++++++--------
9812 drivers/video/sh_mobile_lcdcfb.h | 12 +-
9813 drivers/video/sh_mobile_meram.c | 208 +++-
9814 drivers/video/sh_mobile_meram.h | 41 -
9815 drivers/video/sis/sis_main.c | 30 +-
9816 drivers/video/skeletonfb.c | 2 +-
9817 drivers/video/sm501fb.c | 6 +-
9818 drivers/video/smscufx.c | 1994 ++++++++++++++++++++++++++
9819 drivers/video/tmiofb.c | 2 +-
9820 drivers/video/tridentfb.c | 4 +-
9821 drivers/video/udlfb.c | 187 ++-
9822 drivers/video/valkyriefb.c | 2 +-
9823 drivers/video/vfb.c | 4 +-
9824 drivers/video/vga16fb.c | 2 +-
9825 drivers/video/via/dvi.c | 34 +-
9826 drivers/video/via/dvi.h | 3 +-
9827 drivers/video/via/global.c | 2 +
9828 drivers/video/via/global.h | 2 +
9829 drivers/video/via/hw.c | 544 ++------
9830 drivers/video/via/hw.h | 285 +----
9831 drivers/video/via/lcd.c | 53 +-
9832 drivers/video/via/lcd.h | 7 +-
9833 drivers/video/via/share.h | 23 +-
9834 drivers/video/via/via-core.c | 2 +-
9835 drivers/video/via/via_modesetting.c | 104 ++
9836 drivers/video/via/via_modesetting.h | 23 +
9837 drivers/video/via/viafbdev.c | 182 ++--
9838 drivers/video/via/viamode.c | 60 +-
9839 drivers/video/via/viamode.h | 4 +-
9840 drivers/video/vt8500lcdfb.c | 6 +-
9841 drivers/video/vt8623fb.c | 9 +-
9842 drivers/video/xilinxfb.c | 1 -
9843 include/linux/fsl-diu-fb.h | 92 +-
9844 include/video/sh_mobile_lcdc.h | 135 ++-
9845 include/video/udlfb.h | 1 +
9846 96 files changed, 5526 insertions(+), 3022 deletions(-)
9847 create mode 100644 drivers/video/grvga.c
9848 delete mode 100644 drivers/video/sh_mobile_meram.h
9849 create mode 100644 drivers/video/smscufx.c
9850 Merging viafb/viafb-next
9851 $ git merge viafb/viafb-next
9853 Merging omap_dss2/for-next
9854 $ git merge omap_dss2/for-next
9855 Resolved 'arch/arm/mach-omap2/board-2430sdp.c' using previous resolution.
9856 Resolved 'arch/arm/mach-omap2/board-4430sdp.c' using previous resolution.
9857 Resolved 'arch/arm/mach-omap2/board-apollon.c' using previous resolution.
9858 Resolved 'arch/arm/mach-omap2/board-h4.c' using previous resolution.
9859 Resolved 'arch/arm/mach-omap2/board-ldp.c' using previous resolution.
9860 Resolved 'arch/arm/mach-omap2/board-rx51.c' using previous resolution.
9861 Auto-merging arch/arm/mach-omap2/board-2430sdp.c
9862 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-2430sdp.c
9863 Auto-merging arch/arm/mach-omap2/board-3430sdp.c
9864 Auto-merging arch/arm/mach-omap2/board-4430sdp.c
9865 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
9866 Auto-merging arch/arm/mach-omap2/board-am3517evm.c
9867 Auto-merging arch/arm/mach-omap2/board-apollon.c
9868 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-apollon.c
9869 Auto-merging arch/arm/mach-omap2/board-cm-t35.c
9870 Auto-merging arch/arm/mach-omap2/board-devkit8000.c
9871 Auto-merging arch/arm/mach-omap2/board-h4.c
9872 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-h4.c
9873 Auto-merging arch/arm/mach-omap2/board-igep0020.c
9874 Auto-merging arch/arm/mach-omap2/board-ldp.c
9875 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ldp.c
9876 Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
9877 Auto-merging arch/arm/mach-omap2/board-omap3evm.c
9878 Auto-merging arch/arm/mach-omap2/board-omap3pandora.c
9879 Auto-merging arch/arm/mach-omap2/board-omap3stalker.c
9880 Auto-merging arch/arm/mach-omap2/board-omap3touchbook.c
9881 Auto-merging arch/arm/mach-omap2/board-omap4panda.c
9882 Auto-merging arch/arm/mach-omap2/board-overo.c
9883 Auto-merging arch/arm/mach-omap2/board-rx51.c
9884 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51.c
9885 Auto-merging drivers/media/video/omap/omap_vout.c
9886 Removing drivers/video/omap/lcd_2430sdp.c
9887 CONFLICT (delete/modify): drivers/video/omap/lcd_apollon.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_apollon.c left in tree.
9888 Removing drivers/video/omap/lcd_h4.c
9889 CONFLICT (delete/modify): drivers/video/omap/lcd_ldp.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_ldp.c left in tree.
9890 Removing drivers/video/omap/lcd_omap3beagle.c
9891 Removing drivers/video/omap/lcd_omap3evm.c
9892 CONFLICT (delete/modify): drivers/video/omap/lcd_overo.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_overo.c left in tree.
9893 Auto-merging drivers/video/omap2/displays/panel-taal.c
9894 Auto-merging drivers/video/omap2/dss/hdmi_panel.c
9895 Auto-merging drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
9896 Automatic merge failed; fix conflicts and then commit the result.
9897 $ git rm -f drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
9898 arch/arm/mach-omap2/board-2430sdp.c: needs merge
9899 arch/arm/mach-omap2/board-4430sdp.c: needs merge
9900 arch/arm/mach-omap2/board-apollon.c: needs merge
9901 arch/arm/mach-omap2/board-h4.c: needs merge
9902 arch/arm/mach-omap2/board-ldp.c: needs merge
9903 arch/arm/mach-omap2/board-rx51.c: needs merge
9904 drivers/video/omap/lcd_apollon.c: needs merge
9905 drivers/video/omap/lcd_ldp.c: needs merge
9906 drivers/video/omap/lcd_overo.c: needs merge
9907 rm 'drivers/video/omap/lcd_apollon.c'
9908 rm 'drivers/video/omap/lcd_ldp.c'
9909 rm 'drivers/video/omap/lcd_overo.c'
9911 [master 3e31b30] Merge remote-tracking branch 'omap_dss2/for-next'
9912 $ git diff -M --stat --summary HEAD^..
9913 arch/arm/mach-omap2/board-2430sdp.c | 78 +-
9914 arch/arm/mach-omap2/board-3430sdp.c | 7 +-
9915 arch/arm/mach-omap2/board-4430sdp.c | 208 +++-
9916 arch/arm/mach-omap2/board-am3517evm.c | 6 +-
9917 arch/arm/mach-omap2/board-apollon.c | 35 +-
9918 arch/arm/mach-omap2/board-cm-t35.c | 6 +-
9919 arch/arm/mach-omap2/board-devkit8000.c | 10 +-
9920 arch/arm/mach-omap2/board-h4.c | 42 +-
9921 arch/arm/mach-omap2/board-igep0020.c | 8 +-
9922 arch/arm/mach-omap2/board-ldp.c | 122 ++-
9923 arch/arm/mach-omap2/board-omap3beagle.c | 8 +-
9924 arch/arm/mach-omap2/board-omap3evm.c | 7 +-
9925 arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
9926 arch/arm/mach-omap2/board-omap3stalker.c | 40 +-
9927 arch/arm/mach-omap2/board-omap3touchbook.c | 18 -
9928 arch/arm/mach-omap2/board-omap4panda.c | 8 +-
9929 arch/arm/mach-omap2/board-overo.c | 7 +-
9930 arch/arm/mach-omap2/board-rx51.c | 25 -
9931 arch/arm/mach-omap2/display.c | 60 +-
9932 arch/arm/mach-omap2/twl-common.c | 11 +-
9933 drivers/media/video/omap/omap_vout.c | 18 +-
9934 drivers/video/omap/Kconfig | 29 -
9935 drivers/video/omap/Makefile | 8 -
9936 drivers/video/omap/lcd_2430sdp.c | 203 ---
9937 drivers/video/omap/lcd_apollon.c | 136 --
9938 drivers/video/omap/lcd_h4.c | 117 --
9939 drivers/video/omap/lcd_ldp.c | 201 ---
9940 drivers/video/omap/lcd_omap3beagle.c | 130 --
9941 drivers/video/omap/lcd_omap3evm.c | 193 ---
9942 drivers/video/omap/lcd_overo.c | 180 ---
9943 drivers/video/omap2/displays/Kconfig | 28 +-
9944 drivers/video/omap2/displays/Makefile | 3 +
9945 drivers/video/omap2/displays/panel-dvi.c | 363 +++++
9946 drivers/video/omap2/displays/panel-generic-dpi.c | 113 +-
9947 drivers/video/omap2/displays/panel-n8x0.c | 747 +++++++++
9948 drivers/video/omap2/displays/panel-picodlp.c | 594 +++++++
9949 drivers/video/omap2/displays/panel-picodlp.h | 288 ++++
9950 drivers/video/omap2/displays/panel-taal.c | 123 +-
9951 drivers/video/omap2/dss/Kconfig | 2 +-
9952 drivers/video/omap2/dss/Makefile | 2 +-
9953 drivers/video/omap2/dss/core.c | 4 +
9954 drivers/video/omap2/dss/dispc.c | 1700 ++++++++------------
9955 drivers/video/omap2/dss/dispc.h | 57 +
9956 drivers/video/omap2/dss/display.c | 31 +-
9957 drivers/video/omap2/dss/dpi.c | 28 +-
9958 drivers/video/omap2/dss/dsi.c | 929 +++++++-----
9959 drivers/video/omap2/dss/dss.c | 18 +-
9960 drivers/video/omap2/dss/dss.h | 156 +-
9961 drivers/video/omap2/dss/dss_features.c | 130 ++-
9962 drivers/video/omap2/dss/dss_features.h | 17 +-
9963 drivers/video/omap2/dss/hdmi.c | 1260 ++-------------
9964 .../omap2/dss/{hdmi_omap4_panel.c => hdmi_panel.c} | 68 +-
9965 drivers/video/omap2/dss/manager.c | 191 +--
9966 drivers/video/omap2/dss/overlay.c | 122 +-
9967 drivers/video/omap2/dss/rfbi.c | 45 +-
9968 drivers/video/omap2/dss/sdi.c | 19 +-
9969 drivers/video/omap2/dss/ti_hdmi.h | 138 ++
9970 drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 1239 ++++++++++++++
9971 .../video/omap2/dss/{hdmi.h => ti_hdmi_4xxx_ip.h} | 400 +++---
9972 drivers/video/omap2/dss/venc.c | 27 +-
9973 drivers/video/omap2/omapfb/Kconfig | 2 +-
9974 drivers/video/omap2/omapfb/omapfb-main.c | 134 ++-
9975 drivers/video/omap2/omapfb/omapfb-sysfs.c | 6 +-
9976 include/video/omap-panel-dvi.h | 37 +
9977 include/video/omap-panel-n8x0.h | 15 +
9978 include/video/omap-panel-nokia-dsi.h | 8 +-
9979 include/video/omap-panel-picodlp.h | 23 +
9980 include/video/omapdss.h | 100 +-
9981 68 files changed, 6495 insertions(+), 4595 deletions(-)
9982 delete mode 100644 drivers/video/omap/lcd_2430sdp.c
9983 delete mode 100644 drivers/video/omap/lcd_apollon.c
9984 delete mode 100644 drivers/video/omap/lcd_h4.c
9985 delete mode 100644 drivers/video/omap/lcd_ldp.c
9986 delete mode 100644 drivers/video/omap/lcd_omap3beagle.c
9987 delete mode 100644 drivers/video/omap/lcd_omap3evm.c
9988 delete mode 100644 drivers/video/omap/lcd_overo.c
9989 create mode 100644 drivers/video/omap2/displays/panel-dvi.c
9990 create mode 100644 drivers/video/omap2/displays/panel-n8x0.c
9991 create mode 100644 drivers/video/omap2/displays/panel-picodlp.c
9992 create mode 100644 drivers/video/omap2/displays/panel-picodlp.h
9993 rename drivers/video/omap2/dss/{hdmi_omap4_panel.c => hdmi_panel.c} (79%)
9994 create mode 100644 drivers/video/omap2/dss/ti_hdmi.h
9995 create mode 100644 drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
9996 rename drivers/video/omap2/dss/{hdmi.h => ti_hdmi_4xxx_ip.h} (54%)
9997 create mode 100644 include/video/omap-panel-dvi.h
9998 create mode 100644 include/video/omap-panel-n8x0.h
9999 create mode 100644 include/video/omap-panel-picodlp.h
10000 Merging voltage/for-next
10001 $ git merge voltage/for-next
10002 Auto-merging drivers/regulator/core.c
10003 Merge made by recursive.
10004 drivers/regulator/88pm8607.c | 2 +-
10005 drivers/regulator/aat2870-regulator.c | 1 +
10006 drivers/regulator/core.c | 41 +++++++
10007 drivers/regulator/max8649.c | 2 +-
10008 drivers/regulator/max8952.c | 3 -
10009 drivers/regulator/tps65023-regulator.c | 190 +++++++++++++++++++++++++++----
10010 drivers/regulator/tps6507x-regulator.c | 8 +-
10011 drivers/regulator/tps6586x-regulator.c | 32 +++++-
10012 drivers/regulator/tps65912-regulator.c | 2 -
10013 include/linux/mfd/tps6586x.h | 16 +++
10014 10 files changed, 257 insertions(+), 40 deletions(-)
10015 Merging security/next
10016 $ git merge security/next
10017 Resolved 'fs/ocfs2/xattr.c' using previous resolution.
10018 Auto-merging Documentation/kernel-parameters.txt
10019 Auto-merging MAINTAINERS
10020 Auto-merging drivers/char/tpm/tpm.c
10021 Auto-merging fs/btrfs/xattr.c
10022 Auto-merging fs/gfs2/inode.c
10023 Auto-merging fs/ocfs2/xattr.c
10024 CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
10025 Auto-merging fs/xfs/xfs_iops.c
10026 Auto-merging kernel/cred.c
10027 Removing security/integrity/ima/ima_iint.c
10028 Auto-merging security/keys/encrypted-keys/encrypted.c
10029 Auto-merging security/keys/encrypted-keys/encrypted.h
10030 Auto-merging security/tomoyo/common.c
10031 Automatic merge failed; fix conflicts and then commit the result.
10033 [master cb7c438] Merge remote-tracking branch 'security/next'
10034 $ git diff -M --stat --summary HEAD^..
10035 Documentation/ABI/testing/evm | 23 +
10036 Documentation/kernel-parameters.txt | 6 +
10038 drivers/char/tpm/tpm.c | 3 +
10039 drivers/target/target_core_fabric_lib.c | 12 +-
10041 fs/btrfs/xattr.c | 50 +-
10042 fs/cifs/xattr.c | 40 +-
10043 fs/ext2/xattr_security.c | 34 +-
10044 fs/ext3/xattr_security.c | 36 +-
10045 fs/ext4/xattr_security.c | 36 +-
10046 fs/gfs2/inode.c | 38 +-
10047 fs/jffs2/security.c | 35 +-
10048 fs/jfs/xattr.c | 57 +-
10049 fs/ocfs2/xattr.c | 41 +-
10050 fs/reiserfs/xattr_security.c | 4 +-
10051 fs/xattr.c | 63 ++-
10052 fs/xfs/xfs_iops.c | 39 +-
10053 include/linux/evm.h | 100 +++
10054 include/linux/ima.h | 13 -
10055 include/linux/integrity.h | 39 +
10056 include/linux/kernel.h | 2 +-
10057 include/linux/security.h | 32 +-
10058 include/linux/xattr.h | 19 +-
10059 kernel/cred.c | 18 +-
10060 lib/hexdump.c | 15 +-
10062 security/Kconfig | 6 +-
10063 security/Makefile | 4 +-
10064 security/apparmor/apparmorfs.c | 2 +-
10065 security/apparmor/ipc.c | 1 +
10066 security/apparmor/lib.c | 1 +
10067 security/apparmor/policy_unpack.c | 12 +-
10068 security/apparmor/procattr.c | 1 +
10069 security/commoncap.c | 16 +-
10070 security/integrity/Kconfig | 7 +
10071 security/integrity/Makefile | 12 +
10072 security/integrity/evm/Kconfig | 13 +
10073 security/integrity/evm/Makefile | 7 +
10074 security/integrity/evm/evm.h | 38 +
10075 security/integrity/evm/evm_crypto.c | 216 ++++++
10076 security/integrity/evm/evm_main.c | 384 ++++++++++
10077 security/integrity/evm/evm_posix_acl.c | 26 +
10078 security/integrity/evm/evm_secfs.c | 108 +++
10079 security/integrity/iint.c | 172 +++++
10080 security/integrity/ima/Kconfig | 1 +
10081 security/integrity/ima/Makefile | 2 +-
10082 security/integrity/ima/ima.h | 30 +-
10083 security/integrity/ima/ima_api.c | 7 +-
10084 security/integrity/ima/ima_fs.c | 2 +-
10085 security/integrity/ima/ima_iint.c | 169 -----
10086 security/integrity/ima/ima_main.c | 13 +-
10087 security/integrity/integrity.h | 50 ++
10088 security/keys/Makefile | 2 +-
10089 security/keys/encrypted-keys/Makefile | 6 +
10090 .../keys/{ => encrypted-keys}/ecryptfs_format.c | 0
10091 .../keys/{ => encrypted-keys}/ecryptfs_format.h | 0
10092 security/keys/{ => encrypted-keys}/encrypted.c | 49 +-
10093 security/keys/{ => encrypted-keys}/encrypted.h | 11 +
10094 security/keys/encrypted-keys/masterkey_trusted.c | 45 ++
10095 security/keys/gc.c | 386 +++++++---
10096 security/keys/internal.h | 4 +
10097 security/keys/key.c | 121 +---
10098 security/keys/keyring.c | 3 +-
10099 security/keys/process_keys.c | 16 +-
10100 security/keys/trusted.c | 19 +-
10101 security/security.c | 76 ++-
10102 security/selinux/exports.c | 1 +
10103 security/selinux/hooks.c | 13 +-
10104 security/selinux/include/avc_ss.h | 6 +
10105 security/selinux/include/security.h | 8 +
10106 security/selinux/netlink.c | 2 +
10107 security/selinux/nlmsgtab.c | 1 +
10108 security/selinux/selinuxfs.c | 5 +-
10109 security/selinux/ss/conditional.c | 2 +-
10110 security/selinux/ss/conditional.h | 1 +
10111 security/selinux/ss/policydb.c | 2 -
10112 security/selinux/ss/services.c | 3 -
10113 security/tomoyo/Kconfig | 2 +
10114 security/tomoyo/Makefile | 4 +-
10115 security/tomoyo/audit.c | 7 +-
10116 security/tomoyo/common.c | 217 +++++-
10117 security/tomoyo/common.h | 189 +++++-
10118 security/tomoyo/condition.c | 71 ++-
10119 security/tomoyo/domain.c | 209 +++++-
10120 security/tomoyo/environ.c | 122 +++
10121 security/tomoyo/file.c | 42 +-
10122 security/tomoyo/gc.c | 533 ++++++--------
10123 security/tomoyo/group.c | 61 ++-
10124 security/tomoyo/memory.c | 39 +-
10125 security/tomoyo/network.c | 771 ++++++++++++++++++++
10126 security/tomoyo/realpath.c | 32 +-
10127 security/tomoyo/securityfs_if.c | 123 +++-
10128 security/tomoyo/tomoyo.c | 62 ++
10129 security/tomoyo/util.c | 69 ++-
10130 95 files changed, 4208 insertions(+), 1198 deletions(-)
10131 create mode 100644 Documentation/ABI/testing/evm
10132 create mode 100644 include/linux/evm.h
10133 create mode 100644 include/linux/integrity.h
10134 create mode 100644 security/integrity/Kconfig
10135 create mode 100644 security/integrity/Makefile
10136 create mode 100644 security/integrity/evm/Kconfig
10137 create mode 100644 security/integrity/evm/Makefile
10138 create mode 100644 security/integrity/evm/evm.h
10139 create mode 100644 security/integrity/evm/evm_crypto.c
10140 create mode 100644 security/integrity/evm/evm_main.c
10141 create mode 100644 security/integrity/evm/evm_posix_acl.c
10142 create mode 100644 security/integrity/evm/evm_secfs.c
10143 create mode 100644 security/integrity/iint.c
10144 delete mode 100644 security/integrity/ima/ima_iint.c
10145 create mode 100644 security/integrity/integrity.h
10146 create mode 100644 security/keys/encrypted-keys/Makefile
10147 rename security/keys/{ => encrypted-keys}/ecryptfs_format.c (100%)
10148 rename security/keys/{ => encrypted-keys}/ecryptfs_format.h (100%)
10149 rename security/keys/{ => encrypted-keys}/encrypted.c (96%)
10150 rename security/keys/{ => encrypted-keys}/encrypted.h (81%)
10151 create mode 100644 security/keys/encrypted-keys/masterkey_trusted.c
10152 create mode 100644 security/tomoyo/environ.c
10153 create mode 100644 security/tomoyo/network.c
10154 Merging selinux/master
10155 $ git merge selinux/master
10156 Already up-to-date.
10157 Merging lblnet/master
10158 $ git merge lblnet/master
10159 Already up-to-date.
10160 Merging agp/agp-next
10161 $ git merge agp/agp-next
10162 Merge made by recursive.
10163 Merging watchdog/master
10164 $ git merge watchdog/master
10165 Merge made by recursive.
10166 Merging bdev/master
10167 $ git merge bdev/master
10168 Already up-to-date.
10169 Merging dwmw2-iommu/master
10170 $ git merge dwmw2-iommu/master
10171 Already up-to-date.
10173 $ git merge iommu/next
10174 Auto-merging arch/arm/plat-omap/include/plat/iopgtable.h
10175 Auto-merging drivers/iommu/amd_iommu.c
10176 Auto-merging drivers/iommu/omap-iommu-debug.c
10177 Auto-merging drivers/iommu/omap-iommu.c
10178 Auto-merging drivers/iommu/omap-iovmm.c
10179 Auto-merging drivers/media/video/Kconfig
10180 Auto-merging drivers/media/video/omap3isp/isp.c
10181 Auto-merging drivers/media/video/omap3isp/isp.h
10182 Auto-merging drivers/media/video/omap3isp/ispccdc.c
10183 Auto-merging drivers/media/video/omap3isp/ispvideo.c
10184 Auto-merging virt/kvm/iommu.c
10185 Merge made by recursive.
10186 arch/arm/mach-omap2/iommu2.c | 31 +-
10187 arch/arm/plat-omap/Kconfig | 12 -
10188 arch/arm/plat-omap/Makefile | 2 -
10189 arch/arm/plat-omap/include/plat/iommu.h | 78 ++--
10190 arch/arm/plat-omap/include/plat/iommu2.h | 4 +-
10191 arch/arm/plat-omap/{ => include/plat}/iopgtable.h | 20 +-
10192 arch/arm/plat-omap/include/plat/iovmm.h | 30 +-
10193 arch/ia64/kvm/kvm-ia64.c | 3 +-
10194 arch/x86/kvm/x86.c | 3 +-
10195 drivers/iommu/Kconfig | 19 +
10196 drivers/iommu/Makefile | 3 +
10197 drivers/iommu/amd_iommu.c | 2 +-
10198 drivers/iommu/intel-iommu.c | 2 +-
10199 drivers/iommu/iommu.c | 114 ++++-
10200 drivers/iommu/msm_iommu.c | 9 +-
10201 .../iommu/omap-iommu-debug.c | 36 +-
10202 .../iommu.c => drivers/iommu/omap-iommu.c | 527 +++++++++++++-------
10203 .../iovmm.c => drivers/iommu/omap-iovmm.c | 370 ++++----------
10204 drivers/media/video/Kconfig | 3 +-
10205 drivers/media/video/omap3isp/isp.c | 45 ++-
10206 drivers/media/video/omap3isp/isp.h | 5 +-
10207 drivers/media/video/omap3isp/ispccdc.c | 25 +-
10208 drivers/media/video/omap3isp/ispstat.c | 11 +-
10209 drivers/media/video/omap3isp/ispvideo.c | 4 +-
10210 include/linux/device.h | 6 +
10211 include/linux/iommu.h | 76 +++-
10212 lib/dma-debug.c | 68 +++-
10213 virt/kvm/iommu.c | 4 +-
10214 28 files changed, 867 insertions(+), 645 deletions(-)
10215 rename arch/arm/plat-omap/{ => include/plat}/iopgtable.h (82%)
10216 rename arch/arm/plat-omap/iommu-debug.c => drivers/iommu/omap-iommu-debug.c (91%)
10217 rename arch/arm/plat-omap/iommu.c => drivers/iommu/omap-iommu.c (61%)
10218 rename arch/arm/plat-omap/iovmm.c => drivers/iommu/omap-iovmm.c (62%)
10219 Merging cputime/cputime
10220 $ git merge cputime/cputime
10221 Already up-to-date.
10222 Merging osd/linux-next
10223 $ git merge osd/linux-next
10224 Merge made by recursive.
10225 drivers/scsi/osd/Kconfig | 4 -
10226 fs/exofs/exofs.h | 26 +-
10227 fs/exofs/inode.c | 167 ++++++---
10228 fs/exofs/ore.c | 330 +++++++++++------
10229 fs/exofs/super.c | 205 +++++------
10230 fs/nfs/objlayout/objio_osd.c | 848 +++++++++---------------------------------
10231 fs/nfs/objlayout/objlayout.c | 209 ++++-------
10232 fs/nfs/objlayout/objlayout.h | 48 ++--
10233 include/scsi/osd_ore.h | 53 +++-
10234 9 files changed, 752 insertions(+), 1138 deletions(-)
10235 Merging jc_docs/docs-next
10236 $ git merge jc_docs/docs-next
10237 Already up-to-date.
10238 Merging nommu/master
10239 $ git merge nommu/master
10240 Already up-to-date.
10241 Merging trivial/for-next
10242 $ git merge trivial/for-next
10243 Resolved 'Documentation/PCI/pci.txt' using previous resolution.
10244 Resolved 'drivers/net/Kconfig' using previous resolution.
10245 Auto-merging Documentation/PCI/pci.txt
10246 CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
10247 Auto-merging Documentation/kernel-parameters.txt
10248 Auto-merging Documentation/laptops/thinkpad-acpi.txt
10249 Auto-merging Documentation/networking/scaling.txt
10250 Auto-merging arch/arm/Kconfig
10251 Auto-merging arch/arm/include/asm/io.h
10252 CONFLICT (delete/modify): arch/arm/mach-nuc93x/time.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-nuc93x/time.c left in tree.
10253 Auto-merging arch/arm/mach-omap2/smartreflex.c
10254 Auto-merging arch/arm/mach-pxa/xcep.c
10255 Auto-merging drivers/block/drbd/drbd_int.h
10256 Auto-merging drivers/block/rbd.c
10257 Auto-merging drivers/block/xen-blkback/common.h
10258 Auto-merging drivers/media/dvb/dvb-usb/af9005.c
10259 Auto-merging drivers/media/radio/wl128x/fmdrv_v4l2.c
10260 Auto-merging drivers/mtd/Kconfig
10261 Auto-merging drivers/net/Kconfig
10262 CONFLICT (content): Merge conflict in drivers/net/Kconfig
10263 Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
10264 Auto-merging drivers/net/ethernet/broadcom/bnx2.h
10265 Auto-merging drivers/net/ethernet/dec/tulip/21142.c
10266 Auto-merging drivers/net/ethernet/dec/tulip/eeprom.c
10267 Auto-merging drivers/net/ethernet/dec/tulip/interrupt.c
10268 Auto-merging drivers/net/ethernet/dec/tulip/media.c
10269 Auto-merging drivers/net/ethernet/dec/tulip/pnic.c
10270 Auto-merging drivers/net/ethernet/dec/tulip/pnic2.c
10271 Auto-merging drivers/net/ethernet/dec/tulip/timer.c
10272 Auto-merging drivers/net/ethernet/dec/tulip/tulip.h
10273 Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
10274 Auto-merging drivers/net/ethernet/intel/igb/e1000_mbx.c
10275 Auto-merging drivers/net/ethernet/intel/igbvf/mbx.c
10276 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
10277 Auto-merging drivers/net/ethernet/intel/ixgbevf/mbx.c
10278 Auto-merging drivers/net/ethernet/marvell/sky2.c
10279 Auto-merging drivers/net/ethernet/micrel/ks8695net.c
10280 Auto-merging drivers/net/ethernet/tile/tilepro.c
10281 Auto-merging drivers/net/wireless/rtlwifi/pci.c
10282 Auto-merging drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
10283 Auto-merging drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
10284 Auto-merging drivers/scsi/fcoe/fcoe.c
10285 Auto-merging drivers/scsi/isci/phy.c
10286 Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c
10287 Auto-merging drivers/scsi/mpt2sas/mpt2sas_ctl.c
10288 Auto-merging drivers/scsi/mpt2sas/mpt2sas_scsih.c
10289 Auto-merging drivers/scsi/mvsas/mv_sas.h
10290 Auto-merging drivers/target/target_core_transport.c
10291 Auto-merging drivers/target/tcm_fc/tfc_cmd.c
10292 Auto-merging drivers/target/tcm_fc/tfc_conf.c
10293 Auto-merging drivers/target/tcm_fc/tfc_io.c
10294 Auto-merging fs/cifs/connect.c
10295 Auto-merging fs/locks.c
10296 Auto-merging include/linux/ceph/messenger.h
10297 Auto-merging kernel/sched.c
10298 Auto-merging lib/Kconfig.debug
10299 Auto-merging scripts/checkpatch.pl
10300 Automatic merge failed; fix conflicts and then commit the result.
10301 $ git rm -f arch/arm/mach-nuc93x/time.c
10302 Documentation/PCI/pci.txt: needs merge
10303 arch/arm/mach-nuc93x/time.c: needs merge
10304 drivers/net/Kconfig: needs merge
10305 rm 'arch/arm/mach-nuc93x/time.c'
10307 [master 9a2500b] Merge remote-tracking branch 'trivial/for-next'
10308 $ git diff -M --stat --summary HEAD^..
10309 Documentation/ABI/removed/o2cb | 2 +-
10310 Documentation/ABI/removed/raw1394 | 2 +-
10311 Documentation/ABI/testing/sysfs-bus-bcma | 8 ++--
10312 .../testing/sysfs-class-backlight-driver-adp8870 | 16 ++++----
10313 Documentation/blackfin/bfin-gpio-notes.txt | 2 +-
10314 Documentation/block/biodoc.txt | 2 +-
10315 Documentation/bus-virt-phys-mapping.txt | 2 +-
10316 Documentation/cdrom/packet-writing.txt | 2 +-
10317 Documentation/development-process/4.Coding | 2 +-
10318 Documentation/devicetree/bindings/gpio/led.txt | 2 +-
10319 Documentation/filesystems/caching/object.txt | 6 +-
10320 Documentation/filesystems/locks.txt | 11 +++--
10321 Documentation/filesystems/nfs/idmapper.txt | 2 +-
10322 .../filesystems/pohmelfs/design_notes.txt | 5 +-
10323 Documentation/filesystems/proc.txt | 2 +-
10324 Documentation/filesystems/vfs.txt | 3 -
10325 Documentation/frv/booting.txt | 6 ---
10326 Documentation/input/input.txt | 2 +-
10327 Documentation/kernel-docs.txt | 4 +-
10328 Documentation/kernel-parameters.txt | 12 +++---
10329 Documentation/laptops/thinkpad-acpi.txt | 4 +-
10330 Documentation/media-framework.txt | 4 +-
10331 Documentation/memory-barriers.txt | 2 +-
10332 Documentation/networking/scaling.txt | 2 +-
10333 Documentation/power/basic-pm-debugging.txt | 2 +-
10334 Documentation/power/userland-swsusp.txt | 3 +-
10335 Documentation/rfkill.txt | 3 +-
10336 Documentation/scsi/aic7xxx_old.txt | 2 +-
10337 Documentation/scsi/scsi_mid_low_api.txt | 5 --
10338 Documentation/security/keys-trusted-encrypted.txt | 3 +-
10339 Documentation/sound/oss/PAS16 | 3 +-
10340 Documentation/spi/pxa2xx | 4 +-
10341 Documentation/timers/highres.txt | 2 +-
10342 Documentation/usb/dma.txt | 6 +-
10343 Documentation/virtual/lguest/lguest.c | 2 +-
10344 Documentation/vm/numa | 4 +-
10345 arch/alpha/kernel/srm_env.c | 5 +-
10346 arch/arm/Kconfig | 2 +-
10347 arch/arm/include/asm/io.h | 2 +-
10348 arch/arm/mach-bcmring/Kconfig | 2 -
10349 arch/arm/mach-bcmring/irq.c | 1 -
10350 arch/arm/mach-bcmring/timer.c | 1 -
10351 arch/arm/mach-omap2/smartreflex.c | 2 +-
10352 arch/arm/mach-pxa/xcep.c | 3 +-
10353 arch/arm/mach-w90x900/cpu.c | 2 +-
10354 arch/ia64/hp/common/sba_iommu.c | 12 +++---
10355 arch/m68k/q40/README | 2 +-
10356 arch/microblaze/include/asm/dma-mapping.h | 2 +-
10357 arch/mips/include/asm/lasat/lasat.h | 6 +--
10358 arch/mn10300/Kconfig | 2 +-
10359 arch/mn10300/kernel/irq.c | 1 -
10360 arch/openrisc/Kconfig | 2 +-
10361 arch/openrisc/include/asm/dma-mapping.h | 2 +-
10362 arch/parisc/include/asm/dma-mapping.h | 2 +-
10363 arch/parisc/kernel/pci-dma.c | 2 +-
10364 arch/powerpc/include/asm/qe.h | 2 +-
10365 arch/powerpc/platforms/embedded6xx/storcenter.c | 2 +-
10366 arch/powerpc/sysdev/qe_lib/qe.c | 2 +-
10367 arch/s390/hypfs/hypfs_diag.c | 3 +-
10368 arch/unicore32/include/asm/io.h | 2 +-
10369 arch/x86/Kconfig | 2 +-
10370 arch/x86/Kconfig.debug | 2 +-
10371 arch/x86/boot/header.S | 2 +-
10372 arch/x86/include/asm/dma-mapping.h | 2 +-
10373 arch/x86/kernel/amd_gart_64.c | 2 +-
10374 arch/x86/kernel/apm_32.c | 2 -
10375 arch/x86/kernel/pci-dma.c | 4 +-
10376 arch/x86/kernel/process_32.c | 2 +-
10377 arch/x86/mm/mmio-mod.c | 1 -
10378 drivers/atm/idt77252.c | 11 +++--
10379 drivers/atm/lanai.c | 3 +-
10380 drivers/block/drbd/drbd_bitmap.c | 5 +-
10381 drivers/block/drbd/drbd_int.h | 3 +-
10382 drivers/block/drbd/drbd_nl.c | 4 +-
10383 drivers/block/rbd.c | 2 +-
10384 drivers/block/xen-blkback/common.h | 1 -
10385 drivers/bluetooth/btmrvl_sdio.c | 4 +-
10386 drivers/char/agp/backend.c | 3 +-
10387 drivers/char/apm-emulation.c | 5 +--
10388 drivers/char/raw.c | 3 +-
10389 drivers/char/rtc.c | 7 +--
10390 drivers/gpu/drm/radeon/radeon_fence.c | 2 +-
10391 drivers/i2c/busses/i2c-designware.c | 2 +-
10392 drivers/input/misc/rotary_encoder.c | 2 +-
10393 drivers/isdn/i4l/isdn_common.c | 4 +-
10394 drivers/isdn/mISDN/dsp_core.c | 3 +-
10395 drivers/isdn/mISDN/l1oip_codec.c | 6 +--
10396 drivers/leds/Kconfig | 2 +-
10397 drivers/media/dvb/dvb-usb/af9005-remote.c | 2 +-
10398 drivers/media/dvb/dvb-usb/af9005.c | 2 +-
10399 drivers/media/dvb/frontends/dib3000.h | 2 +-
10400 drivers/media/dvb/frontends/dib3000mb.c | 2 +-
10401 drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +-
10402 drivers/media/video/cx18/cx18-mailbox.h | 2 +-
10403 drivers/mtd/Kconfig | 2 +-
10404 drivers/net/can/sja1000/sja1000_of_platform.c | 2 +-
10405 drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
10406 drivers/net/ethernet/broadcom/bnx2.h | 12 +++---
10407 drivers/net/ethernet/dec/tulip/21142.c | 3 -
10408 drivers/net/ethernet/dec/tulip/eeprom.c | 2 -
10409 drivers/net/ethernet/dec/tulip/interrupt.c | 3 -
10410 drivers/net/ethernet/dec/tulip/media.c | 3 -
10411 drivers/net/ethernet/dec/tulip/pnic.c | 3 -
10412 drivers/net/ethernet/dec/tulip/pnic2.c | 3 -
10413 drivers/net/ethernet/dec/tulip/timer.c | 3 -
10414 drivers/net/ethernet/dec/tulip/tulip.h | 3 -
10415 drivers/net/ethernet/dec/tulip/tulip_core.c | 3 -
10416 drivers/net/ethernet/intel/igb/e1000_mbx.c | 2 +-
10417 drivers/net/ethernet/intel/igbvf/mbx.c | 2 +-
10418 drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 2 +-
10419 drivers/net/ethernet/intel/ixgbevf/mbx.c | 2 +-
10420 drivers/net/ethernet/marvell/sky2.c | 2 +-
10421 drivers/net/ethernet/micrel/ks8695net.c | 2 +-
10422 drivers/net/ethernet/tile/tilepro.c | 2 +-
10423 drivers/net/phy/broadcom.c | 2 +-
10424 drivers/net/wireless/ipw2x00/libipw_tx.c | 2 +-
10425 drivers/net/wireless/libertas_tf/deb_defs.h | 2 +-
10426 drivers/net/wireless/rtlwifi/pci.c | 6 +-
10427 drivers/parisc/sba_iommu.c | 16 ++++----
10428 drivers/platform/x86/Kconfig | 5 +--
10429 drivers/s390/cio/blacklist.c | 3 +-
10430 drivers/scsi/aacraid/src.c | 1 -
10431 drivers/scsi/aic94xx/aic94xx_dump.c | 2 +-
10432 drivers/scsi/bfa/bfad_drv.h | 1 -
10433 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1 -
10434 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 -
10435 drivers/scsi/fcoe/fcoe.c | 1 -
10436 drivers/scsi/isci/phy.c | 2 +-
10437 drivers/scsi/megaraid/megaraid_mbox.c | 2 +-
10438 drivers/scsi/mpt2sas/mpt2sas_base.c | 1 -
10439 drivers/scsi/mpt2sas/mpt2sas_config.c | 1 -
10440 drivers/scsi/mpt2sas/mpt2sas_ctl.c | 1 -
10441 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 -
10442 drivers/scsi/mvsas/mv_sas.h | 1 -
10443 drivers/scsi/pmcraid.c | 1 -
10444 drivers/scsi/pmcraid.h | 1 -
10445 drivers/scsi/sg.c | 18 +++++----
10446 drivers/staging/cxt1e1/Kconfig | 3 +-
10447 drivers/staging/iio/addac/adt7316-i2c.c | 2 +-
10448 drivers/staging/iio/dds/ad9832.c | 2 +-
10449 drivers/target/iscsi/iscsi_target_nego.c | 2 +-
10450 drivers/target/target_core_alua.c | 1 -
10451 drivers/target/target_core_configfs.c | 1 -
10452 drivers/target/target_core_fabric_configfs.c | 1 -
10453 drivers/target/target_core_file.c | 1 -
10454 drivers/target/target_core_iblock.c | 1 -
10455 drivers/target/target_core_pr.c | 1 -
10456 drivers/target/target_core_pscsi.c | 1 -
10457 drivers/target/target_core_rd.c | 1 -
10458 drivers/target/target_core_stat.c | 1 -
10459 drivers/target/target_core_tmr.c | 1 -
10460 drivers/target/target_core_tpg.c | 2 +-
10461 drivers/target/target_core_transport.c | 1 -
10462 drivers/target/target_core_ua.c | 1 -
10463 drivers/target/tcm_fc/tfc_cmd.c | 1 -
10464 drivers/target/tcm_fc/tfc_conf.c | 1 -
10465 drivers/target/tcm_fc/tfc_io.c | 1 -
10466 drivers/target/tcm_fc/tfc_sess.c | 1 -
10467 drivers/tty/serial/mrst_max3110.c | 2 +-
10468 drivers/usb/gadget/langwell_udc.c | 2 +-
10469 drivers/usb/gadget/mv_udc_core.c | 4 +-
10470 drivers/usb/gadget/net2280.c | 2 +-
10471 drivers/usb/gadget/uvc.h | 1 +
10472 drivers/usb/gadget/uvc_v4l2.c | 1 -
10473 drivers/usb/musb/musb_gadget.c | 2 +-
10474 drivers/usb/serial/digi_acceleport.c | 2 +-
10475 drivers/usb/serial/mos7720.c | 1 -
10476 drivers/usb/serial/mos7840.c | 1 -
10477 drivers/usb/storage/realtek_cr.c | 1 -
10478 drivers/uwb/uwb-internal.h | 1 -
10479 drivers/video/igafb.c | 2 +-
10480 drivers/watchdog/smsc37b787_wdt.c | 2 +-
10481 fs/cifs/connect.c | 2 +-
10482 fs/coda/coda_linux.h | 5 +-
10483 fs/configfs/inode.c | 3 +-
10484 fs/configfs/item.c | 2 +-
10485 fs/eventpoll.c | 2 +-
10487 fs/reiserfs/journal.c | 9 +---
10488 fs/reiserfs/resize.c | 4 +-
10489 fs/squashfs/Kconfig | 6 +-
10490 fs/xfs/kmem.h | 7 +---
10491 include/linux/ceph/messenger.h | 1 -
10492 include/linux/drbd_tag_magic.h | 2 +-
10493 include/linux/io-mapping.h | 2 +-
10494 include/linux/isdn.h | 2 +-
10495 include/linux/platform_data/ntc_thermistor.h | 2 +-
10496 include/media/pwc-ioctl.h | 1 -
10497 include/media/videobuf-dma-sg.h | 2 +-
10498 include/target/configfs_macros.h | 4 +-
10499 kernel/async.c | 4 +-
10500 kernel/futex.c | 10 ++--
10501 kernel/sched.c | 2 +-
10502 lib/Kconfig.debug | 40 ++++++++++----------
10503 lib/dynamic_debug.c | 1 -
10505 mm/page_cgroup.c | 3 +-
10507 net/netfilter/Kconfig | 2 +-
10508 net/netfilter/x_tables.c | 5 +-
10509 net/rds/ib_cm.c | 6 +--
10510 scripts/checkpatch.pl | 4 +-
10511 sound/core/memalloc.c | 4 +-
10512 sound/oss/Kconfig | 4 +-
10513 tools/perf/util/config.c | 4 +-
10514 205 files changed, 263 insertions(+), 380 deletions(-)
10515 Merging audit/for-next
10516 $ git merge audit/for-next
10517 Already up-to-date.
10518 Merging pm/linux-next
10519 $ git merge pm/linux-next
10520 Resolved 'arch/arm/mach-shmobile/board-ap4evb.c' using previous resolution.
10521 Auto-merging Documentation/kernel-parameters.txt
10522 Auto-merging Documentation/power/basic-pm-debugging.txt
10523 Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
10524 CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
10525 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
10526 Auto-merging arch/s390/Kconfig
10527 Auto-merging drivers/bluetooth/btusb.c
10528 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
10529 Auto-merging drivers/net/usb/usbnet.c
10530 Auto-merging include/linux/device.h
10531 Auto-merging include/linux/netdevice.h
10532 Removing include/linux/pm_qos_params.h
10533 Auto-merging include/sound/pcm.h
10534 Auto-merging kernel/Makefile
10535 Auto-merging kernel/power/Kconfig
10536 Auto-merging kernel/power/qos.c
10537 Auto-merging net/mac80211/main.c
10538 Auto-merging net/mac80211/mlme.c
10539 Auto-merging net/mac80211/scan.c
10540 Auto-merging sound/core/pcm_native.c
10541 Auto-merging sound/usb/card.c
10542 Automatic merge failed; fix conflicts and then commit the result.
10544 [master 17f9286] Merge remote-tracking branch 'pm/linux-next'
10545 $ git diff -M --stat --summary HEAD^..
10546 Documentation/ABI/testing/sysfs-class-devfreq | 52 +++
10547 Documentation/kernel-parameters.txt | 4 +
10548 Documentation/power/basic-pm-debugging.txt | 24 +
10549 Documentation/power/devices.txt | 8 +-
10550 Documentation/power/pm_qos_interface.txt | 92 ++++-
10551 Documentation/power/runtime_pm.txt | 2 +
10552 Documentation/usb/power-management.txt | 8 +-
10553 arch/arm/mach-msm/clock.c | 2 +-
10554 arch/arm/mach-omap1/pm_bus.c | 1 +
10555 arch/arm/mach-shmobile/board-ap4evb.c | 1 +
10556 arch/arm/mach-shmobile/board-mackerel.c | 2 +-
10557 arch/arm/mach-shmobile/include/mach/common.h | 4 +-
10558 arch/arm/mach-shmobile/include/mach/sh7372.h | 3 +
10559 arch/arm/mach-shmobile/pm-sh7372.c | 295 ++++++++++---
10560 arch/arm/mach-shmobile/pm_runtime.c | 1 +
10561 arch/arm/mach-shmobile/setup-sh7372.c | 3 +
10562 arch/arm/mach-shmobile/sleep-sh7372.S | 221 ++--------
10563 arch/s390/Kconfig | 1 +
10564 arch/s390/kernel/suspend.c | 118 +++++
10565 arch/s390/kernel/swsusp_asm64.S | 3 +
10566 drivers/Kconfig | 2 +
10567 drivers/Makefile | 2 +
10568 drivers/acpi/processor_idle.c | 2 +-
10569 drivers/acpi/sleep.c | 16 +
10570 drivers/base/power/Makefile | 4 +-
10571 drivers/base/power/clock_ops.c | 123 +++---
10572 drivers/base/power/common.c | 86 ++++
10573 drivers/base/power/domain.c | 348 +++++++++------
10574 drivers/base/power/main.c | 34 ++-
10575 drivers/base/power/opp.c | 30 ++
10576 drivers/base/power/power.h | 10 +-
10577 drivers/base/power/qos.c | 419 +++++++++++++++++
10578 drivers/base/power/runtime.c | 94 +++--
10579 drivers/base/power/wakeup.c | 4 +-
10580 drivers/bluetooth/btusb.c | 2 +-
10581 drivers/cpuidle/cpuidle.c | 2 +-
10582 drivers/cpuidle/governors/ladder.c | 2 +-
10583 drivers/cpuidle/governors/menu.c | 2 +-
10584 drivers/devfreq/Kconfig | 75 +++
10585 drivers/devfreq/Makefile | 5 +
10586 drivers/devfreq/devfreq.c | 601 +++++++++++++++++++++++++
10587 drivers/devfreq/governor.h | 24 +
10588 drivers/devfreq/governor_performance.c | 29 ++
10589 drivers/devfreq/governor_powersave.c | 29 ++
10590 drivers/devfreq/governor_simpleondemand.c | 88 ++++
10591 drivers/devfreq/governor_userspace.c | 116 +++++
10592 drivers/hid/hid-picolcd.c | 2 +-
10593 drivers/hid/usbhid/hid-core.c | 7 +-
10594 drivers/media/video/via-camera.c | 4 +-
10595 drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
10596 drivers/net/usb/usbnet.c | 2 +-
10597 drivers/net/wimax/i2400m/usb.c | 4 +-
10598 drivers/net/wireless/ipw2x00/ipw2100.c | 4 +-
10599 drivers/tty/Kconfig | 4 +
10600 drivers/usb/class/cdc-acm.c | 2 +-
10601 drivers/usb/class/cdc-wdm.c | 6 +-
10602 drivers/usb/core/driver.c | 9 +-
10603 drivers/usb/core/hcd.c | 9 +-
10604 drivers/usb/core/hub.c | 15 +-
10605 drivers/usb/serial/sierra.c | 2 +-
10606 drivers/usb/serial/usb_wwan.c | 2 +-
10607 include/linux/devfreq.h | 238 ++++++++++
10608 include/linux/device.h | 5 +
10609 include/linux/freezer.h | 4 +-
10610 include/linux/netdevice.h | 4 +-
10611 include/linux/opp.h | 12 +
10612 include/linux/pm.h | 25 +-
10613 include/linux/pm_clock.h | 71 +++
10614 include/linux/pm_domain.h | 26 +-
10615 include/linux/pm_qos.h | 155 +++++++
10616 include/linux/pm_qos_params.h | 38 --
10617 include/linux/pm_runtime.h | 42 --
10618 include/linux/suspend.h | 95 ++++-
10619 include/sound/pcm.h | 4 +-
10620 include/trace/events/rpm.h | 99 ++++
10621 kernel/Makefile | 2 +-
10622 kernel/power/Kconfig | 3 +
10623 kernel/power/Makefile | 4 +-
10624 kernel/power/console.c | 4 +-
10625 kernel/power/hibernate.c | 30 +-
10626 kernel/power/main.c | 102 +++++
10627 kernel/power/power.h | 3 +-
10628 kernel/power/process.c | 30 +-
10629 kernel/{pm_qos_params.c => power/qos.c} | 273 ++++++------
10630 kernel/power/snapshot.c | 18 +
10631 kernel/power/suspend.c | 17 +-
10632 kernel/trace/Makefile | 3 +
10633 kernel/trace/rpm-traces.c | 20 +
10634 net/mac80211/main.c | 2 +-
10635 net/mac80211/mlme.c | 2 +-
10636 net/mac80211/scan.c | 2 +-
10637 sound/core/pcm_native.c | 2 +-
10638 sound/usb/card.c | 2 +-
10639 93 files changed, 3578 insertions(+), 827 deletions(-)
10640 create mode 100644 Documentation/ABI/testing/sysfs-class-devfreq
10641 create mode 100644 drivers/base/power/common.c
10642 create mode 100644 drivers/base/power/qos.c
10643 create mode 100644 drivers/devfreq/Kconfig
10644 create mode 100644 drivers/devfreq/Makefile
10645 create mode 100644 drivers/devfreq/devfreq.c
10646 create mode 100644 drivers/devfreq/governor.h
10647 create mode 100644 drivers/devfreq/governor_performance.c
10648 create mode 100644 drivers/devfreq/governor_powersave.c
10649 create mode 100644 drivers/devfreq/governor_simpleondemand.c
10650 create mode 100644 drivers/devfreq/governor_userspace.c
10651 create mode 100644 include/linux/devfreq.h
10652 create mode 100644 include/linux/pm_clock.h
10653 create mode 100644 include/linux/pm_qos.h
10654 delete mode 100644 include/linux/pm_qos_params.h
10655 create mode 100644 include/trace/events/rpm.h
10656 rename kernel/{pm_qos_params.c => power/qos.c} (71%)
10657 create mode 100644 kernel/trace/rpm-traces.c
10658 Merging apm/for-next
10659 $ git merge apm/for-next
10660 Auto-merging drivers/char/apm-emulation.c
10661 Merge made by recursive.
10662 drivers/char/apm-emulation.c | 16 ++++++----------
10663 1 files changed, 6 insertions(+), 10 deletions(-)
10664 Merging fsnotify/for-next
10665 $ git merge fsnotify/for-next
10666 Auto-merging fs/cachefiles/namei.c
10667 Auto-merging fs/nfsd/vfs.c
10668 Auto-merging fs/notify/fanotify/fanotify_user.c
10669 Auto-merging fs/notify/group.c
10670 Auto-merging fs/notify/mark.c
10671 Auto-merging include/linux/fsnotify_backend.h
10672 Merge made by recursive.
10673 fs/cachefiles/namei.c | 1 -
10674 fs/cachefiles/xattr.c | 1 -
10675 fs/nfsd/vfs.c | 3 -
10676 fs/notify/dnotify/dnotify.c | 15 +++---
10677 fs/notify/fanotify/fanotify.c | 24 +++++----
10678 fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++-----------
10679 fs/notify/group.c | 1 +
10680 fs/notify/mark.c | 36 +++++--------
10681 include/linux/fanotify.h | 5 ++-
10682 include/linux/fsnotify_backend.h | 14 ++++-
10683 10 files changed, 121 insertions(+), 80 deletions(-)
10684 Merging irda/for-next
10685 $ git merge irda/for-next
10686 Already up-to-date.
10687 Merging edac/linux_next
10688 $ git merge edac/linux_next
10689 Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
10690 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
10691 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
10692 Removing drivers/edac/edac_mce.c
10693 Auto-merging drivers/edac/i7core_edac.c
10694 Auto-merging include/linux/edac.h
10695 Removing include/linux/edac_mce.h
10696 Automatic merge failed; fix conflicts and then commit the result.
10698 [master 30a53c2] Merge remote-tracking branch 'edac/linux_next'
10699 $ git diff -M --stat --summary HEAD^..
10700 arch/x86/kernel/cpu/mcheck/mce.c | 18 +-
10701 drivers/edac/Kconfig | 8 +-
10702 drivers/edac/Makefile | 1 -
10703 drivers/edac/edac_core.h | 350 +--------------------------------
10704 drivers/edac/edac_mce.c | 61 ------
10705 drivers/edac/i7core_edac.c | 415 ++++++++++++++++++++++++++++++++++----
10706 include/linux/edac.h | 350 ++++++++++++++++++++++++++++++++
10707 include/linux/edac_mce.h | 31 ---
10708 8 files changed, 736 insertions(+), 498 deletions(-)
10709 delete mode 100644 drivers/edac/edac_mce.c
10710 delete mode 100644 include/linux/edac_mce.h
10711 Merging edac-amd/for-next
10712 $ git merge edac-amd/for-next
10713 Merge made by recursive.
10714 drivers/edac/amd64_edac.c | 37 +++++++++++++++++++++++++----------
10715 drivers/edac/mce_amd.c | 46 ++++++++++++++------------------------------
10716 drivers/edac/mce_amd.h | 6 ++--
10717 3 files changed, 44 insertions(+), 45 deletions(-)
10718 Merging devicetree/devicetree/next
10719 $ git merge devicetree/devicetree/next
10720 Auto-merging MAINTAINERS
10721 Auto-merging drivers/of/fdt.c
10722 Merge made by recursive.
10723 .../devicetree/bindings/gpio/pl061-gpio.txt | 10 ++
10724 .../devicetree/bindings/spi/spi_pl022.txt | 12 ++
10725 .../devicetree/bindings/vendor-prefixes.txt | 40 +++++
10727 drivers/of/base.c | 150 ++++++++++++++++++++
10728 drivers/of/fdt.c | 6 +-
10729 drivers/of/irq.c | 14 +-
10730 drivers/of/pdt.c | 8 +
10731 drivers/tty/serial/altera_jtaguart.c | 5 +-
10732 drivers/tty/serial/altera_uart.c | 4 +-
10733 drivers/tty/serial/imx.c | 11 +-
10734 drivers/tty/serial/uartlite.c | 4 +-
10735 include/linux/of.h | 27 ++++
10736 13 files changed, 269 insertions(+), 24 deletions(-)
10737 create mode 100644 Documentation/devicetree/bindings/gpio/pl061-gpio.txt
10738 create mode 100644 Documentation/devicetree/bindings/spi/spi_pl022.txt
10739 create mode 100644 Documentation/devicetree/bindings/vendor-prefixes.txt
10740 Merging spi/spi/next
10741 $ git merge spi/spi/next
10742 Auto-merging drivers/spi/spi-pl022.c
10743 Merge made by recursive.
10744 drivers/spi/spi-dw-mid.c | 9 ++-
10745 drivers/spi/spi-dw.c | 62 ++++++++++----------
10746 drivers/spi/spi-dw.h | 97 +++++++++++++++++--------------
10747 drivers/spi/spi-pl022.c | 146 +++++++++++++++++++++------------------------
10748 4 files changed, 157 insertions(+), 157 deletions(-)
10749 Merging gpio/gpio/next
10750 $ git merge gpio/gpio/next
10751 Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
10752 Auto-merging drivers/gpio/Kconfig
10753 Auto-merging drivers/gpio/gpio-mxc.c
10754 Auto-merging drivers/gpio/gpio-nomadik.c
10755 Merge made by recursive.
10756 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 3 +
10757 drivers/gpio/Kconfig | 2 +
10758 drivers/gpio/gpio-ml-ioh.c | 254 ++++++++++++++++++++-
10759 drivers/gpio/gpio-mxc.c | 6 +
10760 drivers/gpio/gpio-nomadik.c | 127 +++++++++--
10761 drivers/gpio/gpio-pch.c | 250 ++++++++++++++++++++-
10762 6 files changed, 613 insertions(+), 29 deletions(-)
10763 $ git reset --hard HEAD^
10764 HEAD is now at 91b0e47 Merge remote-tracking branch 'spi/spi/next'
10765 Merging refs/next/20111005/gpio
10766 $ git merge refs/next/20111005/gpio
10767 Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
10768 Auto-merging drivers/gpio/gpio-nomadik.c
10769 Merge made by recursive.
10770 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 3 +
10771 drivers/gpio/gpio-nomadik.c | 127 ++++++++++++++++++---
10772 2 files changed, 116 insertions(+), 14 deletions(-)
10773 Merging tip/auto-latest
10774 $ git merge tip/auto-latest
10775 Resolved 'drivers/iommu/Makefile' using previous resolution.
10776 Auto-merging Documentation/kernel-parameters.txt
10777 Auto-merging arch/arm/common/gic.c
10778 Auto-merging arch/arm/kernel/smp.c
10779 Auto-merging arch/arm/kernel/traps.c
10780 Auto-merging arch/arm/mach-footbridge/netwinder-hw.c
10781 Auto-merging arch/arm/mach-integrator/core.c
10782 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
10783 Auto-merging arch/arm/mm/cache-l2x0.c
10784 Auto-merging arch/arm/mm/context.c
10785 Auto-merging arch/ia64/configs/generic_defconfig
10786 Auto-merging arch/x86/Kconfig
10787 Auto-merging arch/x86/include/asm/cpufeature.h
10788 Auto-merging drivers/acpi/processor_idle.c
10789 Auto-merging drivers/cpufreq/cpufreq_ondemand.c
10790 Auto-merging drivers/iommu/Kconfig
10791 Auto-merging drivers/iommu/Makefile
10792 CONFLICT (content): Merge conflict in drivers/iommu/Makefile
10793 Auto-merging drivers/iommu/intel-iommu.c
10794 Auto-merging drivers/leds/Kconfig
10795 Removing drivers/leds/leds-alix2.c
10796 Removing drivers/staging/hv/hv_timesource.c
10797 Auto-merging kernel/events/core.c
10798 Auto-merging kernel/sched.c
10799 Automatic merge failed; fix conflicts and then commit the result.
10801 [master f3f0912] Merge remote-tracking branch 'tip/auto-latest'
10802 $ git diff -M --stat --summary HEAD^..
10803 Documentation/kernel-parameters.txt | 21 +-
10804 Documentation/scheduler/sched-bwc.txt | 122 ++++
10805 Documentation/x86/entry_64.txt | 3 -
10806 arch/arm/common/gic.c | 26 +-
10807 arch/arm/include/asm/dma.h | 6 +-
10808 arch/arm/include/asm/mmu.h | 4 +-
10809 arch/arm/kernel/dma.c | 2 +-
10810 arch/arm/kernel/smp.c | 6 +-
10811 arch/arm/kernel/traps.c | 20 +-
10812 arch/arm/mach-footbridge/include/mach/hardware.h | 2 +-
10813 arch/arm/mach-footbridge/netwinder-hw.c | 14 +-
10814 arch/arm/mach-footbridge/netwinder-leds.c | 10 +-
10815 arch/arm/mach-integrator/core.c | 6 +-
10816 arch/arm/mach-integrator/pci_v3.c | 14 +-
10817 arch/arm/mach-ixp4xx/common-pci.c | 22 +-
10818 arch/arm/mach-shark/leds.c | 6 +-
10819 arch/arm/mm/cache-l2x0.c | 46 +-
10820 arch/arm/mm/context.c | 14 +-
10821 arch/arm/mm/copypage-v4mc.c | 6 +-
10822 arch/arm/mm/copypage-v6.c | 10 +-
10823 arch/arm/mm/copypage-xscale.c | 6 +-
10824 arch/ia64/configs/generic_defconfig | 2 +-
10825 arch/ia64/dig/Makefile | 2 +-
10826 arch/ia64/include/asm/device.h | 2 +-
10827 arch/ia64/include/asm/iommu.h | 6 +-
10828 arch/ia64/include/asm/pci.h | 2 +-
10829 arch/ia64/kernel/Makefile | 2 +-
10830 arch/ia64/kernel/acpi.c | 4 +-
10831 arch/ia64/kernel/msi_ia64.c | 4 +-
10832 arch/ia64/kernel/pci-dma.c | 2 +-
10833 arch/powerpc/sysdev/uic.c | 24 +-
10834 arch/s390/kernel/time.c | 13 +-
10835 arch/x86/Kconfig | 30 +-
10836 arch/x86/configs/x86_64_defconfig | 4 +-
10837 arch/x86/include/asm/amd_nb.h | 6 +
10838 arch/x86/include/asm/apic.h | 2 +-
10839 arch/x86/include/asm/archrandom.h | 75 ++
10840 arch/x86/include/asm/atomic.h | 8 +-
10841 arch/x86/include/asm/atomic64_64.h | 6 +-
10842 arch/x86/include/asm/cmpxchg.h | 205 ++++++
10843 arch/x86/include/asm/cmpxchg_32.h | 114 ----
10844 arch/x86/include/asm/cmpxchg_64.h | 131 ----
10845 arch/x86/include/asm/cpufeature.h | 1 +
10846 arch/x86/include/asm/device.h | 2 +-
10847 arch/x86/include/asm/dwarf2.h | 2 +
10848 arch/x86/include/asm/elf.h | 31 +
10849 arch/x86/include/asm/hw_irq.h | 2 +-
10850 arch/x86/include/asm/irq_remapping.h | 6 +-
10851 arch/x86/include/asm/pgtable_types.h | 1 -
10852 arch/x86/include/asm/rwsem.h | 8 +-
10853 arch/x86/include/asm/spinlock.h | 114 +---
10854 arch/x86/include/asm/spinlock_types.h | 22 +-
10855 arch/x86/include/asm/unistd_64.h | 1 -
10856 arch/x86/include/asm/uv/uv_bau.h | 7 +-
10857 arch/x86/include/asm/uv/uv_hub.h | 37 +-
10858 arch/x86/include/asm/x86_init.h | 12 -
10859 arch/x86/kernel/apic/apic.c | 33 +-
10860 arch/x86/kernel/apic/bigsmp_32.c | 20 +-
10861 arch/x86/kernel/apic/io_apic.c | 284 ++++----
10862 arch/x86/kernel/apic/probe_32.c | 10 +-
10863 arch/x86/kernel/apic/x2apic_uv_x.c | 7 +-
10864 arch/x86/kernel/cpu/Makefile | 6 +
10865 arch/x86/kernel/cpu/amd.c | 47 +-
10866 arch/x86/kernel/cpu/common.c | 5 +
10867 arch/x86/kernel/cpu/cpu.h | 1 +
10868 arch/x86/kernel/cpu/intel_cacheinfo.c | 127 ++---
10869 arch/x86/kernel/cpu/mcheck/mce_intel.c | 10 +-
10870 arch/x86/kernel/cpu/mshyperv.c | 23 +
10871 arch/x86/kernel/cpu/perf_event.c | 373 +----------
10872 arch/x86/kernel/cpu/perf_event.h | 493 ++++++++++++++
10873 arch/x86/kernel/cpu/perf_event_amd.c | 21 +-
10874 arch/x86/kernel/cpu/perf_event_intel.c | 55 +-
10875 arch/x86/kernel/cpu/perf_event_intel_ds.c | 79 +--
10876 arch/x86/kernel/cpu/perf_event_intel_lbr.c | 28 +-
10877 arch/x86/kernel/cpu/perf_event_p4.c | 10 +-
10878 arch/x86/kernel/cpu/perf_event_p6.c | 9 +-
10879 arch/x86/kernel/cpu/rdrand.c | 73 ++
10880 arch/x86/kernel/entry_64.S | 14 +-
10881 arch/x86/kernel/process.c | 2 +-
10882 arch/x86/kernel/sys_x86_64.c | 78 ++-
10883 arch/x86/kernel/x86_init.c | 4 -
10884 arch/x86/mm/fault.c | 10 +-
10885 arch/x86/mm/init.c | 147 +++-
10886 arch/x86/mm/mmap.c | 20 +-
10887 arch/x86/oprofile/nmi_int.c | 4 +-
10888 arch/x86/oprofile/op_model_ppro.c | 27 +-
10889 arch/x86/platform/Makefile | 1 +
10890 arch/x86/platform/geode/Makefile | 1 +
10891 arch/x86/platform/geode/alix.c | 142 ++++
10892 arch/x86/platform/uv/tlb_uv.c | 17 +-
10893 arch/x86/vdso/vma.c | 9 +
10894 arch/x86/xen/mmu.c | 15 -
10895 drivers/acpi/apei/Kconfig | 1 -
10896 drivers/acpi/processor_idle.c | 10 +-
10897 drivers/char/agp/intel-gtt.c | 4 +-
10898 drivers/char/random.c | 23 +-
10899 drivers/cpufreq/cpufreq_conservative.c | 4 +-
10900 drivers/cpufreq/cpufreq_ondemand.c | 4 +-
10901 drivers/dca/dca-core.c | 78 ++-
10902 drivers/dma/ipu/ipu_irq.c | 48 +-
10903 drivers/iommu/Kconfig | 25 +-
10904 drivers/iommu/Makefile | 5 +-
10905 drivers/iommu/dmar.c | 246 ++------
10906 drivers/iommu/intel-iommu.c | 203 +++++-
10907 drivers/iommu/intr_remapping.c | 93 ++-
10908 drivers/leds/Kconfig | 8 -
10909 drivers/leds/Makefile | 1 -
10910 drivers/leds/leds-alix2.c | 239 -------
10911 drivers/oprofile/event_buffer.c | 4 +-
10912 drivers/oprofile/oprofile_perf.c | 4 +-
10913 drivers/oprofile/oprofilefs.c | 6 +-
10914 drivers/pci/quirks.c | 2 +-
10915 drivers/staging/hv/Makefile | 2 +-
10916 drivers/staging/hv/hv_timesource.c | 101 ---
10917 drivers/video/console/vgacon.c | 42 +-
10918 fs/proc/stat.c | 41 +-
10919 include/asm-generic/cputime.h | 4 +-
10920 include/linux/alarmtimer.h | 51 ++-
10921 include/linux/clockchips.h | 12 +-
10922 include/linux/dma_remapping.h | 10 +-
10923 include/linux/dmar.h | 43 +-
10924 include/linux/init_task.h | 2 +-
10925 include/linux/intel-iommu.h | 10 +-
10926 include/linux/interrupt.h | 38 +-
10927 include/linux/irq.h | 18 +-
10928 include/linux/irq_work.h | 15 +-
10929 include/linux/irqdesc.h | 1 +
10930 include/linux/jiffies.h | 2 +-
10931 include/linux/kprobes.h | 2 +-
10932 include/linux/llist.h | 71 ++-
10933 include/linux/oprofile.h | 2 +-
10934 include/linux/percpu_counter.h | 2 +-
10935 include/linux/posix-timers.h | 5 +-
10936 include/linux/proportions.h | 6 +-
10937 include/linux/random.h | 13 +
10938 include/linux/ratelimit.h | 6 +-
10939 include/linux/rwsem-spinlock.h | 2 +-
10940 include/linux/rwsem.h | 10 +-
10941 include/linux/sched.h | 11 +-
10942 include/linux/semaphore.h | 4 +-
10943 include/trace/events/sched.h | 9 +-
10944 include/trace/ftrace.h | 3 +
10945 init/Kconfig | 12 +
10946 kernel/cgroup.c | 18 +-
10947 kernel/events/core.c | 97 +++-
10948 kernel/irq/chip.c | 64 ++-
10949 kernel/irq/internals.h | 19 +-
10950 kernel/irq/irqdesc.c | 32 +-
10951 kernel/irq/manage.c | 218 ++++++-
10952 kernel/irq/settings.h | 7 +
10953 kernel/irq_work.c | 91 +--
10954 kernel/kprobes.c | 34 +-
10955 kernel/latencytop.c | 14 +-
10956 kernel/lockdep.c | 156 ++++-
10957 kernel/posix-cpu-timers.c | 12 +-
10958 kernel/printk.c | 46 +-
10959 kernel/rtmutex-debug.c | 75 +--
10960 kernel/sched.c | 622 ++++++++++++++---
10961 kernel/sched_cpupri.c | 89 ++-
10962 kernel/sched_cpupri.h | 7 +-
10963 kernel/sched_fair.c | 716 +++++++++++++++++++-
10964 kernel/sched_features.h | 5 -
10965 kernel/sched_rt.c | 91 +--
10966 kernel/sched_stats.h | 12 +-
10967 kernel/sched_stoptask.c | 2 +
10968 kernel/semaphore.c | 28 +-
10969 kernel/sysctl.c | 10 +
10970 kernel/time.c | 2 +-
10971 kernel/time/Kconfig | 2 +
10972 kernel/time/alarmtimer.c | 266 +++++---
10973 kernel/time/clockevents.c | 129 ++++-
10974 kernel/time/clocksource.c | 38 +-
10975 kernel/time/tick-broadcast.c | 4 +-
10976 kernel/time/tick-common.c | 4 +-
10977 kernel/time/tick-internal.h | 2 -
10978 kernel/time/tick-oneshot.c | 77 +--
10979 kernel/time/tick-sched.c | 55 ++-
10980 kernel/time/timer_stats.c | 6 +-
10981 kernel/trace/ring_buffer.c | 52 +-
10982 kernel/trace/trace.c | 10 +-
10983 kernel/trace/trace_irqsoff.c | 6 +-
10984 kernel/watchdog.c | 7 +-
10986 lib/Makefile | 4 +-
10987 lib/atomic64.c | 66 +-
10988 lib/llist.c | 74 +--
10989 lib/percpu_counter.c | 18 +-
10990 lib/proportions.c | 12 +-
10991 lib/ratelimit.c | 4 +-
10992 lib/rwsem-spinlock.c | 38 +-
10993 lib/rwsem.c | 14 +-
10994 tools/perf/Documentation/perf-annotate.txt | 14 +
10995 tools/perf/Documentation/perf-buildid-list.txt | 6 +
10996 tools/perf/Documentation/perf-report.txt | 3 +
10997 tools/perf/Documentation/perf-sched.txt | 6 +-
10998 tools/perf/Documentation/perf-stat.txt | 16 +
10999 tools/perf/builtin-annotate.c | 8 +
11000 tools/perf/builtin-buildid-list.c | 52 ++-
11001 tools/perf/builtin-record.c | 19 +-
11002 tools/perf/builtin-report.c | 7 +-
11003 tools/perf/builtin-stat.c | 190 ++++--
11004 tools/perf/builtin-top.c | 34 +-
11005 .../perf/scripts/python/bin/net_dropmonitor-record | 2 +
11006 .../perf/scripts/python/bin/net_dropmonitor-report | 4 +
11007 tools/perf/scripts/python/net_dropmonitor.py | 72 ++
11008 tools/perf/util/annotate.c | 11 +-
11009 tools/perf/util/annotate.h | 2 +
11010 tools/perf/util/color.c | 2 +-
11011 tools/perf/util/map.c | 98 ++--
11012 tools/perf/util/map.h | 42 +-
11013 tools/perf/util/symbol.c | 2 +
11014 tools/perf/util/symbol.h | 4 +-
11015 tools/perf/util/top.h | 3 +
11016 tools/perf/util/ui/browsers/top.c | 28 +-
11017 214 files changed, 5794 insertions(+), 3208 deletions(-)
11018 create mode 100644 Documentation/scheduler/sched-bwc.txt
11019 create mode 100644 arch/x86/include/asm/archrandom.h
11020 create mode 100644 arch/x86/kernel/cpu/perf_event.h
11021 create mode 100644 arch/x86/kernel/cpu/rdrand.c
11022 create mode 100644 arch/x86/platform/geode/Makefile
11023 create mode 100644 arch/x86/platform/geode/alix.c
11024 delete mode 100644 drivers/leds/leds-alix2.c
11025 delete mode 100644 drivers/staging/hv/hv_timesource.c
11026 create mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-record
11027 create mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-report
11028 create mode 100755 tools/perf/scripts/python/net_dropmonitor.py
11029 $ git am -3 ../patches/0001-llist-add-back-llist_add_batch-and-llist_del_first.patch
11030 Applying: llist: add back llist_add_batch and llist_del_first
11032 Unstaged changes after reset:
11033 M include/linux/llist.h
11035 $ git commit -v -a --amend
11036 [master e48c1d1] Merge remote-tracking branch 'tip/auto-latest'
11037 Merging rcu/rcu/next
11038 $ git merge rcu/rcu/next
11039 Auto-merging include/linux/sched.h
11040 Auto-merging init/Kconfig
11041 Auto-merging kernel/lockdep.c
11042 Auto-merging kernel/sched.c
11043 Auto-merging kernel/time/tick-sched.c
11044 Merge made by recursive.
11045 Documentation/RCU/NMI-RCU.txt | 2 +-
11046 Documentation/RCU/lockdep-splat.txt | 110 +++++++++
11047 Documentation/RCU/lockdep.txt | 34 ++-
11048 Documentation/RCU/torture.txt | 137 ++++++++---
11049 Documentation/RCU/trace.txt | 38 ++--
11050 include/linux/lockdep.h | 2 +-
11051 include/linux/rcupdate.h | 300 +++++++++++-------------
11052 include/linux/rcutiny.h | 20 ++-
11053 include/linux/rcutree.h | 2 +
11054 include/linux/sched.h | 4 -
11055 include/linux/types.h | 10 +
11056 include/trace/events/rcu.h | 459 +++++++++++++++++++++++++++++++++++
11057 init/Kconfig | 6 +-
11058 kernel/lockdep.c | 84 ++++---
11059 kernel/pid.c | 4 +-
11060 kernel/rcu.h | 85 +++++++
11061 kernel/rcupdate.c | 26 ++-
11062 kernel/rcutiny.c | 117 ++-------
11063 kernel/rcutiny_plugin.h | 134 +++++++----
11064 kernel/rcutorture.c | 77 +++----
11065 kernel/rcutree.c | 290 ++++++++++++++--------
11066 kernel/rcutree.h | 17 +-
11067 kernel/rcutree_plugin.h | 150 +++++++-----
11068 kernel/rcutree_trace.c | 13 +-
11069 kernel/rtmutex.c | 8 +
11070 kernel/sched.c | 13 +-
11071 kernel/time/tick-sched.c | 6 -
11072 27 files changed, 1489 insertions(+), 659 deletions(-)
11073 create mode 100644 Documentation/RCU/lockdep-splat.txt
11074 create mode 100644 include/trace/events/rcu.h
11075 create mode 100644 kernel/rcu.h
11076 Merging kmemleak/kmemleak
11077 $ git merge kmemleak/kmemleak
11078 Merge made by recursive.
11079 Documentation/kmemleak.txt | 3 +
11080 include/linux/kmemleak.h | 8 ++
11081 mm/kmemleak.c | 152 +++++++++++++++++++++++++++++++++++++-------
11082 mm/percpu.c | 12 +++-
11083 4 files changed, 150 insertions(+), 25 deletions(-)
11084 Merging kvm/kvm-updates/3.2
11085 $ git merge kvm/kvm-updates/3.2
11086 Auto-merging Documentation/kernel-parameters.txt
11087 Auto-merging arch/powerpc/kernel/asm-offsets.c
11088 Auto-merging arch/powerpc/kernel/exceptions-64s.S
11089 Auto-merging arch/x86/include/asm/cpufeature.h
11090 Auto-merging arch/x86/kvm/x86.c
11091 Auto-merging virt/kvm/assigned-dev.c
11092 Merge made by recursive.
11093 Documentation/kernel-parameters.txt | 4 +
11094 Documentation/virtual/kvm/api.txt | 71 +++-
11095 arch/powerpc/include/asm/kvm.h | 13 +
11096 arch/powerpc/include/asm/kvm_book3s.h | 40 ++-
11097 arch/powerpc/include/asm/kvm_book3s_asm.h | 2 +
11098 arch/powerpc/include/asm/kvm_host.h | 30 +-
11099 arch/powerpc/include/asm/kvm_ppc.h | 1 +
11100 arch/powerpc/kernel/asm-offsets.c | 13 +-
11101 arch/powerpc/kernel/exceptions-64s.S | 10 -
11102 arch/powerpc/kvm/44x.c | 2 +
11103 arch/powerpc/kvm/Makefile | 4 +
11104 arch/powerpc/kvm/book3s_32_sr.S | 2 +-
11105 arch/powerpc/kvm/book3s_64_mmu.c | 8 +-
11106 arch/powerpc/kvm/book3s_64_slb.S | 2 +-
11107 arch/powerpc/kvm/book3s_emulate.c | 29 +
11108 arch/powerpc/kvm/book3s_exports.c | 4 +-
11109 arch/powerpc/kvm/book3s_hv.c | 343 +++++++-----
11110 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 33 --
11111 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 300 +++++++++--
11112 arch/powerpc/kvm/book3s_interrupts.S | 129 +----
11113 arch/powerpc/kvm/book3s_pr.c | 58 ++-
11114 arch/powerpc/kvm/book3s_pr_papr.c | 158 ++++++
11115 arch/powerpc/kvm/book3s_rmhandlers.S | 54 +--
11116 arch/powerpc/kvm/book3s_segment.S | 117 ++++-
11117 arch/powerpc/kvm/booke.c | 10 +-
11118 arch/powerpc/kvm/e500.c | 2 +
11119 arch/powerpc/kvm/powerpc.c | 55 ++-
11120 arch/x86/include/asm/apicdef.h | 2 +
11121 arch/x86/include/asm/cpufeature.h | 1 +
11122 arch/x86/include/asm/kvm_emulate.h | 4 +-
11123 arch/x86/include/asm/kvm_host.h | 14 +-
11124 arch/x86/include/asm/msr-index.h | 2 +
11125 arch/x86/include/asm/vmx.h | 12 +
11126 arch/x86/kvm/emulate.c | 867 ++++++++++++++---------------
11127 arch/x86/kvm/i8254.c | 6 +-
11128 arch/x86/kvm/i8259.c | 123 ++++-
11129 arch/x86/kvm/irq.h | 4 +-
11130 arch/x86/kvm/kvm_cache_regs.h | 7 -
11131 arch/x86/kvm/kvm_timer.h | 2 +
11132 arch/x86/kvm/lapic.c | 167 +++++--
11133 arch/x86/kvm/lapic.h | 4 +
11134 arch/x86/kvm/mmu.c | 5 +-
11135 arch/x86/kvm/mmu_audit.c | 6 +-
11136 arch/x86/kvm/paging_tmpl.h | 24 +-
11137 arch/x86/kvm/svm.c | 92 +--
11138 arch/x86/kvm/trace.h | 118 ++++-
11139 arch/x86/kvm/vmx.c | 131 +++---
11140 arch/x86/kvm/x86.c | 274 ++++++----
11141 include/linux/kvm.h | 5 +-
11142 include/linux/kvm_host.h | 32 +-
11143 virt/kvm/assigned-dev.c | 62 ++-
11144 virt/kvm/coalesced_mmio.c | 131 ++---
11145 virt/kvm/coalesced_mmio.h | 7 +-
11146 virt/kvm/eventfd.c | 3 +-
11147 virt/kvm/ioapic.c | 3 +-
11148 virt/kvm/kvm_main.c | 112 ++++-
11149 56 files changed, 2351 insertions(+), 1363 deletions(-)
11150 create mode 100644 arch/powerpc/kvm/book3s_pr_papr.c
11151 Merging oprofile/for-next
11152 $ git merge oprofile/for-next
11153 Already up-to-date.
11154 Merging ptrace/ptrace
11155 $ git merge ptrace/ptrace
11156 Auto-merging arch/mips/kernel/signal.c
11157 Auto-merging arch/openrisc/kernel/signal.c
11158 Auto-merging arch/s390/kernel/compat_signal.c
11159 Auto-merging arch/s390/kernel/signal.c
11160 Auto-merging arch/sparc/kernel/signal32.c
11161 Auto-merging arch/sparc/kernel/signal_32.c
11162 Auto-merging arch/sparc/kernel/signal_64.c
11163 Auto-merging include/linux/sched.h
11164 Merge made by recursive.
11165 arch/alpha/kernel/signal.c | 31 ++++++------------
11166 arch/arm/kernel/signal.c | 24 +++++---------
11167 arch/avr32/kernel/signal.c | 26 +++++----------
11168 arch/blackfin/kernel/signal.c | 17 ++--------
11169 arch/cris/arch-v10/kernel/signal.c | 34 +++++++-------------
11170 arch/cris/arch-v32/kernel/signal.c | 37 ++++++---------------
11171 arch/frv/kernel/signal.c | 32 ++++++-------------
11172 arch/h8300/kernel/signal.c | 33 +++++--------------
11173 arch/ia64/kernel/signal.c | 15 +--------
11174 arch/m32r/kernel/signal.c | 12 +------
11175 arch/m68k/kernel/signal_mm.c | 22 +++++--------
11176 arch/m68k/kernel/signal_no.c | 28 +++++-----------
11177 arch/microblaze/kernel/signal.c | 42 ++++++++++---------------
11178 arch/mips/kernel/signal.c | 27 +++-------------
11179 arch/mips/kernel/signal32.c | 20 ++---------
11180 arch/mips/kernel/signal_n32.c | 10 +-----
11181 arch/mn10300/kernel/signal.c | 32 ++++++-------------
11182 arch/openrisc/kernel/signal.c | 45 +++++++++++---------------
11183 arch/parisc/kernel/signal.c | 12 +------
11184 arch/powerpc/kernel/signal.c | 13 +------
11185 arch/powerpc/kernel/signal_32.c | 11 +++---
11186 arch/s390/kernel/compat_signal.c | 6 +---
11187 arch/s390/kernel/signal.c | 6 +---
11188 arch/score/kernel/signal.c | 13 ++------
11189 arch/sh/kernel/signal_32.c | 35 ++++++---------------
11190 arch/sh/kernel/signal_64.c | 40 ++++++-----------------
11191 arch/sparc/include/asm/signal.h | 3 +-
11192 arch/sparc/kernel/signal32.c | 17 ++--------
11193 arch/sparc/kernel/signal_32.c | 28 +++++-----------
11194 arch/sparc/kernel/signal_64.c | 29 ++++++-----------
11195 arch/tile/kernel/compat_signal.c | 5 +--
11196 arch/tile/kernel/signal.c | 13 +------
11197 arch/um/kernel/signal.c | 28 +++++-----------
11198 arch/um/sys-i386/signal.c | 12 +------
11199 arch/um/sys-x86_64/signal.c | 6 +---
11200 arch/unicore32/kernel/signal.c | 13 +------
11201 arch/x86/kernel/signal.c | 6 +---
11202 arch/xtensa/kernel/signal.c | 35 ++++++--------------
11203 fs/autofs4/waitq.c | 14 ++------
11204 fs/coda/upcall.c | 19 +++++------
11205 fs/dlm/user.c | 1 -
11206 fs/exec.c | 18 +---------
11207 fs/ncpfs/sock.c | 15 +++------
11208 include/linux/sched.h | 3 +-
11209 include/linux/signal.h | 1 +
11210 kernel/fork.c | 61 +++++++++++++++++++++++-------------
11211 kernel/signal.c | 22 +++++++++++++
11212 47 files changed, 321 insertions(+), 651 deletions(-)
11213 Merging xen/upstream/xen
11214 $ git merge xen/upstream/xen
11215 Auto-merging arch/x86/xen/time.c
11216 Merge made by recursive.
11217 arch/ia64/include/asm/xen/interface.h | 1 +
11218 arch/x86/include/asm/microcode.h | 9 +
11219 arch/x86/include/asm/xen/hypercall.h | 8 +
11220 arch/x86/include/asm/xen/interface.h | 1 +
11221 arch/x86/kernel/Makefile | 1 +
11222 arch/x86/kernel/microcode_core.c | 5 +-
11223 arch/x86/kernel/microcode_xen.c | 198 ++++++++++++++++++++
11224 arch/x86/xen/Kconfig | 4 +
11225 arch/x86/xen/time.c | 16 ++-
11226 include/xen/interface/platform.h | 320 +++++++++++++++++++++++++++++++++
11227 include/xen/interface/xen.h | 1 +
11228 11 files changed, 562 insertions(+), 2 deletions(-)
11229 create mode 100644 arch/x86/kernel/microcode_xen.c
11230 create mode 100644 include/xen/interface/platform.h
11231 Merging xen-two/linux-next
11232 $ git merge xen-two/linux-next
11233 Resolved 'arch/x86/xen/Kconfig' using previous resolution.
11234 Auto-merging arch/x86/xen/Kconfig
11235 CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
11236 Auto-merging arch/x86/xen/mmu.c
11237 Auto-merging drivers/block/xen-blkback/common.h
11238 Auto-merging drivers/xen/xen-pciback/xenbus.c
11239 Automatic merge failed; fix conflicts and then commit the result.
11241 [master 4757873] Merge remote-tracking branch 'xen-two/linux-next'
11242 $ git diff -M --stat --summary HEAD^..
11243 arch/x86/include/asm/xen/page.h | 6 +-
11244 arch/x86/pci/xen.c | 32 +++-
11245 arch/x86/xen/Kconfig | 11 +-
11246 arch/x86/xen/enlighten.c | 1 +
11247 arch/x86/xen/mmu.c | 52 -----
11248 arch/x86/xen/p2m.c | 128 ++++++++++--
11249 arch/x86/xen/setup.c | 284 ++++++++++++---------------
11250 drivers/block/xen-blkback/blkback.c | 94 +++++++--
11251 drivers/block/xen-blkback/common.h | 93 +++++++--
11252 drivers/block/xen-blkback/xenbus.c | 58 ++++++
11253 drivers/block/xen-blkfront.c | 113 +++++++++---
11254 drivers/pci/xen-pcifront.c | 5 +-
11255 drivers/xen/Kconfig | 10 -
11256 drivers/xen/Makefile | 4 +-
11257 drivers/xen/balloon.c | 75 +++++---
11258 drivers/xen/events.c | 56 ++++--
11259 drivers/xen/gntdev.c | 37 +++-
11260 drivers/xen/grant-table.c | 8 +-
11261 drivers/xen/pci.c | 109 +++++++++--
11262 drivers/xen/swiotlb-xen.c | 70 +++++--
11263 drivers/xen/xen-balloon.c | 17 +-
11264 drivers/xen/xen-pciback/conf_space.c | 1 -
11265 drivers/xen/xen-pciback/conf_space_header.c | 5 +-
11266 drivers/xen/xen-pciback/conf_space_quirks.c | 3 +-
11267 drivers/xen/xen-pciback/passthrough.c | 34 ++--
11268 drivers/xen/xen-pciback/pci_stub.c | 37 ++--
11269 drivers/xen/xen-pciback/pciback.h | 32 ++--
11270 drivers/xen/xen-pciback/pciback_ops.c | 1 -
11271 drivers/xen/xen-pciback/vpci.c | 35 ++--
11272 drivers/xen/xen-pciback/xenbus.c | 27 +--
11273 drivers/xen/xenbus/xenbus_comms.c | 4 +-
11274 drivers/xen/xenbus/xenbus_probe.c | 7 +-
11275 drivers/xen/xenbus/xenbus_probe.h | 3 +-
11276 drivers/xen/xenbus/xenbus_probe_backend.c | 2 -
11277 drivers/xen/xenbus/xenbus_probe_frontend.c | 121 ++++++++++++
11278 drivers/xen/xenbus/xenbus_xs.c | 17 ++-
11279 include/xen/balloon.h | 5 +-
11280 include/xen/grant_table.h | 1 +
11281 include/xen/interface/io/blkif.h | 36 ++++
11282 include/xen/interface/io/xs_wire.h | 6 +-
11283 include/xen/interface/physdev.h | 34 +++-
11284 include/xen/page.h | 12 +-
11285 42 files changed, 1152 insertions(+), 534 deletions(-)
11286 Merging xen-pvhvm/linux-next
11287 $ git merge xen-pvhvm/linux-next
11288 Already up-to-date.
11289 Merging percpu/for-next
11290 $ git merge percpu/for-next
11291 Auto-merging mm/percpu.c
11292 Merge made by recursive.
11293 mm/percpu-vm.c | 5 ++---
11294 mm/percpu.c | 17 +++++++++--------
11295 2 files changed, 11 insertions(+), 11 deletions(-)
11296 Merging workqueues/for-next
11297 $ git merge workqueues/for-next
11298 Already up-to-date.
11299 Merging sfi/sfi-test
11300 $ git merge sfi/sfi-test
11301 Already up-to-date.
11302 Merging asm-generic/next
11303 $ git merge asm-generic/next
11304 Already up-to-date.
11305 Merging drivers-x86/linux-next
11306 $ git merge drivers-x86/linux-next
11307 Already up-to-date.
11308 Merging hwpoison/hwpoison
11309 $ git merge hwpoison/hwpoison
11310 Already up-to-date.
11311 Merging sysctl/master
11312 $ git merge sysctl/master
11313 Auto-merging fs/proc/proc_sysctl.c
11314 Merge made by recursive.
11315 fs/proc/proc_sysctl.c | 14 ++------------
11316 1 files changed, 2 insertions(+), 12 deletions(-)
11317 Merging namespace/master
11318 $ git merge namespace/master
11319 Auto-merging fs/proc/inode.c
11320 Merge made by recursive.
11321 fs/proc/inode.c | 6 +-
11322 fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++-------
11323 2 files changed, 142 insertions(+), 24 deletions(-)
11324 Merging regmap/for-next
11325 $ git merge regmap/for-next
11326 Resolved 'drivers/mfd/wm831x-spi.c' using previous resolution.
11327 Auto-merging drivers/base/regmap/regmap-spi.c
11328 Auto-merging drivers/mfd/Kconfig
11329 Auto-merging drivers/mfd/wm831x-core.c
11330 Auto-merging drivers/mfd/wm831x-i2c.c
11331 Auto-merging drivers/mfd/wm831x-spi.c
11332 CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
11333 Auto-merging drivers/mfd/wm8994-core.c
11334 Auto-merging include/linux/mfd/wm831x/core.h
11335 Auto-merging include/linux/mfd/wm8994/core.h
11336 Automatic merge failed; fix conflicts and then commit the result.
11338 [master 39365cb] Merge remote-tracking branch 'regmap/for-next'
11339 $ git diff -M --stat --summary HEAD^..
11340 drivers/base/regmap/Kconfig | 2 +
11341 drivers/base/regmap/Makefile | 3 +-
11342 drivers/base/regmap/internal.h | 128 ++++++++++
11343 drivers/base/regmap/regcache-indexed.c | 65 +++++
11344 drivers/base/regmap/regcache-lzo.c | 361 +++++++++++++++++++++++++++
11345 drivers/base/regmap/regcache-rbtree.c | 350 ++++++++++++++++++++++++++
11346 drivers/base/regmap/regcache.c | 401 ++++++++++++++++++++++++++++++
11347 drivers/base/regmap/regmap-debugfs.c | 209 ++++++++++++++++
11348 drivers/base/regmap/regmap-i2c.c | 2 -
11349 drivers/base/regmap/regmap-spi.c | 2 -
11350 drivers/base/regmap/regmap.c | 190 +++++++++++----
11351 drivers/mfd/Kconfig | 3 +
11352 drivers/mfd/wm831x-core.c | 424 ++++++++++++++++++++++++++++----
11353 drivers/mfd/wm831x-i2c.c | 68 +-----
11354 drivers/mfd/wm831x-spi.c | 196 +++-------------
11355 drivers/mfd/wm8400-core.c | 106 +++------
11356 drivers/mfd/wm8994-core.c | 178 +++-----------
11357 include/linux/mfd/wm831x/core.h | 9 +-
11358 include/linux/mfd/wm8400-private.h | 7 +-
11359 include/linux/mfd/wm8994/core.h | 9 +-
11360 include/linux/regmap.h | 29 ++-
11361 include/trace/events/regmap.h | 136 ++++++++++
11362 22 files changed, 2310 insertions(+), 568 deletions(-)
11363 create mode 100644 drivers/base/regmap/internal.h
11364 create mode 100644 drivers/base/regmap/regcache-indexed.c
11365 create mode 100644 drivers/base/regmap/regcache-lzo.c
11366 create mode 100644 drivers/base/regmap/regcache-rbtree.c
11367 create mode 100644 drivers/base/regmap/regcache.c
11368 create mode 100644 drivers/base/regmap/regmap-debugfs.c
11369 create mode 100644 include/trace/events/regmap.h
11370 Merging driver-core/driver-core-next
11371 $ git merge driver-core/driver-core-next
11372 Resolved 'arch/arm/plat-mxc/devices.c' using previous resolution.
11373 Removing Documentation/zh_CN/SubmitChecklist
11374 Auto-merging MAINTAINERS
11375 Auto-merging arch/arm/plat-mxc/devices.c
11376 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
11377 Auto-merging arch/arm/plat-mxc/include/mach/devices-common.h
11378 Auto-merging drivers/base/platform.c
11379 Auto-merging include/linux/device.h
11380 Auto-merging include/linux/netdevice.h
11381 Auto-merging lib/dynamic_debug.c
11382 Auto-merging net/core/dev.c
11383 Automatic merge failed; fix conflicts and then commit the result.
11385 [master 9fb956f] Merge remote-tracking branch 'driver-core/driver-core-next'
11386 $ git diff -M --stat --summary HEAD^..
11387 Documentation/driver-model/binding.txt | 4 -
11388 Documentation/driver-model/device.txt | 65 +++++-----
11389 Documentation/filesystems/sysfs.txt | 10 ++-
11390 Documentation/zh_CN/SubmitChecklist | 109 ---------------
11392 arch/arm/plat-mxc/devices.c | 53 -------
11393 arch/arm/plat-mxc/include/mach/devices-common.h | 16 ++-
11394 drivers/base/core.c | 5 +-
11395 drivers/base/dd.c | 3 +
11396 drivers/base/memory.c | 64 ++++++---
11397 drivers/base/platform.c | 54 +++++---
11398 drivers/misc/pch_phub.c | 10 +-
11399 drivers/uio/uio.c | 7 +-
11400 drivers/uio/uio_pci_generic.c | 5 -
11401 drivers/uio/uio_pdrv_genirq.c | 2 +-
11402 fs/debugfs/inode.c | 2 +-
11403 fs/sysfs/dir.c | 168 +++++++++++++++--------
11404 fs/sysfs/inode.c | 14 +--
11405 fs/sysfs/sysfs.h | 17 ++-
11406 include/linux/device.h | 5 +
11407 include/linux/dynamic_debug.h | 34 ++++--
11408 include/linux/netdevice.h | 10 +-
11409 include/linux/platform_device.h | 48 ++++++-
11410 lib/dynamic_debug.c | 158 +++++++++++++++------
11411 lib/kobject_uevent.c | 2 +-
11412 net/core/dev.c | 3 +-
11413 26 files changed, 477 insertions(+), 397 deletions(-)
11414 delete mode 100644 Documentation/zh_CN/SubmitChecklist
11415 Merging tty/tty-next
11416 $ git merge tty/tty-next
11417 Resolved 'arch/powerpc/include/asm/udbg.h' using previous resolution.
11418 Resolved 'arch/powerpc/kernel/udbg.c' using previous resolution.
11419 Resolved 'drivers/tty/serial/8250.c' using previous resolution.
11420 Auto-merging arch/arm/Kconfig
11421 Auto-merging arch/arm/plat-s5p/Kconfig
11422 Auto-merging arch/arm/plat-samsung/Kconfig
11423 Auto-merging arch/arm/plat-samsung/Makefile
11424 Auto-merging arch/arm/plat-samsung/include/plat/irqs.h
11425 Removing arch/arm/plat-samsung/irq-uart.c
11426 Auto-merging arch/powerpc/include/asm/udbg.h
11427 CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
11428 Auto-merging arch/powerpc/kernel/udbg.c
11429 CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
11430 Auto-merging arch/x86/platform/mrst/mrst.c
11431 Auto-merging drivers/staging/Kconfig
11432 Auto-merging drivers/staging/Makefile
11433 Auto-merging drivers/tty/Kconfig
11434 Auto-merging drivers/tty/hvc/hvcs.c
11435 Auto-merging drivers/tty/serial/8250.c
11436 CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
11437 Auto-merging drivers/tty/serial/8250_pci.c
11438 Auto-merging drivers/tty/serial/altera_jtaguart.c
11439 Auto-merging drivers/tty/serial/altera_uart.c
11440 Auto-merging drivers/tty/serial/atmel_serial.c
11441 Auto-merging drivers/tty/serial/bfin_uart.c
11442 Auto-merging drivers/tty/serial/crisv10.c
11443 Auto-merging drivers/tty/serial/imx.c
11444 Auto-merging drivers/tty/serial/lantiq.c
11445 Auto-merging drivers/tty/serial/max3107.c
11446 Auto-merging drivers/tty/serial/mrst_max3110.c
11447 Auto-merging drivers/tty/serial/msm_serial.c
11448 Auto-merging drivers/tty/serial/pch_uart.c
11449 Auto-merging drivers/tty/serial/samsung.c
11450 Auto-merging drivers/tty/serial/serial_core.c
11451 Auto-merging drivers/tty/serial/sh-sci.c
11452 Auto-merging drivers/tty/serial/uartlite.c
11453 Auto-merging drivers/tty/serial/ucc_uart.c
11454 Auto-merging include/linux/tty.h
11455 Automatic merge failed; fix conflicts and then commit the result.
11457 [master 352bcd1] Merge remote-tracking branch 'tty/tty-next'
11458 $ git diff -M --stat --summary HEAD^..
11459 .../bindings/tty/serial/snps-dw-apb-uart.txt | 25 +
11460 Documentation/serial/serial-rs485.txt | 3 +
11461 arch/arm/Kconfig | 1 -
11462 arch/arm/mach-s3c64xx/dev-uart.c | 60 +--
11463 arch/arm/mach-s3c64xx/include/mach/irqs.h | 30 -
11464 arch/arm/mach-s3c64xx/irq.c | 25 -
11465 arch/arm/plat-s5p/Kconfig | 1 -
11466 arch/arm/plat-s5p/dev-uart.c | 84 +--
11467 arch/arm/plat-s5p/irq.c | 34 -
11468 arch/arm/plat-samsung/Kconfig | 5 -
11469 arch/arm/plat-samsung/Makefile | 1 -
11470 arch/arm/plat-samsung/include/plat/irqs.h | 35 -
11471 arch/arm/plat-samsung/include/plat/regs-serial.h | 5 +
11472 arch/arm/plat-samsung/irq-uart.c | 96 ---
11473 arch/mips/pmc-sierra/msp71xx/msp_serial.c | 73 ++-
11474 arch/powerpc/include/asm/udbg.h | 1 +
11475 arch/powerpc/kernel/udbg.c | 2 +
11476 arch/x86/platform/mrst/mrst.c | 3 +
11477 drivers/isdn/i4l/isdn_tty.c | 2 +-
11478 drivers/staging/Kconfig | 2 +
11479 drivers/staging/Makefile | 1 +
11480 drivers/{tty => staging}/serial/68360serial.c | 0
11481 drivers/staging/serial/Kconfig | 16 +
11482 drivers/staging/serial/Makefile | 1 +
11483 drivers/staging/serial/TODO | 6 +
11484 drivers/tty/Kconfig | 34 +
11485 drivers/tty/Makefile | 1 +
11486 drivers/tty/amiserial.c | 12 +-
11487 drivers/tty/cyclades.c | 14 +-
11488 drivers/tty/ehv_bytechan.c | 881 ++++++++++++++++++++
11489 drivers/tty/hvc/hvc_console.c | 2 +-
11490 drivers/tty/hvc/hvc_irq.c | 2 +-
11491 drivers/tty/hvc/hvcs.c | 4 +-
11492 drivers/tty/hvc/hvsi.c | 2 +-
11493 drivers/tty/isicom.c | 2 +-
11494 drivers/tty/mxser.c | 13 +-
11495 drivers/tty/n_gsm.c | 70 +-
11496 drivers/tty/serial/68328serial.c | 37 +-
11497 drivers/tty/serial/68328serial.h | 1 -
11498 drivers/tty/serial/8250.c | 132 ++--
11499 drivers/tty/serial/8250_dw.c | 194 +++++
11500 drivers/tty/serial/8250_pci.c | 33 +
11501 drivers/tty/serial/Kconfig | 30 +-
11502 drivers/tty/serial/Makefile | 4 +-
11503 drivers/tty/serial/altera_jtaguart.c | 2 +-
11504 drivers/tty/serial/altera_uart.c | 2 +-
11505 drivers/tty/serial/apbuart.c | 1 +
11506 drivers/tty/serial/atmel_serial.c | 9 +-
11507 drivers/tty/serial/bfin_sport_uart.c | 2 +-
11508 drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} | 65 +-
11509 drivers/tty/serial/cpm_uart/cpm_uart_core.c | 1 +
11510 drivers/tty/serial/crisv10.c | 30 +-
11511 drivers/tty/serial/dz.c | 1 +
11512 drivers/tty/serial/icom.c | 2 +-
11513 drivers/tty/serial/imx.c | 10 +-
11514 drivers/tty/serial/ioc3_serial.c | 1 +
11515 drivers/tty/serial/ioc4_serial.c | 1 +
11516 drivers/tty/serial/jsm/jsm.h | 10 -
11517 drivers/tty/serial/jsm/jsm_driver.c | 19 -
11518 drivers/tty/serial/jsm/jsm_neo.c | 29 +-
11519 drivers/tty/serial/jsm/jsm_tty.c | 94 +--
11520 drivers/tty/serial/lantiq.c | 6 +-
11521 drivers/tty/serial/m32r_sio.c | 1 +
11522 drivers/tty/serial/max3100.c | 2 +
11523 drivers/tty/serial/max3107.c | 2 +
11524 drivers/tty/serial/mcf.c | 2 +-
11525 drivers/tty/serial/mfd.c | 49 ++-
11526 drivers/tty/serial/mpc52xx_uart.c | 3 +-
11527 drivers/tty/serial/mrst_max3110.c | 115 ++--
11528 drivers/tty/serial/mrst_max3110.h | 1 +
11529 drivers/tty/serial/msm_serial.c | 2 -
11530 drivers/tty/serial/msm_serial_hs.c | 2 +
11531 drivers/tty/serial/mux.c | 2 +
11532 drivers/tty/serial/nwpserial.c | 1 +
11533 drivers/tty/serial/pch_uart.c | 2 +
11534 drivers/tty/serial/pxa.c | 20 +
11535 drivers/tty/serial/samsung.c | 107 +++-
11536 drivers/tty/serial/samsung.h | 1 +
11537 drivers/tty/serial/sb1250-duart.c | 1 +
11538 drivers/tty/serial/serial_core.c | 71 +--
11539 drivers/tty/serial/serial_ks8695.c | 9 +-
11540 drivers/tty/serial/serial_txx9.c | 2 +
11541 drivers/tty/serial/sh-sci.c | 2 +-
11542 drivers/tty/serial/sn_console.c | 3 +-
11543 drivers/tty/serial/timbuart.c | 2 +
11544 drivers/tty/serial/uartlite.c | 1 +
11545 drivers/tty/serial/ucc_uart.c | 4 +-
11546 drivers/tty/serial/xilinx_uartps.c | 4 +-
11547 drivers/tty/serial/zs.c | 1 +
11548 drivers/tty/synclink.c | 1 -
11549 drivers/tty/synclinkmp.c | 6 +-
11550 drivers/tty/tty_ldisc.c | 1 -
11551 drivers/tty/tty_mutex.c | 12 -
11552 drivers/tty/tty_port.c | 2 +-
11553 drivers/tty/vt/keyboard.c | 3 +-
11554 drivers/tty/vt/selection.c | 4 +-
11555 drivers/tty/vt/vt.c | 2 +-
11556 include/linux/serial.h | 1 +
11557 include/linux/serial_8250.h | 2 +
11558 include/linux/serial_core.h | 10 +-
11559 include/linux/serial_reg.h | 1 +
11560 include/linux/tty.h | 20 +-
11561 net/irda/ircomm/ircomm_tty.c | 2 +-
11562 103 files changed, 1834 insertions(+), 910 deletions(-)
11563 create mode 100644 Documentation/devicetree/bindings/tty/serial/snps-dw-apb-uart.txt
11564 delete mode 100644 arch/arm/plat-samsung/irq-uart.c
11565 rename drivers/{tty => staging}/serial/68360serial.c (100%)
11566 create mode 100644 drivers/staging/serial/Kconfig
11567 create mode 100644 drivers/staging/serial/Makefile
11568 create mode 100644 drivers/staging/serial/TODO
11569 create mode 100644 drivers/tty/ehv_bytechan.c
11570 create mode 100644 drivers/tty/serial/8250_dw.c
11571 rename drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} (97%)
11572 Merging usb/usb-next
11573 $ git merge usb/usb-next
11574 Resolved 'arch/arm/mach-omap2/Makefile' using previous resolution.
11575 Auto-merging Documentation/usb/power-management.txt
11576 Auto-merging MAINTAINERS
11577 Auto-merging arch/arm/mach-mmp/pxa168.c
11578 Auto-merging arch/arm/mach-omap2/Makefile
11579 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
11580 Auto-merging drivers/usb/Kconfig
11581 Auto-merging drivers/usb/class/cdc-acm.c
11582 Auto-merging drivers/usb/class/cdc-wdm.c
11583 Auto-merging drivers/usb/core/driver.c
11584 Auto-merging drivers/usb/core/hcd.c
11585 Auto-merging drivers/usb/core/hub.c
11586 Auto-merging drivers/usb/gadget/at91_udc.c
11587 Auto-merging drivers/usb/gadget/langwell_udc.c
11588 Auto-merging drivers/usb/gadget/mv_udc_core.c
11589 Auto-merging drivers/usb/gadget/net2280.c
11590 Auto-merging drivers/usb/gadget/uvc.h
11591 Auto-merging drivers/usb/gadget/uvc_v4l2.c
11592 Auto-merging drivers/usb/host/Makefile
11593 Auto-merging drivers/usb/host/ehci-au1xxx.c
11594 Auto-merging drivers/usb/host/ehci-hcd.c
11595 Auto-merging drivers/usb/host/ohci-au1xxx.c
11596 Auto-merging drivers/usb/host/ohci-pnx4008.c
11597 Auto-merging drivers/usb/host/xhci-hub.c
11598 Auto-merging drivers/usb/host/xhci-ring.c
11599 Auto-merging drivers/usb/musb/musb_gadget.c
11600 Auto-merging drivers/usb/storage/realtek_cr.c
11601 Auto-merging include/linux/sched.h
11602 Auto-merging include/linux/usb/ch9.h
11603 Auto-merging kernel/signal.c
11604 Automatic merge failed; fix conflicts and then commit the result.
11606 [master 66898fa] Merge remote-tracking branch 'usb/usb-next'
11607 $ git diff -M --stat --summary HEAD^..
11608 .../ABI/testing/sysfs-bus-pci-drivers-ehci_hcd | 46 +
11609 Documentation/ABI/testing/sysfs-bus-usb | 15 +
11610 Documentation/usb/dwc3.txt | 45 +
11611 Documentation/usb/power-management.txt | 26 +
11613 arch/arm/mach-mmp/include/mach/pxa168.h | 7 +
11614 arch/arm/mach-mmp/pxa168.c | 46 +
11615 arch/arm/mach-omap2/Makefile | 14 +-
11616 drivers/usb/Kconfig | 14 +
11617 drivers/usb/Makefile | 4 +
11618 drivers/usb/class/cdc-acm.c | 9 +-
11619 drivers/usb/class/cdc-wdm.c | 2 +-
11620 drivers/usb/class/usbtmc.c | 5 +-
11621 drivers/usb/core/config.c | 111 +-
11622 drivers/usb/core/devices.c | 4 +-
11623 drivers/usb/core/devio.c | 57 +-
11624 drivers/usb/core/driver.c | 16 +-
11625 drivers/usb/core/endpoint.c | 2 +-
11626 drivers/usb/core/hcd-pci.c | 2 +-
11627 drivers/usb/core/hcd.c | 9 +-
11628 drivers/usb/core/hub.c | 311 ++--
11629 drivers/usb/core/message.c | 2 +-
11630 drivers/usb/core/quirks.c | 24 +
11631 drivers/usb/core/sysfs.c | 59 +-
11632 drivers/usb/core/urb.c | 2 +-
11633 drivers/usb/core/usb.c | 1 +
11634 drivers/usb/core/usb.h | 7 +
11635 drivers/usb/dwc3/Kconfig | 25 +
11636 drivers/usb/dwc3/Makefile | 36 +
11637 drivers/usb/dwc3/core.c | 484 +++++
11638 drivers/usb/dwc3/core.h | 768 +++++++
11639 drivers/usb/dwc3/debug.h | 50 +
11640 drivers/usb/dwc3/debugfs.c | 441 ++++
11641 drivers/usb/dwc3/dwc3-omap.c | 401 ++++
11642 drivers/usb/dwc3/dwc3-pci.c | 219 ++
11643 drivers/usb/dwc3/ep0.c | 804 ++++++++
11644 drivers/usb/dwc3/gadget.c | 2104 ++++++++++++++++++++
11645 drivers/usb/dwc3/gadget.h | 211 ++
11646 drivers/usb/dwc3/io.h | 54 +
11647 drivers/usb/gadget/Kconfig | 37 +-
11648 drivers/usb/gadget/amd5536udc.c | 20 +-
11649 drivers/usb/gadget/amd5536udc.h | 9 -
11650 drivers/usb/gadget/at91_udc.c | 16 +-
11651 drivers/usb/gadget/at91_udc.h | 10 -
11652 drivers/usb/gadget/atmel_usba_udc.c | 13 +-
11653 drivers/usb/gadget/cdc2.c | 9 -
11654 drivers/usb/gadget/ci13xxx_msm.c | 11 -
11655 drivers/usb/gadget/ci13xxx_udc.c | 2 +-
11656 drivers/usb/gadget/composite.c | 33 +-
11657 drivers/usb/gadget/config.c | 9 -
11658 drivers/usb/gadget/dbgp.c | 1 -
11659 drivers/usb/gadget/dummy_hcd.c | 13 +-
11660 drivers/usb/gadget/epautoconf.c | 12 +-
11661 drivers/usb/gadget/ether.c | 9 -
11662 drivers/usb/gadget/f_audio.c | 15 +-
11663 drivers/usb/gadget/f_ecm.c | 9 -
11664 drivers/usb/gadget/f_eem.c | 9 -
11665 drivers/usb/gadget/f_fs.c | 9 -
11666 drivers/usb/gadget/f_hid.c | 9 -
11667 drivers/usb/gadget/f_loopback.c | 9 -
11668 drivers/usb/gadget/f_mass_storage.c | 156 +-
11669 drivers/usb/gadget/f_ncm.c | 9 -
11670 drivers/usb/gadget/f_obex.c | 9 -
11671 drivers/usb/gadget/f_phonet.c | 10 -
11672 drivers/usb/gadget/f_rndis.c | 9 -
11673 drivers/usb/gadget/f_sourcesink.c | 9 -
11674 drivers/usb/gadget/f_subset.c | 9 -
11675 drivers/usb/gadget/f_uvc.c | 1 -
11676 drivers/usb/gadget/f_uvc.h | 1 -
11677 drivers/usb/gadget/file_storage.c | 159 +-
11678 drivers/usb/gadget/fsl_qe_udc.c | 2 +-
11679 drivers/usb/gadget/fsl_udc_core.c | 55 +-
11680 drivers/usb/gadget/fusb300_udc.c | 16 +-
11681 drivers/usb/gadget/fusb300_udc.h | 10 -
11682 drivers/usb/gadget/g_ffs.c | 9 -
11683 drivers/usb/gadget/gadget_chips.h | 3 +
11684 drivers/usb/gadget/gmidi.c | 11 +-
11685 drivers/usb/gadget/hid.c | 9 -
11686 drivers/usb/gadget/imx_udc.c | 4 +-
11687 drivers/usb/gadget/imx_udc.h | 5 -
11688 drivers/usb/gadget/inode.c | 9 -
11689 drivers/usb/gadget/langwell_udc.c | 62 +-
11690 drivers/usb/gadget/langwell_udc.h | 10 -
11691 drivers/usb/gadget/m66592-udc.c | 16 +-
11692 drivers/usb/gadget/m66592-udc.h | 10 -
11693 drivers/usb/gadget/mass_storage.c | 9 -
11694 drivers/usb/gadget/multi.c | 9 -
11695 drivers/usb/gadget/mv_udc_core.c | 4 +-
11696 drivers/usb/gadget/ncm.c | 9 -
11697 drivers/usb/gadget/ndis.h | 6 -
11698 drivers/usb/gadget/net2272.c | 6 +-
11699 drivers/usb/gadget/net2280.c | 17 +-
11700 drivers/usb/gadget/net2280.h | 9 -
11701 drivers/usb/gadget/omap_udc.c | 18 +-
11702 drivers/usb/gadget/pch_udc.c | 15 +-
11703 drivers/usb/gadget/printer.c | 25 +-
11704 drivers/usb/gadget/pxa25x_udc.c | 30 +-
11705 drivers/usb/gadget/pxa25x_udc.h | 9 -
11706 drivers/usb/gadget/pxa27x_udc.c | 12 +-
11707 drivers/usb/gadget/pxa27x_udc.h | 9 -
11708 drivers/usb/gadget/r8a66597-udc.c | 16 +-
11709 drivers/usb/gadget/r8a66597-udc.h | 10 -
11710 drivers/usb/gadget/s3c-hsotg.c | 10 +-
11711 drivers/usb/gadget/s3c-hsudc.c | 69 +-
11712 drivers/usb/gadget/s3c2410_udc.c | 16 +-
11713 drivers/usb/gadget/s3c2410_udc.h | 10 -
11714 drivers/usb/gadget/storage_common.c | 65 +-
11715 drivers/usb/gadget/u_ether.c | 9 -
11716 drivers/usb/gadget/u_ether.h | 9 -
11717 drivers/usb/gadget/u_serial.c | 3 +-
11718 drivers/usb/gadget/udc-core.c | 21 +-
11719 drivers/usb/gadget/uvc.h | 1 -
11720 drivers/usb/gadget/uvc_queue.c | 1 -
11721 drivers/usb/gadget/uvc_v4l2.c | 1 -
11722 drivers/usb/gadget/uvc_video.c | 1 -
11723 drivers/usb/gadget/webcam.c | 2 +-
11724 drivers/usb/gadget/zero.c | 9 -
11725 drivers/usb/host/Kconfig | 15 +-
11726 drivers/usb/host/Makefile | 3 +-
11727 drivers/usb/host/ehci-ath79.c | 2 +-
11728 drivers/usb/host/ehci-au1xxx.c | 4 +-
11729 drivers/usb/host/ehci-dbg.c | 17 +-
11730 drivers/usb/host/ehci-fsl.c | 6 +-
11731 drivers/usb/host/ehci-hcd.c | 61 +-
11732 drivers/usb/host/ehci-hub.c | 10 +-
11733 drivers/usb/host/ehci-mxc.c | 2 +-
11734 drivers/usb/host/ehci-octeon.c | 2 +-
11735 drivers/usb/host/ehci-omap.c | 2 +-
11736 drivers/usb/host/ehci-orion.c | 2 +-
11737 drivers/usb/host/ehci-pci.c | 2 +-
11738 drivers/usb/host/ehci-ps3.c | 2 +-
11739 drivers/usb/host/ehci-pxa168.c | 363 ++++
11740 drivers/usb/host/ehci-q.c | 31 +-
11741 drivers/usb/host/ehci-s5p.c | 4 +-
11742 drivers/usb/host/ehci-sched.c | 11 +-
11743 drivers/usb/host/ehci-sh.c | 2 +-
11744 drivers/usb/host/ehci-spear.c | 2 +-
11745 drivers/usb/host/ehci-tegra.c | 2 +-
11746 drivers/usb/host/ehci-vt8500.c | 2 +-
11747 drivers/usb/host/ehci-xls.c | 161 ++
11748 drivers/usb/host/ehci.h | 7 +
11749 drivers/usb/host/fhci-hcd.c | 9 +-
11750 drivers/usb/host/imx21-hcd.c | 2 +-
11751 drivers/usb/host/isp116x-hcd.c | 2 +-
11752 drivers/usb/host/isp1362-hcd.c | 8 +-
11753 drivers/usb/host/isp1760-hcd.c | 401 +++--
11754 drivers/usb/host/isp1760-hcd.h | 3 +-
11755 drivers/usb/host/isp1760-if.c | 6 +-
11756 drivers/usb/host/ohci-ath79.c | 2 +-
11757 drivers/usb/host/ohci-au1xxx.c | 2 +-
11758 drivers/usb/host/ohci-da8xx.c | 2 +-
11759 drivers/usb/host/ohci-ep93xx.c | 2 +-
11760 drivers/usb/host/ohci-hcd.c | 5 +
11761 drivers/usb/host/ohci-octeon.c | 2 +-
11762 drivers/usb/host/ohci-omap.c | 4 +-
11763 drivers/usb/host/ohci-omap3.c | 4 +-
11764 drivers/usb/host/ohci-pnx4008.c | 2 +-
11765 drivers/usb/host/ohci-pnx8550.c | 2 +-
11766 drivers/usb/host/ohci-ppc-of.c | 2 +-
11767 drivers/usb/host/ohci-ppc-soc.c | 2 +-
11768 drivers/usb/host/ohci-ps3.c | 2 +-
11769 drivers/usb/host/ohci-pxa27x.c | 2 +-
11770 drivers/usb/host/ohci-q.c | 4 +-
11771 drivers/usb/host/ohci-s3c2410.c | 2 +-
11772 drivers/usb/host/ohci-sa1111.c | 2 +-
11773 drivers/usb/host/ohci-sh.c | 2 +-
11774 drivers/usb/host/ohci-sm501.c | 2 +-
11775 drivers/usb/host/ohci-spear.c | 2 +-
11776 drivers/usb/host/ohci-ssb.c | 2 +-
11777 drivers/usb/host/ohci-tmio.c | 2 +-
11778 drivers/usb/host/ohci-xls.c | 151 ++
11779 drivers/usb/host/r8a66597-hcd.c | 4 +-
11780 drivers/usb/host/sl811-hcd.c | 2 +-
11781 drivers/usb/host/uhci-hcd.c | 66 +-
11782 drivers/usb/host/uhci-q.c | 6 +-
11783 drivers/usb/host/xhci-ext-caps.h | 6 +
11784 drivers/usb/host/xhci-hub.c | 105 +-
11785 drivers/usb/host/xhci-mem.c | 371 +++-
11786 drivers/usb/host/xhci-pci.c | 107 +-
11787 drivers/usb/host/xhci-ring.c | 80 +-
11788 drivers/usb/host/xhci.c | 1151 ++++++++++-
11789 drivers/usb/host/xhci.h | 187 ++-
11790 drivers/usb/misc/adutux.c | 14 +-
11791 drivers/usb/misc/ftdi-elan.c | 2 +-
11792 drivers/usb/misc/idmouse.c | 2 +-
11793 drivers/usb/misc/iowarrior.c | 2 +-
11794 drivers/usb/misc/ldusb.c | 4 +-
11795 drivers/usb/misc/legousbtower.c | 4 +-
11796 drivers/usb/misc/usblcd.c | 129 +-
11797 drivers/usb/misc/usbled.c | 25 +-
11798 drivers/usb/misc/usbtest.c | 31 +-
11799 drivers/usb/mon/mon_bin.c | 2 +-
11800 drivers/usb/musb/musb_gadget.c | 71 +-
11801 drivers/usb/musb/musb_gadget_ep0.c | 8 +
11802 drivers/usb/musb/musb_host.c | 2 +-
11803 drivers/usb/musb/musbhsdma.c | 2 +-
11804 drivers/usb/otg/isp1301_omap.c | 2 +-
11805 drivers/usb/otg/twl6030-usb.c | 16 -
11806 drivers/usb/renesas_usbhs/mod.c | 2 +-
11807 drivers/usb/renesas_usbhs/pipe.c | 2 +-
11808 drivers/usb/serial/Kconfig | 1 +
11809 drivers/usb/serial/ftdi_sio.c | 4 +-
11810 drivers/usb/serial/ftdi_sio_ids.h | 6 +-
11811 drivers/usb/serial/io_edgeport.c | 4 +-
11812 drivers/usb/serial/ipw.c | 33 +-
11813 drivers/usb/serial/opticon.c | 2 +-
11814 drivers/usb/serial/option.c | 170 +-
11815 drivers/usb/serial/pl2303.c | 4 +-
11816 drivers/usb/serial/pl2303.h | 5 +
11817 drivers/usb/serial/qcserial.c | 2 +
11818 drivers/usb/serial/symbolserial.c | 2 +-
11819 drivers/usb/serial/usb-serial.c | 8 +-
11820 drivers/usb/storage/Kconfig | 2 +-
11821 drivers/usb/storage/realtek_cr.c | 116 +-
11822 drivers/usb/storage/transport.c | 34 +-
11823 drivers/usb/storage/usb.c | 16 +-
11824 drivers/usb/usb-common.c | 35 +
11825 drivers/usb/usb-skeleton.c | 2 +-
11826 drivers/usb/wusbcore/wa-hc.c | 2 +-
11827 include/linux/platform_data/dwc3-omap.h | 47 +
11828 include/linux/sched.h | 3 +-
11829 include/linux/usb.h | 20 +-
11830 include/linux/usb/ch9.h | 29 +
11831 include/linux/usb/hcd.h | 1 +
11832 kernel/signal.c | 24 +-
11833 225 files changed, 10117 insertions(+), 1962 deletions(-)
11834 create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
11835 create mode 100644 Documentation/usb/dwc3.txt
11836 create mode 100644 drivers/usb/dwc3/Kconfig
11837 create mode 100644 drivers/usb/dwc3/Makefile
11838 create mode 100644 drivers/usb/dwc3/core.c
11839 create mode 100644 drivers/usb/dwc3/core.h
11840 create mode 100644 drivers/usb/dwc3/debug.h
11841 create mode 100644 drivers/usb/dwc3/debugfs.c
11842 create mode 100644 drivers/usb/dwc3/dwc3-omap.c
11843 create mode 100644 drivers/usb/dwc3/dwc3-pci.c
11844 create mode 100644 drivers/usb/dwc3/ep0.c
11845 create mode 100644 drivers/usb/dwc3/gadget.c
11846 create mode 100644 drivers/usb/dwc3/gadget.h
11847 create mode 100644 drivers/usb/dwc3/io.h
11848 create mode 100644 drivers/usb/host/ehci-pxa168.c
11849 create mode 100644 drivers/usb/host/ehci-xls.c
11850 create mode 100644 drivers/usb/host/ohci-xls.c
11851 create mode 100644 drivers/usb/usb-common.c
11852 create mode 100644 include/linux/platform_data/dwc3-omap.h
11853 Merging staging/staging-next
11854 $ git merge staging/staging-next
11855 Auto-merging MAINTAINERS
11856 Removing drivers/char/scc.h
11857 Auto-merging drivers/misc/altera-stapl/altera.c
11858 CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
11859 Auto-merging drivers/staging/Kconfig
11860 Auto-merging drivers/staging/Makefile
11861 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c
11862 Removing drivers/staging/brcm80211/brcmsmac/alloc.c
11863 Removing drivers/staging/brcm80211/brcmsmac/bmac.c
11864 Removing drivers/staging/brcm80211/brcmsmac/bmac.h
11865 Auto-merging drivers/staging/brcm80211/brcmsmac/brcms_trace_events.c
11866 Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.c
11867 CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/mac80211_if.c
11868 Auto-merging drivers/staging/comedi/drivers/ni_labpc.c
11869 CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c
11870 Removing drivers/staging/cx25821/cx25821-gpio.h
11871 Auto-merging drivers/staging/dt3155v4l/dt3155v4l.c
11872 Auto-merging drivers/staging/et131x/et1310_tx.c
11873 CONFLICT (content): Merge conflict in drivers/staging/et131x/et1310_tx.c
11874 Auto-merging drivers/staging/et131x/et131x_netdev.c
11875 Auto-merging drivers/staging/hv/Makefile
11876 Removing drivers/staging/hv/blkvsc_drv.c
11877 Removing drivers/staging/hv/hyperv_storage.h
11878 Auto-merging drivers/staging/hv/netvsc_drv.c
11879 Removing drivers/staging/hv/storvsc.c
11880 Removing drivers/staging/iio/accel/accel.h
11881 Removing drivers/staging/iio/accel/inclinometer.h
11882 Removing drivers/staging/iio/adc/ad7314.c
11883 Removing drivers/staging/iio/adc/ad7745.c
11884 Removing drivers/staging/iio/adc/adc.h
11885 Auto-merging drivers/staging/iio/addac/adt7316-i2c.c
11886 Auto-merging drivers/staging/iio/dds/ad9832.c
11887 Removing drivers/staging/iio/gyro/gyro.h
11888 Removing drivers/staging/iio/industrialio-ring.c
11889 Removing drivers/staging/iio/magnetometer/magnet.h
11890 Removing drivers/staging/iio/resolver/ad2s120x.c
11891 Removing drivers/staging/iio/ring_generic.h
11892 Removing drivers/staging/rtl8192e/ieee80211/dot11d.c
11893 Removing drivers/staging/rtl8192e/ieee80211/dot11d.h
11894 Removing drivers/staging/rtl8192e/ieee80211/ieee80211.h
11895 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
11896 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
11897 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
11898 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
11899 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
11900 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
11901 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
11902 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
11903 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
11904 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
11905 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
11906 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
11907 Removing drivers/staging/rtl8192e/r8180_93cx6.c
11908 Removing drivers/staging/rtl8192e/r8180_93cx6.h
11909 Removing drivers/staging/rtl8192e/r8190_rtl8256.c
11910 Removing drivers/staging/rtl8192e/r8190_rtl8256.h
11911 Removing drivers/staging/rtl8192e/r8192E.h
11912 CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
11913 Removing drivers/staging/rtl8192e/r8192E_dm.c
11914 Removing drivers/staging/rtl8192e/r8192E_dm.h
11915 Removing drivers/staging/rtl8192e/r8192E_wx.c
11916 Removing drivers/staging/rtl8192e/r8192E_wx.h
11917 Removing drivers/staging/rtl8192e/r8192_pm.c
11918 Removing drivers/staging/rtl8192e/r8192_pm.h
11919 Removing drivers/staging/rtl8192e/r819xE_cmdpkt.c
11920 Removing drivers/staging/rtl8192e/r819xE_cmdpkt.h
11921 Removing drivers/staging/rtl8192e/r819xE_firmware.c
11922 Removing drivers/staging/rtl8192e/r819xE_phy.c
11923 Removing drivers/staging/rtl8192e/r819xE_phy.h
11924 Auto-merging drivers/staging/rtl8192e/rtl_crypto.h
11925 Auto-merging drivers/staging/rtl8192e/rtllib_crypt.c
11926 Auto-merging drivers/staging/rtl8192e/rtllib_crypt.h
11927 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
11928 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_tkip.c
11929 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_wep.c
11930 Auto-merging drivers/staging/rtl8192e/rtllib_softmac_wx.c
11931 Auto-merging drivers/staging/vt6655/Resolved 'drivers/misc/altera-stapl/altera.c' using previous resolution.
11932 Resolved 'drivers/staging/brcm80211/brcmsmac/mac80211_if.c' using previous resolution.
11933 Resolved 'drivers/staging/comedi/drivers/ni_labpc.c' using previous resolution.
11934 Resolved 'drivers/staging/et131x/et1310_tx.c' using previous resolution.
11935 Resolved 'drivers/staging/xgifb/XGI_main_26.c' using previous resolution.
11936 Resolved 'drivers/staging/zram/zram_drv.c' using previous resolution.
11938 Auto-merging drivers/staging/vt6656/main_usb.c
11939 Auto-merging drivers/staging/wlags49_h2/wl_netdev.c
11940 Auto-merging drivers/staging/xgifb/XGI_main_26.c
11941 CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
11942 Auto-merging drivers/staging/zcache/zcache-main.c
11943 Auto-merging drivers/staging/zram/zram_drv.c
11944 CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
11945 Automatic merge failed; fix conflicts and then commit the result.
11946 $ git rm -f drivers/staging/rtl8192e/r8192E_core.c
11947 drivers/misc/altera-stapl/altera.c: needs merge
11948 drivers/staging/brcm80211/brcmsmac/mac80211_if.c: needs merge
11949 drivers/staging/comedi/drivers/ni_labpc.c: needs merge
11950 drivers/staging/et131x/et1310_tx.c: needs merge
11951 drivers/staging/rtl8192e/r8192E_core.c: needs merge
11952 drivers/staging/xgifb/XGI_main_26.c: needs merge
11953 drivers/staging/zram/zram_drv.c: needs merge
11954 rm 'drivers/staging/rtl8192e/r8192E_core.c'
11956 [master 9da4503] Merge remote-tracking branch 'staging/staging-next'
11957 $ git diff -M --stat --summary HEAD^..
11958 MAINTAINERS | 14 +-
11959 arch/x86/include/asm/hyperv.h | 1 +
11960 drivers/char/scc.h | 613 -
11961 drivers/misc/altera-stapl/altera.c | 3 +-
11962 drivers/staging/Kconfig | 2 +
11963 drivers/staging/Makefile | 1 +
11964 drivers/staging/bcm/Bcmchar.c | 3181 ++--
11965 drivers/staging/bcm/InterfaceDld.c | 93 +-
11966 drivers/staging/bcm/Macros.h | 337 +-
11967 drivers/staging/bcm/Misc.c | 4 +
11968 drivers/staging/bcm/headers.h | 2 +
11969 drivers/staging/bcm/nvm.c | 13 +-
11970 drivers/staging/brcm80211/Kconfig | 11 +-
11971 drivers/staging/brcm80211/Makefile | 1 -
11972 drivers/staging/brcm80211/TODO | 4 -
11973 drivers/staging/brcm80211/brcmfmac/Makefile | 8 +-
11974 drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 505 +-
11975 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 1227 +-
11976 drivers/staging/brcm80211/brcmfmac/dhd.h | 505 +-
11977 drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 39 +-
11978 drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 220 +-
11979 drivers/staging/brcm80211/brcmfmac/dhd_common.c | 834 +-
11980 drivers/staging/brcm80211/brcmfmac/dhd_dbg.h | 46 +-
11981 drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 1118 +-
11982 drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 25 +-
11983 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 7187 ++----
11984 drivers/staging/brcm80211/brcmfmac/sdio_host.h | 293 +-
11985 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 3476 ++--
11986 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 85 +-
11987 drivers/staging/brcm80211/brcmsmac/Makefile | 15 +-
11988 drivers/staging/brcm80211/brcmsmac/aiutils.c | 1248 +-
11989 drivers/staging/brcm80211/brcmsmac/aiutils.h | 310 +-
11990 drivers/staging/brcm80211/brcmsmac/alloc.c | 275 -
11991 drivers/staging/brcm80211/brcmsmac/ampdu.c | 594 +-
11992 drivers/staging/brcm80211/brcmsmac/antsel.c | 239 +-
11993 drivers/staging/brcm80211/brcmsmac/bmac.c | 3593 ---
11994 drivers/staging/brcm80211/brcmsmac/bmac.h | 174 -
11995 .../brcmsmac/{alloc.h => brcms_trace_events.c} | 12 +-
11996 .../brcm80211/brcmsmac/brcms_trace_events.h | 92 +
11997 drivers/staging/brcm80211/brcmsmac/channel.c | 1252 +-
11998 drivers/staging/brcm80211/brcmsmac/channel.h | 87 +-
11999 drivers/staging/brcm80211/brcmsmac/d11.h | 705 +-
12000 drivers/staging/brcm80211/brcmsmac/dma.c | 1686 +-
12001 drivers/staging/brcm80211/brcmsmac/dma.h | 200 +-
12002 drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 1530 +-
12003 drivers/staging/brcm80211/brcmsmac/mac80211_if.h | 25 +-
12004 drivers/staging/brcm80211/brcmsmac/main.c |10143 ++++++---
12005 drivers/staging/brcm80211/brcmsmac/main.h | 898 +-
12006 drivers/staging/brcm80211/brcmsmac/nicpci.c | 181 +-
12007 drivers/staging/brcm80211/brcmsmac/nicpci.h | 41 +-
12008 drivers/staging/brcm80211/brcmsmac/otp.c | 237 +-
12009 drivers/staging/brcm80211/brcmsmac/otp.h | 15 +-
12010 drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 1161 +-
12011 drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h | 85 +-
12012 drivers/staging/brcm80211/brcmsmac/phy/phy_int.h | 212 +-
12013 drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c | 5864 +++---
12014 drivers/staging/brcm80211/brcmsmac/phy/phy_n.c |24070 ++++++++++----------
12015 drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c | 172 +-
12016 .../staging/brcm80211/brcmsmac/phy/phytbl_lcn.c | 1236 +-
12017 drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c | 131 +-
12018 drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h | 24 +-
12019 drivers/staging/brcm80211/brcmsmac/phy_shim.c | 40 +-
12020 drivers/staging/brcm80211/brcmsmac/phy_shim.h | 73 +-
12021 drivers/staging/brcm80211/brcmsmac/pmu.c | 76 +-
12022 drivers/staging/brcm80211/brcmsmac/pmu.h | 14 -
12023 drivers/staging/brcm80211/brcmsmac/pub.h | 768 +-
12024 drivers/staging/brcm80211/brcmsmac/rate.c | 182 +-
12025 drivers/staging/brcm80211/brcmsmac/rate.h | 299 +-
12026 drivers/staging/brcm80211/brcmsmac/scb.h | 61 +-
12027 drivers/staging/brcm80211/brcmsmac/srom.c | 1427 +-
12028 drivers/staging/brcm80211/brcmsmac/srom.h | 4 +-
12029 drivers/staging/brcm80211/brcmsmac/stf.c | 259 +-
12030 drivers/staging/brcm80211/brcmsmac/stf.h | 6 +-
12031 drivers/staging/brcm80211/brcmsmac/types.h | 331 +-
12032 drivers/staging/brcm80211/brcmsmac/ucode_loader.c | 120 +-
12033 drivers/staging/brcm80211/brcmsmac/ucode_loader.h | 50 +-
12034 drivers/staging/brcm80211/brcmutil/utils.c | 203 +-
12035 drivers/staging/brcm80211/brcmutil/wifi.c | 41 +-
12036 drivers/staging/brcm80211/include/brcmu_utils.h | 242 +-
12037 drivers/staging/brcm80211/include/brcmu_wifi.h | 162 +-
12038 drivers/staging/brcm80211/include/chipcommon.h | 13 +-
12039 drivers/staging/brcm80211/include/defs.h | 32 +-
12040 drivers/staging/brcm80211/include/soc.h | 9 +-
12041 drivers/staging/comedi/Kconfig | 18 +-
12042 drivers/staging/comedi/comedi_fops.c | 2 +-
12043 drivers/staging/comedi/drivers/Makefile | 1 +
12044 drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +-
12045 drivers/staging/comedi/drivers/cb_das16_cs.c | 5 +-
12046 drivers/staging/comedi/drivers/ni_labpc.c | 16 +-
12047 drivers/staging/comedi/drivers/ni_pcidio.c | 2 +-
12048 drivers/staging/comedi/drivers/pcmmio.c | 34 +-
12049 drivers/staging/comedi/drivers/usbduxsigma.c | 2880 +++
12050 drivers/staging/crystalhd/bc_dts_defs.h | 4 +-
12051 drivers/staging/crystalhd/bc_dts_glob_lnx.h | 6 +-
12052 drivers/staging/crystalhd/bc_dts_types.h | 57 -
12053 drivers/staging/crystalhd/crystalhd_cmds.h | 2 +-
12054 drivers/staging/crystalhd/crystalhd_fw_if.h | 532 +-
12055 drivers/staging/crystalhd/crystalhd_misc.h | 6 +-
12056 drivers/staging/cx25821/cx25821-alsa.c | 2 +-
12057 drivers/staging/cx25821/cx25821-audio-upstream.c | 43 +-
12058 drivers/staging/cx25821/cx25821-audio-upstream.h | 9 +-
12059 drivers/staging/cx25821/cx25821-audio.h | 6 +-
12060 drivers/staging/cx25821/cx25821-cards.c | 26 +-
12061 drivers/staging/cx25821/cx25821-core.c | 505 +-
12062 drivers/staging/cx25821/cx25821-gpio.c | 1 +
12063 drivers/staging/cx25821/cx25821-gpio.h | 2 -
12064 drivers/staging/cx25821/cx25821-i2c.c | 30 +-
12065 .../staging/cx25821/cx25821-video-upstream-ch2.c | 81 +-
12066 .../staging/cx25821/cx25821-video-upstream-ch2.h | 83 +-
12067 drivers/staging/cx25821/cx25821-video-upstream.c | 18 +-
12068 drivers/staging/cx25821/cx25821-video-upstream.h | 78 +-
12069 drivers/staging/cx25821/cx25821-video.c | 1244 +-
12070 drivers/staging/cx25821/cx25821-video.h | 79 +-
12071 drivers/staging/cx25821/cx25821.h | 10 +-
12072 drivers/staging/cxd2099/Makefile | 6 +-
12073 drivers/staging/cxt1e1/linux.c | 6 -
12074 drivers/staging/cxt1e1/sbecom_inline_linux.h | 64 -
12075 drivers/staging/dt3155v4l/dt3155v4l.c | 122 +-
12076 drivers/staging/dt3155v4l/dt3155v4l.h | 4 +-
12077 drivers/staging/easycap/easycap_ioctl.c | 30 +-
12078 drivers/staging/easycap/easycap_main.c | 4 +-
12079 drivers/staging/et131x/Makefile | 1 +
12080 drivers/staging/et131x/README | 8 +-
12081 drivers/staging/et131x/et1310_address_map.h | 8 +-
12082 drivers/staging/et131x/et1310_eeprom.c | 34 +-
12083 drivers/staging/et131x/et1310_mac.c | 391 +-
12084 drivers/staging/et131x/et1310_phy.c | 863 +-
12085 drivers/staging/et131x/et1310_phy.h | 300 +-
12086 drivers/staging/et131x/et1310_pm.c | 75 +-
12087 drivers/staging/et131x/et1310_rx.c | 635 +-
12088 drivers/staging/et131x/et1310_rx.h | 64 +-
12089 drivers/staging/et131x/et1310_tx.c | 469 +-
12090 drivers/staging/et131x/et131x.h | 88 +-
12091 drivers/staging/et131x/et131x_adapter.h | 105 +-
12092 drivers/staging/et131x/et131x_defs.h | 2 +
12093 drivers/staging/et131x/et131x_ethtool.c | 201 +
12094 drivers/staging/et131x/et131x_initpci.c | 552 +-
12095 drivers/staging/et131x/et131x_isr.c | 87 +-
12096 drivers/staging/et131x/et131x_netdev.c | 277 +-
12097 drivers/staging/et131x/et131x_version.h | 1 +
12098 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 10 +
12099 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 8 +-
12100 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 3 +-
12101 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 24 +-
12102 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 4 +-
12103 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2 +-
12104 drivers/staging/gma500/accel_2d.c | 24 +-
12105 drivers/staging/gma500/cdv_device.c | 1 -
12106 drivers/staging/gma500/framebuffer.c | 92 +-
12107 drivers/staging/gma500/gem.c | 5 +-
12108 drivers/staging/gma500/gtt.c | 81 +-
12109 drivers/staging/gma500/gtt.h | 3 +
12110 drivers/staging/gma500/intel_opregion.c | 1 +
12111 drivers/staging/gma500/mdfld_intel_display.c | 12 +-
12112 drivers/staging/gma500/mrst_crtc.c | 16 +-
12113 drivers/staging/gma500/power.c | 8 +-
12114 drivers/staging/gma500/psb_device.c | 32 -
12115 drivers/staging/gma500/psb_drv.c | 49 +-
12116 drivers/staging/gma500/psb_drv.h | 6 +-
12117 drivers/staging/gma500/psb_intel_display.c | 4 -
12118 drivers/staging/gma500/psb_intel_lvds.c | 61 +-
12119 drivers/staging/gma500/psb_irq.c | 71 +-
12120 drivers/staging/gma500/psb_lid.c | 2 -
12121 drivers/staging/go7007/Makefile | 8 +-
12122 drivers/staging/go7007/wis-tw2804.c | 6 +-
12123 drivers/staging/hv/Kconfig | 9 +-
12124 drivers/staging/hv/Makefile | 4 +-
12125 drivers/staging/hv/TODO | 11 +-
12126 drivers/staging/hv/blkvsc_drv.c | 1026 -
12127 drivers/staging/hv/channel.c | 120 +-
12128 drivers/staging/hv/channel_mgmt.c | 177 +-
12129 drivers/staging/hv/connection.c | 54 +-
12130 drivers/staging/hv/hv.c | 21 +-
12131 drivers/staging/hv/hv_kvp.c | 14 +-
12132 drivers/staging/hv/hv_kvp.h | 2 +-
12133 drivers/staging/hv/hv_mouse.c | 711 +-
12134 drivers/staging/hv/hv_util.c | 202 +-
12135 drivers/staging/hv/hyperv.h | 85 +-
12136 drivers/staging/hv/hyperv_net.h | 5 +-
12137 drivers/staging/hv/hyperv_storage.h | 334 -
12138 drivers/staging/hv/hyperv_vmbus.h | 12 +-
12139 drivers/staging/hv/netvsc.c | 329 +-
12140 drivers/staging/hv/netvsc_drv.c | 148 +-
12141 drivers/staging/hv/ring_buffer.c | 9 +-
12142 drivers/staging/hv/rndis_filter.c | 146 +-
12143 drivers/staging/hv/storvsc.c | 564 -
12144 drivers/staging/hv/storvsc_drv.c | 869 +-
12145 drivers/staging/hv/tools/hv_kvp_daemon.c | 19 +-
12146 drivers/staging/hv/vmbus_drv.c | 444 +-
12147 drivers/staging/iio/Documentation/generic_buffer.c | 12 +-
12148 drivers/staging/iio/Documentation/iio_utils.h | 2 +-
12149 drivers/staging/iio/Documentation/sysfs-bus-iio | 738 +-
12150 .../iio/Documentation/sysfs-bus-iio-adc-ad7280a | 21 +
12151 .../sysfs-bus-iio-impedance-analyzer-ad5933 | 30 +
12152 drivers/staging/iio/Kconfig | 7 +-
12153 drivers/staging/iio/Makefile | 3 +-
12154 drivers/staging/iio/accel/Kconfig | 32 +-
12155 drivers/staging/iio/accel/Makefile | 12 +-
12156 drivers/staging/iio/accel/accel.h | 87 -
12157 drivers/staging/iio/accel/adis16201.h | 6 +-
12158 drivers/staging/iio/accel/adis16201_core.c | 41 +-
12159 drivers/staging/iio/accel/adis16201_ring.c | 48 +-
12160 drivers/staging/iio/accel/adis16201_trigger.c | 13 +-
12161 drivers/staging/iio/accel/adis16203.h | 6 +-
12162 drivers/staging/iio/accel/adis16203_core.c | 41 +-
12163 drivers/staging/iio/accel/adis16203_ring.c | 39 +-
12164 drivers/staging/iio/accel/adis16203_trigger.c | 14 +-
12165 drivers/staging/iio/accel/adis16204.h | 6 +-
12166 drivers/staging/iio/accel/adis16204_core.c | 92 +-
12167 drivers/staging/iio/accel/adis16204_ring.c | 39 +-
12168 drivers/staging/iio/accel/adis16204_trigger.c | 14 +-
12169 drivers/staging/iio/accel/adis16209.h | 6 +-
12170 drivers/staging/iio/accel/adis16209_core.c | 44 +-
12171 drivers/staging/iio/accel/adis16209_ring.c | 42 +-
12172 drivers/staging/iio/accel/adis16209_trigger.c | 14 +-
12173 drivers/staging/iio/accel/adis16220_core.c | 343 +-
12174 drivers/staging/iio/accel/adis16240.h | 6 +-
12175 drivers/staging/iio/accel/adis16240_core.c | 42 +-
12176 drivers/staging/iio/accel/adis16240_ring.c | 40 +-
12177 drivers/staging/iio/accel/adis16240_trigger.c | 14 +-
12178 drivers/staging/iio/accel/inclinometer.h | 25 -
12179 drivers/staging/iio/accel/kxsd9.c | 269 +-
12180 drivers/staging/iio/accel/lis3l02dq.h | 26 +-
12181 drivers/staging/iio/accel/lis3l02dq_core.c | 109 +-
12182 drivers/staging/iio/accel/lis3l02dq_ring.c | 124 +-
12183 drivers/staging/iio/accel/sca3000.h | 4 +-
12184 drivers/staging/iio/accel/sca3000_core.c | 70 +-
12185 drivers/staging/iio/accel/sca3000_ring.c | 152 +-
12186 drivers/staging/iio/adc/Kconfig | 57 +-
12187 drivers/staging/iio/adc/Makefile | 13 +-
12188 drivers/staging/iio/adc/ad7150.c | 975 +-
12189 drivers/staging/iio/adc/ad7152.c | 784 +-
12190 drivers/staging/iio/adc/ad7192.c | 1185 +
12191 drivers/staging/iio/adc/ad7192.h | 47 +
12192 drivers/staging/iio/adc/ad7280a.c | 998 +
12193 drivers/staging/iio/adc/ad7280a.h | 38 +
12194 drivers/staging/iio/adc/ad7291.c | 1080 +-
12195 drivers/staging/iio/adc/ad7298.h | 6 +-
12196 drivers/staging/iio/adc/ad7298_core.c | 48 +-
12197 drivers/staging/iio/adc/ad7298_ring.c | 48 +-
12198 drivers/staging/iio/adc/ad7314.c | 281 -
12199 drivers/staging/iio/adc/ad7476.h | 6 +-
12200 drivers/staging/iio/adc/ad7476_core.c | 70 +-
12201 drivers/staging/iio/adc/ad7476_ring.c | 50 +-
12202 drivers/staging/iio/adc/ad7606.h | 12 +-
12203 drivers/staging/iio/adc/ad7606_core.c | 274 +-
12204 drivers/staging/iio/adc/ad7606_par.c | 2 +-
12205 drivers/staging/iio/adc/ad7606_ring.c | 86 +-
12206 drivers/staging/iio/adc/ad7606_spi.c | 2 +-
12207 drivers/staging/iio/adc/ad7745.c | 674 -
12208 drivers/staging/iio/adc/ad7746.c | 806 +
12209 drivers/staging/iio/adc/ad7746.h | 29 +
12210 drivers/staging/iio/adc/ad7780.c | 7 +-
12211 drivers/staging/iio/adc/ad7793.c | 272 +-
12212 drivers/staging/iio/adc/ad7816.c | 25 +-
12213 drivers/staging/iio/adc/ad7887.h | 10 +-
12214 drivers/staging/iio/adc/ad7887_core.c | 59 +-
12215 drivers/staging/iio/adc/ad7887_ring.c | 59 +-
12216 drivers/staging/iio/adc/ad799x.h | 4 +-
12217 drivers/staging/iio/adc/ad799x_core.c | 709 +-
12218 drivers/staging/iio/adc/ad799x_ring.c | 69 +-
12219 drivers/staging/iio/adc/adc.h | 42 -
12220 drivers/staging/iio/adc/adt7310.c | 23 +-
12221 drivers/staging/iio/adc/adt7410.c | 21 +-
12222 drivers/staging/iio/adc/adt75.c | 20 +-
12223 drivers/staging/iio/adc/max1363.h | 8 +-
12224 drivers/staging/iio/adc/max1363_core.c | 311 +-
12225 drivers/staging/iio/adc/max1363_ring.c | 63 +-
12226 drivers/staging/iio/addac/Kconfig | 4 +-
12227 drivers/staging/iio/addac/adt7316-i2c.c | 1 +
12228 drivers/staging/iio/addac/adt7316.c | 45 +-
12229 drivers/staging/iio/buffer_generic.h | 228 +
12230 drivers/staging/iio/chrdev.h | 54 +-
12231 drivers/staging/iio/dac/Kconfig | 4 +-
12232 drivers/staging/iio/dac/ad5446.c | 27 +-
12233 drivers/staging/iio/dac/ad5504.c | 93 +-
12234 drivers/staging/iio/dac/ad5624r_spi.c | 83 +-
12235 drivers/staging/iio/dac/ad5686.c | 121 +-
12236 drivers/staging/iio/dac/ad5791.c | 236 +-
12237 drivers/staging/iio/dac/ad5791.h | 4 -
12238 drivers/staging/iio/dac/dac.h | 2 +-
12239 drivers/staging/iio/dac/max517.c | 26 +-
12240 drivers/staging/iio/dds/Kconfig | 4 +-
12241 drivers/staging/iio/dds/ad5930.c | 1 +
12242 drivers/staging/iio/dds/ad9832.c | 1 +
12243 drivers/staging/iio/dds/ad9834.c | 1 +
12244 drivers/staging/iio/dds/ad9850.c | 1 +
12245 drivers/staging/iio/dds/ad9852.c | 2 +-
12246 drivers/staging/iio/dds/ad9910.c | 2 +-
12247 drivers/staging/iio/dds/ad9951.c | 2 +-
12248 drivers/staging/iio/gyro/Kconfig | 8 +-
12249 drivers/staging/iio/gyro/Makefile | 2 +-
12250 drivers/staging/iio/gyro/adis16060_core.c | 124 +-
12251 drivers/staging/iio/gyro/adis16080_core.c | 102 +-
12252 drivers/staging/iio/gyro/adis16130_core.c | 145 +-
12253 drivers/staging/iio/gyro/adis16260.h | 6 +-
12254 drivers/staging/iio/gyro/adis16260_core.c | 55 +-
12255 drivers/staging/iio/gyro/adis16260_ring.c | 39 +-
12256 drivers/staging/iio/gyro/adis16260_trigger.c | 14 +-
12257 drivers/staging/iio/gyro/adxrs450_core.c | 253 +-
12258 drivers/staging/iio/gyro/gyro.h | 85 -
12259 drivers/staging/iio/iio.h | 222 +-
12260 drivers/staging/iio/iio_core.h | 63 +
12261 drivers/staging/iio/iio_core_trigger.h | 46 +
12262 drivers/staging/iio/impedance-analyzer/Kconfig | 18 +
12263 drivers/staging/iio/impedance-analyzer/Makefile | 5 +
12264 drivers/staging/iio/impedance-analyzer/ad5933.c | 813 +
12265 drivers/staging/iio/impedance-analyzer/ad5933.h | 28 +
12266 drivers/staging/iio/imu/Kconfig | 16 +-
12267 drivers/staging/iio/imu/Makefile | 2 +-
12268 drivers/staging/iio/imu/adis16400.h | 6 +-
12269 drivers/staging/iio/imu/adis16400_core.c | 650 +-
12270 drivers/staging/iio/imu/adis16400_ring.c | 49 +-
12271 drivers/staging/iio/imu/adis16400_trigger.c | 16 +-
12272 drivers/staging/iio/industrialio-buffer.c | 635 +
12273 drivers/staging/iio/industrialio-core.c | 908 +-
12274 drivers/staging/iio/industrialio-ring.c | 596 -
12275 drivers/staging/iio/industrialio-trigger.c | 146 +-
12276 drivers/staging/iio/kfifo_buf.c | 78 +-
12277 drivers/staging/iio/kfifo_buf.h | 16 +-
12278 drivers/staging/iio/light/Kconfig | 4 +-
12279 drivers/staging/iio/light/isl29018.c | 73 +-
12280 drivers/staging/iio/light/tsl2563.c | 59 +-
12281 drivers/staging/iio/light/tsl2583.c | 221 +-
12282 drivers/staging/iio/magnetometer/Kconfig | 3 +-
12283 drivers/staging/iio/magnetometer/ak8975.c | 235 +-
12284 drivers/staging/iio/magnetometer/hmc5843.c | 100 +-
12285 drivers/staging/iio/magnetometer/magnet.h | 31 -
12286 drivers/staging/iio/meter/Kconfig | 8 +-
12287 drivers/staging/iio/meter/Makefile | 2 +-
12288 drivers/staging/iio/meter/ade7753.c | 26 +-
12289 drivers/staging/iio/meter/ade7754.c | 27 +-
12290 drivers/staging/iio/meter/ade7758.h | 13 +-
12291 drivers/staging/iio/meter/ade7758_core.c | 51 +-
12292 drivers/staging/iio/meter/ade7758_ring.c | 57 +-
12293 drivers/staging/iio/meter/ade7758_trigger.c | 16 +-
12294 drivers/staging/iio/meter/ade7759.c | 23 +-
12295 drivers/staging/iio/meter/ade7854-i2c.c | 1 +
12296 drivers/staging/iio/meter/ade7854-spi.c | 1 +
12297 drivers/staging/iio/meter/ade7854.c | 3 +-
12298 drivers/staging/iio/resolver/Kconfig | 7 +-
12299 drivers/staging/iio/resolver/Makefile | 2 +-
12300 drivers/staging/iio/resolver/ad2s1200.c | 187 +
12301 drivers/staging/iio/resolver/ad2s120x.c | 177 -
12302 drivers/staging/iio/resolver/ad2s1210.c | 221 +-
12303 drivers/staging/iio/resolver/ad2s90.c | 59 +-
12304 drivers/staging/iio/ring_generic.h | 288 -
12305 drivers/staging/iio/ring_hw.h | 6 +-
12306 drivers/staging/iio/ring_sw.c | 69 +-
12307 drivers/staging/iio/ring_sw.h | 8 +-
12308 drivers/staging/iio/sysfs.h | 136 +-
12309 drivers/staging/iio/trigger.h | 116 +-
12310 drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 6 +-
12311 drivers/staging/iio/trigger/iio-trig-gpio.c | 6 +-
12312 .../staging/iio/trigger/iio-trig-periodic-rtc.c | 7 +-
12313 drivers/staging/iio/trigger/iio-trig-sysfs.c | 13 +-
12314 drivers/staging/iio/trigger_consumer.h | 71 +-
12315 drivers/staging/intel_sst/intel_sst.c | 10 +-
12316 drivers/staging/intel_sst/intel_sst_dsp.c | 2 +-
12317 drivers/staging/intel_sst/intelmid.c | 1 +
12318 drivers/staging/keucr/scsiglue.c | 5 +-
12319 drivers/staging/keucr/smil.h | 6 +-
12320 drivers/staging/keucr/smilsub.c | 1574 +-
12321 drivers/staging/keucr/smscsi.c | 117 +-
12322 drivers/staging/lirc/lirc_imon.c | 6 +-
12323 drivers/staging/lirc/lirc_sasem.c | 46 +-
12324 drivers/staging/lirc/lirc_serial.c | 2 +-
12325 drivers/staging/lirc/lirc_sir.c | 2 +-
12326 drivers/staging/mei/Kconfig | 2 +-
12327 drivers/staging/mei/init.c | 25 +-
12328 drivers/staging/mei/interface.c | 4 +-
12329 drivers/staging/mei/interface.h | 8 +-
12330 drivers/staging/mei/interrupt.c | 85 +-
12331 drivers/staging/mei/main.c | 51 +-
12332 drivers/staging/mei/mei_dev.h | 24 +-
12333 drivers/staging/mei/wd.c | 242 +-
12334 drivers/staging/nvec/Kconfig | 12 +-
12335 drivers/staging/nvec/Makefile | 1 +
12336 drivers/staging/nvec/TODO | 10 +-
12337 drivers/staging/nvec/nvec-keytable.h | 225 +-
12338 drivers/staging/nvec/nvec.c | 957 +-
12339 drivers/staging/nvec/nvec.h | 217 +-
12340 drivers/staging/nvec/nvec_kbd.c | 95 +-
12341 drivers/staging/nvec/nvec_leds.c | 114 +
12342 drivers/staging/nvec/nvec_power.c | 352 +-
12343 drivers/staging/nvec/nvec_ps2.c | 114 +-
12344 drivers/staging/olpc_dcon/olpc_dcon.c | 47 +-
12345 drivers/staging/panel/panel.c | 10 +-
12346 drivers/staging/pohmelfs/trans.c | 6 +-
12347 drivers/staging/quatech_usb2/quatech_usb2.c | 9 +-
12348 drivers/staging/rtl8187se/Makefile | 6 +-
12349 drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 +-
12350 .../rtl8187se/ieee80211/ieee80211_softmac.c | 14 +-
12351 drivers/staging/rtl8187se/r8180_rtl8225z2.c | 4 +-
12352 drivers/staging/rtl8192e/Makefile | 67 +-
12353 drivers/staging/rtl8192e/TODO | 2 +
12354 drivers/staging/rtl8192e/dot11d.c | 216 +
12355 drivers/staging/rtl8192e/dot11d.h | 113 +-
12356 drivers/staging/rtl8192e/ieee80211/dot11d.c | 218 -
12357 drivers/staging/rtl8192e/ieee80211/dot11d.h | 102 -
12358 drivers/staging/rtl8192e/ieee80211/ieee80211.h | 2636 ---
12359 .../staging/rtl8192e/ieee80211/ieee80211_module.c | 352 -
12360 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2676 ---
12361 .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3278 ---
12362 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 955 -
12363 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 872 -
12364 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h | 69 -
12365 .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 676 -
12366 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 483 -
12367 .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 1732 --
12368 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h | 582 -
12369 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h | 56 -
12370 .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 627 -
12371 drivers/staging/rtl8192e/license | 339 +
12372 drivers/staging/rtl8192e/r8180_93cx6.c | 141 -
12373 drivers/staging/rtl8192e/r8180_93cx6.h | 41 -
12374 drivers/staging/rtl8192e/r8190P_def.h | 410 +
12375 drivers/staging/rtl8192e/r8190P_rtl8256.c | 306 +
12376 drivers/staging/rtl8192e/r8190P_rtl8256.h | 31 +
12377 drivers/staging/rtl8192e/r8190_rtl8256.c | 677 -
12378 drivers/staging/rtl8192e/r8190_rtl8256.h | 29 -
12379 drivers/staging/rtl8192e/r8192E.h | 1148 -
12380 drivers/staging/rtl8192e/r8192E_cmdpkt.c | 418 +
12381 drivers/staging/rtl8192e/r8192E_cmdpkt.h | 159 +
12382 drivers/staging/rtl8192e/r8192E_core.c | 5039 ----
12383 drivers/staging/rtl8192e/r8192E_dev.c | 2395 ++
12384 drivers/staging/rtl8192e/r8192E_dev.h | 62 +
12385 drivers/staging/rtl8192e/r8192E_dm.c | 2554 ---
12386 drivers/staging/rtl8192e/r8192E_dm.h | 228 -
12387 drivers/staging/rtl8192e/r8192E_firmware.c | 348 +
12388 drivers/staging/rtl8192e/r8192E_firmware.h | 73 +
12389 drivers/staging/rtl8192e/r8192E_hw.h | 552 +-
12390 drivers/staging/rtl8192e/r8192E_hwimg.c | 3336 +++
12391 drivers/staging/rtl8192e/r8192E_hwimg.h | 51 +
12392 drivers/staging/rtl8192e/r8192E_phy.c | 1637 ++
12393 drivers/staging/rtl8192e/r8192E_phy.h | 120 +
12394 drivers/staging/rtl8192e/r8192E_phyreg.h | 852 +
12395 drivers/staging/rtl8192e/r8192E_wx.c | 1163 -
12396 drivers/staging/rtl8192e/r8192E_wx.h | 18 -
12397 drivers/staging/rtl8192e/r8192_pm.c | 123 -
12398 drivers/staging/rtl8192e/r8192_pm.h | 24 -
12399 drivers/staging/rtl8192e/r819xE_cmdpkt.c | 444 -
12400 drivers/staging/rtl8192e/r819xE_cmdpkt.h | 207 -
12401 drivers/staging/rtl8192e/r819xE_firmware.c | 351 -
12402 drivers/staging/rtl8192e/r819xE_phy.c | 2225 --
12403 drivers/staging/rtl8192e/r819xE_phy.h | 131 -
12404 drivers/staging/rtl8192e/rtl819x_BA.h | 77 +
12405 drivers/staging/rtl8192e/rtl819x_BAProc.c | 566 +
12406 drivers/staging/rtl8192e/rtl819x_HT.h | 475 +
12407 drivers/staging/rtl8192e/rtl819x_HTProc.c | 1075 +
12408 drivers/staging/rtl8192e/rtl819x_Qos.h | 444 +
12409 drivers/staging/rtl8192e/rtl819x_TS.h | 73 +
12410 drivers/staging/rtl8192e/rtl819x_TSProc.c | 548 +
12411 drivers/staging/rtl8192e/rtl_cam.c | 304 +
12412 drivers/staging/rtl8192e/rtl_cam.h | 46 +
12413 drivers/staging/rtl8192e/rtl_core.c | 3198 +++
12414 drivers/staging/rtl8192e/rtl_core.h | 1124 +
12415 .../staging/rtl8192e/{ieee80211 => }/rtl_crypto.h | 105 +-
12416 drivers/staging/rtl8192e/rtl_debug.c | 1108 +
12417 drivers/staging/rtl8192e/rtl_debug.h | 299 +
12418 drivers/staging/rtl8192e/rtl_dm.c | 2995 +++
12419 drivers/staging/rtl8192e/rtl_dm.h | 324 +
12420 drivers/staging/rtl8192e/rtl_eeprom.c | 139 +
12421 drivers/staging/rtl8192e/rtl_eeprom.h | 29 +
12422 drivers/staging/rtl8192e/rtl_ethtool.c | 53 +
12423 drivers/staging/rtl8192e/rtl_pci.c | 97 +
12424 drivers/staging/rtl8192e/rtl_pci.h | 104 +
12425 drivers/staging/rtl8192e/rtl_pm.c | 136 +
12426 drivers/staging/rtl8192e/rtl_pm.h | 35 +
12427 drivers/staging/rtl8192e/rtl_ps.c | 310 +
12428 drivers/staging/rtl8192e/rtl_ps.h | 47 +
12429 drivers/staging/rtl8192e/rtl_wx.c | 1333 ++
12430 drivers/staging/rtl8192e/rtl_wx.h | 31 +
12431 drivers/staging/rtl8192e/rtllib.h | 3144 +++
12432 .../ieee80211_crypt.c => rtllib_crypt.c} | 91 +-
12433 .../ieee80211_crypt.h => rtllib_crypt.h} | 32 +-
12434 .../ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} | 170 +-
12435 .../ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} | 310 +-
12436 .../ieee80211_crypt_wep.c => rtllib_crypt_wep.c} | 116 +-
12437 drivers/staging/rtl8192e/rtllib_endianfree.h | 160 +
12438 drivers/staging/rtl8192e/rtllib_module.c | 289 +
12439 drivers/staging/rtl8192e/rtllib_rx.c | 2720 +++
12440 drivers/staging/rtl8192e/rtllib_softmac.c | 3741 +++
12441 .../ieee80211_softmac_wx.c => rtllib_softmac_wx.c} | 381 +-
12442 drivers/staging/rtl8192e/rtllib_tx.c | 967 +
12443 drivers/staging/rtl8192e/rtllib_wx.c | 876 +
12444 drivers/staging/rtl8192u/ieee80211/compress.c | 4 +-
12445 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +-
12446 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 14 +-
12447 drivers/staging/rtl8712/Kconfig | 7 +
12448 drivers/staging/rtl8712/basic_types.h | 25 +
12449 drivers/staging/rtl8712/big_endian.h | 25 +
12450 drivers/staging/rtl8712/drv_types.h | 33 +
12451 drivers/staging/rtl8712/ethernet.h | 25 +
12452 drivers/staging/rtl8712/generic.h | 25 +
12453 drivers/staging/rtl8712/hal_init.c | 6 +
12454 drivers/staging/rtl8712/ieee80211.c | 35 +-
12455 drivers/staging/rtl8712/ieee80211.h | 31 +-
12456 drivers/staging/rtl8712/if_ether.h | 25 +
12457 drivers/staging/rtl8712/little_endian.h | 25 +
12458 drivers/staging/rtl8712/mlme_osdep.h | 25 +
12459 drivers/staging/rtl8712/mp_custom_oid.h | 25 +
12460 drivers/staging/rtl8712/os_intfs.c | 33 +-
12461 drivers/staging/rtl8712/osdep_intf.h | 25 +
12462 drivers/staging/rtl8712/osdep_service.h | 69 +-
12463 drivers/staging/rtl8712/recv_linux.c | 6 +-
12464 drivers/staging/rtl8712/recv_osdep.h | 25 +
12465 drivers/staging/rtl8712/rtl8712_bitdef.h | 21 +
12466 drivers/staging/rtl8712/rtl8712_cmd.c | 18 +
12467 drivers/staging/rtl8712/rtl8712_cmd.h | 87 +
12468 drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 19 +
12469 drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h | 19 +
12470 drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | 19 +
12471 drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h | 19 +
12472 .../staging/rtl8712/rtl8712_edcasetting_bitdef.h | 25 +
12473 .../staging/rtl8712/rtl8712_edcasetting_regdef.h | 19 +
12474 drivers/staging/rtl8712/rtl8712_efuse.c | 75 +-
12475 drivers/staging/rtl8712/rtl8712_event.h | 25 +
12476 drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h | 19 +
12477 drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h | 19 +
12478 drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 25 +
12479 drivers/staging/rtl8712/rtl8712_gp_regdef.h | 25 +
12480 drivers/staging/rtl8712/rtl8712_hal.h | 25 +
12481 drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h | 19 +
12482 drivers/staging/rtl8712/rtl8712_led.c | 2 +-
12483 .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 19 +
12484 .../staging/rtl8712/rtl8712_macsetting_regdef.h | 19 +
12485 drivers/staging/rtl8712/rtl8712_powersave_bitdef.h | 19 +
12486 drivers/staging/rtl8712/rtl8712_powersave_regdef.h | 19 +
12487 drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h | 19 +
12488 drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 25 +
12489 drivers/staging/rtl8712/rtl8712_recv.c | 24 +-
12490 drivers/staging/rtl8712/rtl8712_recv.h | 31 +-
12491 drivers/staging/rtl8712/rtl8712_regdef.h | 25 +
12492 drivers/staging/rtl8712/rtl8712_security_bitdef.h | 19 +
12493 drivers/staging/rtl8712/rtl8712_spec.h | 25 +
12494 drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 25 +
12495 drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 25 +
12496 drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 19 +
12497 drivers/staging/rtl8712/rtl8712_timectrl_regdef.h | 19 +
12498 drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 25 +
12499 drivers/staging/rtl8712/rtl8712_wmac_regdef.h | 25 +
12500 drivers/staging/rtl8712/rtl8712_xmit.c | 303 +-
12501 drivers/staging/rtl8712/rtl8712_xmit.h | 37 +
12502 drivers/staging/rtl8712/rtl871x_byteorder.h | 19 +
12503 drivers/staging/rtl8712/rtl871x_cmd.c | 172 +-
12504 drivers/staging/rtl8712/rtl871x_cmd.h | 77 +-
12505 drivers/staging/rtl8712/rtl871x_debug.h | 25 +
12506 drivers/staging/rtl8712/rtl871x_eeprom.h | 19 +
12507 drivers/staging/rtl8712/rtl871x_event.h | 25 +
12508 drivers/staging/rtl8712/rtl871x_ht.h | 25 +
12509 drivers/staging/rtl8712/rtl871x_io.h | 25 +
12510 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 306 +-
12511 drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 25 +
12512 drivers/staging/rtl8712/rtl871x_ioctl_set.c | 3 +-
12513 drivers/staging/rtl8712/rtl871x_ioctl_set.h | 27 +-
12514 drivers/staging/rtl8712/rtl871x_led.h | 25 +
12515 drivers/staging/rtl8712/rtl871x_mlme.c | 58 +-
12516 drivers/staging/rtl8712/rtl871x_mlme.h | 28 +-
12517 drivers/staging/rtl8712/rtl871x_mp.c | 26 +-
12518 drivers/staging/rtl8712/rtl871x_mp.h | 26 +-
12519 drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 29 +-
12520 drivers/staging/rtl8712/rtl871x_pwrctrl.h | 25 +
12521 drivers/staging/rtl8712/rtl871x_recv.c | 4 +
12522 drivers/staging/rtl8712/rtl871x_rf.h | 25 +
12523 drivers/staging/rtl8712/rtl871x_security.c | 15 +
12524 drivers/staging/rtl8712/rtl871x_security.h | 25 +
12525 drivers/staging/rtl8712/rtl871x_wlan_sme.h | 25 +
12526 drivers/staging/rtl8712/rtl871x_xmit.c | 31 +-
12527 drivers/staging/rtl8712/rtl871x_xmit.h | 52 +-
12528 drivers/staging/rtl8712/sta_info.h | 29 +-
12529 drivers/staging/rtl8712/swab.h | 25 +
12530 drivers/staging/rtl8712/usb_intf.c | 19 +-
12531 drivers/staging/rtl8712/usb_ops.h | 25 +
12532 drivers/staging/rtl8712/usb_ops_linux.c | 29 +-
12533 drivers/staging/rtl8712/usb_osintf.h | 26 +
12534 drivers/staging/rtl8712/usb_vendor_req.h | 25 +
12535 drivers/staging/rtl8712/wifi.h | 25 +
12536 drivers/staging/rtl8712/wlan_bssdef.h | 25 +
12537 drivers/staging/rtl8712/xmit_linux.c | 27 +-
12538 drivers/staging/rtl8712/xmit_osdep.h | 26 +
12539 drivers/staging/rts5139/Kconfig | 16 +
12540 drivers/staging/rts5139/Makefile | 37 +
12541 drivers/staging/rts5139/TODO | 5 +
12542 drivers/staging/rts5139/debug.h | 46 +
12543 drivers/staging/rts5139/ms.c | 4191 ++++
12544 drivers/staging/rts5139/ms.h | 263 +
12545 drivers/staging/rts5139/ms_mg.c | 642 +
12546 drivers/staging/rts5139/ms_mg.h | 41 +
12547 drivers/staging/rts5139/rts51x.c | 967 +
12548 drivers/staging/rts5139/rts51x.h | 205 +
12549 drivers/staging/rts5139/rts51x_card.c | 986 +
12550 drivers/staging/rts5139/rts51x_card.h | 881 +
12551 drivers/staging/rts5139/rts51x_chip.c | 1167 +
12552 drivers/staging/rts5139/rts51x_chip.h | 904 +
12553 drivers/staging/rts5139/rts51x_fop.c | 298 +
12554 drivers/staging/rts5139/rts51x_fop.h | 62 +
12555 drivers/staging/rts5139/rts51x_scsi.c | 2234 ++
12556 drivers/staging/rts5139/rts51x_scsi.h | 162 +
12557 drivers/staging/rts5139/rts51x_sys.h | 54 +
12558 drivers/staging/rts5139/rts51x_transport.c | 1000 +
12559 drivers/staging/rts5139/rts51x_transport.h | 80 +
12560 drivers/staging/rts5139/sd.c | 3400 +++
12561 drivers/staging/rts5139/sd.h | 304 +
12562 drivers/staging/rts5139/sd_cprm.c | 1215 +
12563 drivers/staging/rts5139/sd_cprm.h | 54 +
12564 drivers/staging/rts5139/trace.h | 137 +
12565 drivers/staging/rts5139/xd.c | 2255 ++
12566 drivers/staging/rts5139/xd.h | 193 +
12567 drivers/staging/rts_pstor/Makefile | 2 +-
12568 drivers/staging/rts_pstor/rtsx_scsi.c | 2 +-
12569 drivers/staging/rts_pstor/sd.c | 4 +-
12570 drivers/staging/rts_pstor/spi.c | 2 +-
12571 drivers/staging/sep/sep_driver.c | 6 +-
12572 drivers/staging/serqt_usb2/serqt_usb2.c | 37 +-
12573 drivers/staging/sm7xx/smtcfb.c | 2 +
12574 drivers/staging/spectra/ffsport.c | 15 +-
12575 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 +
12576 drivers/staging/tidspbridge/gen/gh.c | 2 +-
12577 drivers/staging/usbip/stub.h | 5 +
12578 drivers/staging/usbip/stub_dev.c | 7 +-
12579 drivers/staging/usbip/stub_main.c | 1 +
12580 drivers/staging/usbip/stub_rx.c | 5 +-
12581 drivers/staging/usbip/usbip_common.h | 8 +-
12582 drivers/staging/usbip/usbip_protocol.txt | 358 +
12583 .../staging/usbip/userspace/libsrc/vhci_driver.c | 2 +-
12584 drivers/staging/usbip/userspace/src/usbip_attach.c | 4 +-
12585 drivers/staging/usbip/userspace/src/utils.h | 1 +
12586 drivers/staging/usbip/vhci.h | 5 +
12587 drivers/staging/vme/bridges/vme_ca91cx42.c | 24 +
12588 drivers/staging/vme/bridges/vme_tsi148.c | 24 +
12589 drivers/staging/vme/devices/vme_user.c | 4 +-
12590 drivers/staging/vme/vme.c | 95 +-
12591 drivers/staging/vme/vme_bridge.h | 13 +-
12592 drivers/staging/vt6655/IEEE11h.c | 406 +-
12593 drivers/staging/vt6655/device_main.c | 10 +-
12594 drivers/staging/vt6655/dpc.c | 30 +-
12595 drivers/staging/vt6655/ioctl.c | 1 +
12596 drivers/staging/vt6655/wmgr.c | 49 +-
12597 drivers/staging/vt6656/dpc.c | 30 +-
12598 drivers/staging/vt6656/ioctl.c | 1 +
12599 drivers/staging/vt6656/main_usb.c | 11 +-
12600 drivers/staging/vt6656/wmgr.c | 49 +-
12601 drivers/staging/vt6656/wpactl.c | 18 +-
12602 drivers/staging/winbond/phy_calibration.c | 12 +-
12603 drivers/staging/wlags49_h2/debug.h | 61 +-
12604 drivers/staging/wlags49_h2/hcf.c | 6434 +++---
12605 drivers/staging/wlags49_h2/hcf.h | 10 -
12606 drivers/staging/wlags49_h2/hcfcfg.h | 1567 --
12607 drivers/staging/wlags49_h2/hcfdef.h | 857 +-
12608 drivers/staging/wlags49_h2/mdd.h | 34 +-
12609 drivers/staging/wlags49_h2/wl_cs.c | 114 -
12610 drivers/staging/wlags49_h2/wl_internal.h | 7 -
12611 drivers/staging/wlags49_h2/wl_netdev.c | 2 +-
12612 drivers/staging/wlags49_h2/wl_version.h | 6 +-
12613 drivers/staging/wlags49_h2/wl_wext.c | 269 +-
12614 drivers/staging/wlags49_h2/wl_wext.h | 8 -
12615 drivers/staging/xgifb/TODO | 1 -
12616 drivers/staging/xgifb/XGI_main.h | 141 +-
12617 drivers/staging/xgifb/XGI_main_26.c | 838 +-
12618 drivers/staging/xgifb/XGIfb.h | 16 +-
12619 drivers/staging/xgifb/vb_def.h | 605 +-
12620 drivers/staging/xgifb/vb_ext.h | 20 -
12621 drivers/staging/xgifb/vb_init.c | 22 +-
12622 drivers/staging/xgifb/vb_setmode.c | 1530 +-
12623 drivers/staging/xgifb/vb_struct.h | 93 +-
12624 drivers/staging/xgifb/vb_table.h | 1200 +-
12625 drivers/staging/xgifb/vb_util.c | 5 +-
12626 drivers/staging/xgifb/vgatypes.h | 7 +-
12627 drivers/staging/zcache/zcache-main.c | 6 +-
12628 drivers/staging/zram/zram_drv.c | 97 +-
12629 drivers/staging/zram/zram_drv.h | 12 +-
12630 drivers/staging/zram/zram_sysfs.c | 22 +-
12631 include/linux/mod_devicetable.h | 9 +
12632 scripts/mod/file2alias.c | 25 +
12633 675 files changed, 126056 insertions(+), 105072 deletions(-)
12634 delete mode 100644 drivers/char/scc.h
12635 delete mode 100644 drivers/staging/brcm80211/brcmsmac/alloc.c
12636 delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.c
12637 delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.h
12638 rename drivers/staging/brcm80211/brcmsmac/{alloc.h => brcms_trace_events.c} (76%)
12639 create mode 100644 drivers/staging/brcm80211/brcmsmac/brcms_trace_events.h
12640 create mode 100644 drivers/staging/comedi/drivers/usbduxsigma.c
12641 delete mode 100644 drivers/staging/cx25821/cx25821-gpio.h
12642 create mode 100644 drivers/staging/et131x/et131x_ethtool.c
12643 delete mode 100644 drivers/staging/hv/blkvsc_drv.c
12644 delete mode 100644 drivers/staging/hv/hyperv_storage.h
12645 delete mode 100644 drivers/staging/hv/storvsc.c
12646 create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-adc-ad7280a
12647 create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933
12648 delete mode 100644 drivers/staging/iio/accel/accel.h
12649 delete mode 100644 drivers/staging/iio/accel/inclinometer.h
12650 create mode 100644 drivers/staging/iio/adc/ad7192.c
12651 create mode 100644 drivers/staging/iio/adc/ad7192.h
12652 create mode 100644 drivers/staging/iio/adc/ad7280a.c
12653 create mode 100644 drivers/staging/iio/adc/ad7280a.h
12654 delete mode 100644 drivers/staging/iio/adc/ad7314.c
12655 delete mode 100644 drivers/staging/iio/adc/ad7745.c
12656 create mode 100644 drivers/staging/iio/adc/ad7746.c
12657 create mode 100644 drivers/staging/iio/adc/ad7746.h
12658 delete mode 100644 drivers/staging/iio/adc/adc.h
12659 create mode 100644 drivers/staging/iio/buffer_generic.h
12660 delete mode 100644 drivers/staging/iio/gyro/gyro.h
12661 create mode 100644 drivers/staging/iio/iio_core.h
12662 create mode 100644 drivers/staging/iio/iio_core_trigger.h
12663 create mode 100644 drivers/staging/iio/impedance-analyzer/Kconfig
12664 create mode 100644 drivers/staging/iio/impedance-analyzer/Makefile
12665 create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.c
12666 create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h
12667 create mode 100644 drivers/staging/iio/industrialio-buffer.c
12668 delete mode 100644 drivers/staging/iio/industrialio-ring.c
12669 delete mode 100644 drivers/staging/iio/magnetometer/magnet.h
12670 create mode 100644 drivers/staging/iio/resolver/ad2s1200.c
12671 delete mode 100644 drivers/staging/iio/resolver/ad2s120x.c
12672 delete mode 100644 drivers/staging/iio/ring_generic.h
12673 create mode 100644 drivers/staging/nvec/nvec_leds.c
12674 create mode 100644 drivers/staging/rtl8192e/TODO
12675 create mode 100644 drivers/staging/rtl8192e/dot11d.c
12676 delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.c
12677 delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.h
12678 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211.h
12679 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
12680 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
12681 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
12682 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
12683 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
12684 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
12685 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
12686 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
12687 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
12688 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
12689 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
12690 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
12691 create mode 100644 drivers/staging/rtl8192e/license
12692 delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.c
12693 delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.h
12694 create mode 100644 drivers/staging/rtl8192e/r8190P_def.h
12695 create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.c
12696 create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.h
12697 delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.c
12698 delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.h
12699 delete mode 100644 drivers/staging/rtl8192e/r8192E.h
12700 create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.c
12701 create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.h
12702 delete mode 100644 drivers/staging/rtl8192e/r8192E_core.c
12703 create mode 100644 drivers/staging/rtl8192e/r8192E_dev.c
12704 create mode 100644 drivers/staging/rtl8192e/r8192E_dev.h
12705 delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.c
12706 delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.h
12707 create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.c
12708 create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.h
12709 create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.c
12710 create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.h
12711 create mode 100644 drivers/staging/rtl8192e/r8192E_phy.c
12712 create mode 100644 drivers/staging/rtl8192e/r8192E_phy.h
12713 create mode 100644 drivers/staging/rtl8192e/r8192E_phyreg.h
12714 delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.c
12715 delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.h
12716 delete mode 100644 drivers/staging/rtl8192e/r8192_pm.c
12717 delete mode 100644 drivers/staging/rtl8192e/r8192_pm.h
12718 delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.c
12719 delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.h
12720 delete mode 100644 drivers/staging/rtl8192e/r819xE_firmware.c
12721 delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.c
12722 delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.h
12723 create mode 100644 drivers/staging/rtl8192e/rtl819x_BA.h
12724 create mode 100644 drivers/staging/rtl8192e/rtl819x_BAProc.c
12725 create mode 100644 drivers/staging/rtl8192e/rtl819x_HT.h
12726 create mode 100644 drivers/staging/rtl8192e/rtl819x_HTProc.c
12727 create mode 100644 drivers/staging/rtl8192e/rtl819x_Qos.h
12728 create mode 100644 drivers/staging/rtl8192e/rtl819x_TS.h
12729 create mode 100644 drivers/staging/rtl8192e/rtl819x_TSProc.c
12730 create mode 100644 drivers/staging/rtl8192e/rtl_cam.c
12731 create mode 100644 drivers/staging/rtl8192e/rtl_cam.h
12732 create mode 100644 drivers/staging/rtl8192e/rtl_core.c
12733 create mode 100644 drivers/staging/rtl8192e/rtl_core.h
12734 rename drivers/staging/rtl8192e/{ieee80211 => }/rtl_crypto.h (74%)
12735 create mode 100644 drivers/staging/rtl8192e/rtl_debug.c
12736 create mode 100644 drivers/staging/rtl8192e/rtl_debug.h
12737 create mode 100644 drivers/staging/rtl8192e/rtl_dm.c
12738 create mode 100644 drivers/staging/rtl8192e/rtl_dm.h
12739 create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.c
12740 create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.h
12741 create mode 100644 drivers/staging/rtl8192e/rtl_ethtool.c
12742 create mode 100644 drivers/staging/rtl8192e/rtl_pci.c
12743 create mode 100644 drivers/staging/rtl8192e/rtl_pci.h
12744 create mode 100644 drivers/staging/rtl8192e/rtl_pm.c
12745 create mode 100644 drivers/staging/rtl8192e/rtl_pm.h
12746 create mode 100644 drivers/staging/rtl8192e/rtl_ps.c
12747 create mode 100644 drivers/staging/rtl8192e/rtl_ps.h
12748 create mode 100644 drivers/staging/rtl8192e/rtl_wx.c
12749 create mode 100644 drivers/staging/rtl8192e/rtl_wx.h
12750 create mode 100644 drivers/staging/rtl8192e/rtllib.h
12751 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.c => rtllib_crypt.c} (63%)
12752 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.h => rtllib_crypt.h} (74%)
12753 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} (67%)
12754 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} (71%)
12755 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_wep.c => rtllib_crypt_wep.c} (71%)
12756 create mode 100644 drivers/staging/rtl8192e/rtllib_endianfree.h
12757 create mode 100644 drivers/staging/rtl8192e/rtllib_module.c
12758 create mode 100644 drivers/staging/rtl8192e/rtllib_rx.c
12759 create mode 100644 drivers/staging/rtl8192e/rtllib_softmac.c
12760 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_softmac_wx.c => rtllib_softmac_wx.c} (50%)
12761 create mode 100644 drivers/staging/rtl8192e/rtllib_tx.c
12762 create mode 100644 drivers/staging/rtl8192e/rtllib_wx.c
12763 create mode 100644 drivers/staging/rts5139/Kconfig
12764 create mode 100644 drivers/staging/rts5139/Makefile
12765 create mode 100644 drivers/staging/rts5139/TODO
12766 create mode 100644 drivers/staging/rts5139/debug.h
12767 create mode 100644 drivers/staging/rts5139/ms.c
12768 create mode 100644 drivers/staging/rts5139/ms.h
12769 create mode 100644 drivers/staging/rts5139/ms_mg.c
12770 create mode 100644 drivers/staging/rts5139/ms_mg.h
12771 create mode 100644 drivers/staging/rts5139/rts51x.c
12772 create mode 100644 drivers/staging/rts5139/rts51x.h
12773 create mode 100644 drivers/staging/rts5139/rts51x_card.c
12774 create mode 100644 drivers/staging/rts5139/rts51x_card.h
12775 create mode 100644 drivers/staging/rts5139/rts51x_chip.c
12776 create mode 100644 drivers/staging/rts5139/rts51x_chip.h
12777 create mode 100644 drivers/staging/rts5139/rts51x_fop.c
12778 create mode 100644 drivers/staging/rts5139/rts51x_fop.h
12779 create mode 100644 drivers/staging/rts5139/rts51x_scsi.c
12780 create mode 100644 drivers/staging/rts5139/rts51x_scsi.h
12781 create mode 100644 drivers/staging/rts5139/rts51x_sys.h
12782 create mode 100644 drivers/staging/rts5139/rts51x_transport.c
12783 create mode 100644 drivers/staging/rts5139/rts51x_transport.h
12784 create mode 100644 drivers/staging/rts5139/sd.c
12785 create mode 100644 drivers/staging/rts5139/sd.h
12786 create mode 100644 drivers/staging/rts5139/sd_cprm.c
12787 create mode 100644 drivers/staging/rts5139/sd_cprm.h
12788 create mode 100644 drivers/staging/rts5139/trace.h
12789 create mode 100644 drivers/staging/rts5139/xd.c
12790 create mode 100644 drivers/staging/rts5139/xd.h
12791 create mode 100644 drivers/staging/usbip/usbip_protocol.txt
12792 Merging bkl-config/config
12793 $ git merge bkl-config/config
12794 Already up-to-date.
12796 $ git merge tmem/tmem
12797 Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache
12798 Auto-merging drivers/staging/zcache/zcache-main.c
12799 Auto-merging include/linux/swap.h
12800 Auto-merging mm/filemap.c
12801 Merge made by recursive.
12802 .../ABI/testing/sysfs-kernel-mm-cleancache | 11 -
12803 Documentation/vm/cleancache.txt | 41 ++--
12804 Documentation/vm/frontswap.txt | 210 +++++++++++++++
12805 drivers/staging/zcache/zcache-main.c | 10 +-
12806 drivers/xen/tmem.c | 10 +-
12809 include/linux/cleancache.h | 24 +-
12810 include/linux/frontswap.h | 126 +++++++++
12811 include/linux/swap.h | 4 +
12812 include/linux/swapfile.h | 13 +
12815 mm/cleancache.c | 98 +++-----
12816 mm/filemap.c | 2 +-
12817 mm/frontswap.c | 273 ++++++++++++++++++++
12818 mm/page_io.c | 12 +
12819 mm/swapfile.c | 64 ++++-
12820 mm/truncate.c | 10 +-
12821 19 files changed, 796 insertions(+), 134 deletions(-)
12822 delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache
12823 create mode 100644 Documentation/vm/frontswap.txt
12824 create mode 100644 include/linux/frontswap.h
12825 create mode 100644 include/linux/swapfile.h
12826 create mode 100644 mm/frontswap.c
12827 Merging writeback/writeback-for-next
12828 $ git merge writeback/writeback-for-next
12829 Auto-merging include/linux/sched.h
12830 Auto-merging kernel/fork.c
12831 Merge made by recursive.
12832 fs/fs-writeback.c | 19 +-
12833 include/linux/backing-dev.h | 11 +
12834 include/linux/sched.h | 7 +
12835 include/linux/writeback.h | 1 +
12836 include/trace/events/writeback.h | 24 --
12837 kernel/fork.c | 3 +
12838 mm/backing-dev.c | 4 +
12839 mm/page-writeback.c | 678 +++++++++++++++++++++++++++++---------
12840 8 files changed, 566 insertions(+), 181 deletions(-)
12841 Merging arm-dt/devicetree/arm-next
12842 $ git merge arm-dt/devicetree/arm-next
12843 Already up-to-date.
12844 Merging hwspinlock/linux-next
12845 $ git merge hwspinlock/linux-next
12846 Auto-merging MAINTAINERS
12847 Merge made by recursive.
12848 Documentation/hwspinlock.txt | 74 +++++++-----
12849 MAINTAINERS | 14 ++
12850 arch/arm/mach-omap2/hwspinlock.c | 8 +-
12851 drivers/hwspinlock/Kconfig | 27 +++--
12852 drivers/hwspinlock/Makefile | 1 +
12853 drivers/hwspinlock/hwspinlock_core.c | 204 +++++++++++++++++++-----------
12854 drivers/hwspinlock/hwspinlock_internal.h | 40 ++++--
12855 drivers/hwspinlock/omap_hwspinlock.c | 127 +++++++------------
12856 drivers/hwspinlock/u8500_hsem.c | 198 +++++++++++++++++++++++++++++
12857 include/linux/hwspinlock.h | 46 +++++--
12858 10 files changed, 514 insertions(+), 225 deletions(-)
12859 create mode 100644 drivers/hwspinlock/u8500_hsem.c
12860 Merging pinctrl/for-next
12861 $ git merge pinctrl/for-next
12862 Resolved 'arch/arm/mach-u300/Kconfig' using previous resolution.
12863 Resolved 'arch/arm/mach-u300/core.c' using previous resolution.
12864 Auto-merging MAINTAINERS
12865 Auto-merging arch/arm/mach-u300/Kconfig
12866 CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig
12867 Auto-merging arch/arm/mach-u300/core.c
12868 CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c
12869 Auto-merging arch/arm/mach-u300/mmc.c
12870 Removing arch/arm/mach-u300/padmux.c
12871 Removing arch/arm/mach-u300/padmux.h
12872 Auto-merging drivers/Kconfig
12873 Auto-merging drivers/Makefile
12874 Automatic merge failed; fix conflicts and then commit the result.
12876 [master 974c721] Merge remote-tracking branch 'pinctrl/for-next'
12877 $ git diff -M --stat --summary HEAD^..
12878 Documentation/pinctrl.txt | 951 ++++++++++++++++++++++++
12880 arch/arm/mach-u300/Kconfig | 2 +
12881 arch/arm/mach-u300/Makefile | 2 +-
12882 arch/arm/mach-u300/core.c | 81 ++
12883 arch/arm/mach-u300/include/mach/syscon.h | 136 ----
12884 arch/arm/mach-u300/mmc.c | 16 -
12885 arch/arm/mach-u300/padmux.c | 367 ----------
12886 arch/arm/mach-u300/padmux.h | 39 -
12887 arch/arm/mach-u300/spi.c | 20 -
12888 drivers/Kconfig | 4 +
12889 drivers/Makefile | 2 +
12890 drivers/pinctrl/Kconfig | 36 +
12891 drivers/pinctrl/Makefile | 7 +
12892 drivers/pinctrl/core.c | 601 +++++++++++++++
12893 drivers/pinctrl/core.h | 73 ++
12894 drivers/pinctrl/pinmux-u300.c | 1148 +++++++++++++++++++++++++++++
12895 drivers/pinctrl/pinmux.c | 1180 ++++++++++++++++++++++++++++++
12896 drivers/pinctrl/pinmux.h | 47 ++
12897 include/linux/pinctrl/machine.h | 107 +++
12898 include/linux/pinctrl/pinctrl.h | 133 ++++
12899 include/linux/pinctrl/pinmux.h | 117 +++
12900 22 files changed, 4495 insertions(+), 579 deletions(-)
12901 create mode 100644 Documentation/pinctrl.txt
12902 delete mode 100644 arch/arm/mach-u300/padmux.c
12903 delete mode 100644 arch/arm/mach-u300/padmux.h
12904 create mode 100644 drivers/pinctrl/Kconfig
12905 create mode 100644 drivers/pinctrl/Makefile
12906 create mode 100644 drivers/pinctrl/core.c
12907 create mode 100644 drivers/pinctrl/core.h
12908 create mode 100644 drivers/pinctrl/pinmux-u300.c
12909 create mode 100644 drivers/pinctrl/pinmux.c
12910 create mode 100644 drivers/pinctrl/pinmux.h
12911 create mode 100644 include/linux/pinctrl/machine.h
12912 create mode 100644 include/linux/pinctrl/pinctrl.h
12913 create mode 100644 include/linux/pinctrl/pinmux.h
12914 Merging moduleh/for-sfr
12915 $ git merge moduleh/for-sfr
12916 Auto-merging arch/arm/common/scoop.c
12917 Auto-merging arch/arm/kernel/armksyms.c
12918 Auto-merging arch/arm/kernel/perf_event.c
12919 Auto-merging arch/arm/kernel/process.c
12920 Auto-merging arch/arm/kernel/setup.c
12921 Auto-merging arch/arm/mach-bcmring/mm.c
12922 CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
12923 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
12924 Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c
12925 Auto-merging arch/arm/mach-imx/mach-mx31lilly.c
12926 Auto-merging arch/arm/mach-imx/mach-mx31lite.c
12927 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
12928 Auto-merging arch/arm/mach-ixp2000/core.c
12929 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
12930 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
12931 Auto-merging arch/arm/mach-omap1/board-sx1.c
12932 Auto-merging arch/arm/mach-omap1/board-voiceblue.c
12933 Auto-merging arch/arm/mach-omap2/board-omap3evm.c
12934 Auto-merging arch/arm/mach-omap2/clockdomain.c
12935 Auto-merging arch/arm/mach-omap2/display.c
12936 Auto-merging arch/arm/mach-omap2/pm.c
12937 Auto-merging arch/arm/mach-omap2/voltage.c
12938 Auto-merging arch/arm/mach-pxa/colibri-pxa270.c
12939 Auto-merging arch/arm/mach-pxa/corgi.c
12940 Auto-merging arch/arm/mach-pxa/poodle.c
12941 Auto-merging arch/arm/mach-pxa/spitz.c
12942 Auto-merging arch/arm/mach-pxa/trizeps4.c
12943 Auto-merging arch/arm/mach-s3c2410/mach-h1940.c
12944 Auto-merging arch/arm/mach-sa1100/jornada720.c
12945 Auto-merging arch/arm/mm/init.c
12946 Auto-merging arch/arm/plat-samsung/dev-ts.c
12947 Auto-merging arch/arm/plat-samsung/platformdata.c
12948 Auto-merging arch/arm/vfp/vfpmodule.c
12949 Auto-merging arch/blackfin/mach-bf518/boards/ezbrd.c
12950 Auto-merging arch/blackfin/mach-bf527/boards/ad7160eval.c
12951 Auto-merging arch/blackfin/mach-bf527/boards/cm_bf527.c
12952 Auto-merging arch/blackfin/mach-bf527/boards/ezbrd.c
12953 Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c
12954 Auto-merging arch/blackfin/mach-bf527/boards/tll6527m.c
12955 Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537e.c
12956 Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537u.c
12957 Auto-merging arch/blackfin/mach-bf537/boards/dnp5370.c
12958 Auto-merging arch/blackfin/mach-bf537/boards/pnav10.c
12959 Auto-merging arch/blackfin/mach-bf537/boards/stamp.c
12960 Auto-merging arch/blackfin/mach-bf537/boards/tcm_bf537.c
12961 Auto-merging arch/mips/bcm47xx/gpio.c
12962 Auto-merging arch/mips/bcm47xx/setup.c
12963 Auto-merging arch/mips/kernel/cpu-probe.c
12964 Auto-merging arch/mips/kernel/traps.c
12965 Auto-merging arch/mips/kernel/vpe.c
12966 Auto-merging arch/parisc/kernel/pci-dma.c
12967 Auto-merging arch/powerpc/include/asm/machdep.h
12968 Auto-merging arch/powerpc/kernel/dma-iommu.c
12969 Auto-merging arch/powerpc/kernel/dma.c
12970 Auto-merging arch/powerpc/kernel/ibmebus.c
12971 Auto-merging arch/powerpc/kernel/pci-common.c
12972 Auto-merging arch/powerpc/kernel/prom.c
12973 Auto-merging arch/powerpc/kernel/ptrace.c
12974 Auto-merging arch/powerpc/kernel/setup_64.c
12975 Auto-merging arch/powerpc/kernel/smp.c
12976 Auto-merging arch/powerpc/kernel/vio.c
12977 Auto-merging arch/powerpc/kvm/44x.c
12978 Auto-merging arch/powerpc/kvm/book3s_exports.c
12979 Auto-merging arch/powerpc/kvm/book3s_hv.c
12980 Auto-merging arch/powerpc/kvm/book3s_pr.c
12981 Auto-merging arch/powerpc/kvm/powerpc.c
12982 Auto-merging arch/powerpc/mm/hash_utils_64.c
12983 Auto-merging arch/powerpc/mm/mem.c
12984 Auto-merging arch/powerpc/mm/mmu_context_hash64.c
12985 Auto-merging arch/powerpc/mm/numa.c
12986 Auto-merging arch/powerpc/mm/tlb_nohash.c
12987 Auto-merging arch/powerpc/platforms/ps3/system-bus.c
12988 Auto-merging arch/powerpc/platforms/pseries/eeh.c
12989 Auto-merging arch/powerpc/platforms/pseries/iommu.c
12990 Auto-merging arch/powerpc/xmon/xmon.c
12991 Auto-merging arch/sparc/kernel/cpu.c
12992 Auto-merging arch/sparc/kernel/cpumap.c
12993 Auto-merging arch/sparc/kernel/process_64.c
12994 Auto-merging arch/sparc/kernel/setup_32.c
12995 Auto-merging arch/sparc/kernel/setup_64.c
12996 Auto-merging arch/x86/crypto/aes_glue.c
12997 Auto-merging arch/x86/kernel/cpu/amd.c
12998 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
12999 Auto-merging arch/x86/kernel/pci-dma.c
13000 Auto-merging arch/x86/kernel/rtc.c
13001 Auto-merging arch/x86/lguest/boot.c
13002 Auto-merging arch/x86/platform/mrst/vrtc.c
13003 Auto-merging block/ioctl.c
13004 Auto-merging drivers/ata/libata-eh.c
13005 Auto-merging drivers/ata/libata-scsi.c
13006 Auto-merging drivers/base/power/main.c
13007 Auto-merging drivers/base/power/runtime.c
13008 Auto-merging drivers/base/power/wakeup.c
13009 Auto-merging drivers/bcma/core.c
13010 Auto-merging drivers/bcma/driver_chipcommon.c
13011 Auto-merging drivers/bcma/driver_pci.c
13012 Auto-merging drivers/bcma/main.c
13013 Auto-merging drivers/block/aoe/aoeblk.c
13014 Auto-merging drivers/block/ps3vram.c
13015 Auto-merging drivers/bluetooth/btmrvl_sdio.c
13016 Auto-merging drivers/bluetooth/btwilink.c
13017 Auto-merging drivers/char/virtio_console.c
13018 Auto-merging drivers/cpuidle/cpuidle.c
13019 Auto-merging drivers/cpuidle/governors/ladder.c
13020 Auto-merging drivers/cpuidle/governors/menu.c
13021 Auto-merging drivers/dca/dca-core.c
13022 Auto-merging drivers/dma/imx-dma.c
13023 Auto-merging drivers/dma/imx-sdma.c
13024 Auto-merging drivers/dma/intel_mid_dma.c
13025 Auto-merging drivers/gpio/gpio-ep93xx.c
13026 Auto-merging drivers/gpio/gpio-mxc.c
13027 Auto-merging drivers/gpio/gpio-mxs.c
13028 Auto-merging drivers/gpu/drm/i915/i915_drv.c
13029 Auto-merging drivers/gpu/drm/i915/intel_sdvo.c
13030 Auto-merging drivers/gpu/drm/radeon/ni.c
13031 Auto-merging drivers/gpu/drm/radeon/r100.c
13032 Auto-merging drivers/gpu/drm/radeon/r600.c
13033 Auto-merging drivers/hid/hid-axff.c
13034 Auto-merging drivers/hid/hid-debug.c
13035 Auto-merging drivers/hid/hid-picolcd.c
13036 Auto-merging drivers/hid/hid-sjoy.c
13037 Auto-merging drivers/hid/usbhid/hid-quirks.c
13038 Auto-merging drivers/infiniband/core/cma.c
13039 Auto-merging drivers/infiniband/core/mad.c
13040 Auto-merging drivers/infiniband/core/ucma.c
13041 Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c
13042 Auto-merging drivers/infiniband/hw/qib/qib_init.c
13043 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_cm.c
13044 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_ib.c
13045 Auto-merging drivers/infiniband/ulp/iser/iscsi_iser.c
13046 Auto-merging drivers/input/input-mt.c
13047 Auto-merging drivers/input/input-polldev.c
13048 Auto-merging drivers/isdn/i4l/isdn_tty.c
13049 Auto-merging drivers/leds/leds-asic3.c
13050 Auto-merging drivers/md/dm-raid.c
13051 Auto-merging drivers/md/faulty.c
13052 Auto-merging drivers/md/linear.c
13053 Auto-merging drivers/md/md.c
13054 Auto-merging drivers/md/multipath.c
13055 Auto-merging drivers/md/raid0.c
13056 Auto-merging drivers/md/raid1.c
13057 Auto-merging drivers/md/raid10.c
13058 Auto-merging drivers/md/raid5.c
13059 Auto-merging drivers/media/common/saa7146_core.c
13060 Auto-merging drivers/media/common/saa7146_fops.c
13061 Auto-merging drivers/media/common/saa7146_hlp.c
13062 Auto-merging drivers/media/common/saa7146_video.c
13063 Auto-merging drivers/media/dvb/frontends/dibx000_common.c
13064 CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
13065 Auto-merging drivers/media/radio/radio-wl1273.c
13066 Auto-merging drivers/media/radio/wl128x/fmdrv_v4l2.c
13067 Auto-merging drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
13068 Auto-merging drivers/media/rc/rc-main.c
13069 Auto-merging drivers/media/video/adp1653.c
13070 Auto-merging drivers/media/video/cx25840/cx25840-ir.c
13071 Auto-merging drivers/media/video/hexium_gemini.c
13072 Auto-merging drivers/media/video/hexium_orion.c
13073 Auto-merging drivers/media/video/m5mols/m5mols_core.c
13074 Auto-merging drivers/media/video/mt9m111.c
13075 Auto-merging drivers/media/video/mxb.c
13076 Auto-merging drivers/media/video/noon010pc30.c
13077 Auto-merging drivers/media/video/sr030pc30.c
13078 Auto-merging drivers/media/video/tvp7002.c
13079 Auto-merging drivers/media/video/v4l2-ctrls.c
13080 Auto-merging drivers/media/video/v4l2-device.c
13081 Auto-merging drivers/media/video/v4l2-subdev.c
13082 Auto-merging drivers/mfd/ab3100-core.c
13083 Auto-merging drivers/mfd/asic3.c
13084 Auto-merging drivers/mfd/max8997.c
13085 Auto-merging drivers/mfd/twl-core.c
13086 Auto-merging drivers/mfd/twl6030-irq.c
13087 Auto-merging drivers/mfd/wm8400-core.c
13088 Auto-merging drivers/mmc/card/mmc_test.c
13089 Auto-merging drivers/mmc/core/debugfs.c
13090 Auto-merging drivers/mmc/core/host.c
13091 Auto-merging drivers/mmc/core/mmc.c
13092 Auto-merging drivers/mmc/core/mmc_ops.c
13093 Auto-merging drivers/mmc/core/quirks.c
13094 Auto-merging drivers/mmc/core/sd.c
13095 Auto-merging drivers/mmc/core/sd_ops.c
13096 Auto-merging drivers/mmc/host/sdhci-of-esdhc.c
13097 Auto-merging drivers/mmc/host/sdhci-pci.c
13098 Auto-merging drivers/mmc/host/sdhci-pxav2.c
13099 Auto-merging drivers/mmc/host/sdhci-spear.c
13100 Auto-merging drivers/mmc/host/sdhci-tegra.c
13101 Auto-merging drivers/mmc/host/sdhci.c
13102 Auto-merging drivers/mmc/host/sh_mmcif.c
13103 Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
13104 Auto-merging drivers/mtd/ar7part.c
13105 Auto-merging drivers/mtd/cmdlinepart.c
13106 Auto-merging drivers/mtd/mtdsuper.c
13107 Auto-merging drivers/mtd/nand/cafe_nand.c
13108 Auto-merging drivers/mtd/nand/cmx270_nand.c
13109 Auto-merging drivers/mtd/nand/diskonchip.c
13110 Auto-merging drivers/mtd/nand/nand_bbt.c
13111 Auto-merging drivers/mtd/nand/omap2.c
13112 Auto-merging drivers/mtd/nand/sm_common.c
13113 Auto-merging drivers/mtd/onenand/onenand_bbt.c
13114 Auto-merging drivers/mtd/redboot.c
13115 Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
13116 Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
13117 Auto-merging drivers/net/ethernet/chelsio/cxgb3/l2t.c
13118 Auto-merging drivers/net/ethernet/chelsio/cxgb4/l2t.c
13119 Auto-merging drivers/net/ethernet/chelsio/cxgb4/sge.c
13120 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
13121 Auto-merging drivers/net/ethernet/ethoc.c
13122 Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
13123 Auto-merging drivers/net/ethernet/intel/e1000e/param.c
13124 Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c
13125 Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
13126 Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
13127 Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c
13128 Auto-merging drivers/net/ethernet/mellanox/mlx4/en_tx.c
13129 Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
13130 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
13131 Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c
13132 Auto-merging drivers/net/ethernet/mellanox/mlx4/mcg.c
13133 Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
13134 Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
13135 Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
13136 Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
13137 Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
13138 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
13139 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
13140 CONFLICT (content): Merge conflict in drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
13141 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
13142 Auto-merging drivers/net/ethernet/sfc/rx.c
13143 Auto-merging drivers/net/ethernet/smsc/smsc9420.c
13144 Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
13145 Auto-merging drivers/net/usb/lg-vl600.c
13146 Auto-merging drivers/net/vmxnet3/vmxnet3_drv.c
13147 Auto-merging drivers/net/wimax/i2400m/usb.c
13148 Auto-merging drivers/net/wireless/adm8211.c
13149 Auto-merging drivers/net/wireless/ath/ath5k/debug.c
13150 Auto-merging drivers/net/wireless/ath/ath5k/pci.c
13151 Auto-merging drivers/net/wireless/ath/ath9k/ahb.c
13152 Auto-merging drivers/net/wireless/ath/ath9k/ani.c
13153 Auto-merging drivers/net/wireless/ath/ath9k/ar9002_hw.c
13154 Auto-merging drivers/net/wireless/ath/ath9k/ar9002_mac.c
13155 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_mac.c
13156 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_paprd.c
13157 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.c
13158 Auto-merging drivers/net/wireless/ath/ath9k/calib.c
13159 Auto-merging drivers/net/wireless/ath/ath9k/debug.c
13160 Auto-merging drivers/net/wireless/ath/ath9k/hw.c
13161 Auto-merging drivers/net/wireless/ath/ath9k/init.c
13162 Auto-merging drivers/net/wireless/ath/ath9k/mac.c
13163 Auto-merging drivers/net/wireless/ath/ath9k/pci.c
13164 Auto-merging drivers/net/wireless/ath/ath9k/rc.c
13165 Auto-merging drivers/net/wireless/ath/carl9170/fw.c
13166 Auto-merging drivers/net/wireless/b43/main.c
13167 Auto-merging drivers/net/wireless/b43legacy/main.c
13168 Auto-merging drivers/net/wireless/iwlegacy/iwl-tx.c
13169 Auto-merging drivers/net/wireless/iwlwifi/iwl-pci.c
13170 Auto-merging drivers/net/wireless/libertas/cmd.c
13171 Auto-merging drivers/net/wireless/libertas/if_sdio.c
13172 Auto-merging drivers/net/wireless/libertas/if_spi.c
13173 Auto-merging drivers/net/wireless/libertas/if_usb.c
13174 Auto-merging drivers/net/wireless/libertas/main.c
13175 Auto-merging drivers/net/wireless/libertas/rx.c
13176 Auto-merging drivers/net/wireless/libertas/tx.c
13177 Auto-merging drivers/net/wireless/mac80211_hwsim.c
13178 Auto-merging drivers/net/wireless/p54/eeprom.c
13179 Auto-merging drivers/net/wireless/p54/fwio.c
13180 Auto-merging drivers/net/wireless/p54/main.c
13181 Auto-merging drivers/net/wireless/p54/txrx.c
13182 Auto-merging drivers/net/wireless/rtl818x/rtl8180/dev.c
13183 Auto-merging drivers/net/wireless/rtl818x/rtl8187/dev.c
13184 Auto-merging drivers/net/wireless/rtlwifi/base.c
13185 Auto-merging drivers/net/wireless/rtlwifi/pci.c
13186 Auto-merging drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
13187 Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
13188 Auto-merging drivers/net/wireless/rtlwifi/rtl8192de/sw.c
13189 Auto-merging drivers/net/wireless/rtlwifi/rtl8192se/sw.c
13190 Auto-merging drivers/net/wireless/rtlwifi/usb.c
13191 Auto-merging drivers/net/wireless/wl12xx/boot.c
13192 Auto-merging drivers/parisc/sba_iommu.c
13193 Auto-merging drivers/pci/quirks.c
13194 Auto-merging drivers/power/max17042_battery.c
13195 Auto-merging drivers/power/max8903_charger.c
13196 Auto-merging drivers/power/max8997_charger.c
13197 Auto-merging drivers/power/max8998_charger.c
13198 Auto-merging drivers/power/power_supply_sysfs.c
13199 Auto-merging drivers/regulator/88pm8607.c
13200 Auto-merging drivers/regulator/core.c
13201 Auto-merging drivers/regulator/mc13783-regulator.c
13202 Auto-merging drivers/regulator/tps6586x-regulator.c
13203 Auto-merging drivers/s390/char/vmur.c
13204 Auto-merging drivers/s390/cio/qdio_debug.c
13205 Auto-merging drivers/s390/cio/qdio_setup.c
13206 Auto-merging drivers/s390/scsi/zfcp_dbf.c
13207 Auto-merging drivers/s390/scsi/zfcp_qdio.c
13208 Auto-merging drivers/s390/scsi/zfcp_scsi.c
13209 Auto-merging drivers/scsi/be2iscsi/be_main.c
13210 Auto-merging drivers/scsi/cxgbi/libcxgbi.c
13211 Auto-merging drivers/scsi/device_handler/scsi_dh.c
13212 Auto-merging drivers/scsi/device_handler/scsi_dh_alua.c
13213 Auto-merging drivers/scsi/device_handler/scsi_dh_rdac.c
13214 Auto-merging drivers/scsi/iscsi_tcp.c
13215 Auto-merging drivers/scsi/libfc/fc_exch.c
13216 Auto-merging drivers/scsi/libfc/fc_lport.c
13217 CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
13218 Auto-merging drivers/scsi/libiscsi.c
13219 Auto-merging drivers/scsi/libsas/sas_scsi_host.c
13220 Auto-merging drivers/scsi/lpfc/lpfc_attr.c
13221 Auto-merging drivers/scsi/lpfc/lpfc_init.c
13222 Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
13223 Auto-merging drivers/scsi/megaraid/megaraid_mbox.c
13224 Auto-merging drivers/spi/spi-dw.c
13225 Auto-merging drivers/ssb/main.c
13226 Auto-merging drivers/staging/brcm80211/brcmfmac/bcmsdh.c
13227 Auto-merging drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
13228 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c
13229 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
13230 Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.c
13231 Auto-merging drivers/staging/brcm80211/brcmutil/utils.c
13232 Auto-merging drivers/staging/brcm80211/brcmutil/wifi.c
13233 Auto-merging drivers/staging/cxt1e1/linux.c
13234 Auto-merging drivers/staging/gma500/psb_drv.c
13235 Auto-merging drivers/staging/iio/accel/adis16201_ring.c
13236 Auto-merging drivers/staging/iio/accel/adis16201_trigger.c
13237 Auto-merging drivers/staging/iio/accel/adis16203_ring.c
13238 Auto-merging drivers/staging/iio/accel/adis16203_trigger.c
13239 Auto-merging drivers/staging/iio/accel/adis16204_ring.c
13240 Auto-merging drivers/staging/iio/accel/adis16204_trigger.c
13241 Auto-merging drivers/staging/iio/accel/adis16209_ring.c
13242 Auto-merging drivers/staging/iio/accel/adis16209_trigger.c
13243 Auto-merging drivers/staging/iio/accel/adis16240_ring.c
13244 Auto-merging drivers/staging/iio/accel/adis16240_trigger.c
13245 Auto-merging drivers/staging/iio/accel/lis3l02dq_ring.c
13246 Auto-merging drivers/staging/iio/adc/ad7793.c
13247 Auto-merging drivers/staging/iio/dac/ad5686.c
13248 Auto-merging drivers/staging/iio/gyro/adis16060_core.c
13249 Auto-merging drivers/staging/iio/gyro/adis16260_ring.c
13250 Auto-merging drivers/staging/iio/gyro/adis16260_trigger.c
13251 Auto-merging drivers/staging/iio/imu/adis16400_ring.c
13252 Auto-merging drivers/staging/iio/imu/adis16400_trigger.c
13253 CONFLICT (delete/modify): drivers/staging/iio/industrialio-ring.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/iio/industrialio-ring.c left in tree.
13254 Auto-merging drivers/staging/iio/meter/ade7758_ring.c
13255 Auto-merging drivers/staging/iio/meter/ade7758_trigger.c
13256 Auto-merging drivers/staging/intel_sst/intel_sst.c
13257 Auto-merging drivers/staging/winbond/wbusb.c
13258 Auto-merging drivers/staging/wlags49_h2/wl_cs.c
13259 Auto-merging drivers/target/target_core_alua.c
13260 Auto-merging drivers/target/target_core_fabric_lib.c
13261 Auto-merging drivers/target/target_core_file.c
13262 Auto-merging drivers/target/target_core_iblock.c
13263 Auto-merging drivers/target/target_core_pscsi.c
13264 Auto-merging drivers/target/target_core_tmr.c
13265 Auto-merging drivers/target/target_core_tpg.c
13266 Auto-merging drivers/target/target_core_transport.c
13267 Auto-merging drivers/tty/serial/jsm/jsm_driver.c
13268 Auto-merging drivers/tty/serial/max3100.c
13269 Auto-merging drivers/tty/serial/max3107.c
13270 Auto-merging drivers/tty/serial/nwpserial.c
13271 Auto-merging drivers/tty/serial/timbuart.c
13272 Auto-merging drivers/tty/serial/xilinx_uartps.c
13273 Auto-merging drivers/uio/uio_pdrv_genirq.c
13274 Auto-merging drivers/usb/core/driver.c
13275 Auto-merging drivers/usb/gadget/cdc2.c
13276 Auto-merging drivers/usb/gadget/composite.c
13277 Auto-merging drivers/usb/gadget/dbgp.c
13278 Auto-merging drivers/usb/gadget/f_fs.c
13279 Auto-merging drivers/usb/gadget/f_obex.c
13280 Auto-merging drivers/usb/gadget/f_sourcesink.c
13281 Auto-merging drivers/usb/gadget/file_storage.c
13282 Auto-merging drivers/usb/gadget/fusb300_udc.c
13283 Auto-merging drivers/usb/gadget/gmidi.c
13284 Auto-merging drivers/usb/gadget/u_serial.c
13285 Auto-merging drivers/usb/host/isp1760-if.c
13286 Auto-merging drivers/usb/host/xhci-hub.c
13287 Auto-merging drivers/usb/host/xhci-pci.c
13288 Auto-merging drivers/usb/mon/mon_bin.c
13289 Auto-merging drivers/usb/serial/qcserial.c
13290 Auto-merging drivers/usb/storage/transport.c
13291 Auto-merging drivers/usb/wusbcore/wa-hc.c
13292 Auto-merging drivers/video/atmel_lcdfb.c
13293 Auto-merging drivers/video/carminefb.c
13294 Auto-merging drivers/video/mb862xx/mb862xx-i2c.c
13295 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
13296 Auto-merging drivers/video/msm/mdp.c
13297 Auto-merging drivers/video/omap2/dss/dispc.c
13298 Auto-merging drivers/video/omap2/dss/dpi.c
13299 Auto-merging drivers/video/omap2/dss/dsi.c
13300 Auto-merging drivers/video/omap2/dss/dss.c
13301 Auto-merging drivers/video/omap2/dss/rfbi.c
13302 Auto-merging drivers/video/omap2/dss/sdi.c
13303 Auto-merging drivers/video/sh_mobile_lcdcfb.c
13304 Auto-merging drivers/xen/balloon.c
13305 Auto-merging drivers/xen/swiotlb-xen.c
13306 Auto-merging drivers/xen/xen-pciback/conf_space.c
13307 Auto-merging drivers/xen/xenbus/xenbus_probe.c
13308 Auto-merging drivers/xen/xenbus/xenbus_probe_backend.c
13309 Auto-merging drivers/xen/xenbus/xenbus_probe_frontend.c
13310 Auto-merging fs/cifs/connect.c
13311 Auto-merging fs/exofs/ore.c
13312 Auto-merging fs/exofs/super.c
13313 Auto-merging fs/gfs2/ops_fstype.c
13314 Auto-merging fs/logfs/super.c
13315 Auto-merging fs/nfs/nfs4filelayout.c
13316 Auto-merging fs/nfs/write.c
13317 Auto-merging fs/nfsd/nfsctl.c
13318 Auto-merging fs/ocfs2/cluster/tcp.c
13319 Auto-merging include/linux/bcma/bcma.h
13320 Auto-merging include/linux/blkdev.h
13321 Auto-merging include/linux/device.h
13322 Auto-merging include/linux/dmaengine.h
13323 CONFLICT (content): Merge conflict in include/linux/dmaengine.h
13324 Auto-merging include/linux/hid.h
13325 Auto-merging include/linux/irq.h
13326 Auto-merging include/linux/irqdesc.h
13327 Auto-merging include/linux/mtd/mtd.h
13328 Auto-merging include/linux/pm_runtime.h
13329 Auto-merging include/linux/regmap.h
13330 Auto-merging include/linux/regulator/driver.h
13331 Auto-merging include/linux/serio.h
13332 Auto-merging include/linux/ssb/ssb.h
13333 Auto-merging include/linux/usb.h
13334 Auto-merging include/media/saa7146.h
13335 Auto-merging include/net/bluetooth/hci_core.h
13336 Auto-merging include/net/lib80211.h
13337 Auto-merging include/net/sock.h
13338 Auto-merging kernel/async.c
13339 Auto-merging kernel/crash_dump.c
13340 Auto-merging kernel/cred.c
13341 Auto-merging kernel/events/core.c
13342 Auto-merging kernel/fork.c
13343 Auto-merging kernel/futex.c
13344 Auto-merging kernel/irq/irqdesc.c
13345 Auto-merging kernel/irq_work.c
13346 Auto-merging kernel/kprobes.c
13347 Auto-merging kernel/latencytop.c
13348 Auto-merging kernel/lockdep.c
13349 Auto-merging kernel/pid.c
13350 Auto-merging kernel/power/hibernate.c
13351 Auto-merging kernel/power/main.c
13352 Auto-merging kernel/power/qos.c
13353 Auto-merging kernel/power/suspend.c
13354 Auto-merging kernel/ptrace.c
13355 Auto-merging kernel/rcupdate.c
13356 Auto-merging kernel/rcutiny.c
13357 Auto-merging kernel/rcutorture.c
13358 Auto-merging kernel/rcutree.c
13359 Auto-merging kernel/rcutree_trace.c
13360 Auto-merging kernel/resource.c
13361 Auto-merging kernel/rtmutex-debug.c
13362 Auto-merging kernel/rtmutex.c
13363 Auto-merging kernel/sched.c
13364 Auto-merging kernel/semaphore.c
13365 Auto-merging kernel/signal.c
13366 Auto-merging kernel/sys.c
13367 Auto-merging kernel/time.c
13368 Auto-merging kernel/watchdog.c
13369 Auto-merging kernel/workqueue.c
13370 Auto-merging lib/dma-debug.c
13371 Auto-merging mm/memcontrol.c
13372 Auto-merging mm/swapfile.c
13373 Auto-merging net/802/garp.c
13374 Auto-merging net/802/stp.c
13375 Auto-merging net/bluetooth/hci_sysfs.c
13376 Auto-merging net/bluetooth/mgmt.c
13377 Auto-merging net/bridge/br_input.c
13378 Auto-merging net/caif/caif_dev.c
13379 Auto-merging net/ceph/messenger.c
13380 Auto-merging net/core/dev_addr_lists.c
13381 Auto-merging net/core/fib_rules.c
13382 Auto-merging net/core/net-sysfs.c
13383 Auto-merging net/core/netpoll.c
13384 Auto-merging net/core/user_dma.c
13385 Auto-merging net/ipv4/fib_trie.c
13386 Auto-merging net/ipv4/ipmr.c
13387 Auto-merging net/ipv4/proc.c
13388 Auto-merging net/ipv6/addrconf.c
13389 Auto-merging net/ipv6/exthdrs.c
13390 Auto-merging net/ipv6/ip6_flowlabel.c
13391 Auto-merging net/ipv6/ip6mr.c
13392 Auto-merging net/ipv6/raw.c
13393 Auto-merging net/ipv6/route.c
13394 Auto-merging net/irda/qos.c
13395 Auto-merging net/mac80211/agg-rx.c
13396 Auto-merging net/mac80211/agg-tx.c
13397 Auto-merging net/mac80211/ht.c
13398 Auto-merging net/mac80211/key.c
13399 Auto-merging net/mac80211/mlme.c
13400 Auto-merging net/mac80211/rate.c
13401 Auto-merging net/mac80211/rx.c
13402 Auto-merging net/mac80211/scan.c
13403 Auto-merging net/mac80211/status.c
13404 Auto-merging net/mac80211/tx.c
13405 Auto-merging net/mac80211/util.c
13406 Auto-merging net/netfilter/nf_conntrack_ecache.c
13407 Auto-merging net/netfilter/x_tables.c
13408 Auto-merging net/nfc/rawsock.c
13409 Auto-merging net/phonet/socket.c
13410 Auto-merging net/sunrpc/svc_xprt.c
13411 Auto-merging net/sunrpc/svcsock.c
13412 Auto-merging net/tipc/socket.c
13413 Auto-merging net/wireless/mesh.c
13414 Auto-merging net/wireless/reg.c
13415 Auto-merging net/wireless/sme.c
13416 Auto-merging net/wireless/util.c
13417 Auto-merging net/wireless/wext-compat.c
13418 Auto-merging net/wireless/wext-sme.c
13419 Auto-merging security/selinux/hooks.c
13420 Auto-merging security/selinux/netlink.c
13421 Auto-merging sound/arm/pxa2xx-ac97-lib.c
13422 Auto-merging sound/core/control.c
13423 Auto-merging sound/core/jack.c
13424 Auto-merging sound/core/oss/mixer_oss.c
13425 Auto-merging sound/core/pcm_lib.c
13426 Auto-merging sound/core/pcm_native.c
13427 Auto-merging sound/drivers/aloop.c
13428 Auto-merging sound/drivers/ml403-ac97cr.c
13429 Auto-merging sound/drivers/mpu401/mpu401.c
13430 Auto-merging sound/drivers/mpu401/mpu401_uart.c
13431 Auto-merging sound/drivers/mtpav.c
13432 Auto-merging sound/drivers/serial-u16550.c
13433 Auto-merging sound/isa/ad1816a/ad1816a.c
13434 Auto-merging sound/isa/als100.c
13435 Auto-merging sound/isa/azt2320.c
13436 Auto-merging sound/isa/cmi8330.c
13437 Auto-merging sound/isa/cs423x/cs4231.c
13438 Auto-merging sound/isa/cs423x/cs4236.c
13439 Auto-merging sound/isa/es1688/es1688.c
13440 Auto-merging sound/isa/es1688/es1688_lib.c
13441 Auto-merging sound/isa/es18xx.c
13442 Auto-merging sound/isa/gus/gus_main.c
13443 Auto-merging sound/isa/gus/gusextreme.c
13444 Auto-merging sound/isa/gus/gusmax.c
13445 Auto-merging sound/isa/gus/interwave.c
13446 Auto-merging sound/isa/opl3sa2.c
13447 Auto-merging sound/isa/opti9xx/miro.c
13448 Auto-merging sound/isa/opti9xx/opti92x-ad1848.c
13449 Auto-merging sound/isa/sb/sb16.c
13450 Auto-merging sound/isa/sb/sb_common.c
13451 Auto-merging sound/isa/sscape.c
13452 Auto-merging sound/isa/wavefront/wavefront.c
13453 Auto-merging sound/isa/wss/wss_lib.c
13454 Auto-merging sound/mips/au1x00.c
13455 Auto-merging sound/pci/als4000.c
13456 Auto-merging sound/pci/azt3328.c
13457 Auto-merging sound/pci/cmipci.c
13458 Auto-merging sound/pci/es1938.c
13459 Auto-merging sound/pci/es1968.c
13460 Auto-merging sound/pci/fm801.c
13461 Auto-merging sound/pci/hda/hda_codec.c
13462 Auto-merging sound/pci/hda/hda_hwdep.c
13463 Auto-merging sound/pci/hda/patch_analog.c
13464 Auto-merging sound/pci/hda/patch_cirrus.c
13465 Auto-merging sound/pci/hda/patch_conexant.c
13466 Auto-merging sound/pci/hda/patch_hdmi.c
13467 Auto-merging sound/pci/hda/patch_realtek.c
13468 Auto-merging sound/pci/hda/patch_sigmatel.c
13469 Auto-merging sound/pci/hda/patch_via.c
13470 Auto-merging sound/pci/ice1712/ice1712.c
13471 Auto-merging sound/pci/maestro3.c
13472 Auto-merging sound/pci/oxygen/oxygen_lib.c
13473 Auto-merging sound/pci/riptide/riptide.c
13474 Auto-merging sound/pci/rme9652/hdspm.c
13475 Auto-merging sound/pci/sis7019.c
13476 Auto-merging sound/pci/sonicvibes.c
13477 Auto-merging sound/pci/trident/trident.c
13478 Auto-merging sound/pci/via82xx.c
13479 Auto-merging sound/pci/ymfpci/ymfpci.c
13480 Auto-merging sound/pci/ymfpci/ymfpci_main.c
13481 Auto-merging sound/ppc/snd_ps3.c
13482 Auto-merging sound/soc/codecs/sn95031.c
13483 Auto-merging sound/soc/codecs/wl1273.c
13484 Auto-merging sound/soc/ep93xx/edb93xx.c
13485 Auto-merging sound/soc/ep93xx/snappercl15.c
13486 Auto-merging sound/soc/mResolved 'arch/arm/mach-bcmring/mm.c' using previous resolution.
13487 Resolved 'drivers/media/dvb/frontends/dibx000_common.c' using previous resolution.
13488 Resolved 'drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c' using previous resolution.
13489 Resolved 'drivers/scsi/libfc/fc_lport.c' using previous resolution.
13490 Resolved 'include/linux/dmaengine.h' using previous resolution.
13491 Resolved 'sound/soc/soc-io.c' using previous resolution.
13492 id-x86/mfld_machine.c
13493 Auto-merging sound/soc/mid-x86/sst_platform.c
13494 Auto-merging sound/soc/omap/am3517evm.c
13495 Auto-merging sound/soc/omap/igep0020.c
13496 Auto-merging sound/soc/omap/n810.c
13497 Auto-merging sound/soc/omap/omap-pcm.c
13498 Auto-merging sound/soc/omap/omap3evm.c
13499 Auto-merging sound/soc/omap/omap3pandora.c
13500 Auto-merging sound/soc/omap/osk5912.c
13501 Auto-merging sound/soc/omap/overo.c
13502 Auto-merging sound/soc/omap/rx51.c
13503 Auto-merging sound/soc/omap/sdp3430.c
13504 Auto-merging sound/soc/omap/sdp4430.c
13505 Auto-merging sound/soc/omap/zoom2.c
13506 Auto-merging sound/soc/samsung/ac97.c
13507 Auto-merging sound/soc/samsung/dma.c
13508 Auto-merging sound/soc/samsung/i2s.c
13509 Auto-merging sound/soc/samsung/jive_wm8750.c
13510 Auto-merging sound/soc/samsung/pcm.c
13511 Auto-merging sound/soc/samsung/s3c2412-i2s.c
13512 Auto-merging sound/soc/samsung/s3c24xx-i2s.c
13513 Auto-merging sound/soc/samsung/s3c24xx_simtec.c
13514 Auto-merging sound/soc/samsung/s3c24xx_uda134x.c
13515 Auto-merging sound/soc/samsung/smartq_wm8987.c
13516 Auto-merging sound/soc/samsung/smdk_wm8580.c
13517 Auto-merging sound/soc/samsung/smdk_wm8580pcm.c
13518 Auto-merging sound/soc/samsung/spdif.c
13519 Auto-merging sound/soc/samsung/speyside.c
13520 Auto-merging sound/soc/samsung/speyside_wm8962.c
13521 Auto-merging sound/soc/sh/fsi.c
13522 Auto-merging sound/soc/soc-cache.c
13523 Auto-merging sound/soc/soc-io.c
13524 CONFLICT (content): Merge conflict in sound/soc/soc-io.c
13525 Auto-merging sound/soc/soc-jack.c
13526 Auto-merging sound/usb/6fire/firmware.c
13527 Auto-merging sound/usb/card.c
13528 Auto-merging sound/usb/midi.c
13529 Auto-merging virt/kvm/iommu.c
13530 Automatic merge failed; fix conflicts and then commit the result.
13531 $ git rm -f drivers/staging/iio/industrialio-ring.c
13532 arch/arm/mach-bcmring/mm.c: needs merge
13533 drivers/media/dvb/frontends/dibx000_common.c: needs merge
13534 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c: needs merge
13535 drivers/scsi/libfc/fc_lport.c: needs merge
13536 drivers/staging/iio/industrialio-ring.c: needs merge
13537 include/linux/dmaengine.h: needs merge
13538 sound/soc/soc-io.c: needs merge
13539 rm 'drivers/staging/iio/industrialio-ring.c'
13541 [master bbed5c4] Merge remote-tracking branch 'moduleh/for-sfr'
13542 $ git diff -M --stat --summary HEAD^..
13543 arch/alpha/kernel/core_irongate.c | 1 +
13544 arch/alpha/kernel/pci-sysfs.c | 1 +
13545 arch/alpha/kernel/pci_iommu.c | 1 +
13546 arch/alpha/kernel/setup.c | 1 +
13547 arch/arm/common/it8152.c | 1 +
13548 arch/arm/common/scoop.c | 1 +
13549 arch/arm/kernel/armksyms.c | 2 +-
13550 arch/arm/kernel/bios32.c | 2 +-
13551 arch/arm/kernel/devtree.c | 2 +-
13552 arch/arm/kernel/elf.c | 2 +-
13553 arch/arm/kernel/etm.c | 1 +
13554 arch/arm/kernel/io.c | 2 +-
13555 arch/arm/kernel/irq.c | 1 -
13556 arch/arm/kernel/leds.c | 3 +-
13557 arch/arm/kernel/perf_event.c | 2 +-
13558 arch/arm/kernel/pj4-cp0.c | 1 -
13559 arch/arm/kernel/process.c | 2 +-
13560 arch/arm/kernel/ptrace.c | 1 +
13561 arch/arm/kernel/return_address.c | 2 +-
13562 arch/arm/kernel/setup.c | 2 +-
13563 arch/arm/kernel/stacktrace.c | 2 +-
13564 arch/arm/kernel/sys_arm.c | 2 +-
13565 arch/arm/kernel/time.c | 2 +-
13566 arch/arm/kernel/unwind.c | 2 +-
13567 arch/arm/kernel/xscale-cp0.c | 1 -
13568 arch/arm/mach-at91/cpuidle.c | 1 +
13569 arch/arm/mach-bcmring/dma.c | 1 +
13570 arch/arm/mach-bcmring/mm.c | 1 +
13571 arch/arm/mach-davinci/board-dm644x-evm.c | 1 +
13572 arch/arm/mach-davinci/board-dm646x-evm.c | 1 +
13573 arch/arm/mach-davinci/cdce949.c | 1 +
13574 arch/arm/mach-davinci/cpufreq.c | 1 +
13575 arch/arm/mach-davinci/cpuidle.c | 1 +
13576 arch/arm/mach-ep93xx/core.c | 1 +
13577 arch/arm/mach-exynos4/dev-sysmmu.c | 1 +
13578 arch/arm/mach-imx/mach-mx31lilly.c | 1 +
13579 arch/arm/mach-imx/mach-mx31lite.c | 1 +
13580 arch/arm/mach-imx/mach-mx31moboard.c | 1 +
13581 arch/arm/mach-iop13xx/pci.c | 1 +
13582 arch/arm/mach-ixp2000/core.c | 1 +
13583 arch/arm/mach-ixp4xx/common-pci.c | 1 +
13584 arch/arm/mach-ixp4xx/common.c | 1 +
13585 arch/arm/mach-kirkwood/cpuidle.c | 1 +
13586 arch/arm/mach-msm/io.c | 1 +
13587 arch/arm/mach-netx/xc.c | 1 +
13588 arch/arm/mach-omap1/board-ams-delta.c | 1 +
13589 arch/arm/mach-omap1/board-sx1.c | 1 +
13590 arch/arm/mach-omap1/board-voiceblue.c | 1 +
13591 arch/arm/mach-omap1/mailbox.c | 1 +
13592 arch/arm/mach-omap2/board-omap3evm.c | 1 +
13593 arch/arm/mach-omap2/clockdomain.c | 1 +
13594 arch/arm/mach-omap2/display.c | 1 +
13595 arch/arm/mach-omap2/gpmc-onenand.c | 1 +
13596 arch/arm/mach-omap2/pm.c | 1 +
13597 arch/arm/mach-omap2/prcm.c | 1 +
13598 arch/arm/mach-omap2/usb-tusb6010.c | 2 +
13599 arch/arm/mach-omap2/voltage.c | 1 +
13600 arch/arm/mach-pxa/colibri-pxa270.c | 1 +
13601 arch/arm/mach-pxa/corgi.c | 1 +
13602 arch/arm/mach-pxa/poodle.c | 1 +
13603 arch/arm/mach-pxa/spitz.c | 1 +
13604 arch/arm/mach-pxa/trizeps4.c | 1 +
13605 arch/arm/mach-s3c2410/mach-h1940.c | 1 +
13606 arch/arm/mach-s3c64xx/dev-audio.c | 1 +
13607 arch/arm/mach-sa1100/collie.c | 1 +
13608 arch/arm/mach-sa1100/jornada720.c | 1 +
13609 arch/arm/mach-shmobile/clock.c | 1 +
13610 arch/arm/mach-tegra/pcie.c | 1 +
13611 arch/arm/mm/fault-armv.c | 1 -
13612 arch/arm/mm/init.c | 1 +
13613 arch/arm/plat-iop/gpio.c | 1 +
13614 arch/arm/plat-iop/time.c | 1 +
13615 arch/arm/plat-omap/clock.c | 1 +
13616 arch/arm/plat-omap/mailbox.c | 1 +
13617 arch/arm/plat-s3c24xx/devs.c | 1 +
13618 arch/arm/plat-s5p/dev-ehci.c | 1 +
13619 arch/arm/plat-s5p/dev-onenand.c | 2 +
13620 arch/arm/plat-samsung/dev-adc.c | 2 +
13621 arch/arm/plat-samsung/dev-asocdma.c | 1 +
13622 arch/arm/plat-samsung/dev-backlight.c | 1 +
13623 arch/arm/plat-samsung/dev-ide.c | 2 +
13624 arch/arm/plat-samsung/dev-nand.c | 1 +
13625 arch/arm/plat-samsung/dev-pwm.c | 1 +
13626 arch/arm/plat-samsung/dev-rtc.c | 1 +
13627 arch/arm/plat-samsung/dev-ts.c | 2 +
13628 arch/arm/plat-samsung/dev-usb.c | 1 +
13629 arch/arm/plat-samsung/dev-wdt.c | 3 +
13630 arch/arm/plat-samsung/platformdata.c | 1 +
13631 arch/arm/vfp/vfpmodule.c | 1 -
13632 arch/avr32/mach-at32ap/clock.c | 1 +
13633 arch/avr32/mach-at32ap/cpufreq.c | 1 +
13634 arch/avr32/mach-at32ap/intc.c | 1 +
13635 arch/avr32/mach-at32ap/pio.c | 1 +
13636 arch/avr32/mm/dma-coherent.c | 1 +
13637 arch/blackfin/kernel/dma-mapping.c | 1 +
13638 arch/blackfin/kernel/perf_event.c | 1 +
13639 arch/blackfin/kernel/sys_bfin.c | 1 +
13640 arch/blackfin/mach-bf518/boards/ezbrd.c | 1 +
13641 arch/blackfin/mach-bf527/boards/ad7160eval.c | 1 +
13642 arch/blackfin/mach-bf527/boards/cm_bf527.c | 1 +
13643 arch/blackfin/mach-bf527/boards/ezbrd.c | 1 +
13644 arch/blackfin/mach-bf527/boards/ezkit.c | 1 +
13645 arch/blackfin/mach-bf527/boards/tll6527m.c | 1 +
13646 arch/blackfin/mach-bf537/boards/cm_bf537e.c | 1 +
13647 arch/blackfin/mach-bf537/boards/cm_bf537u.c | 1 +
13648 arch/blackfin/mach-bf537/boards/dnp5370.c | 1 +
13649 arch/blackfin/mach-bf537/boards/pnav10.c | 1 +
13650 arch/blackfin/mach-bf537/boards/stamp.c | 1 +
13651 arch/blackfin/mach-bf537/boards/tcm_bf537.c | 1 +
13652 arch/blackfin/mach-common/cpufreq.c | 1 +
13653 arch/blackfin/mm/init.c | 1 +
13654 arch/ia64/hp/common/hwsw_iommu.c | 1 +
13655 arch/ia64/kernel/dma-mapping.c | 1 +
13656 arch/ia64/kernel/topology.c | 1 +
13657 arch/ia64/pci/pci.c | 1 +
13658 arch/ia64/sn/kernel/io_acpi_init.c | 1 +
13659 arch/ia64/sn/kernel/io_init.c | 1 +
13660 arch/ia64/sn/pci/pcibr/pcibr_dma.c | 1 +
13661 arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 +
13662 arch/ia64/sn/pci/tioca_provider.c | 1 +
13663 arch/ia64/xen/hypervisor.c | 1 +
13664 arch/m68k/atari/time.c | 1 +
13665 arch/m68k/kernel/dma_mm.c | 1 +
13666 arch/m68k/kernel/dma_no.c | 1 +
13667 arch/microblaze/kernel/dma.c | 1 +
13668 arch/microblaze/kernel/irq.c | 1 +
13669 arch/microblaze/mm/init.c | 1 +
13670 arch/microblaze/pci/iomap.c | 1 +
13671 arch/microblaze/pci/pci-common.c | 1 +
13672 arch/mips/bcm47xx/gpio.c | 1 +
13673 arch/mips/bcm47xx/setup.c | 1 +
13674 arch/mips/cavium-octeon/csrc-octeon.c | 1 +
13675 arch/mips/cavium-octeon/dma-octeon.c | 1 +
13676 arch/mips/cavium-octeon/flash_setup.c | 1 +
13677 arch/mips/kernel/8250-platform.c | 1 -
13678 arch/mips/kernel/cpu-probe.c | 3 +-
13679 arch/mips/kernel/i8253.c | 2 +-
13680 arch/mips/kernel/init_task.c | 2 +-
13681 arch/mips/kernel/irq-msc01.c | 1 -
13682 arch/mips/kernel/irq.c | 1 -
13683 arch/mips/kernel/mips-mt.c | 2 +-
13684 arch/mips/kernel/mips_ksyms.c | 2 +-
13685 arch/mips/kernel/module.c | 1 -
13686 arch/mips/kernel/process.c | 2 +-
13687 arch/mips/kernel/prom.c | 2 +-
13688 arch/mips/kernel/reset.c | 2 +-
13689 arch/mips/kernel/rtlx.c | 1 -
13690 arch/mips/kernel/setup.c | 2 +-
13691 arch/mips/kernel/spinlock_test.c | 2 +-
13692 arch/mips/kernel/stacktrace.c | 2 +-
13693 arch/mips/kernel/time.c | 2 +-
13694 arch/mips/kernel/traps.c | 1 -
13695 arch/mips/kernel/unaligned.c | 1 -
13696 arch/mips/kernel/vpe.c | 1 -
13697 arch/mips/loongson/common/platform.c | 1 +
13698 arch/mips/pci/pci-ip27.c | 1 +
13699 arch/mips/pci/pci.c | 1 +
13700 arch/mips/powertv/pci/fixup-powertv.c | 1 +
13701 arch/mips/powertv/powertv-usb.c | 1 +
13702 arch/mips/rb532/gpio.c | 1 +
13703 arch/mips/rb532/setup.c | 1 +
13704 arch/mips/txx9/generic/spi_eeprom.c | 1 +
13705 arch/mips/txx9/rbtx4939/setup.c | 1 +
13706 arch/mips/vr41xx/common/giu.c | 1 +
13707 arch/mips/vr41xx/common/rtc.c | 1 +
13708 arch/parisc/kernel/drivers.c | 1 +
13709 arch/parisc/kernel/pci-dma.c | 1 +
13710 arch/parisc/kernel/setup.c | 1 +
13711 arch/parisc/lib/iomap.c | 1 +
13712 arch/powerpc/include/asm/lv1call.h | 1 +
13713 arch/powerpc/include/asm/machdep.h | 1 +
13714 arch/powerpc/include/asm/spu.h | 1 +
13715 arch/powerpc/kernel/btext.c | 2 +-
13716 arch/powerpc/kernel/clock.c | 2 +-
13717 arch/powerpc/kernel/cputable.c | 2 +-
13718 arch/powerpc/kernel/crash.c | 1 +
13719 arch/powerpc/kernel/dma-iommu.c | 1 +
13720 arch/powerpc/kernel/dma.c | 1 +
13721 arch/powerpc/kernel/firmware.c | 3 +-
13722 arch/powerpc/kernel/hw_breakpoint.c | 1 -
13723 arch/powerpc/kernel/ibmebus.c | 2 +
13724 arch/powerpc/kernel/init_task.c | 2 +-
13725 arch/powerpc/kernel/io-workarounds.c | 1 +
13726 arch/powerpc/kernel/io.c | 2 +-
13727 arch/powerpc/kernel/iomap.c | 1 +
13728 arch/powerpc/kernel/irq.c | 2 +-
13729 arch/powerpc/kernel/isa-bridge.c | 1 +
13730 arch/powerpc/kernel/kvm.c | 1 +
13731 arch/powerpc/kernel/module.c | 1 -
13732 arch/powerpc/kernel/of_platform.c | 2 +-
13733 arch/powerpc/kernel/paca.c | 2 +-
13734 arch/powerpc/kernel/pci-common.c | 1 +
13735 arch/powerpc/kernel/pci_32.c | 1 +
13736 arch/powerpc/kernel/pci_64.c | 1 +
13737 arch/powerpc/kernel/pci_dn.c | 1 +
13738 arch/powerpc/kernel/pci_of_scan.c | 1 +
13739 arch/powerpc/kernel/pmc.c | 2 +-
13740 arch/powerpc/kernel/ppc_ksyms.c | 2 +-
13741 arch/powerpc/kernel/process.c | 2 +-
13742 arch/powerpc/kernel/prom.c | 2 +-
13743 arch/powerpc/kernel/prom_parse.c | 1 -
13744 arch/powerpc/kernel/ptrace.c | 1 -
13745 arch/powerpc/kernel/rtas.c | 2 +-
13746 arch/powerpc/kernel/setup-common.c | 2 +-
13747 arch/powerpc/kernel/setup_64.c | 2 +-
13748 arch/powerpc/kernel/signal_64.c | 1 -
13749 arch/powerpc/kernel/smp.c | 2 +-
13750 arch/powerpc/kernel/stacktrace.c | 2 +-
13751 arch/powerpc/kernel/swsusp_64.c | 1 +
13752 arch/powerpc/kernel/sysfs.c | 2 +-
13753 arch/powerpc/kernel/time.c | 2 +-
13754 arch/powerpc/kernel/vdso.c | 1 -
13755 arch/powerpc/kernel/vio.c | 3 +-
13756 arch/powerpc/kvm/44x.c | 1 +
13757 arch/powerpc/kvm/book3s.c | 1 +
13758 arch/powerpc/kvm/book3s_exports.c | 2 +-
13759 arch/powerpc/kvm/book3s_hv.c | 1 +
13760 arch/powerpc/kvm/book3s_hv_builtin.c | 1 +
13761 arch/powerpc/kvm/book3s_pr.c | 1 +
13762 arch/powerpc/kvm/powerpc.c | 1 -
13763 arch/powerpc/lib/checksum_wrappers_64.c | 2 +-
13764 arch/powerpc/lib/devres.c | 2 +-
13765 arch/powerpc/lib/locks.c | 2 +-
13766 arch/powerpc/lib/rheap.c | 2 +-
13767 arch/powerpc/mm/dma-noncoherent.c | 1 +
13768 arch/powerpc/mm/hash_utils_64.c | 1 +
13769 arch/powerpc/mm/mem.c | 2 +-
13770 arch/powerpc/mm/mmu_context_hash32.c | 1 +
13771 arch/powerpc/mm/mmu_context_hash64.c | 2 +-
13772 arch/powerpc/mm/numa.c | 2 +-
13773 arch/powerpc/mm/pgtable_64.c | 1 +
13774 arch/powerpc/mm/slice.c | 2 +-
13775 arch/powerpc/mm/tlb_hash32.c | 1 +
13776 arch/powerpc/mm/tlb_nohash.c | 1 +
13777 arch/powerpc/platforms/44x/warp.c | 1 +
13778 arch/powerpc/platforms/512x/clock.c | 1 +
13779 arch/powerpc/platforms/52xx/mpc52xx_common.c | 1 +
13780 arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 +
13781 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 +
13782 arch/powerpc/platforms/83xx/suspend.c | 1 +
13783 arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 -
13784 arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 -
13785 arch/powerpc/platforms/85xx/sbc8548.c | 1 -
13786 arch/powerpc/platforms/86xx/gef_gpio.c | 1 +
13787 arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 -
13788 arch/powerpc/platforms/cell/axon_msi.c | 1 +
13789 arch/powerpc/platforms/cell/beat.c | 2 +-
13790 arch/powerpc/platforms/cell/beat_spu_priv1.c | 2 -
13791 arch/powerpc/platforms/cell/beat_wrapper.h | 1 +
13792 arch/powerpc/platforms/cell/cbe_cpufreq.c | 1 +
13793 arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c | 1 +
13794 arch/powerpc/platforms/cell/cbe_powerbutton.c | 1 +
13795 arch/powerpc/platforms/cell/cbe_regs.c | 2 +-
13796 arch/powerpc/platforms/cell/celleb_setup.c | 1 +
13797 arch/powerpc/platforms/cell/cpufreq_spudemand.c | 1 +
13798 arch/powerpc/platforms/cell/interrupt.c | 2 +-
13799 arch/powerpc/platforms/cell/pmu.c | 1 +
13800 arch/powerpc/platforms/cell/qpace_setup.c | 1 +
13801 arch/powerpc/platforms/cell/setup.c | 1 +
13802 arch/powerpc/platforms/cell/smp.c | 1 -
13803 arch/powerpc/platforms/cell/spu_callbacks.c | 2 +-
13804 arch/powerpc/platforms/cell/spu_fault.c | 2 +-
13805 arch/powerpc/platforms/cell/spu_manage.c | 2 +-
13806 arch/powerpc/platforms/cell/spu_notify.c | 3 +-
13807 arch/powerpc/platforms/cell/spu_priv1_mmio.c | 1 -
13808 arch/powerpc/platforms/cell/spufs/backing_ops.c | 1 -
13809 arch/powerpc/platforms/cell/spufs/context.c | 2 +-
13810 arch/powerpc/platforms/cell/spufs/coredump.c | 1 -
13811 arch/powerpc/platforms/cell/spufs/fault.c | 1 -
13812 arch/powerpc/platforms/cell/spufs/file.c | 2 +-
13813 arch/powerpc/platforms/cell/spufs/hw_ops.c | 1 -
13814 arch/powerpc/platforms/cell/spufs/sched.c | 1 -
13815 arch/powerpc/platforms/cell/spufs/switch.c | 2 +-
13816 arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +-
13817 arch/powerpc/platforms/embedded6xx/holly.c | 1 +
13818 arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 1 +
13819 arch/powerpc/platforms/iseries/hvlpconfig.c | 2 +-
13820 arch/powerpc/platforms/iseries/iommu.c | 2 +-
13821 arch/powerpc/platforms/iseries/ksyms.c | 2 +-
13822 arch/powerpc/platforms/iseries/lpardata.c | 1 -
13823 arch/powerpc/platforms/iseries/lpevents.c | 2 +-
13824 arch/powerpc/platforms/iseries/mf.c | 1 +
13825 arch/powerpc/platforms/iseries/pci.c | 1 -
13826 arch/powerpc/platforms/iseries/setup.c | 1 +
13827 arch/powerpc/platforms/iseries/smp.c | 1 -
13828 arch/powerpc/platforms/iseries/vio.c | 2 +-
13829 arch/powerpc/platforms/iseries/viopath.c | 2 +-
13830 arch/powerpc/platforms/maple/setup.c | 1 +
13831 arch/powerpc/platforms/pasemi/cpufreq.c | 1 +
13832 arch/powerpc/platforms/pasemi/dma_lib.c | 3 +-
13833 arch/powerpc/platforms/pasemi/setup.c | 1 +
13834 arch/powerpc/platforms/powermac/backlight.c | 1 +
13835 arch/powerpc/platforms/powermac/feature.c | 1 +
13836 arch/powerpc/platforms/powermac/low_i2c.c | 2 +-
13837 arch/powerpc/platforms/powermac/nvram.c | 2 +-
13838 arch/powerpc/platforms/powermac/pic.c | 1 -
13839 arch/powerpc/platforms/powermac/setup.c | 1 +
13840 arch/powerpc/platforms/ps3/exports.c | 2 -
13841 arch/powerpc/platforms/ps3/interrupt.c | 2 +-
13842 arch/powerpc/platforms/ps3/mm.c | 2 +-
13843 arch/powerpc/platforms/ps3/os-area.c | 1 +
13844 arch/powerpc/platforms/ps3/setup.c | 1 +
13845 arch/powerpc/platforms/ps3/spu.c | 1 +
13846 arch/powerpc/platforms/ps3/system-bus.c | 2 +-
13847 arch/powerpc/platforms/pseries/eeh.c | 2 +
13848 arch/powerpc/platforms/pseries/eeh_event.c | 1 +
13849 arch/powerpc/platforms/pseries/eeh_sysfs.c | 1 +
13850 arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 +
13851 arch/powerpc/platforms/pseries/hvconsole.c | 3 +-
13852 arch/powerpc/platforms/pseries/io_event_irq.c | 2 +-
13853 arch/powerpc/platforms/pseries/iommu.c | 1 +
13854 arch/powerpc/platforms/pseries/lpar.c | 1 +
13855 arch/powerpc/platforms/pseries/mobility.c | 1 +
13856 arch/powerpc/platforms/pseries/pci_dlpar.c | 1 +
13857 arch/powerpc/platforms/pseries/plpar_wrappers.h | 3 +
13858 arch/powerpc/platforms/pseries/setup.c | 2 +-
13859 arch/powerpc/platforms/pseries/smp.c | 1 -
13860 arch/powerpc/platforms/pseries/suspend.c | 1 +
13861 arch/powerpc/sysdev/bestcomm/sram.c | 2 +-
13862 arch/powerpc/sysdev/cpm_common.c | 1 +
13863 arch/powerpc/sysdev/dcr.c | 1 +
13864 arch/powerpc/sysdev/fsl_gtm.c | 1 +
13865 arch/powerpc/sysdev/fsl_lbc.c | 3 +-
13866 arch/powerpc/sysdev/fsl_pmc.c | 1 +
13867 arch/powerpc/sysdev/fsl_rio.c | 2 +-
13868 arch/powerpc/sysdev/fsl_soc.c | 2 +-
13869 arch/powerpc/sysdev/mpc5xxx_clocks.c | 1 +
13870 arch/powerpc/sysdev/mpc8xx_pic.c | 1 -
13871 arch/powerpc/sysdev/mv64x60_pci.c | 1 +
13872 arch/powerpc/sysdev/pmi.c | 1 +
13873 arch/powerpc/sysdev/ppc4xx_msi.c | 1 +
13874 arch/powerpc/sysdev/qe_lib/gpio.c | 1 +
13875 arch/powerpc/sysdev/qe_lib/ucc.c | 2 +-
13876 arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2 +-
13877 arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2 +-
13878 arch/powerpc/sysdev/qe_lib/usb.c | 1 +
13879 arch/powerpc/sysdev/rtc_cmos_setup.c | 1 +
13880 arch/powerpc/sysdev/scom.c | 1 +
13881 arch/powerpc/sysdev/simple_gpio.c | 1 -
13882 arch/powerpc/sysdev/tsi108_dev.c | 2 +-
13883 arch/powerpc/xmon/xmon.c | 2 +-
13884 arch/s390/crypto/sha_common.c | 1 +
13885 arch/s390/mm/init.c | 1 +
13886 arch/sh/drivers/dma/dma-sysfs.c | 1 +
13887 arch/sh/drivers/pci/pci.c | 1 +
13888 arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 +
13889 arch/sh/kernel/perf_event.c | 1 +
13890 arch/sh/kernel/topology.c | 1 +
13891 arch/sh/mm/init.c | 1 +
13892 arch/sparc/include/asm/termios.h | 1 -
13893 arch/sparc/kernel/apc.c | 1 +
13894 arch/sparc/kernel/auxio_32.c | 1 +
13895 arch/sparc/kernel/btext.c | 1 -
13896 arch/sparc/kernel/central.c | 1 +
13897 arch/sparc/kernel/cpu.c | 2 +-
13898 arch/sparc/kernel/cpumap.c | 2 +-
13899 arch/sparc/kernel/dma.c | 1 -
13900 arch/sparc/kernel/ebus.c | 2 +-
13901 arch/sparc/kernel/hvapi.c | 2 +-
13902 arch/sparc/kernel/idprom.c | 2 +-
13903 arch/sparc/kernel/iommu.c | 2 +-
13904 arch/sparc/kernel/irq_32.c | 1 +
13905 arch/sparc/kernel/irq_64.c | 1 -
13906 arch/sparc/kernel/ldc.c | 2 +-
13907 arch/sparc/kernel/leon_kernel.c | 1 -
13908 arch/sparc/kernel/leon_pci.c | 1 +
13909 arch/sparc/kernel/leon_pci_grpci2.c | 2 +-
13910 arch/sparc/kernel/mdesc.c | 2 +
13911 arch/sparc/kernel/nmi.c | 2 +-
13912 arch/sparc/kernel/of_device_32.c | 1 -
13913 arch/sparc/kernel/of_device_64.c | 3 +-
13914 arch/sparc/kernel/of_device_common.c | 2 +-
13915 arch/sparc/kernel/pci.c | 2 +-
13916 arch/sparc/kernel/pci_fire.c | 1 +
13917 arch/sparc/kernel/pci_psycho.c | 1 +
13918 arch/sparc/kernel/pci_sabre.c | 1 +
13919 arch/sparc/kernel/pci_schizo.c | 1 +
13920 arch/sparc/kernel/pci_sun4v.c | 1 +
13921 arch/sparc/kernel/pcic.c | 1 +
13922 arch/sparc/kernel/pcr.c | 3 +-
13923 arch/sparc/kernel/pmc.c | 1 +
13924 arch/sparc/kernel/power.c | 2 +-
13925 arch/sparc/kernel/process_64.c | 2 +-
13926 arch/sparc/kernel/prom_32.c | 1 -
13927 arch/sparc/kernel/prom_64.c | 1 -
13928 arch/sparc/kernel/prom_common.c | 2 +-
13929 arch/sparc/kernel/reboot.c | 2 +-
13930 arch/sparc/kernel/sbus.c | 1 +
13931 arch/sparc/kernel/setup_32.c | 1 +
13932 arch/sparc/kernel/setup_64.c | 1 +
13933 arch/sparc/kernel/smp_64.c | 2 +-
13934 arch/sparc/kernel/sparc_ksyms_64.c | 2 +-
13935 arch/sparc/kernel/stacktrace.c | 2 +-
13936 arch/sparc/kernel/sys_sparc32.c | 1 -
13937 arch/sparc/kernel/sys_sparc_64.c | 2 +-
13938 arch/sparc/kernel/time_64.c | 2 +-
13939 arch/sparc/kernel/traps_32.c | 1 +
13940 arch/sparc/kernel/unaligned_32.c | 1 -
13941 arch/sparc/kernel/vio.c | 1 +
13942 arch/sparc/kernel/viohs.c | 2 +-
13943 arch/sparc/mm/fault_32.c | 1 -
13944 arch/sparc/mm/generic_32.c | 1 +
13945 arch/sparc/mm/generic_64.c | 1 +
13946 arch/sparc/mm/highmem.c | 1 +
13947 arch/sparc/mm/hugetlbpage.c | 1 -
13948 arch/x86/crypto/aes_glue.c | 1 +
13949 arch/x86/crypto/aesni-intel_glue.c | 1 +
13950 arch/x86/kernel/cpu/amd.c | 1 +
13951 arch/x86/kernel/cpu/mcheck/mce.c | 1 +
13952 arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 +
13953 arch/x86/kernel/devicetree.c | 1 +
13954 arch/x86/kernel/e820.c | 1 +
13955 arch/x86/kernel/hpet.c | 1 +
13956 arch/x86/kernel/irq.c | 1 +
13957 arch/x86/kernel/pci-dma.c | 1 +
13958 arch/x86/kernel/probe_roms.c | 4 +-
13959 arch/x86/kernel/rtc.c | 1 +
13960 arch/x86/kernel/smp.c | 1 +
13961 arch/x86/kernel/time.c | 1 +
13962 arch/x86/kernel/topology.c | 1 +
13963 arch/x86/kernel/vsyscall_64.c | 1 +
13964 arch/x86/lguest/boot.c | 1 +
13965 arch/x86/pci/i386.c | 1 +
13966 arch/x86/pci/legacy.c | 1 +
13967 arch/x86/platform/efi/efi.c | 1 +
13968 arch/x86/platform/efi/efi_32.c | 1 +
13969 arch/x86/platform/mrst/vrtc.c | 1 +
13970 arch/x86/platform/olpc/olpc-xo1-pm.c | 1 +
13971 arch/x86/platform/uv/bios_uv.c | 1 +
13972 arch/x86/power/cpu.c | 1 +
13973 arch/x86/video/fbdev.c | 1 +
13974 block/blk-integrity.c | 1 +
13975 block/ioctl.c | 1 +
13976 crypto/async_tx/async_memcpy.c | 1 +
13977 crypto/async_tx/async_pq.c | 1 +
13978 crypto/async_tx/async_raid6_recov.c | 1 +
13979 crypto/async_tx/async_tx.c | 1 +
13980 crypto/async_tx/async_xor.c | 1 +
13981 crypto/async_tx/raid6test.c | 1 +
13982 crypto/crypto_wq.c | 1 +
13984 crypto/proc.c | 1 +
13985 crypto/vmac.c | 1 +
13986 crypto/xcbc.c | 1 +
13987 drivers/acpi/acpica/hwsleep.c | 1 +
13988 drivers/acpi/ec_sys.c | 1 +
13989 drivers/acpi/sbshc.c | 1 +
13990 drivers/acpi/sysfs.c | 2 +-
13991 drivers/ata/libata-eh.c | 1 +
13992 drivers/ata/libata-pmp.c | 1 +
13993 drivers/ata/libata-scsi.c | 1 +
13994 drivers/ata/libata-sff.c | 1 +
13995 drivers/base/base.h | 1 +
13996 drivers/base/dma-coherent.c | 1 +
13997 drivers/base/dma-mapping.c | 1 +
13998 drivers/base/hypervisor.c | 1 +
13999 drivers/base/power/generic_ops.c | 1 +
14000 drivers/base/power/main.c | 1 +
14001 drivers/base/power/runtime.c | 1 +
14002 drivers/base/power/sysfs.c | 1 +
14003 drivers/base/power/trace.c | 1 +
14004 drivers/base/power/wakeup.c | 1 +
14005 drivers/base/transport_class.c | 1 +
14006 drivers/bcma/core.c | 1 +
14007 drivers/bcma/driver_chipcommon.c | 1 +
14008 drivers/bcma/driver_pci.c | 1 +
14009 drivers/bcma/host_pci.c | 1 +
14010 drivers/bcma/main.c | 1 +
14011 drivers/block/aoe/aoeblk.c | 1 +
14012 drivers/block/aoe/aoechr.c | 1 +
14013 drivers/block/aoe/aoecmd.c | 2 +-
14014 drivers/block/aoe/aoenet.c | 2 +-
14015 drivers/block/ps3disk.c | 1 +
14016 drivers/block/ps3vram.c | 1 +
14017 drivers/block/virtio_blk.c | 1 +
14018 drivers/bluetooth/btmrvl_main.c | 2 +
14019 drivers/bluetooth/btmrvl_sdio.c | 1 +
14020 drivers/bluetooth/btwilink.c | 1 +
14021 drivers/char/hw_random/virtio-rng.c | 1 +
14022 drivers/char/mem.c | 1 +
14023 drivers/char/ps3flash.c | 1 +
14024 drivers/char/ramoops.c | 1 +
14025 drivers/char/ttyprintk.c | 1 +
14026 drivers/char/virtio_console.c | 1 +
14027 drivers/clocksource/sh_cmt.c | 1 +
14028 drivers/clocksource/sh_mtu2.c | 1 +
14029 drivers/clocksource/sh_tmu.c | 1 +
14030 drivers/cpufreq/cpufreq_stats.c | 1 +
14031 drivers/cpufreq/s3c64xx-cpufreq.c | 1 +
14032 drivers/cpuidle/cpuidle.c | 1 +
14033 drivers/cpuidle/governors/ladder.c | 1 +
14034 drivers/cpuidle/governors/menu.c | 1 +
14035 drivers/crypto/mv_cesa.c | 1 +
14036 drivers/dca/dca-core.c | 1 +
14037 drivers/dca/dca-sysfs.c | 1 +
14038 drivers/dma/imx-dma.c | 1 +
14039 drivers/dma/imx-sdma.c | 1 +
14040 drivers/dma/intel_mid_dma.c | 1 +
14041 drivers/dma/ipu/ipu_idmac.c | 1 +
14042 drivers/dma/ste_dma40.c | 1 +
14043 drivers/edac/mce_amd_inj.c | 1 +
14044 drivers/firewire/core-iso.c | 1 +
14045 drivers/firmware/google/gsmi.c | 1 +
14046 drivers/firmware/sigma.c | 1 +
14047 drivers/gpio/gpio-74x164.c | 1 +
14048 drivers/gpio/gpio-ep93xx.c | 1 +
14049 drivers/gpio/gpio-mc33880.c | 1 +
14050 drivers/gpio/gpio-mcp23s08.c | 1 +
14051 drivers/gpio/gpio-ml-ioh.c | 1 +
14052 drivers/gpio/gpio-mpc5200.c | 1 +
14053 drivers/gpio/gpio-mxc.c | 1 +
14054 drivers/gpio/gpio-mxs.c | 1 +
14055 drivers/gpio/gpio-pcf857x.c | 1 +
14056 drivers/gpio/gpio-pch.c | 1 +
14057 drivers/gpio/gpio-xilinx.c | 1 +
14058 drivers/gpu/drm/ati_pcigart.c | 1 +
14059 drivers/gpu/drm/drm_buffer.c | 1 +
14060 drivers/gpu/drm/drm_bufs.c | 1 +
14061 drivers/gpu/drm/drm_cache.c | 1 +
14062 drivers/gpu/drm/drm_crtc.c | 1 +
14063 drivers/gpu/drm/drm_crtc_helper.c | 3 +
14064 drivers/gpu/drm/drm_debugfs.c | 1 +
14065 drivers/gpu/drm/drm_dma.c | 1 +
14066 drivers/gpu/drm/drm_drv.c | 1 +
14067 drivers/gpu/drm/drm_edid.c | 1 +
14068 drivers/gpu/drm/drm_encoder_slave.c | 2 +
14069 drivers/gpu/drm/drm_fb_helper.c | 2 +
14070 drivers/gpu/drm/drm_fops.c | 1 +
14071 drivers/gpu/drm/drm_hashtab.c | 1 +
14072 drivers/gpu/drm/drm_ioc32.c | 1 +
14073 drivers/gpu/drm/drm_irq.c | 1 +
14074 drivers/gpu/drm/drm_memory.c | 1 +
14075 drivers/gpu/drm/drm_mm.c | 1 +
14076 drivers/gpu/drm/drm_modes.c | 1 +
14077 drivers/gpu/drm/drm_pci.c | 1 +
14078 drivers/gpu/drm/drm_platform.c | 1 +
14079 drivers/gpu/drm/drm_proc.c | 1 +
14080 drivers/gpu/drm/drm_sman.c | 1 +
14081 drivers/gpu/drm/drm_sysfs.c | 1 +
14082 drivers/gpu/drm/drm_usb.c | 1 +
14083 drivers/gpu/drm/drm_vm.c | 1 +
14084 drivers/gpu/drm/i2c/ch7006_drv.c | 2 +
14085 drivers/gpu/drm/i2c/sil164_drv.c | 2 +
14086 drivers/gpu/drm/i810/i810_drv.c | 2 +
14087 drivers/gpu/drm/i915/i915_debugfs.c | 1 +
14088 drivers/gpu/drm/i915/i915_dma.c | 1 +
14089 drivers/gpu/drm/i915/i915_drv.c | 1 +
14090 drivers/gpu/drm/i915/intel_dp.c | 1 +
14091 drivers/gpu/drm/i915/intel_i2c.c | 1 +
14092 drivers/gpu/drm/i915/intel_sdvo.c | 1 +
14093 drivers/gpu/drm/mga/mga_drv.c | 2 +
14094 drivers/gpu/drm/mga/mga_warp.c | 1 +
14095 drivers/gpu/drm/nouveau/nouveau_drv.c | 1 +
14096 drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +
14097 drivers/gpu/drm/nouveau/nouveau_temp.c | 2 +
14098 drivers/gpu/drm/nouveau/nvc0_graph.c | 1 +
14099 drivers/gpu/drm/r128/r128_cce.c | 1 +
14100 drivers/gpu/drm/r128/r128_drv.c | 2 +
14101 drivers/gpu/drm/radeon/ni.c | 1 +
14102 drivers/gpu/drm/radeon/r100.c | 1 +
14103 drivers/gpu/drm/radeon/r600.c | 1 +
14104 drivers/gpu/drm/radeon/r600_cp.c | 2 +
14105 drivers/gpu/drm/radeon/radeon_cp.c | 2 +
14106 drivers/gpu/drm/radeon/radeon_drv.c | 1 +
14107 drivers/gpu/drm/radeon/radeon_i2c.c | 2 +
14108 drivers/gpu/drm/savage/savage_drv.c | 2 +
14109 drivers/gpu/drm/sis/sis_drv.c | 2 +
14110 drivers/gpu/drm/tdfx/tdfx_drv.c | 2 +
14111 drivers/gpu/drm/ttm/ttm_tt.c | 1 +
14112 drivers/gpu/drm/via/via_drv.c | 2 +
14113 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 +
14114 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +
14115 drivers/hid/hid-axff.c | 1 +
14116 drivers/hid/hid-debug.c | 1 +
14117 drivers/hid/hid-dr.c | 1 +
14118 drivers/hid/hid-emsff.c | 1 +
14119 drivers/hid/hid-gaff.c | 1 +
14120 drivers/hid/hid-holtekff.c | 1 +
14121 drivers/hid/hid-picolcd.c | 1 +
14122 drivers/hid/hid-pl.c | 1 +
14123 drivers/hid/hid-roccat-common.c | 1 +
14124 drivers/hid/hid-roccat.c | 1 +
14125 drivers/hid/hid-sjoy.c | 1 +
14126 drivers/hid/hid-tmff.c | 1 +
14127 drivers/hid/hid-zpff.c | 1 +
14128 drivers/hid/usbhid/hid-quirks.c | 1 +
14129 drivers/hwmon/ultra45_env.c | 1 +
14130 drivers/i2c/busses/i2c-pxa-pci.c | 1 +
14131 drivers/i2c/busses/i2c-sh7760.c | 1 +
14132 drivers/i2c/busses/i2c-tegra.c | 1 +
14133 drivers/i2c/i2c-boardinfo.c | 1 +
14134 drivers/ide/buddha.c | 1 +
14135 drivers/ide/cmd640.c | 1 +
14136 drivers/ide/ide-acpi.c | 1 +
14137 drivers/ide/ide-atapi.c | 1 +
14138 drivers/ide/ide-disk_proc.c | 1 +
14139 drivers/ide/ide-dma-sff.c | 1 +
14140 drivers/ide/ide-dma.c | 1 +
14141 drivers/ide/ide-eh.c | 1 +
14142 drivers/ide/ide-floppy_proc.c | 1 +
14143 drivers/ide/ide-io-std.c | 1 +
14144 drivers/ide/ide-ioctls.c | 1 +
14145 drivers/ide/ide-legacy.c | 1 +
14146 drivers/ide/ide-lib.c | 1 +
14147 drivers/ide/ide-pnp.c | 1 +
14148 drivers/ide/ide-taskfile.c | 1 +
14149 drivers/ide/ide-xfer-mode.c | 1 +
14150 drivers/ide/macide.c | 1 +
14151 drivers/ide/pmac.c | 1 +
14152 drivers/ide/q40ide.c | 1 +
14153 drivers/ide/setup-pci.c | 1 +
14154 drivers/ide/tc86c001.c | 1 +
14155 drivers/idle/intel_idle.c | 1 +
14156 drivers/infiniband/core/addr.c | 1 +
14157 drivers/infiniband/core/cm.c | 1 +
14158 drivers/infiniband/core/cma.c | 1 +
14159 drivers/infiniband/core/fmr_pool.c | 1 +
14160 drivers/infiniband/core/iwcm.c | 1 +
14161 drivers/infiniband/core/mad.c | 1 +
14162 drivers/infiniband/core/multicast.c | 1 +
14163 drivers/infiniband/core/netlink.c | 1 +
14164 drivers/infiniband/core/packer.c | 1 +
14165 drivers/infiniband/core/sysfs.c | 1 +
14166 drivers/infiniband/core/ucma.c | 1 +
14167 drivers/infiniband/core/ud_header.c | 1 +
14168 drivers/infiniband/core/umem.c | 1 +
14169 drivers/infiniband/core/uverbs_marshall.c | 1 +
14170 drivers/infiniband/core/verbs.c | 1 +
14171 drivers/infiniband/hw/cxgb4/qp.c | 3 +
14172 drivers/infiniband/hw/ipath/ipath_diag.c | 1 +
14173 drivers/infiniband/hw/ipath/ipath_driver.c | 1 +
14174 drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 +
14175 drivers/infiniband/hw/ipath/ipath_init_chip.c | 1 +
14176 drivers/infiniband/hw/ipath/ipath_sysfs.c | 1 +
14177 drivers/infiniband/hw/ipath/ipath_verbs.c | 1 +
14178 drivers/infiniband/hw/mthca/mthca_catas.c | 1 +
14179 drivers/infiniband/hw/mthca/mthca_cmd.c | 1 +
14180 drivers/infiniband/hw/mthca/mthca_provider.c | 2 +
14181 drivers/infiniband/hw/qib/qib_diag.c | 1 +
14182 drivers/infiniband/hw/qib/qib_driver.c | 1 +
14183 drivers/infiniband/hw/qib/qib_file_ops.c | 1 +
14184 drivers/infiniband/hw/qib/qib_iba7220.c | 1 +
14185 drivers/infiniband/hw/qib/qib_iba7322.c | 1 +
14186 drivers/infiniband/hw/qib/qib_init.c | 1 +
14187 drivers/infiniband/hw/qib/qib_pcie.c | 1 +
14188 drivers/infiniband/hw/qib/qib_sd7220.c | 1 +
14189 drivers/infiniband/hw/qib/qib_sdma.c | 1 +
14190 drivers/infiniband/hw/qib/qib_tx.c | 1 +
14191 drivers/infiniband/hw/qib/qib_verbs.c | 1 +
14192 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 +
14193 drivers/infiniband/ulp/ipoib/ipoib_fs.c | 1 +
14194 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 +
14195 drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 1 +
14196 drivers/infiniband/ulp/iser/iscsi_iser.c | 1 +
14197 drivers/input/input-compat.c | 1 +
14198 drivers/input/input-mt.c | 1 +
14199 drivers/input/input-polldev.c | 1 +
14200 drivers/input/joystick/as5011.c | 1 +
14201 drivers/input/keyboard/nomadik-ske-keypad.c | 1 +
14202 drivers/input/keyboard/tnetv107x-keypad.c | 1 +
14203 drivers/input/misc/ad714x.c | 1 +
14204 drivers/input/misc/adxl34x.c | 1 +
14205 drivers/input/misc/ati_remote2.c | 1 +
14206 drivers/input/misc/cma3000_d0x.c | 1 +
14207 drivers/input/misc/dm355evm_keys.c | 1 +
14208 drivers/input/sparse-keymap.c | 1 +
14209 drivers/input/touchscreen/ad7877.c | 1 +
14210 drivers/input/touchscreen/ad7879-spi.c | 1 +
14211 drivers/input/touchscreen/ad7879.c | 1 +
14212 drivers/input/touchscreen/ads7846.c | 1 +
14213 drivers/input/touchscreen/bu21013_ts.c | 1 +
14214 drivers/isdn/capi/kcapi_proc.c | 1 +
14215 drivers/isdn/gigaset/asyncdata.c | 1 +
14216 drivers/isdn/gigaset/capi.c | 1 +
14217 drivers/isdn/gigaset/dummyll.c | 1 +
14218 drivers/isdn/gigaset/ev-layer.c | 1 +
14219 drivers/isdn/gigaset/i4l.c | 1 +
14220 drivers/isdn/gigaset/interface.c | 1 +
14221 drivers/isdn/hardware/mISDN/mISDNisar.c | 1 +
14222 drivers/isdn/i4l/isdn_tty.c | 1 +
14223 drivers/isdn/mISDN/clock.c | 1 +
14224 drivers/isdn/mISDN/dsp_audio.c | 1 +
14225 drivers/isdn/mISDN/dsp_pipeline.c | 1 +
14226 drivers/isdn/mISDN/socket.c | 1 +
14227 drivers/leds/dell-led.c | 1 +
14228 drivers/leds/leds-88pm860x.c | 1 +
14229 drivers/leds/leds-asic3.c | 1 +
14230 drivers/leds/leds-atmel-pwm.c | 1 +
14231 drivers/leds/leds-cobalt-raq.c | 1 +
14232 drivers/leds/leds-fsg.c | 1 +
14233 drivers/leds/leds-gpio.c | 1 +
14234 drivers/leds/leds-lm3530.c | 1 +
14235 drivers/leds/leds-locomo.c | 1 +
14236 drivers/leds/leds-lt3593.c | 1 +
14237 drivers/leds/leds-net48xx.c | 1 +
14238 drivers/leds/leds-net5501.c | 1 +
14239 drivers/leds/leds-ns2.c | 1 +
14240 drivers/leds/leds-s3c24xx.c | 1 +
14241 drivers/leds/leds-wm831x-status.c | 1 +
14242 drivers/leds/leds-wm8350.c | 1 +
14243 drivers/leds/leds-wrap.c | 1 +
14244 drivers/lguest/lguest_device.c | 1 +
14245 drivers/lguest/lguest_user.c | 1 +
14246 drivers/md/dm-exception-store.c | 1 +
14247 drivers/md/dm-log-userspace-base.c | 1 +
14248 drivers/md/dm-path-selector.c | 1 +
14249 drivers/md/dm-raid.c | 1 +
14250 drivers/md/dm-round-robin.c | 1 +
14251 drivers/md/dm-service-time.c | 1 +
14252 drivers/md/dm-snap-persistent.c | 1 +
14253 drivers/md/dm-snap-transient.c | 1 +
14254 drivers/md/dm-uevent.c | 1 +
14255 drivers/md/faulty.c | 1 +
14256 drivers/md/linear.c | 1 +
14257 drivers/md/md.c | 1 +
14258 drivers/md/multipath.c | 1 +
14259 drivers/md/raid0.c | 1 +
14260 drivers/md/raid1.c | 1 +
14261 drivers/md/raid10.c | 1 +
14262 drivers/md/raid5.c | 1 +
14263 drivers/media/common/saa7146_core.c | 1 +
14264 drivers/media/common/saa7146_fops.c | 1 +
14265 drivers/media/common/saa7146_hlp.c | 1 +
14266 drivers/media/common/saa7146_video.c | 1 +
14267 drivers/media/common/tuners/tuner-types.c | 1 +
14268 drivers/media/dvb/frontends/dibx000_common.c | 1 +
14269 drivers/media/dvb/siano/sms-cards.c | 1 +
14270 drivers/media/dvb/siano/smsendian.c | 1 +
14271 drivers/media/dvb/siano/smssdio.c | 1 +
14272 drivers/media/dvb/siano/smsusb.c | 1 +
14273 drivers/media/media-device.c | 1 +
14274 drivers/media/radio/radio-timb.c | 1 +
14275 drivers/media/radio/radio-wl1273.c | 1 +
14276 drivers/media/radio/si4713-i2c.c | 1 +
14277 drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +
14278 drivers/media/rc/ir-jvc-decoder.c | 1 +
14279 drivers/media/rc/ir-lirc-codec.c | 1 +
14280 drivers/media/rc/ir-nec-decoder.c | 1 +
14281 drivers/media/rc/ir-raw.c | 2 +
14282 drivers/media/rc/ir-rc5-decoder.c | 1 +
14283 drivers/media/rc/ir-rc5-sz-decoder.c | 1 +
14284 drivers/media/rc/ir-rc6-decoder.c | 1 +
14285 drivers/media/rc/ir-sony-decoder.c | 1 +
14286 drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 1 +
14287 drivers/media/rc/keymaps/rc-alink-dtu-m.c | 1 +
14288 drivers/media/rc/keymaps/rc-anysee.c | 1 +
14289 drivers/media/rc/keymaps/rc-apac-viewcomp.c | 1 +
14290 drivers/media/rc/keymaps/rc-asus-pc39.c | 1 +
14291 drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 1 +
14292 drivers/media/rc/keymaps/rc-avermedia-a16d.c | 1 +
14293 drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 1 +
14294 drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 1 +
14295 drivers/media/rc/keymaps/rc-avermedia-m135a.c | 1 +
14296 .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 1 +
14297 drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 1 +
14298 drivers/media/rc/keymaps/rc-avermedia.c | 1 +
14299 drivers/media/rc/keymaps/rc-avertv-303.c | 1 +
14300 drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | 1 +
14301 drivers/media/rc/keymaps/rc-behold-columbus.c | 1 +
14302 drivers/media/rc/keymaps/rc-behold.c | 1 +
14303 drivers/media/rc/keymaps/rc-budget-ci-old.c | 1 +
14304 drivers/media/rc/keymaps/rc-cinergy-1400.c | 1 +
14305 drivers/media/rc/keymaps/rc-cinergy.c | 1 +
14306 drivers/media/rc/keymaps/rc-dib0700-nec.c | 1 +
14307 drivers/media/rc/keymaps/rc-dib0700-rc5.c | 1 +
14308 drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | 1 +
14309 drivers/media/rc/keymaps/rc-digittrade.c | 1 +
14310 drivers/media/rc/keymaps/rc-dm1105-nec.c | 1 +
14311 drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 1 +
14312 drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 1 +
14313 drivers/media/rc/keymaps/rc-em-terratec.c | 1 +
14314 drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 1 +
14315 drivers/media/rc/keymaps/rc-encore-enltv.c | 1 +
14316 drivers/media/rc/keymaps/rc-encore-enltv2.c | 1 +
14317 drivers/media/rc/keymaps/rc-evga-indtube.c | 1 +
14318 drivers/media/rc/keymaps/rc-eztv.c | 1 +
14319 drivers/media/rc/keymaps/rc-flydvb.c | 1 +
14320 drivers/media/rc/keymaps/rc-flyvideo.c | 1 +
14321 drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 1 +
14322 drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 1 +
14323 drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 1 +
14324 drivers/media/rc/keymaps/rc-gotview7135.c | 1 +
14325 drivers/media/rc/keymaps/rc-hauppauge.c | 1 +
14326 drivers/media/rc/keymaps/rc-imon-mce.c | 1 +
14327 drivers/media/rc/keymaps/rc-imon-pad.c | 1 +
14328 drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 1 +
14329 drivers/media/rc/keymaps/rc-kaiomy.c | 1 +
14330 drivers/media/rc/keymaps/rc-kworld-315u.c | 1 +
14331 .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 1 +
14332 drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | 1 +
14333 drivers/media/rc/keymaps/rc-lirc.c | 1 +
14334 drivers/media/rc/keymaps/rc-lme2510.c | 1 +
14335 drivers/media/rc/keymaps/rc-manli.c | 1 +
14336 drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 1 +
14337 drivers/media/rc/keymaps/rc-msi-digivox-iii.c | 1 +
14338 drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 1 +
14339 drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 1 +
14340 drivers/media/rc/keymaps/rc-nebula.c | 1 +
14341 .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 1 +
14342 drivers/media/rc/keymaps/rc-norwood.c | 1 +
14343 drivers/media/rc/keymaps/rc-npgtech.c | 1 +
14344 drivers/media/rc/keymaps/rc-pctv-sedna.c | 1 +
14345 drivers/media/rc/keymaps/rc-pinnacle-color.c | 1 +
14346 drivers/media/rc/keymaps/rc-pinnacle-grey.c | 1 +
14347 drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 +
14348 drivers/media/rc/keymaps/rc-pixelview-002t.c | 1 +
14349 drivers/media/rc/keymaps/rc-pixelview-mk12.c | 1 +
14350 drivers/media/rc/keymaps/rc-pixelview-new.c | 1 +
14351 drivers/media/rc/keymaps/rc-pixelview.c | 1 +
14352 .../media/rc/keymaps/rc-powercolor-real-angel.c | 1 +
14353 drivers/media/rc/keymaps/rc-proteus-2309.c | 1 +
14354 drivers/media/rc/keymaps/rc-purpletv.c | 1 +
14355 drivers/media/rc/keymaps/rc-pv951.c | 1 +
14356 drivers/media/rc/keymaps/rc-rc6-mce.c | 1 +
14357 .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 1 +
14358 drivers/media/rc/keymaps/rc-streamzap.c | 1 +
14359 drivers/media/rc/keymaps/rc-tbs-nec.c | 1 +
14360 drivers/media/rc/keymaps/rc-technisat-usb2.c | 1 +
14361 drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 1 +
14362 drivers/media/rc/keymaps/rc-terratec-slim-2.c | 1 +
14363 drivers/media/rc/keymaps/rc-terratec-slim.c | 1 +
14364 drivers/media/rc/keymaps/rc-tevii-nec.c | 1 +
14365 drivers/media/rc/keymaps/rc-tivo.c | 1 +
14366 drivers/media/rc/keymaps/rc-total-media-in-hand.c | 1 +
14367 drivers/media/rc/keymaps/rc-trekstor.c | 1 +
14368 drivers/media/rc/keymaps/rc-tt-1500.c | 1 +
14369 drivers/media/rc/keymaps/rc-twinhan1027.c | 1 +
14370 drivers/media/rc/keymaps/rc-videomate-m1f.c | 1 +
14371 drivers/media/rc/keymaps/rc-videomate-s350.c | 1 +
14372 drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 1 +
14373 drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 1 +
14374 drivers/media/rc/keymaps/rc-winfast.c | 1 +
14375 drivers/media/rc/rc-main.c | 1 +
14376 drivers/media/video/adp1653.c | 1 +
14377 drivers/media/video/ak881x.c | 1 +
14378 drivers/media/video/cpia2/cpia2_usb.c | 1 +
14379 drivers/media/video/cx25840/cx25840-ir.c | 1 +
14380 drivers/media/video/davinci/dm355_ccdc.c | 1 +
14381 drivers/media/video/davinci/dm644x_ccdc.c | 1 +
14382 drivers/media/video/hdpvr/hdpvr-i2c.c | 1 +
14383 drivers/media/video/hexium_gemini.c | 1 +
14384 drivers/media/video/hexium_orion.c | 1 +
14385 drivers/media/video/imx074.c | 1 +
14386 drivers/media/video/m5mols/m5mols_core.c | 1 +
14387 drivers/media/video/mt9m001.c | 1 +
14388 drivers/media/video/mt9m111.c | 1 +
14389 drivers/media/video/mt9t031.c | 1 +
14390 drivers/media/video/mt9v011.c | 1 +
14391 drivers/media/video/mt9v022.c | 1 +
14392 drivers/media/video/mt9v032.c | 1 +
14393 drivers/media/video/mxb.c | 1 +
14394 drivers/media/video/noon010pc30.c | 1 +
14395 drivers/media/video/omap24xxcam.c | 1 +
14396 drivers/media/video/ov6650.c | 1 +
14397 drivers/media/video/pvrusb2/pvrusb2-devattr.c | 1 +
14398 drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 +
14399 drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 +
14400 drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 +
14401 drivers/media/video/rj54n1cb0c.c | 1 +
14402 drivers/media/video/sh_mobile_csi2.c | 1 +
14403 drivers/media/video/sh_vou.c | 1 +
14404 drivers/media/video/sr030pc30.c | 1 +
14405 drivers/media/video/tcm825x.c | 1 +
14406 drivers/media/video/timblogiw.c | 1 +
14407 drivers/media/video/tvp514x.c | 1 +
14408 drivers/media/video/tvp5150.c | 1 +
14409 drivers/media/video/tvp7002.c | 1 +
14410 drivers/media/video/usbvision/usbvision-cards.c | 1 +
14411 drivers/media/video/v4l2-ctrls.c | 1 +
14412 drivers/media/video/v4l2-device.c | 1 +
14413 drivers/media/video/v4l2-event.c | 1 +
14414 drivers/media/video/v4l2-fh.c | 1 +
14415 drivers/media/video/v4l2-int-device.c | 1 +
14416 drivers/media/video/v4l2-subdev.c | 1 +
14417 drivers/memstick/core/memstick.c | 1 +
14418 drivers/memstick/core/mspro_block.c | 1 +
14419 drivers/memstick/host/jmb38x_ms.c | 1 +
14420 drivers/memstick/host/tifm_ms.c | 1 +
14421 drivers/message/i2o/pci.c | 1 +
14422 drivers/mfd/ab3100-core.c | 1 +
14423 drivers/mfd/ab8500-debugfs.c | 1 +
14424 drivers/mfd/ab8500-sysctrl.c | 1 +
14425 drivers/mfd/abx500-core.c | 1 +
14426 drivers/mfd/asic3.c | 1 +
14427 drivers/mfd/dm355evm_msp.c | 1 +
14428 drivers/mfd/max8997.c | 1 +
14429 drivers/mfd/mfd-core.c | 1 +
14430 drivers/mfd/pcf50633-irq.c | 1 +
14431 drivers/mfd/tmio_core.c | 1 +
14432 drivers/mfd/twl-core.c | 1 +
14433 drivers/mfd/twl6030-irq.c | 1 +
14434 drivers/mfd/wl1273-core.c | 1 +
14435 drivers/mfd/wm8400-core.c | 1 +
14436 drivers/misc/ab8500-pwm.c | 1 +
14437 drivers/misc/atmel-ssc.c | 1 +
14438 drivers/misc/atmel_tclib.c | 1 +
14439 drivers/misc/bh1780gli.c | 1 +
14440 drivers/misc/kgdbts.c | 1 +
14441 drivers/misc/sgi-gru/grukservices.c | 1 +
14442 drivers/misc/ti-st/st_kim.c | 1 +
14443 drivers/misc/tifm_7xx1.c | 1 +
14444 drivers/misc/tifm_core.c | 1 +
14445 drivers/mmc/card/mmc_test.c | 1 +
14446 drivers/mmc/core/bus.c | 2 +
14447 drivers/mmc/core/debugfs.c | 1 +
14448 drivers/mmc/core/host.c | 1 +
14449 drivers/mmc/core/mmc.c | 1 +
14450 drivers/mmc/core/mmc_ops.c | 1 +
14451 drivers/mmc/core/quirks.c | 1 +
14452 drivers/mmc/core/sd.c | 1 +
14453 drivers/mmc/core/sd_ops.c | 1 +
14454 drivers/mmc/core/sdio_bus.c | 1 +
14455 drivers/mmc/core/sdio_io.c | 1 +
14456 drivers/mmc/core/sdio_irq.c | 1 +
14457 drivers/mmc/host/mmc_spi.c | 1 +
14458 drivers/mmc/host/mxs-mmc.c | 1 +
14459 drivers/mmc/host/sdhci-of-esdhc.c | 1 +
14460 drivers/mmc/host/sdhci-of-hlwd.c | 1 +
14461 drivers/mmc/host/sdhci-pci.c | 1 +
14462 drivers/mmc/host/sdhci-pltfm.c | 1 +
14463 drivers/mmc/host/sdhci-pxav2.c | 1 +
14464 drivers/mmc/host/sdhci-pxav3.c | 1 +
14465 drivers/mmc/host/sdhci-spear.c | 1 +
14466 drivers/mmc/host/sdhci-tegra.c | 1 +
14467 drivers/mmc/host/sdhci.c | 1 +
14468 drivers/mmc/host/sdricoh_cs.c | 1 +
14469 drivers/mmc/host/sh_mmcif.c | 1 +
14470 drivers/mmc/host/sh_mobile_sdhi.c | 1 +
14471 drivers/mmc/host/tifm_sd.c | 1 +
14472 drivers/mmc/host/via-sdmmc.c | 1 +
14473 drivers/mtd/ar7part.c | 1 +
14474 drivers/mtd/cmdlinepart.c | 1 +
14475 drivers/mtd/lpddr/lpddr_cmds.c | 1 +
14476 drivers/mtd/mtdblock_ro.c | 1 +
14477 drivers/mtd/mtdsuper.c | 1 +
14478 drivers/mtd/nand/cafe_nand.c | 1 +
14479 drivers/mtd/nand/cmx270_nand.c | 1 +
14480 drivers/mtd/nand/diskonchip.c | 1 +
14481 drivers/mtd/nand/nand_bbt.c | 1 +
14482 drivers/mtd/nand/omap2.c | 1 +
14483 drivers/mtd/nand/sm_common.c | 1 +
14484 drivers/mtd/onenand/onenand_bbt.c | 1 +
14485 drivers/mtd/redboot.c | 1 +
14486 drivers/mtd/rfd_ftl.c | 1 +
14487 drivers/mtd/ubi/vmt.c | 1 +
14488 drivers/net/bonding/bond_procfs.c | 1 +
14489 drivers/net/ethernet/brocade/bna/bnad.c | 1 +
14490 drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 1 +
14491 drivers/net/ethernet/chelsio/cxgb3/l2t.c | 1 +
14492 drivers/net/ethernet/chelsio/cxgb4/l2t.c | 7 +-
14493 drivers/net/ethernet/chelsio/cxgb4/sge.c | 1 +
14494 drivers/net/ethernet/emulex/benet/be_main.c | 1 +
14495 drivers/net/ethernet/ethoc.c | 1 +
14496 drivers/net/ethernet/freescale/ucc_geth.c | 1 +
14497 drivers/net/ethernet/intel/e1000e/param.c | 1 +
14498 drivers/net/ethernet/mellanox/mlx4/alloc.c | 1 +
14499 drivers/net/ethernet/mellanox/mlx4/catas.c | 1 +
14500 drivers/net/ethernet/mellanox/mlx4/cmd.c | 1 +
14501 drivers/net/ethernet/mellanox/mlx4/cq.c | 1 +
14502 drivers/net/ethernet/mellanox/mlx4/en_tx.c | 1 +
14503 drivers/net/ethernet/mellanox/mlx4/eq.c | 1 +
14504 drivers/net/ethernet/mellanox/mlx4/fw.c | 1 +
14505 drivers/net/ethernet/mellanox/mlx4/intf.c | 1 +
14506 drivers/net/ethernet/mellanox/mlx4/mcg.c | 1 +
14507 drivers/net/ethernet/mellanox/mlx4/mr.c | 1 +
14508 drivers/net/ethernet/mellanox/mlx4/pd.c | 1 +
14509 drivers/net/ethernet/mellanox/mlx4/port.c | 1 +
14510 drivers/net/ethernet/mellanox/mlx4/qp.c | 1 +
14511 drivers/net/ethernet/mellanox/mlx4/srq.c | 1 +
14512 drivers/net/ethernet/neterion/vxge/vxge-main.c | 1 +
14513 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 1 +
14514 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 1 +
14515 drivers/net/ethernet/sfc/rx.c | 1 +
14516 drivers/net/ethernet/smsc/smsc9420.c | 1 +
14517 drivers/net/ethernet/xscale/ixp4xx_eth.c | 1 +
14518 drivers/net/phy/realtek.c | 1 +
14519 drivers/net/usb/lg-vl600.c | 1 +
14520 drivers/net/veth.c | 1 +
14521 drivers/net/vmxnet3/vmxnet3_drv.c | 1 +
14522 drivers/net/wimax/i2400m/control.c | 2 +
14523 drivers/net/wimax/i2400m/debugfs.c | 1 +
14524 drivers/net/wimax/i2400m/fw.c | 1 +
14525 drivers/net/wimax/i2400m/netdev.c | 1 +
14526 drivers/net/wimax/i2400m/rx.c | 2 +
14527 drivers/net/wimax/i2400m/sdio.c | 1 +
14528 drivers/net/wimax/i2400m/tx.c | 1 +
14529 drivers/net/wimax/i2400m/usb.c | 1 +
14530 drivers/net/wireless/adm8211.c | 1 +
14531 drivers/net/wireless/ath/ath5k/debug.c | 2 +
14532 drivers/net/wireless/ath/ath5k/pci.c | 1 +
14533 drivers/net/wireless/ath/ath9k/ahb.c | 1 +
14534 drivers/net/wireless/ath/ath9k/ani.c | 1 +
14535 drivers/net/wireless/ath/ath9k/ar9002_hw.c | 1 +
14536 drivers/net/wireless/ath/ath9k/ar9002_mac.c | 1 +
14537 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 1 +
14538 drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 1 +
14539 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 1 +
14540 drivers/net/wireless/ath/ath9k/btcoex.c | 1 +
14541 drivers/net/wireless/ath/ath9k/calib.c | 1 +
14542 drivers/net/wireless/ath/ath9k/debug.c | 1 +
14543 drivers/net/wireless/ath/ath9k/hw.c | 1 +
14544 drivers/net/wireless/ath/ath9k/init.c | 1 +
14545 drivers/net/wireless/ath/ath9k/mac.c | 1 +
14546 drivers/net/wireless/ath/ath9k/pci.c | 1 +
14547 drivers/net/wireless/ath/ath9k/rc.c | 1 +
14548 drivers/net/wireless/ath/carl9170/fw.c | 1 +
14549 drivers/net/wireless/ath/debug.c | 1 +
14550 drivers/net/wireless/ath/hw.c | 1 +
14551 drivers/net/wireless/ath/key.c | 1 +
14552 drivers/net/wireless/ath/regd.c | 1 +
14553 drivers/net/wireless/b43/main.c | 2 +-
14554 drivers/net/wireless/b43/pcmcia.c | 1 +
14555 drivers/net/wireless/b43legacy/main.c | 2 +-
14556 drivers/net/wireless/hostap/hostap_80211_rx.c | 1 +
14557 drivers/net/wireless/hostap/hostap_80211_tx.c | 1 +
14558 drivers/net/wireless/hostap/hostap_ap.c | 2 +
14559 drivers/net/wireless/hostap/hostap_info.c | 1 +
14560 drivers/net/wireless/hostap/hostap_ioctl.c | 1 +
14561 drivers/net/wireless/hostap/hostap_proc.c | 1 +
14562 drivers/net/wireless/iwlegacy/iwl-debugfs.c | 1 +
14563 drivers/net/wireless/iwlegacy/iwl-rx.c | 1 +
14564 drivers/net/wireless/iwlegacy/iwl-scan.c | 1 +
14565 drivers/net/wireless/iwlegacy/iwl-sta.c | 1 +
14566 drivers/net/wireless/iwlegacy/iwl-tx.c | 1 +
14567 drivers/net/wireless/iwlwifi/iwl-pci.c | 1 +
14568 drivers/net/wireless/iwmc3200wifi/commands.c | 1 +
14569 drivers/net/wireless/iwmc3200wifi/debugfs.c | 1 +
14570 drivers/net/wireless/iwmc3200wifi/main.c | 1 +
14571 drivers/net/wireless/iwmc3200wifi/sdio.c | 1 +
14572 drivers/net/wireless/libertas/cmd.c | 1 +
14573 drivers/net/wireless/libertas/debugfs.c | 1 +
14574 drivers/net/wireless/libertas/if_sdio.c | 2 +-
14575 drivers/net/wireless/libertas/if_spi.c | 2 +-
14576 drivers/net/wireless/libertas/if_usb.c | 2 +-
14577 drivers/net/wireless/libertas/main.c | 2 +-
14578 drivers/net/wireless/libertas/rx.c | 1 +
14579 drivers/net/wireless/libertas/tx.c | 1 +
14580 drivers/net/wireless/libertas_tf/cmd.c | 1 +
14581 drivers/net/wireless/libertas_tf/if_usb.c | 2 +-
14582 drivers/net/wireless/libertas_tf/main.c | 1 +
14583 drivers/net/wireless/mac80211_hwsim.c | 1 +
14584 drivers/net/wireless/orinoco/fw.c | 1 +
14585 drivers/net/wireless/p54/eeprom.c | 1 +
14586 drivers/net/wireless/p54/fwio.c | 1 +
14587 drivers/net/wireless/p54/main.c | 1 +
14588 drivers/net/wireless/p54/p54pci.c | 1 +
14589 drivers/net/wireless/p54/p54usb.c | 1 +
14590 drivers/net/wireless/p54/txrx.c | 1 +
14591 drivers/net/wireless/rtl818x/rtl8180/dev.c | 1 +
14592 drivers/net/wireless/rtl818x/rtl8187/dev.c | 1 +
14593 drivers/net/wireless/rtlwifi/base.c | 1 +
14594 drivers/net/wireless/rtlwifi/cam.c | 1 +
14595 drivers/net/wireless/rtlwifi/efuse.c | 1 +
14596 drivers/net/wireless/rtlwifi/pci.c | 1 +
14597 drivers/net/wireless/rtlwifi/ps.c | 1 +
14598 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 1 +
14599 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 1 +
14600 drivers/net/wireless/rtlwifi/rtl8192c/main.c | 1 +
14601 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 1 +
14602 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 +
14603 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 +
14604 drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 1 +
14605 drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 1 +
14606 drivers/net/wireless/rtlwifi/usb.c | 1 +
14607 drivers/net/wireless/wl12xx/boot.c | 1 +
14608 drivers/net/wireless/zd1211rw/zd_usb.c | 1 +
14609 drivers/of/of_net.c | 1 +
14610 drivers/of/of_pci.c | 1 +
14611 drivers/of/of_pci_irq.c | 1 +
14612 drivers/of/of_spi.c | 1 +
14613 drivers/parisc/ccio-dma.c | 1 +
14614 drivers/parisc/sba_iommu.c | 1 +
14615 drivers/pci/hotplug-pci.c | 1 +
14616 drivers/pci/hotplug/pciehp_acpi.c | 1 +
14617 drivers/pci/hotplug/pcihp_slot.c | 1 +
14618 drivers/pci/hotplug/rpadlpar_core.c | 1 +
14619 drivers/pci/htirq.c | 1 +
14620 drivers/pci/iov.c | 1 +
14621 drivers/pci/irq.c | 1 +
14622 drivers/pci/msi.c | 1 +
14623 drivers/pci/pci-sysfs.c | 1 +
14624 drivers/pci/quirks.c | 1 +
14625 drivers/pci/rom.c | 1 +
14626 drivers/pci/setup-res.c | 1 +
14627 drivers/pci/slot.c | 1 +
14628 drivers/pci/vpd.c | 1 +
14629 drivers/pcmcia/db1xxx_ss.c | 1 +
14630 drivers/pcmcia/pxa2xx_cm_x255.c | 1 +
14631 drivers/pcmcia/pxa2xx_cm_x270.c | 1 +
14632 drivers/platform/x86/intel_scu_ipc.c | 1 +
14633 drivers/platform/x86/msi-wmi.c | 1 +
14634 drivers/platform/x86/wmi.c | 1 +
14635 drivers/power/max17042_battery.c | 1 +
14636 drivers/power/max8903_charger.c | 1 +
14637 drivers/power/max8997_charger.c | 1 +
14638 drivers/power/max8998_charger.c | 1 +
14639 drivers/power/power_supply_sysfs.c | 1 +
14640 drivers/ps3/ps3stor_lib.c | 1 +
14641 drivers/ps3/sys-manager-core.c | 1 +
14642 drivers/rapidio/switches/idt_gen2.c | 1 +
14643 drivers/regulator/88pm8607.c | 1 +
14644 drivers/regulator/ab8500.c | 1 +
14645 drivers/regulator/bq24022.c | 1 +
14646 drivers/regulator/core.c | 1 +
14647 drivers/regulator/da903x.c | 1 +
14648 drivers/regulator/db8500-prcmu.c | 1 +
14649 drivers/regulator/dummy.c | 1 +
14650 drivers/regulator/fixed.c | 1 +
14651 drivers/regulator/lp3971.c | 1 +
14652 drivers/regulator/lp3972.c | 1 +
14653 drivers/regulator/max8925-regulator.c | 1 +
14654 drivers/regulator/max8997.c | 1 +
14655 drivers/regulator/mc13783-regulator.c | 1 +
14656 drivers/regulator/mc13892-regulator.c | 1 +
14657 drivers/regulator/mc13xxx-regulator-core.c | 1 +
14658 drivers/regulator/tps6586x-regulator.c | 1 +
14659 drivers/regulator/userspace-consumer.c | 1 +
14660 drivers/regulator/virtual.c | 1 +
14661 drivers/regulator/wm8400-regulator.c | 1 +
14662 drivers/rtc/interface.c | 1 +
14663 drivers/rtc/rtc-dm355evm.c | 1 +
14664 drivers/rtc/rtc-ds1305.c | 1 +
14665 drivers/rtc/rtc-ds1511.c | 1 +
14666 drivers/rtc/rtc-ds1553.c | 1 +
14667 drivers/rtc/rtc-ds1672.c | 1 +
14668 drivers/rtc/rtc-ds1742.c | 1 +
14669 drivers/rtc/rtc-em3027.c | 1 +
14670 drivers/rtc/rtc-isl12022.c | 1 +
14671 drivers/rtc/rtc-mv.c | 1 +
14672 drivers/rtc/rtc-pcf2123.c | 1 +
14673 drivers/rtc/rtc-pcf8563.c | 1 +
14674 drivers/rtc/rtc-rs5c348.c | 1 +
14675 drivers/rtc/rtc-rs5c372.c | 1 +
14676 drivers/rtc/rtc-stk17ta8.c | 1 +
14677 drivers/rtc/rtc-tx4939.c | 1 +
14678 drivers/rtc/rtc-x1205.c | 1 +
14679 drivers/s390/char/fs3270.c | 1 +
14680 drivers/s390/char/sclp_cpi_sys.c | 1 +
14681 drivers/s390/char/vmcp.c | 1 +
14682 drivers/s390/char/vmur.c | 1 +
14683 drivers/s390/cio/chp.c | 2 +
14684 drivers/s390/cio/qdio_debug.c | 2 +
14685 drivers/s390/cio/qdio_setup.c | 1 +
14686 drivers/s390/kvm/kvm_virtio.c | 1 +
14687 drivers/s390/scsi/zfcp_aux.c | 1 +
14688 drivers/s390/scsi/zfcp_ccw.c | 1 +
14689 drivers/s390/scsi/zfcp_dbf.c | 1 +
14690 drivers/s390/scsi/zfcp_qdio.c | 1 +
14691 drivers/s390/scsi/zfcp_scsi.c | 1 +
14692 drivers/scsi/a2091.c | 1 +
14693 drivers/scsi/a3000.c | 1 +
14694 drivers/scsi/aacraid/aachba.c | 1 +
14695 drivers/scsi/be2iscsi/be_main.c | 1 +
14696 drivers/scsi/bfa/bfad_debugfs.c | 1 +
14697 drivers/scsi/bfa/bfad_im.c | 2 +
14698 drivers/scsi/cxgbi/libcxgbi.c | 1 +
14699 drivers/scsi/device_handler/scsi_dh.c | 1 +
14700 drivers/scsi/device_handler/scsi_dh_alua.c | 1 +
14701 drivers/scsi/device_handler/scsi_dh_emc.c | 1 +
14702 drivers/scsi/device_handler/scsi_dh_hp_sw.c | 1 +
14703 drivers/scsi/device_handler/scsi_dh_rdac.c | 1 +
14704 drivers/scsi/gvp11.c | 1 +
14705 drivers/scsi/iscsi_tcp.c | 1 +
14706 drivers/scsi/libfc/fc_disc.c | 1 +
14707 drivers/scsi/libfc/fc_elsct.c | 1 +
14708 drivers/scsi/libfc/fc_exch.c | 1 +
14709 drivers/scsi/libfc/fc_libfc.c | 1 +
14710 drivers/scsi/libfc/fc_lport.c | 1 +
14711 drivers/scsi/libfc/fc_npiv.c | 1 +
14712 drivers/scsi/libfc/fc_rport.c | 1 +
14713 drivers/scsi/libiscsi.c | 1 +
14714 drivers/scsi/libiscsi_tcp.c | 1 +
14715 drivers/scsi/libsas/sas_scsi_host.c | 1 +
14716 drivers/scsi/libsas/sas_task.c | 1 +
14717 drivers/scsi/libsrp.c | 1 +
14718 drivers/scsi/lpfc/lpfc_attr.c | 1 +
14719 drivers/scsi/lpfc/lpfc_debugfs.c | 1 +
14720 drivers/scsi/lpfc/lpfc_init.c | 1 +
14721 drivers/scsi/lpfc/lpfc_scsi.c | 1 +
14722 drivers/scsi/mac53c94.c | 1 +
14723 drivers/scsi/megaraid/megaraid_mbox.c | 1 +
14724 drivers/scsi/osd/osd_initiator.c | 1 +
14725 drivers/scsi/ps3rom.c | 1 +
14726 drivers/scsi/scsi_lib.c | 1 +
14727 drivers/scsi/scsi_lib_dma.c | 1 +
14728 drivers/scsi/scsi_netlink.c | 1 +
14729 drivers/scsi/scsi_pm.c | 1 +
14730 drivers/scsi/scsi_tgt_if.c | 1 +
14731 drivers/scsi/sr_ioctl.c | 1 +
14732 drivers/sfi/sfi_core.h | 3 +
14733 drivers/sh/intc/core.c | 2 +
14734 drivers/sh/intc/dynamic.c | 1 +
14735 drivers/sh/intc/virq.c | 1 +
14736 drivers/sh/maple/maple.c | 1 +
14737 drivers/spi/spi-altera.c | 1 +
14738 drivers/spi/spi-au1550.c | 1 +
14739 drivers/spi/spi-bitbang.c | 1 +
14740 drivers/spi/spi-butterfly.c | 1 +
14741 drivers/spi/spi-dw-mmio.c | 1 +
14742 drivers/spi/spi-dw-pci.c | 1 +
14743 drivers/spi/spi-dw.c | 1 +
14744 drivers/spi/spi-gpio.c | 1 +
14745 drivers/spi/spi-oc-tiny.c | 1 +
14746 drivers/spi/spi-omap-uwire.c | 1 +
14747 drivers/spi/spi-orion.c | 1 +
14748 drivers/spi/spi-pxa2xx-pci.c | 1 +
14749 drivers/spi/spi-s3c24xx.c | 1 +
14750 drivers/spi/spi-sh-msiof.c | 1 +
14751 drivers/spi/spi-sh-sci.c | 1 +
14752 drivers/spi/spi-ti-ssp.c | 1 +
14753 drivers/spi/spi-tle62x0.c | 1 +
14754 drivers/spi/spi-txx9.c | 1 +
14755 drivers/spi/spi.c | 1 +
14756 drivers/ssb/b43_pci_bridge.c | 1 +
14757 drivers/ssb/driver_chipcommon.c | 1 +
14758 drivers/ssb/driver_chipcommon_pmu.c | 1 +
14759 drivers/ssb/driver_gige.c | 1 +
14760 drivers/ssb/driver_pcicore.c | 1 +
14761 drivers/ssb/embedded.c | 1 +
14762 drivers/ssb/main.c | 1 +
14763 drivers/ssb/pcihost_wrapper.c | 1 +
14764 drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 2 +
14765 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 1 +
14766 drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 1 +
14767 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 +
14768 drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 1 +
14769 drivers/staging/brcm80211/brcmutil/utils.c | 1 +
14770 drivers/staging/brcm80211/brcmutil/wifi.c | 1 +
14771 drivers/staging/cxt1e1/linux.c | 1 +
14772 drivers/staging/gma500/intel_i2c.c | 1 +
14773 drivers/staging/gma500/mdfld_dsi_output.c | 1 +
14774 drivers/staging/gma500/mdfld_output.c | 3 +-
14775 drivers/staging/gma500/mid_bios.c | 1 +
14776 drivers/staging/gma500/mrst_hdmi_i2c.c | 1 +
14777 drivers/staging/gma500/psb_drv.c | 1 +
14778 drivers/staging/iio/accel/adis16201_ring.c | 1 +
14779 drivers/staging/iio/accel/adis16201_trigger.c | 1 +
14780 drivers/staging/iio/accel/adis16203_ring.c | 1 +
14781 drivers/staging/iio/accel/adis16203_trigger.c | 1 +
14782 drivers/staging/iio/accel/adis16204_ring.c | 1 +
14783 drivers/staging/iio/accel/adis16204_trigger.c | 1 +
14784 drivers/staging/iio/accel/adis16209_ring.c | 1 +
14785 drivers/staging/iio/accel/adis16209_trigger.c | 1 +
14786 drivers/staging/iio/accel/adis16240_ring.c | 1 +
14787 drivers/staging/iio/accel/adis16240_trigger.c | 1 +
14788 drivers/staging/iio/accel/lis3l02dq_ring.c | 1 +
14789 drivers/staging/iio/adc/ad7793.c | 1 +
14790 drivers/staging/iio/dac/ad5686.c | 1 +
14791 drivers/staging/iio/gyro/adis16060_core.c | 1 +
14792 drivers/staging/iio/gyro/adis16260_ring.c | 1 +
14793 drivers/staging/iio/gyro/adis16260_trigger.c | 1 +
14794 drivers/staging/iio/imu/adis16400_ring.c | 1 +
14795 drivers/staging/iio/imu/adis16400_trigger.c | 1 +
14796 drivers/staging/iio/meter/ade7758_ring.c | 1 +
14797 drivers/staging/iio/meter/ade7758_trigger.c | 1 +
14798 drivers/staging/intel_sst/intel_sst.c | 1 +
14799 .../staging/intel_sst/intel_sst_drv_interface.c | 1 +
14800 drivers/staging/line6/audio.c | 1 +
14801 drivers/staging/solo6x10/g723.c | 1 +
14802 drivers/staging/usbip/usbip_common.c | 1 +
14803 drivers/staging/usbip/usbip_event.c | 1 +
14804 drivers/staging/winbond/wbusb.c | 1 +
14805 drivers/staging/wlags49_h2/wl_cs.c | 1 +
14806 drivers/target/iscsi/iscsi_target.c | 1 +
14807 drivers/target/iscsi/iscsi_target_configfs.c | 1 +
14808 drivers/target/iscsi/iscsi_target_stat.c | 1 +
14809 drivers/target/target_core_alua.c | 1 +
14810 drivers/target/target_core_device.c | 1 +
14811 drivers/target/target_core_fabric_lib.c | 1 +
14812 drivers/target/target_core_file.c | 1 +
14813 drivers/target/target_core_hba.c | 1 +
14814 drivers/target/target_core_iblock.c | 1 +
14815 drivers/target/target_core_pscsi.c | 1 +
14816 drivers/target/target_core_tmr.c | 1 +
14817 drivers/target/target_core_tpg.c | 1 +
14818 drivers/target/target_core_transport.c | 1 +
14819 drivers/tty/hvc/hvc_iseries.c | 1 +
14820 drivers/tty/hvc/hvc_vio.c | 1 +
14821 drivers/tty/serial/jsm/jsm_driver.c | 2 +-
14822 drivers/tty/serial/kgdboc.c | 1 +
14823 drivers/tty/serial/max3100.c | 1 +
14824 drivers/tty/serial/max3107-aava.c | 1 +
14825 drivers/tty/serial/max3107.c | 1 +
14826 drivers/tty/serial/nwpserial.c | 1 +
14827 drivers/tty/serial/timbuart.c | 1 +
14828 drivers/tty/serial/xilinx_uartps.c | 1 +
14829 drivers/tty/vt/vc_screen.c | 1 +
14830 drivers/uio/uio_pdrv.c | 1 +
14831 drivers/uio/uio_pdrv_genirq.c | 1 +
14832 drivers/usb/c67x00/c67x00-drv.c | 1 +
14833 drivers/usb/core/driver.c | 1 +
14834 drivers/usb/core/notify.c | 1 +
14835 drivers/usb/gadget/cdc2.c | 1 +
14836 drivers/usb/gadget/composite.c | 1 +
14837 drivers/usb/gadget/dbgp.c | 1 +
14838 drivers/usb/gadget/f_fs.c | 1 +
14839 drivers/usb/gadget/f_obex.c | 1 +
14840 drivers/usb/gadget/f_sourcesink.c | 1 +
14841 drivers/usb/gadget/file_storage.c | 1 +
14842 drivers/usb/gadget/fusb300_udc.c | 1 +
14843 drivers/usb/gadget/gmidi.c | 1 +
14844 drivers/usb/gadget/u_serial.c | 1 +
14845 drivers/usb/host/fsl-mph-dr-of.c | 1 +
14846 drivers/usb/host/isp1760-if.c | 1 +
14847 drivers/usb/host/pci-quirks.c | 1 +
14848 drivers/usb/host/whci/debug.c | 1 +
14849 drivers/usb/host/whci/hcd.c | 1 +
14850 drivers/usb/host/xhci-hub.c | 1 +
14851 drivers/usb/host/xhci-pci.c | 1 +
14852 drivers/usb/mon/mon_bin.c | 1 +
14853 drivers/usb/mon/mon_stat.c | 1 +
14854 drivers/usb/mon/mon_text.c | 1 +
14855 drivers/usb/otg/gpio_vbus.c | 1 +
14856 drivers/usb/otg/otg.c | 1 +
14857 drivers/usb/otg/ulpi.c | 1 +
14858 drivers/usb/serial/aircable.c | 1 +
14859 drivers/usb/serial/qcserial.c | 1 +
14860 drivers/usb/storage/option_ms.c | 1 +
14861 drivers/usb/storage/protocol.c | 1 +
14862 drivers/usb/storage/sierra_ms.c | 1 +
14863 drivers/usb/storage/transport.c | 1 +
14864 drivers/usb/storage/uas.c | 1 +
14865 drivers/usb/wusbcore/devconnect.c | 1 +
14866 drivers/usb/wusbcore/mmc.c | 1 +
14867 drivers/usb/wusbcore/rh.c | 1 +
14868 drivers/usb/wusbcore/security.c | 1 +
14869 drivers/usb/wusbcore/wa-hc.c | 1 +
14870 drivers/usb/wusbcore/wa-rpipe.c | 1 +
14871 drivers/usb/wusbcore/wa-xfer.c | 1 +
14872 drivers/uwb/est.c | 1 +
14873 drivers/uwb/i1480/dfu/dfu.c | 1 +
14874 drivers/uwb/ie.c | 1 +
14875 drivers/uwb/lc-dev.c | 2 +
14876 drivers/uwb/lc-rc.c | 1 +
14877 drivers/uwb/neh.c | 1 +
14878 drivers/uwb/pal.c | 1 +
14879 drivers/uwb/radio.c | 1 +
14880 drivers/uwb/reset.c | 1 +
14881 drivers/uwb/rsv.c | 1 +
14882 drivers/uwb/scan.c | 1 +
14883 drivers/uwb/umc-bus.c | 1 +
14884 drivers/uwb/umc-dev.c | 1 +
14885 drivers/uwb/umc-drv.c | 1 +
14886 drivers/uwb/whci.c | 1 +
14887 drivers/video/atmel_lcdfb.c | 1 +
14888 drivers/video/backlight/88pm860x_bl.c | 1 +
14889 drivers/video/backlight/adp5520_bl.c | 1 +
14890 drivers/video/backlight/ams369fg06.c | 1 +
14891 drivers/video/backlight/da903x_bl.c | 1 +
14892 drivers/video/backlight/ep93xx_bl.c | 1 +
14893 drivers/video/backlight/l4f00242t03.c | 1 +
14894 drivers/video/backlight/ld9040.c | 1 +
14895 drivers/video/backlight/lms283gf05.c | 1 +
14896 drivers/video/backlight/max8925_bl.c | 1 +
14897 drivers/video/backlight/s6e63m0.c | 1 +
14898 drivers/video/backlight/wm831x_bl.c | 1 +
14899 drivers/video/carminefb.c | 1 +
14900 drivers/video/cobalt_lcdfb.c | 1 +
14901 drivers/video/ep93xx-fb.c | 1 +
14902 drivers/video/fb_ddc.c | 3 +-
14903 drivers/video/fb_notify.c | 1 +
14904 drivers/video/mb862xx/mb862xx-i2c.c | 1 +
14905 drivers/video/mb862xx/mb862xxfbdrv.c | 1 +
14906 drivers/video/msm/mdp.c | 1 +
14907 drivers/video/omap/lcd_mipid.c | 1 +
14908 drivers/video/omap/omapfb_main.c | 1 +
14909 drivers/video/omap2/dss/dispc.c | 1 +
14910 drivers/video/omap2/dss/dpi.c | 1 +
14911 drivers/video/omap2/dss/dsi.c | 1 +
14912 drivers/video/omap2/dss/dss.c | 1 +
14913 drivers/video/omap2/dss/rfbi.c | 1 +
14914 drivers/video/omap2/dss/sdi.c | 1 +
14915 drivers/video/omap2/omapfb/omapfb-ioctl.c | 1 +
14916 drivers/video/savage/savagefb_accel.c | 1 +
14917 drivers/video/sh_mipi_dsi.c | 1 +
14918 drivers/video/sh_mobile_lcdcfb.c | 1 +
14919 drivers/video/via/via-gpio.c | 1 +
14920 drivers/video/w100fb.c | 1 +
14921 drivers/virtio/virtio.c | 1 +
14922 drivers/virtio/virtio_balloon.c | 1 +
14923 drivers/virtio/virtio_ring.c | 1 +
14924 drivers/w1/w1_family.c | 1 +
14925 drivers/w1/w1_int.c | 2 +
14926 drivers/watchdog/stmp3xxx_wdt.c | 1 +
14927 drivers/xen/balloon.c | 1 +
14928 drivers/xen/manage.c | 1 +
14929 drivers/xen/swiotlb-xen.c | 1 +
14930 drivers/xen/xen-pciback/conf_space.c | 1 +
14931 drivers/xen/xen-selfballoon.c | 2 +
14932 drivers/xen/xenbus/xenbus_client.c | 1 +
14933 drivers/xen/xenbus/xenbus_probe.c | 1 +
14934 drivers/xen/xenbus/xenbus_probe_backend.c | 1 +
14935 drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
14936 drivers/zorro/proc.c | 1 +
14937 fs/bio-integrity.c | 1 +
14938 fs/cifs/connect.c | 1 +
14939 fs/exofs/ore.c | 1 +
14940 fs/exofs/super.c | 1 +
14941 fs/fuse/cuse.c | 1 +
14942 fs/gfs2/ops_fstype.c | 1 +
14944 fs/jfs/jfs_logmgr.c | 1 +
14945 fs/logfs/super.c | 1 +
14946 fs/nfs/nfs4filelayout.c | 1 +
14947 fs/nfs/pagelist.c | 1 +
14948 fs/nfs/pnfs.c | 1 +
14949 fs/nfs/pnfs_dev.c | 1 +
14950 fs/nfs/write.c | 1 +
14951 fs/nfsd/nfs4acl.c | 1 +
14952 fs/nfsd/nfsctl.c | 1 +
14953 fs/nfsd/nfssvc.c | 1 +
14954 fs/ocfs2/cluster/tcp.c | 1 +
14955 fs/ocfs2/dlm/dlmdebug.c | 1 +
14956 fs/proc/vmcore.c | 1 +
14957 include/acpi/platform/aclinux.h | 2 +-
14958 include/drm/drmP.h | 3 +-
14959 include/linux/bcma/bcma.h | 7 +-
14960 include/linux/blkdev.h | 2 +-
14961 include/linux/cpuidle.h | 3 +-
14962 include/linux/crypto.h | 6 --
14963 include/linux/device.h | 15 ++-
14964 include/linux/device_cgroup.h | 1 -
14965 include/linux/dmaengine.h | 2 +
14966 include/linux/export.h | 89 ++++++++++++++++++++
14967 include/linux/firmware.h | 2 +-
14968 include/linux/ftrace.h | 2 +-
14969 include/linux/gameport.h | 17 ++--
14970 include/linux/hid.h | 9 +-
14971 include/linux/i2c.h | 10 +-
14972 include/linux/ipmi.h | 3 +-
14973 include/linux/ipmi_smi.h | 1 -
14974 include/linux/irq.h | 32 +++-----
14975 include/linux/irqdesc.h | 1 +
14976 include/linux/mdio-bitbang.h | 3 +-
14977 include/linux/miscdevice.h | 3 +-
14978 include/linux/module.h | 73 +----------------
14979 include/linux/moduleparam.h | 5 +
14980 include/linux/mtd/mtd.h | 3 +-
14981 include/linux/of_platform.h | 1 -
14982 include/linux/pci_hotplug.h | 10 +--
14983 include/linux/pm_runtime.h | 1 +
14984 include/linux/regmap.h | 2 +-
14985 include/linux/regulator/driver.h | 1 +
14986 include/linux/serio.h | 20 +++--
14987 include/linux/ssb/ssb.h | 7 +-
14988 include/linux/stop_machine.h | 1 +
14989 include/linux/sunrpc/svc_xprt.h | 3 +-
14990 include/linux/sysdev.h | 1 -
14991 include/linux/textsearch.h | 3 +-
14992 include/linux/uio_driver.h | 12 ++--
14993 include/linux/usb.h | 9 +-
14994 include/linux/uwb.h | 1 +
14995 include/linux/uwb/umc.h | 7 +-
14996 include/linux/vermagic.h | 1 -
14997 include/linux/vlynq.h | 3 +-
14998 include/media/saa7146.h | 3 +-
14999 include/media/v4l2-int-device.h | 3 +-
15000 include/net/bluetooth/hci_core.h | 24 +++---
15001 include/net/inet_timewait_sock.h | 1 -
15002 include/net/ip_vs.h | 15 ++--
15003 include/net/lib80211.h | 3 +-
15004 include/net/netfilter/nf_conntrack.h | 2 +
15005 include/net/sch_generic.h | 1 -
15006 include/net/sock.h | 2 +-
15007 include/sound/core.h | 2 +-
15008 include/trace/define_trace.h | 10 --
15009 include/trace/events/module.h | 2 +-
15010 include/xen/xenbus.h | 1 +
15011 kernel/async.c | 2 +-
15012 kernel/audit.c | 2 +-
15013 kernel/auditsc.c | 2 +-
15014 kernel/capability.c | 2 +-
15015 kernel/cgroup_freezer.c | 2 +-
15016 kernel/compat.c | 1 +
15017 kernel/cpu.c | 2 +-
15018 kernel/cpuset.c | 2 +-
15019 kernel/crash_dump.c | 2 +-
15020 kernel/cred.c | 2 +-
15021 kernel/debug/kdb/kdb_debugger.c | 1 +
15022 kernel/dma.c | 2 +-
15023 kernel/events/core.c | 1 +
15024 kernel/exit.c | 3 +-
15025 kernel/fork.c | 3 +-
15026 kernel/freezer.c | 2 +-
15027 kernel/futex.c | 2 +-
15028 kernel/groups.c | 2 +-
15029 kernel/hrtimer.c | 2 +-
15030 kernel/hung_task.c | 2 +-
15031 kernel/irq/irqdesc.c | 2 +-
15032 kernel/irq_work.c | 4 +-
15033 kernel/kfifo.c | 2 +-
15034 kernel/kprobes.c | 2 +-
15035 kernel/ksysfs.c | 3 +-
15036 kernel/kthread.c | 2 +-
15037 kernel/latencytop.c | 2 +-
15038 kernel/lockdep.c | 2 +-
15039 kernel/lockdep_proc.c | 2 +-
15040 kernel/module.c | 2 +-
15041 kernel/mutex-debug.c | 2 +-
15042 kernel/mutex.c | 2 +-
15043 kernel/notifier.c | 2 +-
15044 kernel/nsproxy.c | 2 +-
15045 kernel/padata.c | 2 +-
15046 kernel/params.c | 4 +-
15047 kernel/pid.c | 2 +-
15048 kernel/posix-timers.c | 2 +-
15049 kernel/power/hibernate.c | 1 +
15050 kernel/power/main.c | 1 +
15051 kernel/power/qos.c | 1 +
15052 kernel/power/suspend.c | 2 +
15053 kernel/power/user.c | 1 +
15054 kernel/profile.c | 2 +-
15055 kernel/ptrace.c | 2 +-
15056 kernel/range.c | 2 +-
15057 kernel/rcupdate.c | 2 +-
15058 kernel/rcutiny.c | 4 +-
15059 kernel/rcutorture.c | 3 +-
15060 kernel/rcutree.c | 2 +-
15061 kernel/rcutree_trace.c | 3 +-
15062 kernel/relay.c | 2 +-
15063 kernel/resource.c | 2 +-
15064 kernel/rtmutex-debug.c | 2 +-
15065 kernel/rtmutex-tester.c | 2 +-
15066 kernel/rtmutex.c | 2 +-
15067 kernel/rwsem.c | 2 +-
15068 kernel/sched.c | 2 +-
15069 kernel/sched_clock.c | 2 +-
15070 kernel/semaphore.c | 2 +-
15071 kernel/signal.c | 2 +-
15072 kernel/smp.c | 2 +-
15073 kernel/softirq.c | 2 +-
15074 kernel/spinlock.c | 2 +-
15075 kernel/srcu.c | 2 +-
15076 kernel/stacktrace.c | 2 +-
15077 kernel/stop_machine.c | 2 +-
15078 kernel/sys.c | 3 +-
15079 kernel/time.c | 2 +-
15080 kernel/time/posix-clock.c | 1 +
15081 kernel/timer.c | 2 +-
15082 kernel/trace/blktrace.c | 1 +
15083 kernel/trace/ftrace.c | 1 +
15084 kernel/trace/trace_syscalls.c | 1 +
15086 kernel/user-return-notifier.c | 2 +-
15087 kernel/user.c | 2 +-
15088 kernel/user_namespace.c | 2 +-
15089 kernel/utsname.c | 2 +-
15090 kernel/utsname_sysctl.c | 2 +-
15091 kernel/wait.c | 2 +-
15092 kernel/watchdog.c | 3 +-
15093 kernel/workqueue.c | 2 +-
15094 lib/dma-debug.c | 1 +
15095 lib/raid6/algos.c | 1 +
15096 lib/raid6/mktables.c | 1 +
15097 lib/raid6/recov.c | 1 +
15099 mm/memcontrol.c | 1 +
15100 mm/memory-failure.c | 1 +
15102 mm/quicklist.c | 1 -
15103 mm/sparse-vmemmap.c | 1 -
15104 mm/swap_state.c | 1 -
15105 mm/swapfile.c | 1 -
15107 net/802/garp.c | 1 +
15108 net/802/stp.c | 1 +
15109 net/8021q/vlan_core.c | 1 +
15110 net/8021q/vlan_netlink.c | 1 +
15111 net/appletalk/aarp.c | 1 +
15112 net/appletalk/atalk_proc.c | 1 +
15113 net/atm/pvc.c | 1 +
15114 net/atm/svc.c | 1 +
15115 net/ax25/ax25_route.c | 1 +
15116 net/ax25/ax25_uid.c | 1 +
15117 net/bluetooth/hci_sysfs.c | 1 +
15118 net/bluetooth/l2cap_sock.c | 2 +
15119 net/bluetooth/mgmt.c | 1 +
15120 net/bridge/br_input.c | 1 +
15121 net/bridge/br_stp_if.c | 1 +
15122 net/caif/caif_dev.c | 1 +
15123 net/caif/cfpkt_skbuff.c | 1 +
15124 net/ceph/messenger.c | 1 +
15126 net/core/dev_addr_lists.c | 1 +
15127 net/core/fib_rules.c | 1 +
15128 net/core/net-sysfs.c | 1 +
15129 net/core/net-traces.c | 1 +
15130 net/core/net_namespace.c | 1 +
15131 net/core/netevent.c | 1 +
15132 net/core/netpoll.c | 1 +
15133 net/core/timestamping.c | 1 +
15134 net/core/user_dma.c | 1 +
15135 net/dcb/dcbevent.c | 1 +
15136 net/dcb/dcbnl.c | 1 +
15137 net/dccp/ackvec.c | 1 +
15138 net/dccp/ccids/lib/tfrc.c | 1 +
15139 net/dccp/timer.c | 1 +
15140 net/decnet/dn_route.c | 1 +
15141 net/decnet/dn_rules.c | 1 +
15142 net/dsa/dsa.c | 1 +
15143 net/ieee802154/nl-mac.c | 1 +
15144 net/ipv4/fib_rules.c | 1 +
15145 net/ipv4/fib_trie.c | 1 +
15146 net/ipv4/inet_timewait_sock.c | 1 +
15147 net/ipv4/ipconfig.c | 1 +
15148 net/ipv4/ipmr.c | 1 +
15149 net/ipv4/netfilter.c | 1 +
15150 .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 1 +
15151 net/ipv4/netfilter/nf_nat_proto_common.c | 1 +
15152 net/ipv4/netfilter/nf_nat_proto_icmp.c | 1 +
15153 net/ipv4/netfilter/nf_nat_proto_sctp.c | 1 +
15154 net/ipv4/netfilter/nf_nat_proto_tcp.c | 1 +
15155 net/ipv4/netfilter/nf_nat_proto_udp.c | 1 +
15156 net/ipv4/netfilter/nf_nat_proto_udplite.c | 1 +
15157 net/ipv4/ping.c | 1 +
15158 net/ipv4/proc.c | 1 +
15159 net/ipv4/raw.c | 1 +
15160 net/ipv4/syncookies.c | 1 +
15161 net/ipv4/udplite.c | 1 +
15162 net/ipv4/xfrm4_state.c | 1 +
15163 net/ipv6/addrconf.c | 1 +
15164 net/ipv6/addrconf_core.c | 1 +
15165 net/ipv6/exthdrs.c | 1 +
15166 net/ipv6/exthdrs_core.c | 1 +
15167 net/ipv6/fib6_rules.c | 1 +
15168 net/ipv6/ip6_flowlabel.c | 1 +
15169 net/ipv6/ip6mr.c | 1 +
15170 net/ipv6/netfilter.c | 1 +
15171 net/ipv6/proc.c | 1 +
15172 net/ipv6/raw.c | 1 +
15173 net/ipv6/reassembly.c | 1 +
15174 net/ipv6/route.c | 1 +
15175 net/ipv6/sysctl_net_ipv6.c | 1 +
15176 net/ipv6/udplite.c | 1 +
15177 net/ipv6/xfrm6_state.c | 1 +
15178 net/ipx/ipx_proc.c | 1 +
15179 net/irda/discovery.c | 1 +
15180 net/irda/irda_device.c | 1 +
15181 net/irda/irttp.c | 1 +
15182 net/irda/qos.c | 2 +
15183 net/llc/llc_input.c | 1 +
15184 net/llc/llc_output.c | 1 +
15185 net/llc/llc_proc.c | 1 +
15186 net/mac80211/agg-rx.c | 1 +
15187 net/mac80211/agg-tx.c | 1 +
15188 net/mac80211/ht.c | 1 +
15189 net/mac80211/key.c | 1 +
15190 net/mac80211/led.c | 1 +
15191 net/mac80211/mlme.c | 2 +
15192 net/mac80211/offchannel.c | 1 +
15193 net/mac80211/rate.c | 1 +
15194 net/mac80211/rc80211_minstrel_debugfs.c | 1 +
15195 net/mac80211/rc80211_minstrel_ht_debugfs.c | 1 +
15196 net/mac80211/rc80211_pid_debugfs.c | 1 +
15197 net/mac80211/rx.c | 1 +
15198 net/mac80211/scan.c | 1 +
15199 net/mac80211/status.c | 1 +
15200 net/mac80211/tkip.c | 1 +
15201 net/mac80211/tx.c | 1 +
15202 net/mac80211/util.c | 1 +
15203 net/netfilter/ipset/ip_set_getport.c | 1 +
15204 net/netfilter/ipset/pfxlen.c | 1 +
15205 net/netfilter/nf_conntrack_acct.c | 1 +
15206 net/netfilter/nf_conntrack_ecache.c | 1 +
15207 net/netfilter/nf_conntrack_expect.c | 2 +
15208 net/netfilter/x_tables.c | 1 +
15209 net/netfilter/xt_quota.c | 1 +
15210 net/netfilter/xt_statistic.c | 1 +
15211 net/netrom/nr_route.c | 1 +
15212 net/nfc/af_nfc.c | 1 +
15213 net/nfc/rawsock.c | 1 +
15214 net/phonet/datagram.c | 1 +
15215 net/phonet/pep.c | 1 +
15216 net/phonet/socket.c | 1 +
15217 net/rds/cong.c | 1 +
15218 net/rds/connection.c | 1 +
15220 net/rds/info.c | 1 +
15222 net/rds/message.c | 1 +
15223 net/rds/page.c | 1 +
15224 net/rds/rdma_transport.c | 1 +
15225 net/rds/recv.c | 1 +
15226 net/rds/send.c | 2 +
15227 net/rds/stats.c | 1 +
15228 net/rds/tcp.c | 1 +
15229 net/rds/threads.c | 1 +
15230 net/rfkill/input.c | 1 +
15231 net/rose/rose_route.c | 1 +
15232 net/rxrpc/ar-output.c | 1 +
15233 net/rxrpc/ar-recvmsg.c | 1 +
15234 net/sched/act_api.c | 1 +
15235 net/sched/cls_flow.c | 1 +
15236 net/sched/sch_mq.c | 1 +
15237 net/sched/sch_mqprio.c | 1 +
15238 net/sctp/proc.c | 1 +
15239 net/sctp/socket.c | 1 +
15240 net/sunrpc/addr.c | 1 +
15241 net/sunrpc/backchannel_rqst.c | 1 +
15242 net/sunrpc/socklib.c | 1 +
15243 net/sunrpc/svc_xprt.c | 1 +
15244 net/sunrpc/svcsock.c | 1 +
15245 net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 +
15246 net/sysctl_net.c | 1 +
15247 net/tipc/core.c | 2 +
15248 net/tipc/socket.c | 1 +
15249 net/wimax/op-msg.c | 1 +
15250 net/wimax/op-reset.c | 1 +
15251 net/wimax/op-rfkill.c | 1 +
15252 net/wimax/stack.c | 1 +
15253 net/wireless/ibss.c | 1 +
15254 net/wireless/mesh.c | 1 +
15255 net/wireless/radiotap.c | 1 +
15256 net/wireless/reg.c | 2 +
15257 net/wireless/sme.c | 1 +
15258 net/wireless/util.c | 1 +
15259 net/wireless/wext-compat.c | 1 +
15260 net/wireless/wext-core.c | 1 +
15261 net/wireless/wext-sme.c | 1 +
15262 net/wireless/wext-spy.c | 1 +
15263 net/x25/x25_proc.c | 1 +
15264 net/xfrm/xfrm_proc.c | 1 +
15265 net/xfrm/xfrm_replay.c | 1 +
15266 security/selinux/hooks.c | 1 +
15267 security/selinux/netlink.c | 1 +
15268 sound/aoa/soundbus/i2sbus/pcm.c | 1 +
15269 sound/arm/pxa2xx-ac97-lib.c | 1 +
15270 sound/arm/pxa2xx-pcm.c | 1 +
15271 sound/core/control.c | 1 +
15272 sound/core/device.c | 1 +
15273 sound/core/hwdep.c | 1 +
15274 sound/core/info.c | 1 +
15275 sound/core/info_oss.c | 1 +
15276 sound/core/init.c | 1 +
15277 sound/core/isadma.c | 1 +
15278 sound/core/jack.c | 1 +
15279 sound/core/memory.c | 1 +
15280 sound/core/misc.c | 1 +
15281 sound/core/oss/mixer_oss.c | 1 +
15282 sound/core/oss/pcm_oss.c | 2 +-
15283 sound/core/pcm.c | 1 +
15284 sound/core/pcm_lib.c | 1 +
15285 sound/core/pcm_memory.c | 1 +
15286 sound/core/pcm_misc.c | 1 +
15287 sound/core/pcm_native.c | 1 +
15288 sound/core/rawmidi.c | 1 +
15289 sound/core/seq/oss/seq_oss.c | 2 +-
15290 sound/core/seq/oss/seq_oss_init.c | 2 +-
15291 sound/core/seq/oss/seq_oss_synth.c | 1 +
15292 sound/core/seq/seq.c | 2 +-
15293 sound/core/seq/seq_clientmgr.c | 1 +
15294 sound/core/seq/seq_device.c | 1 +
15295 sound/core/seq/seq_dummy.c | 2 +-
15296 sound/core/seq/seq_info.c | 1 +
15297 sound/core/seq/seq_lock.c | 1 +
15298 sound/core/seq/seq_memory.c | 1 +
15299 sound/core/seq/seq_midi.c | 2 +-
15300 sound/core/seq/seq_midi_emul.c | 1 +
15301 sound/core/seq/seq_midi_event.c | 1 +
15302 sound/core/seq/seq_ports.c | 1 +
15303 sound/core/seq/seq_system.c | 1 +
15304 sound/core/seq/seq_virmidi.c | 1 +
15305 sound/core/sound.c | 2 +-
15306 sound/core/sound_oss.c | 1 +
15307 sound/core/timer.c | 2 +-
15308 sound/core/vmaster.c | 1 +
15309 sound/drivers/aloop.c | 2 +-
15310 sound/drivers/dummy.c | 2 +-
15311 sound/drivers/ml403-ac97cr.c | 2 +-
15312 sound/drivers/mpu401/mpu401.c | 2 +-
15313 sound/drivers/mpu401/mpu401_uart.c | 1 +
15314 sound/drivers/mtpav.c | 1 +
15315 sound/drivers/mts64.c | 1 +
15316 sound/drivers/opl3/opl3_lib.c | 1 +
15317 sound/drivers/opl3/opl3_oss.c | 1 +
15318 sound/drivers/opl3/opl3_seq.c | 1 +
15319 sound/drivers/opl3/opl3_synth.c | 1 +
15320 sound/drivers/opl4/opl4_lib.c | 1 +
15321 sound/drivers/opl4/opl4_proc.c | 1 +
15322 sound/drivers/opl4/opl4_seq.c | 1 +
15323 sound/drivers/pcsp/pcsp.c | 2 +-
15324 sound/drivers/portman2x4.c | 1 +
15325 sound/drivers/serial-u16550.c | 2 +-
15326 sound/drivers/virmidi.c | 2 +-
15327 sound/drivers/vx/vx_core.c | 1 +
15328 sound/drivers/vx/vx_hwdep.c | 1 +
15329 sound/firewire/iso-resources.c | 1 +
15330 sound/firewire/packets-buffer.c | 1 +
15331 sound/i2c/cs8427.c | 1 +
15332 sound/i2c/i2c.c | 1 +
15333 sound/i2c/other/ak4113.c | 1 +
15334 sound/i2c/other/ak4114.c | 1 +
15335 sound/i2c/other/ak4117.c | 1 +
15336 sound/i2c/other/ak4xxx-adda.c | 1 +
15337 sound/i2c/other/pt2258.c | 1 +
15338 sound/i2c/other/tea575x-tuner.c | 1 +
15339 sound/i2c/tea6330t.c | 1 +
15340 sound/isa/ad1816a/ad1816a.c | 2 +-
15341 sound/isa/ad1848/ad1848.c | 2 +-
15342 sound/isa/als100.c | 2 +-
15343 sound/isa/azt2320.c | 2 +-
15344 sound/isa/cmi8330.c | 2 +-
15345 sound/isa/cs423x/cs4231.c | 2 +-
15346 sound/isa/cs423x/cs4236.c | 2 +-
15347 sound/isa/es1688/es1688.c | 2 +-
15348 sound/isa/es1688/es1688_lib.c | 1 +
15349 sound/isa/es18xx.c | 2 +-
15350 sound/isa/gus/gus_main.c | 1 +
15351 sound/isa/gus/gus_volume.c | 1 +
15352 sound/isa/gus/gusclassic.c | 2 +-
15353 sound/isa/gus/gusextreme.c | 2 +-
15354 sound/isa/gus/gusmax.c | 2 +-
15355 sound/isa/gus/interwave.c | 2 +-
15356 sound/isa/msnd/msnd.c | 1 +
15357 sound/isa/msnd/msnd_midi.c | 1 +
15358 sound/isa/msnd/msnd_pinnacle_mixer.c | 1 +
15359 sound/isa/opl3sa2.c | 2 +-
15360 sound/isa/opti9xx/miro.c | 2 +-
15361 sound/isa/opti9xx/opti92x-ad1848.c | 2 +-
15362 sound/isa/sb/emu8000.c | 1 +
15363 sound/isa/sb/emu8000_callback.c | 1 +
15364 sound/isa/sb/emu8000_patch.c | 1 +
15365 sound/isa/sb/emu8000_synth.c | 1 +
15366 sound/isa/sb/sb16.c | 2 +-
15367 sound/isa/sb/sb16_csp.c | 1 +
15368 sound/isa/sb/sb16_main.c | 1 +
15369 sound/isa/sb/sb8.c | 2 +-
15370 sound/isa/sb/sb8_main.c | 1 +
15371 sound/isa/sb/sb_common.c | 1 +
15372 sound/isa/sscape.c | 2 +-
15373 sound/isa/wavefront/wavefront.c | 2 +-
15374 sound/isa/wavefront/wavefront_fx.c | 1 +
15375 sound/isa/wavefront/wavefront_synth.c | 1 +
15376 sound/isa/wss/wss_lib.c | 1 +
15377 sound/mips/au1x00.c | 1 +
15378 sound/mips/hal2.c | 1 +
15379 sound/mips/sgio2audio.c | 1 +
15380 sound/pci/ac97/ac97_codec.c | 2 +-
15381 sound/pci/ac97/ac97_pcm.c | 1 +
15382 sound/pci/ad1889.c | 1 +
15383 sound/pci/ak4531_codec.c | 1 +
15384 sound/pci/ali5451/ali5451.c | 2 +-
15385 sound/pci/als300.c | 2 +-
15386 sound/pci/als4000.c | 2 +-
15387 sound/pci/asihpi/asihpi.c | 1 +
15388 sound/pci/asihpi/hpioctl.c | 1 +
15389 sound/pci/atiixp.c | 2 +-
15390 sound/pci/atiixp_modem.c | 2 +-
15391 sound/pci/au88x0/au88x0.c | 2 +-
15392 sound/pci/au88x0/au88x0_game.c | 1 +
15393 sound/pci/aw2/aw2-alsa.c | 1 +
15394 sound/pci/azt3328.c | 2 +-
15395 sound/pci/bt87x.c | 2 +-
15396 sound/pci/ca0106/ca0106_main.c | 2 +-
15397 sound/pci/cmipci.c | 2 +-
15398 sound/pci/cs4281.c | 2 +-
15399 sound/pci/cs46xx/cs46xx.c | 2 +-
15400 sound/pci/cs46xx/cs46xx_lib.c | 1 +
15401 sound/pci/cs5530.c | 2 +-
15402 sound/pci/cs5535audio/cs5535audio.c | 2 +-
15403 sound/pci/ctxfi/xfi.c | 1 +
15404 sound/pci/echoaudio/darla20.c | 2 +-
15405 sound/pci/echoaudio/darla24.c | 2 +-
15406 sound/pci/echoaudio/echo3g.c | 2 +-
15407 sound/pci/echoaudio/echoaudio.c | 2 +
15408 sound/pci/echoaudio/gina20.c | 2 +-
15409 sound/pci/echoaudio/gina24.c | 2 +-
15410 sound/pci/echoaudio/indigo.c | 2 +-
15411 sound/pci/echoaudio/indigodj.c | 2 +-
15412 sound/pci/echoaudio/indigodjx.c | 2 +-
15413 sound/pci/echoaudio/indigoio.c | 2 +-
15414 sound/pci/echoaudio/indigoiox.c | 2 +-
15415 sound/pci/echoaudio/layla20.c | 2 +-
15416 sound/pci/echoaudio/layla24.c | 2 +-
15417 sound/pci/echoaudio/mia.c | 2 +-
15418 sound/pci/echoaudio/mona.c | 2 +-
15419 sound/pci/emu10k1/emu10k1.c | 2 +-
15420 sound/pci/emu10k1/emu10k1_callback.c | 1 +
15421 sound/pci/emu10k1/emu10k1_main.c | 1 +
15422 sound/pci/emu10k1/emu10k1_synth.c | 1 +
15423 sound/pci/emu10k1/emu10k1x.c | 2 +-
15424 sound/pci/emu10k1/io.c | 1 +
15425 sound/pci/emu10k1/memory.c | 1 +
15426 sound/pci/emu10k1/voice.c | 1 +
15427 sound/pci/ens1370.c | 2 +-
15428 sound/pci/es1938.c | 2 +-
15429 sound/pci/es1968.c | 2 +-
15430 sound/pci/fm801.c | 2 +-
15431 sound/pci/hda/hda_beep.c | 1 +
15432 sound/pci/hda/hda_codec.c | 1 +
15433 sound/pci/hda/hda_generic.c | 1 +
15434 sound/pci/hda/hda_hwdep.c | 1 +
15435 sound/pci/hda/patch_analog.c | 1 +
15436 sound/pci/hda/patch_ca0110.c | 1 +
15437 sound/pci/hda/patch_ca0132.c | 1 +
15438 sound/pci/hda/patch_cirrus.c | 1 +
15439 sound/pci/hda/patch_cmedia.c | 1 +
15440 sound/pci/hda/patch_conexant.c | 1 +
15441 sound/pci/hda/patch_hdmi.c | 2 +-
15442 sound/pci/hda/patch_realtek.c | 1 +
15443 sound/pci/hda/patch_si3054.c | 1 +
15444 sound/pci/hda/patch_sigmatel.c | 1 +
15445 sound/pci/hda/patch_via.c | 1 +
15446 sound/pci/ice1712/ak4xxx.c | 1 +
15447 sound/pci/ice1712/ice1712.c | 2 +-
15448 sound/pci/ice1712/ice1724.c | 2 +-
15449 sound/pci/intel8x0.c | 2 +-
15450 sound/pci/intel8x0m.c | 2 +-
15451 sound/pci/korg1212/korg1212.c | 2 +-
15452 sound/pci/lola/lola.c | 2 +-
15453 sound/pci/maestro3.c | 2 +-
15454 sound/pci/mixart/mixart.c | 2 +-
15455 sound/pci/mixart/mixart_hwdep.c | 1 +
15456 sound/pci/nm256/nm256.c | 2 +-
15457 sound/pci/oxygen/oxygen.c | 1 +
15458 sound/pci/oxygen/oxygen_io.c | 1 +
15459 sound/pci/oxygen/oxygen_lib.c | 1 +
15460 sound/pci/oxygen/virtuoso.c | 1 +
15461 sound/pci/pcxhr/pcxhr.c | 2 +-
15462 sound/pci/pcxhr/pcxhr_hwdep.c | 1 +
15463 sound/pci/riptide/riptide.c | 1 +
15464 sound/pci/rme32.c | 2 +-
15465 sound/pci/rme96.c | 2 +-
15466 sound/pci/rme9652/hdsp.c | 2 +-
15467 sound/pci/rme9652/hdspm.c | 2 +-
15468 sound/pci/rme9652/rme9652.c | 2 +-
15469 sound/pci/sis7019.c | 2 +-
15470 sound/pci/sonicvibes.c | 2 +-
15471 sound/pci/trident/trident.c | 2 +-
15472 sound/pci/trident/trident_main.c | 1 +
15473 sound/pci/via82xx.c | 2 +-
15474 sound/pci/via82xx_modem.c | 2 +-
15475 sound/pci/vx222/vx222.c | 2 +-
15476 sound/pci/ymfpci/ymfpci.c | 2 +-
15477 sound/pci/ymfpci/ymfpci_main.c | 1 +
15478 sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 +-
15479 sound/pcmcia/vx/vxpocket.c | 2 +-
15480 sound/ppc/powermac.c | 2 +-
15481 sound/ppc/snd_ps3.c | 1 +
15482 sound/sh/aica.c | 2 +-
15483 sound/sh/sh_dac_audio.c | 1 +
15484 sound/soc/blackfin/bf5xx-sport.c | 1 +
15485 sound/soc/blackfin/bfin-eval-adav80x.c | 1 +
15486 sound/soc/codecs/ac97.c | 1 +
15487 sound/soc/codecs/ads117x.c | 1 +
15488 sound/soc/codecs/ak4642.c | 1 +
15489 sound/soc/codecs/cx20442.c | 1 +
15490 sound/soc/codecs/da7210.c | 1 +
15491 sound/soc/codecs/dmic.c | 1 +
15492 sound/soc/codecs/pcm3008.c | 1 +
15493 sound/soc/codecs/sn95031.c | 1 +
15494 sound/soc/codecs/wl1273.c | 1 +
15495 sound/soc/ep93xx/edb93xx.c | 1 +
15496 sound/soc/ep93xx/snappercl15.c | 1 +
15497 sound/soc/imx/wm1133-ev1.c | 1 +
15498 sound/soc/mid-x86/mfld_machine.c | 1 +
15499 sound/soc/mid-x86/sst_platform.c | 1 +
15500 sound/soc/omap/am3517evm.c | 1 +
15501 sound/soc/omap/ams-delta.c | 1 +
15502 sound/soc/omap/igep0020.c | 1 +
15503 sound/soc/omap/n810.c | 1 +
15504 sound/soc/omap/omap-pcm.c | 1 +
15505 sound/soc/omap/omap3beagle.c | 1 +
15506 sound/soc/omap/omap3evm.c | 1 +
15507 sound/soc/omap/omap3pandora.c | 1 +
15508 sound/soc/omap/omap4-hdmi-card.c | 1 +
15509 sound/soc/omap/osk5912.c | 1 +
15510 sound/soc/omap/overo.c | 1 +
15511 sound/soc/omap/rx51.c | 1 +
15512 sound/soc/omap/sdp3430.c | 1 +
15513 sound/soc/omap/sdp4430.c | 1 +
15514 sound/soc/omap/zoom2.c | 1 +
15515 sound/soc/pxa/pxa2xx-pcm.c | 1 +
15516 sound/soc/samsung/ac97.c | 1 +
15517 sound/soc/samsung/dma.c | 1 +
15518 sound/soc/samsung/goni_wm8994.c | 1 +
15519 sound/soc/samsung/h1940_uda1380.c | 1 +
15520 sound/soc/samsung/i2s.c | 1 +
15521 sound/soc/samsung/idma.c | 1 +
15522 sound/soc/samsung/jive_wm8750.c | 1 +
15523 sound/soc/samsung/ln2440sbc_alc650.c | 1 +
15524 sound/soc/samsung/pcm.c | 1 +
15525 sound/soc/samsung/rx1950_uda1380.c | 1 +
15526 sound/soc/samsung/s3c2412-i2s.c | 1 +
15527 sound/soc/samsung/s3c24xx-i2s.c | 1 +
15528 sound/soc/samsung/s3c24xx_simtec.c | 1 +
15529 sound/soc/samsung/s3c24xx_simtec_hermes.c | 1 +
15530 sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 1 +
15531 sound/soc/samsung/s3c24xx_uda134x.c | 1 +
15532 sound/soc/samsung/smartq_wm8987.c | 1 +
15533 sound/soc/samsung/smdk_spdif.c | 1 +
15534 sound/soc/samsung/smdk_wm8580.c | 1 +
15535 sound/soc/samsung/smdk_wm8580pcm.c | 1 +
15536 sound/soc/samsung/smdk_wm8994pcm.c | 1 +
15537 sound/soc/samsung/smdk_wm9713.c | 1 +
15538 sound/soc/samsung/spdif.c | 1 +
15539 sound/soc/samsung/speyside.c | 1 +
15540 sound/soc/samsung/speyside_wm8962.c | 1 +
15541 sound/soc/sh/fsi-ak4642.c | 1 +
15542 sound/soc/sh/fsi-da7210.c | 1 +
15543 sound/soc/sh/fsi-hdmi.c | 1 +
15544 sound/soc/sh/fsi.c | 1 +
15545 sound/soc/sh/siu_dai.c | 1 +
15546 sound/soc/soc-cache.c | 1 +
15547 sound/soc/soc-io.c | 1 +
15548 sound/soc/soc-jack.c | 1 +
15549 sound/soc/soc-utils.c | 1 +
15550 sound/soc/tegra/tegra_asoc_utils.c | 1 +
15551 sound/sparc/dbri.c | 1 +
15552 sound/synth/emux/emux.c | 1 +
15553 sound/synth/emux/emux_oss.c | 1 +
15554 sound/synth/emux/emux_seq.c | 2 +-
15555 sound/synth/emux/emux_synth.c | 1 +
15556 sound/synth/emux/soundfont.c | 1 +
15557 sound/synth/util_mem.c | 1 +
15558 sound/usb/6fire/firmware.c | 1 +
15559 sound/usb/card.c | 1 +
15560 sound/usb/midi.c | 1 +
15561 sound/usb/usx2y/us122l.c | 1 +
15562 sound/usb/usx2y/usbusx2yaudio.c | 1 +
15563 virt/kvm/iommu.c | 2 +
15564 2021 files changed, 2228 insertions(+), 579 deletions(-)
15565 create mode 100644 include/linux/export.h
15566 $ git am -3 ../modsplit/drivers-md-change-module.h-export.h-in-persistent-da.patch
15567 Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
15569 Unstaged changes after reset:
15570 M drivers/md/persistent-data/dm-btree-remove.c
15571 M drivers/md/persistent-data/dm-btree.c
15572 M drivers/md/persistent-data/dm-space-map-disk.c
15573 M drivers/md/persistent-data/dm-transaction-manager.c
15575 $ git commit -v -a --amend
15576 [master 9fda039] Merge remote-tracking branch 'moduleh/for-sfr'
15577 $ git am -3 ../modsplit/block-bsg-lib.c-change-module.h-export.h-in-power-co.patch
15578 Applying: block/bsg-lib.c: change module.h -> export.h in power/common.c
15580 Unstaged changes after reset:
15583 $ git commit -v -a --amend
15584 [master 4885b59] Merge remote-tracking branch 'moduleh/for-sfr'
15585 $ git am -3 ../modsplit/drivers-base-change-module.h-export.h-in-power-commo.patch
15586 Applying: drivers/base: change module.h -> export.h in power/common.c
15588 Unstaged changes after reset:
15589 M drivers/base/power/common.c
15591 $ git commit -v -a --amend
15592 [master ecc3de5] Merge remote-tracking branch 'moduleh/for-sfr'
15593 $ git am -3 ../modsplit/rtlwifi-use-of-module_param-requires-the-inclusion-o.patch
15594 Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
15596 Unstaged changes after reset:
15597 M drivers/net/wireless/rtlwifi/debug.c
15599 $ git commit -v -a --amend
15600 [master d63bb19] Merge remote-tracking branch 'moduleh/for-sfr'
15601 $ git am -3 ../modsplit/mmc-using-module_param-requires-the-inclusion-of-mod.patch
15602 Applying: mmc: using module_param requires the inclusion of moduleparam.h
15604 Unstaged changes after reset:
15605 M drivers/mmc/core/debugfs.c
15607 $ git commit -v -a --amend
15608 [master 73cc11e] Merge remote-tracking branch 'moduleh/for-sfr'
15609 $ git am -3 ../modsplit/NFC-use-of-module-facilities-requires-the-inclusion-.patch
15610 Applying: NFC: use of module facilities requires the inclusion of module.h
15612 Unstaged changes after reset:
15613 M drivers/nfc/nfcwilink.c
15615 $ git commit -v -a --amend
15616 [master 120ea1f] Merge remote-tracking branch 'moduleh/for-sfr'
15617 $ git am -3 ../modsplit/block-mtip32xx-include-module.h-for-its-utilities.patch
15618 Applying: block/mtip32xx: include module.h for its utilities
15620 Unstaged changes after reset:
15621 M drivers/block/mtip32xx/mtip32xx.c
15623 $ git commit -v -a --amend
15624 [master 090fc9b] Merge remote-tracking branch 'moduleh/for-sfr'
15625 $ git am -3 ../modsplit/powerpc-powernv-include-export.h-in-hvc_opal.h-for-T.patch
15626 Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
15628 Unstaged changes after reset:
15629 M drivers/tty/hvc/hvc_opal.c
15631 $ git commit -v -a --amend
15632 [master efd1a23] Merge remote-tracking branch 'moduleh/for-sfr'
15633 $ git am -3 ../modsplit/PM-QoS-include-export.h-in-qos.c-for-EXPORT_SYMBOL.patch
15634 Applying: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
15636 Unstaged changes after reset:
15637 M drivers/base/power/qos.c
15639 $ git commit -v -a --amend
15640 [master 4257184] Merge remote-tracking branch 'moduleh/for-sfr'
15641 $ git am -3 ../modsplit/net-Add-export.h-to-nfc-nci-core.c.patch
15642 Applying: net: Add export.h to nfc/nci/core.c
15644 Unstaged changes after reset:
15645 M net/nfc/nci/core.c
15647 $ git commit -v -a --amend
15648 [master f262c78] Merge remote-tracking branch 'moduleh/for-sfr'
15649 $ git am -3 ../modsplit/scsi-Add-export.h-to-drivers-scsi-libsas-sas_host_sm.patch
15650 Applying: scsi: Add export.h to drivers/scsi/libsas/sas_host_smp.c
15652 Unstaged changes after reset:
15653 M drivers/scsi/libsas/sas_host_smp.c
15655 $ git commit -v -a --amend
15656 [master 32b6620] Merge remote-tracking branch 'moduleh/for-sfr'
15657 $ git am -3 ../modsplit/drivers-net-Add-module.h-to-wireless-ath-ath6kl-sdio.patch
15658 Applying: drivers/net: Add module.h to wireless/ath/ath6kl/sdio.c
15660 Unstaged changes after reset:
15661 M drivers/net/wireless/ath/ath6kl/sdio.c
15663 $ git commit -v -a --amend
15664 [master 5f24aa4] Merge remote-tracking branch 'moduleh/for-sfr'
15665 $ git am -3 ../modsplit/drivers-net-wireless-ath-ath5k-debug.c-does-not-need.patch
15666 Applying: drivers/net: wireless/ath/ath5k/debug.c does not need module.h
15668 Unstaged changes after reset:
15669 M drivers/net/wireless/ath/ath5k/debug.c
15671 $ git commit -v -a --amend
15672 [master 012bac1] Merge remote-tracking branch 'moduleh/for-sfr'
15673 $ git am -3 ../modsplit/drivers-bcma-driver_chipcommon_pmu.c-needs-export.h-.patch
15674 Applying: drivers/bcma: driver_chipcommon_pmu.c needs export.h for EXPORT_SYMBOL
15676 Unstaged changes after reset:
15677 M drivers/bcma/driver_chipcommon_pmu.c
15679 $ git commit -v -a --amend
15680 [master 18f4d3c] Merge remote-tracking branch 'moduleh/for-sfr'
15681 $ git am -3 ../modsplit/drivers-base-Add-export.h-to-regmap-regcache.c.patch
15682 Applying: drivers/base: Add export.h to regmap/regcache.c
15683 Using index info to reconstruct a base tree...
15684 Falling back to patching base and 3-way merge...
15685 Auto-merging drivers/base/regmap/regcache.c
15687 Unstaged changes after reset:
15688 M drivers/base/regmap/regcache.c
15690 $ git commit -v -a --amend
15691 [master ba39d89] Merge remote-tracking branch 'moduleh/for-sfr'
15692 $ git am -3 ../modsplit/staging-Add-export.h-to-rts5139-rts51x_scsi.c.patch
15693 Applying: staging: Add export.h to rts5139/rts51x_scsi.c
15695 Unstaged changes after reset:
15696 M drivers/staging/rts5139/rts51x_scsi.c
15698 $ git commit -v -a --amend
15699 [master d4d1a09] Merge remote-tracking branch 'moduleh/for-sfr'
15700 $ git am -3 ../modsplit/pinctrl-EXPORT_SYMBOL-needs-export.h.patch
15701 Applying: pinctrl: EXPORT_SYMBOL needs export.h
15703 Unstaged changes after reset:
15704 M drivers/pinctrl/core.c
15706 $ git commit -v -a --amend
15707 [master e9950cd] Merge remote-tracking branch 'moduleh/for-sfr'
15708 $ git am -3 ../modsplit/staging-Add-export.h-for-EXPORT_SYMBOL-to-drivers-st.patch
15709 Applying: staging: Add export.h for EXPORT_SYMBOL to drivers/staging/iio/industrialio-buffer.c
15711 Unstaged changes after reset:
15712 M drivers/staging/iio/industrialio-buffer.c
15714 $ git commit -v -a --amend
15715 [master 077ed4c] Merge remote-tracking branch 'moduleh/for-sfr'
15716 $ git am -3 ../modsplit/ath6kl-THIS_MODULES-needs-export.h.patch
15717 Applying: ath6kl: THIS_MODULES needs export.h
15719 Unstaged changes after reset:
15720 M drivers/net/wireless/ath/ath6kl/debug.c
15722 $ git commit -v -a --amend
15723 [master 2b42608] Merge remote-tracking branch 'moduleh/for-sfr'
15724 $ git am -3 ../modsplit/ath6kl-module_param-needs-the-inclusion-of-modulepar.patch
15725 Applying: ath6kl: module_param needs the inclusion of moduleparam.h
15727 Unstaged changes after reset:
15728 M drivers/net/wireless/ath/ath6kl/cfg80211.c
15730 $ git commit -v -a --amend
15731 [master 8bf470b] Merge remote-tracking branch 'moduleh/for-sfr'
15732 Merging kvmtool/master
15733 $ git merge kvmtool/master
15734 Resolved 'include/net/9p/9p.h' using previous resolution.
15735 Auto-merging MAINTAINERS
15736 Auto-merging include/net/9p/9p.h
15737 CONFLICT (content): Merge conflict in include/net/9p/9p.h
15738 Automatic merge failed; fix conflicts and then commit the result.
15740 [master 51023d7] Merge remote-tracking branch 'kvmtool/master'
15741 $ git diff -M --stat --summary HEAD^..
15743 tools/kvm/.gitignore | 10 +
15744 tools/kvm/CREDITS-Git | 30 +
15745 tools/kvm/Documentation/kernel-debugging.txt | 15 +
15746 tools/kvm/Documentation/kvm-balloon.txt | 24 +
15747 tools/kvm/Documentation/kvm-debug.txt | 16 +
15748 tools/kvm/Documentation/kvm-list.txt | 16 +
15749 tools/kvm/Documentation/kvm-pause.txt | 16 +
15750 tools/kvm/Documentation/kvm-resume.txt | 16 +
15751 tools/kvm/Documentation/kvm-run.txt | 62 ++
15752 tools/kvm/Documentation/kvm-setup.txt | 15 +
15753 tools/kvm/Documentation/kvm-stat.txt | 19 +
15754 tools/kvm/Documentation/kvm-stop.txt | 16 +
15755 tools/kvm/Documentation/kvm-version.txt | 21 +
15756 tools/kvm/Makefile | 286 ++++++
15757 tools/kvm/README | 109 +++
15758 tools/kvm/bios.c | 157 ++++
15759 tools/kvm/bios/.gitignore | 3 +
15760 tools/kvm/bios/bios-rom.S | 12 +
15761 tools/kvm/bios/e820.c | 73 ++
15762 tools/kvm/bios/entry.S | 90 ++
15763 tools/kvm/bios/gen-offsets.sh | 14 +
15764 tools/kvm/bios/int10.c | 151 +++
15765 tools/kvm/bios/int15.c | 18 +
15766 tools/kvm/bios/local.S | 7 +
15767 tools/kvm/bios/macro.S | 25 +
15768 tools/kvm/bios/rom.ld.S | 17 +
15769 tools/kvm/builtin-balloon.c | 75 ++
15770 tools/kvm/builtin-debug.c | 66 ++
15771 tools/kvm/builtin-help.c | 61 ++
15772 tools/kvm/builtin-list.c | 66 ++
15773 tools/kvm/builtin-pause.c | 66 ++
15774 tools/kvm/builtin-resume.c | 66 ++
15775 tools/kvm/builtin-run.c | 991 ++++++++++++++++++++
15776 tools/kvm/builtin-setup.c | 214 +++++
15777 tools/kvm/builtin-stat.c | 79 ++
15778 tools/kvm/builtin-stop.c | 66 ++
15779 tools/kvm/builtin-version.c | 15 +
15780 tools/kvm/code16gcc.h | 15 +
15781 tools/kvm/command-list.txt | 14 +
15782 tools/kvm/config/feature-tests.mak | 148 +++
15783 tools/kvm/config/utilities.mak | 188 ++++
15784 tools/kvm/cpuid.c | 55 ++
15785 tools/kvm/disk/blk.c | 39 +
15786 tools/kvm/disk/core.c | 222 +++++
15787 tools/kvm/disk/qcow.c | 1099 ++++++++++++++++++++++
15788 tools/kvm/disk/raw.c | 82 ++
15789 tools/kvm/framebuffer.c | 68 ++
15790 tools/kvm/guest/init.c | 46 +
15791 tools/kvm/guest_compat.c | 104 +++
15792 tools/kvm/hw/i8042.c | 348 +++++++
15793 tools/kvm/hw/pci-shmem.c | 264 ++++++
15794 tools/kvm/hw/rtc.c | 87 ++
15795 tools/kvm/hw/serial.c | 364 ++++++++
15796 tools/kvm/hw/vesa.c | 77 ++
15797 tools/kvm/include/asm/hweight.h | 8 +
15798 tools/kvm/include/kvm/8250-serial.h | 10 +
15799 tools/kvm/include/kvm/apic.h | 17 +
15800 tools/kvm/include/kvm/assembly.h | 24 +
15801 tools/kvm/include/kvm/barrier.h | 15 +
15802 tools/kvm/include/kvm/bios-export.h | 13 +
15803 tools/kvm/include/kvm/bios.h | 83 ++
15804 tools/kvm/include/kvm/boot-protocol.h | 16 +
15805 tools/kvm/include/kvm/brlock.h | 41 +
15806 tools/kvm/include/kvm/builtin-balloon.h | 7 +
15807 tools/kvm/include/kvm/builtin-debug.h | 7 +
15808 tools/kvm/include/kvm/builtin-help.h | 6 +
15809 tools/kvm/include/kvm/builtin-list.h | 7 +
15810 tools/kvm/include/kvm/builtin-pause.h | 7 +
15811 tools/kvm/include/kvm/builtin-resume.h | 7 +
15812 tools/kvm/include/kvm/builtin-run.h | 7 +
15813 tools/kvm/include/kvm/builtin-setup.h | 9 +
15814 tools/kvm/include/kvm/builtin-stat.h | 7 +
15815 tools/kvm/include/kvm/builtin-stop.h | 7 +
15816 tools/kvm/include/kvm/builtin-version.h | 6 +
15817 tools/kvm/include/kvm/compiler.h | 6 +
15818 tools/kvm/include/kvm/cpufeature.h | 41 +
15819 tools/kvm/include/kvm/disk-image.h | 73 ++
15820 tools/kvm/include/kvm/e820.h | 12 +
15821 tools/kvm/include/kvm/framebuffer.h | 34 +
15822 tools/kvm/include/kvm/guest_compat.h | 9 +
15823 tools/kvm/include/kvm/i8042.h | 12 +
15824 tools/kvm/include/kvm/interrupt.h | 26 +
15825 tools/kvm/include/kvm/ioeventfd.h | 27 +
15826 tools/kvm/include/kvm/ioport.h | 65 ++
15827 tools/kvm/include/kvm/irq.h | 29 +
15828 tools/kvm/include/kvm/kvm-cmd.h | 17 +
15829 tools/kvm/include/kvm/kvm-cpu.h | 44 +
15830 tools/kvm/include/kvm/kvm.h | 108 +++
15831 tools/kvm/include/kvm/mptable.h | 8 +
15832 tools/kvm/include/kvm/mutex.h | 33 +
15833 tools/kvm/include/kvm/parse-options.h | 213 +++++
15834 tools/kvm/include/kvm/pci-shmem.h | 28 +
15835 tools/kvm/include/kvm/pci.h | 75 ++
15836 tools/kvm/include/kvm/qcow.h | 122 +++
15837 tools/kvm/include/kvm/rbtree-interval.h | 27 +
15838 tools/kvm/include/kvm/read-write.h | 32 +
15839 tools/kvm/include/kvm/rtc.h | 6 +
15840 tools/kvm/include/kvm/rwsem.h | 39 +
15841 tools/kvm/include/kvm/sdl.h | 17 +
15842 tools/kvm/include/kvm/segment.h | 21 +
15843 tools/kvm/include/kvm/strbuf.h | 6 +
15844 tools/kvm/include/kvm/symbol.h | 22 +
15845 tools/kvm/include/kvm/term.h | 18 +
15846 tools/kvm/include/kvm/threadpool.h | 37 +
15847 tools/kvm/include/kvm/types.h | 7 +
15848 tools/kvm/include/kvm/uip.h | 358 ++++++++
15849 tools/kvm/include/kvm/util.h | 78 ++
15850 tools/kvm/include/kvm/vesa.h | 18 +
15851 tools/kvm/include/kvm/virtio-9p.h | 75 ++
15852 tools/kvm/include/kvm/virtio-balloon.h | 8 +
15853 tools/kvm/include/kvm/virtio-blk.h | 12 +
15854 tools/kvm/include/kvm/virtio-console.h | 9 +
15855 tools/kvm/include/kvm/virtio-net.h | 21 +
15856 tools/kvm/include/kvm/virtio-pci-dev.h | 27 +
15857 tools/kvm/include/kvm/virtio-pci.h | 59 ++
15858 tools/kvm/include/kvm/virtio-rng.h | 9 +
15859 tools/kvm/include/kvm/virtio.h | 65 ++
15860 tools/kvm/include/kvm/vnc.h | 14 +
15861 tools/kvm/include/linux/bitops.h | 33 +
15862 tools/kvm/include/linux/byteorder.h | 7 +
15863 tools/kvm/include/linux/kernel.h | 39 +
15864 tools/kvm/include/linux/module.h | 6 +
15865 tools/kvm/include/linux/prefetch.h | 6 +
15866 tools/kvm/include/linux/types.h | 50 +
15867 tools/kvm/interrupt.c | 27 +
15868 tools/kvm/ioeventfd.c | 128 +++
15869 tools/kvm/ioport.c | 192 ++++
15870 tools/kvm/irq.c | 193 ++++
15871 tools/kvm/kvm-cmd.c | 91 ++
15872 tools/kvm/kvm-cpu.c | 509 +++++++++++
15873 tools/kvm/kvm.c | 749 +++++++++++++++
15874 tools/kvm/main.c | 14 +
15875 tools/kvm/mmio.c | 132 +++
15876 tools/kvm/mptable.c | 284 ++++++
15877 tools/kvm/net/uip/arp.c | 30 +
15878 tools/kvm/net/uip/buf.c | 114 +++
15879 tools/kvm/net/uip/core.c | 190 ++++
15880 tools/kvm/net/uip/csum.c | 92 ++
15881 tools/kvm/net/uip/dhcp.c | 203 +++++
15882 tools/kvm/net/uip/icmp.c | 29 +
15883 tools/kvm/net/uip/ipv4.c | 29 +
15884 tools/kvm/net/uip/tcp.c | 317 +++++++
15885 tools/kvm/net/uip/udp.c | 236 +++++
15886 tools/kvm/pci.c | 169 ++++
15887 tools/kvm/read-write.c | 318 +++++++
15888 tools/kvm/symbol.c | 98 ++
15889 tools/kvm/term.c | 170 ++++
15890 tools/kvm/tests/Makefile | 19 +
15891 tools/kvm/tests/boot/Makefile | 13 +
15892 tools/kvm/tests/boot/init.c | 11 +
15893 tools/kvm/tests/kernel/.gitignore | 2 +
15894 tools/kvm/tests/kernel/Makefile | 20 +
15895 tools/kvm/tests/kernel/README | 16 +
15896 tools/kvm/tests/kernel/kernel.S | 8 +
15897 tools/kvm/tests/pit/.gitignore | 2 +
15898 tools/kvm/tests/pit/Makefile | 20 +
15899 tools/kvm/tests/pit/README | 16 +
15900 tools/kvm/tests/pit/tick.S | 109 +++
15901 tools/kvm/threadpool.c | 146 +++
15902 tools/kvm/ui/sdl.c | 279 ++++++
15903 tools/kvm/ui/vnc.c | 218 +++++
15904 tools/kvm/util.c | 101 ++
15905 tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
15906 tools/kvm/util/generate-cmdlist.sh | 23 +
15907 tools/kvm/util/kvm-ifup-vbr0 | 6 +
15908 tools/kvm/util/parse-options.c | 577 ++++++++++++
15909 tools/kvm/util/rbtree-interval.c | 90 ++
15910 tools/kvm/util/set_private_br.sh | 51 +
15911 tools/kvm/util/strbuf.c | 13 +
15912 tools/kvm/virtio/9p-pdu.c | 287 ++++++
15913 tools/kvm/virtio/9p.c | 1263 ++++++++++++++++++++++++++
15914 tools/kvm/virtio/balloon.c | 288 ++++++
15915 tools/kvm/virtio/blk.c | 247 +++++
15916 tools/kvm/virtio/console.c | 196 ++++
15917 tools/kvm/virtio/core.c | 123 +++
15918 tools/kvm/virtio/net.c | 421 +++++++++
15919 tools/kvm/virtio/pci.c | 314 +++++++
15920 tools/kvm/virtio/rng.c | 183 ++++
15921 179 files changed, 18059 insertions(+), 0 deletions(-)
15922 create mode 100644 tools/kvm/.gitignore
15923 create mode 100644 tools/kvm/CREDITS-Git
15924 create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
15925 create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
15926 create mode 100644 tools/kvm/Documentation/kvm-debug.txt
15927 create mode 100644 tools/kvm/Documentation/kvm-list.txt
15928 create mode 100644 tools/kvm/Documentation/kvm-pause.txt
15929 create mode 100644 tools/kvm/Documentation/kvm-resume.txt
15930 create mode 100644 tools/kvm/Documentation/kvm-run.txt
15931 create mode 100644 tools/kvm/Documentation/kvm-setup.txt
15932 create mode 100644 tools/kvm/Documentation/kvm-stat.txt
15933 create mode 100644 tools/kvm/Documentation/kvm-stop.txt
15934 create mode 100644 tools/kvm/Documentation/kvm-version.txt
15935 create mode 100644 tools/kvm/Makefile
15936 create mode 100644 tools/kvm/README
15937 create mode 100644 tools/kvm/bios.c
15938 create mode 100644 tools/kvm/bios/.gitignore
15939 create mode 100644 tools/kvm/bios/bios-rom.S
15940 create mode 100644 tools/kvm/bios/e820.c
15941 create mode 100644 tools/kvm/bios/entry.S
15942 create mode 100644 tools/kvm/bios/gen-offsets.sh
15943 create mode 100644 tools/kvm/bios/int10.c
15944 create mode 100644 tools/kvm/bios/int15.c
15945 create mode 100644 tools/kvm/bios/local.S
15946 create mode 100644 tools/kvm/bios/macro.S
15947 create mode 100644 tools/kvm/bios/rom.ld.S
15948 create mode 100644 tools/kvm/builtin-balloon.c
15949 create mode 100644 tools/kvm/builtin-debug.c
15950 create mode 100644 tools/kvm/builtin-help.c
15951 create mode 100644 tools/kvm/builtin-list.c
15952 create mode 100644 tools/kvm/builtin-pause.c
15953 create mode 100644 tools/kvm/builtin-resume.c
15954 create mode 100644 tools/kvm/builtin-run.c
15955 create mode 100644 tools/kvm/builtin-setup.c
15956 create mode 100644 tools/kvm/builtin-stat.c
15957 create mode 100644 tools/kvm/builtin-stop.c
15958 create mode 100644 tools/kvm/builtin-version.c
15959 create mode 100644 tools/kvm/code16gcc.h
15960 create mode 100644 tools/kvm/command-list.txt
15961 create mode 100644 tools/kvm/config/feature-tests.mak
15962 create mode 100644 tools/kvm/config/utilities.mak
15963 create mode 100644 tools/kvm/cpuid.c
15964 create mode 100644 tools/kvm/disk/blk.c
15965 create mode 100644 tools/kvm/disk/core.c
15966 create mode 100644 tools/kvm/disk/qcow.c
15967 create mode 100644 tools/kvm/disk/raw.c
15968 create mode 100644 tools/kvm/framebuffer.c
15969 create mode 100644 tools/kvm/guest/init.c
15970 create mode 100644 tools/kvm/guest_compat.c
15971 create mode 100644 tools/kvm/hw/i8042.c
15972 create mode 100644 tools/kvm/hw/pci-shmem.c
15973 create mode 100644 tools/kvm/hw/rtc.c
15974 create mode 100644 tools/kvm/hw/serial.c
15975 create mode 100644 tools/kvm/hw/vesa.c
15976 create mode 100644 tools/kvm/include/asm/hweight.h
15977 create mode 100644 tools/kvm/include/kvm/8250-serial.h
15978 create mode 100644 tools/kvm/include/kvm/apic.h
15979 create mode 100644 tools/kvm/include/kvm/assembly.h
15980 create mode 100644 tools/kvm/include/kvm/barrier.h
15981 create mode 100644 tools/kvm/include/kvm/bios-export.h
15982 create mode 100644 tools/kvm/include/kvm/bios.h
15983 create mode 100644 tools/kvm/include/kvm/boot-protocol.h
15984 create mode 100644 tools/kvm/include/kvm/brlock.h
15985 create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
15986 create mode 100644 tools/kvm/include/kvm/builtin-debug.h
15987 create mode 100644 tools/kvm/include/kvm/builtin-help.h
15988 create mode 100644 tools/kvm/include/kvm/builtin-list.h
15989 create mode 100644 tools/kvm/include/kvm/builtin-pause.h
15990 create mode 100644 tools/kvm/include/kvm/builtin-resume.h
15991 create mode 100644 tools/kvm/include/kvm/builtin-run.h
15992 create mode 100644 tools/kvm/include/kvm/builtin-setup.h
15993 create mode 100644 tools/kvm/include/kvm/builtin-stat.h
15994 create mode 100644 tools/kvm/include/kvm/builtin-stop.h
15995 create mode 100644 tools/kvm/include/kvm/builtin-version.h
15996 create mode 100644 tools/kvm/include/kvm/compiler.h
15997 create mode 100644 tools/kvm/include/kvm/cpufeature.h
15998 create mode 100644 tools/kvm/include/kvm/disk-image.h
15999 create mode 100644 tools/kvm/include/kvm/e820.h
16000 create mode 100644 tools/kvm/include/kvm/framebuffer.h
16001 create mode 100644 tools/kvm/include/kvm/guest_compat.h
16002 create mode 100644 tools/kvm/include/kvm/i8042.h
16003 create mode 100644 tools/kvm/include/kvm/interrupt.h
16004 create mode 100644 tools/kvm/include/kvm/ioeventfd.h
16005 create mode 100644 tools/kvm/include/kvm/ioport.h
16006 create mode 100644 tools/kvm/include/kvm/irq.h
16007 create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
16008 create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
16009 create mode 100644 tools/kvm/include/kvm/kvm.h
16010 create mode 100644 tools/kvm/include/kvm/mptable.h
16011 create mode 100644 tools/kvm/include/kvm/mutex.h
16012 create mode 100644 tools/kvm/include/kvm/parse-options.h
16013 create mode 100644 tools/kvm/include/kvm/pci-shmem.h
16014 create mode 100644 tools/kvm/include/kvm/pci.h
16015 create mode 100644 tools/kvm/include/kvm/qcow.h
16016 create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
16017 create mode 100644 tools/kvm/include/kvm/read-write.h
16018 create mode 100644 tools/kvm/include/kvm/rtc.h
16019 create mode 100644 tools/kvm/include/kvm/rwsem.h
16020 create mode 100644 tools/kvm/include/kvm/sdl.h
16021 create mode 100644 tools/kvm/include/kvm/segment.h
16022 create mode 100644 tools/kvm/include/kvm/strbuf.h
16023 create mode 100644 tools/kvm/include/kvm/symbol.h
16024 create mode 100644 tools/kvm/include/kvm/term.h
16025 create mode 100644 tools/kvm/include/kvm/threadpool.h
16026 create mode 100644 tools/kvm/include/kvm/types.h
16027 create mode 100644 tools/kvm/include/kvm/uip.h
16028 create mode 100644 tools/kvm/include/kvm/util.h
16029 create mode 100644 tools/kvm/include/kvm/vesa.h
16030 create mode 100644 tools/kvm/include/kvm/virtio-9p.h
16031 create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
16032 create mode 100644 tools/kvm/include/kvm/virtio-blk.h
16033 create mode 100644 tools/kvm/include/kvm/virtio-console.h
16034 create mode 100644 tools/kvm/include/kvm/virtio-net.h
16035 create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
16036 create mode 100644 tools/kvm/include/kvm/virtio-pci.h
16037 create mode 100644 tools/kvm/include/kvm/virtio-rng.h
16038 create mode 100644 tools/kvm/include/kvm/virtio.h
16039 create mode 100644 tools/kvm/include/kvm/vnc.h
16040 create mode 100644 tools/kvm/include/linux/bitops.h
16041 create mode 100644 tools/kvm/include/linux/byteorder.h
16042 create mode 100644 tools/kvm/include/linux/kernel.h
16043 create mode 100644 tools/kvm/include/linux/module.h
16044 create mode 100644 tools/kvm/include/linux/prefetch.h
16045 create mode 100644 tools/kvm/include/linux/types.h
16046 create mode 100644 tools/kvm/interrupt.c
16047 create mode 100644 tools/kvm/ioeventfd.c
16048 create mode 100644 tools/kvm/ioport.c
16049 create mode 100644 tools/kvm/irq.c
16050 create mode 100644 tools/kvm/kvm-cmd.c
16051 create mode 100644 tools/kvm/kvm-cpu.c
16052 create mode 100644 tools/kvm/kvm.c
16053 create mode 100644 tools/kvm/main.c
16054 create mode 100644 tools/kvm/mmio.c
16055 create mode 100644 tools/kvm/mptable.c
16056 create mode 100644 tools/kvm/net/uip/arp.c
16057 create mode 100644 tools/kvm/net/uip/buf.c
16058 create mode 100644 tools/kvm/net/uip/core.c
16059 create mode 100644 tools/kvm/net/uip/csum.c
16060 create mode 100644 tools/kvm/net/uip/dhcp.c
16061 create mode 100644 tools/kvm/net/uip/icmp.c
16062 create mode 100644 tools/kvm/net/uip/ipv4.c
16063 create mode 100644 tools/kvm/net/uip/tcp.c
16064 create mode 100644 tools/kvm/net/uip/udp.c
16065 create mode 100644 tools/kvm/pci.c
16066 create mode 100644 tools/kvm/read-write.c
16067 create mode 100644 tools/kvm/symbol.c
16068 create mode 100644 tools/kvm/term.c
16069 create mode 100644 tools/kvm/tests/Makefile
16070 create mode 100644 tools/kvm/tests/boot/Makefile
16071 create mode 100644 tools/kvm/tests/boot/init.c
16072 create mode 100644 tools/kvm/tests/kernel/.gitignore
16073 create mode 100644 tools/kvm/tests/kernel/Makefile
16074 create mode 100644 tools/kvm/tests/kernel/README
16075 create mode 100644 tools/kvm/tests/kernel/kernel.S
16076 create mode 100644 tools/kvm/tests/pit/.gitignore
16077 create mode 100644 tools/kvm/tests/pit/Makefile
16078 create mode 100644 tools/kvm/tests/pit/README
16079 create mode 100644 tools/kvm/tests/pit/tick.S
16080 create mode 100644 tools/kvm/threadpool.c
16081 create mode 100644 tools/kvm/ui/sdl.c
16082 create mode 100644 tools/kvm/ui/vnc.c
16083 create mode 100644 tools/kvm/util.c
16084 create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
16085 create mode 100755 tools/kvm/util/generate-cmdlist.sh
16086 create mode 100755 tools/kvm/util/kvm-ifup-vbr0
16087 create mode 100644 tools/kvm/util/parse-options.c
16088 create mode 100644 tools/kvm/util/rbtree-interval.c
16089 create mode 100755 tools/kvm/util/set_private_br.sh
16090 create mode 100644 tools/kvm/util/strbuf.c
16091 create mode 100644 tools/kvm/virtio/9p-pdu.c
16092 create mode 100644 tools/kvm/virtio/9p.c
16093 create mode 100644 tools/kvm/virtio/balloon.c
16094 create mode 100644 tools/kvm/virtio/blk.c
16095 create mode 100644 tools/kvm/virtio/console.c
16096 create mode 100644 tools/kvm/virtio/core.c
16097 create mode 100644 tools/kvm/virtio/net.c
16098 create mode 100644 tools/kvm/virtio/pci.c
16099 create mode 100644 tools/kvm/virtio/rng.c
16100 Merging scsi-post-merge/merge-base:master
16101 Merging c6x/for-linux-next
16102 $ git merge c6x/for-linux-next
16103 Auto-merging MAINTAINERS
16104 Merge made by recursive.
16105 Documentation/devicetree/bindings/c6x/clocks.txt | 40 +
16106 Documentation/devicetree/bindings/c6x/dscr.txt | 127 +++
16107 Documentation/devicetree/bindings/c6x/emifa.txt | 62 ++
16108 .../devicetree/bindings/c6x/interrupt.txt | 104 +++
16109 Documentation/devicetree/bindings/c6x/soc.txt | 28 +
16110 Documentation/devicetree/bindings/c6x/timer64.txt | 26 +
16112 arch/c6x/Kconfig | 174 +++++
16113 arch/c6x/Makefile | 60 ++
16114 arch/c6x/boot/Makefile | 30 +
16115 arch/c6x/boot/dts/dsk6455.dts | 62 ++
16116 arch/c6x/boot/dts/evmc6457.dts | 48 ++
16117 arch/c6x/boot/dts/evmc6472.dts | 73 ++
16118 arch/c6x/boot/dts/evmc6474.dts | 58 ++
16119 arch/c6x/boot/dts/tms320c6455.dtsi | 96 +++
16120 arch/c6x/boot/dts/tms320c6457.dtsi | 68 ++
16121 arch/c6x/boot/dts/tms320c6472.dtsi | 134 ++++
16122 arch/c6x/boot/dts/tms320c6474.dtsi | 89 +++
16123 arch/c6x/boot/linked_dtb.S | 2 +
16124 arch/c6x/configs/dsk6455_defconfig | 44 ++
16125 arch/c6x/configs/evmc6457_defconfig | 41 +
16126 arch/c6x/configs/evmc6472_defconfig | 42 +
16127 arch/c6x/configs/evmc6474_defconfig | 42 +
16128 arch/c6x/include/asm/Kbuild | 54 ++
16129 arch/c6x/include/asm/asm-offsets.h | 1 +
16130 arch/c6x/include/asm/bitops.h | 105 +++
16131 arch/c6x/include/asm/byteorder.h | 12 +
16132 arch/c6x/include/asm/cache.h | 90 +++
16133 arch/c6x/include/asm/cacheflush.h | 65 ++
16134 arch/c6x/include/asm/checksum.h | 34 +
16135 arch/c6x/include/asm/clkdev.h | 22 +
16136 arch/c6x/include/asm/clock.h | 148 ++++
16137 arch/c6x/include/asm/delay.h | 67 ++
16138 arch/c6x/include/asm/dma-mapping.h | 91 +++
16139 arch/c6x/include/asm/dscr.h | 34 +
16140 arch/c6x/include/asm/elf.h | 113 +++
16141 arch/c6x/include/asm/ftrace.h | 6 +
16142 arch/c6x/include/asm/hardirq.h | 20 +
16143 arch/c6x/include/asm/irq.h | 302 ++++++++
16144 arch/c6x/include/asm/irqflags.h | 72 ++
16145 arch/c6x/include/asm/linkage.h | 30 +
16146 arch/c6x/include/asm/megamod-pic.h | 9 +
16147 arch/c6x/include/asm/memblock.h | 4 +
16148 arch/c6x/include/asm/mmu.h | 18 +
16149 arch/c6x/include/asm/module.h | 33 +
16150 arch/c6x/include/asm/mutex.h | 6 +
16151 arch/c6x/include/asm/page.h | 11 +
16152 arch/c6x/include/asm/pgtable.h | 81 ++
16153 arch/c6x/include/asm/processor.h | 132 ++++
16154 arch/c6x/include/asm/procinfo.h | 28 +
16155 arch/c6x/include/asm/prom.h | 1 +
16156 arch/c6x/include/asm/ptrace.h | 174 +++++
16157 arch/c6x/include/asm/sections.h | 12 +
16158 arch/c6x/include/asm/setup.h | 32 +
16159 arch/c6x/include/asm/sigcontext.h | 80 ++
16160 arch/c6x/include/asm/signal.h | 17 +
16161 arch/c6x/include/asm/soc.h | 35 +
16162 arch/c6x/include/asm/string.h | 21 +
16163 arch/c6x/include/asm/swab.h | 54 ++
16164 arch/c6x/include/asm/syscall.h | 123 +++
16165 arch/c6x/include/asm/syscalls.h | 55 ++
16166 arch/c6x/include/asm/system.h | 168 ++++
16167 arch/c6x/include/asm/thread_info.h | 121 +++
16168 arch/c6x/include/asm/timer64.h | 6 +
16169 arch/c6x/include/asm/timex.h | 33 +
16170 arch/c6x/include/asm/tlb.h | 8 +
16171 arch/c6x/include/asm/traps.h | 36 +
16172 arch/c6x/include/asm/uaccess.h | 107 +++
16173 arch/c6x/include/asm/unaligned.h | 170 +++++
16174 arch/c6x/include/asm/unistd.h | 26 +
16175 arch/c6x/kernel/Makefile | 12 +
16176 arch/c6x/kernel/asm-offsets.c | 123 +++
16177 arch/c6x/kernel/c6x_ksyms.c | 66 ++
16178 arch/c6x/kernel/devicetree.c | 53 ++
16179 arch/c6x/kernel/dma.c | 153 ++++
16180 arch/c6x/kernel/entry.S | 803 ++++++++++++++++++++
16181 arch/c6x/kernel/head.S | 84 ++
16182 arch/c6x/kernel/irq.c | 728 ++++++++++++++++++
16183 arch/c6x/kernel/module.c | 123 +++
16184 arch/c6x/kernel/process.c | 263 +++++++
16185 arch/c6x/kernel/ptrace.c | 187 +++++
16186 arch/c6x/kernel/setup.c | 498 ++++++++++++
16187 arch/c6x/kernel/signal.c | 377 +++++++++
16188 arch/c6x/kernel/soc.c | 91 +++
16189 arch/c6x/kernel/switch_to.S | 74 ++
16190 arch/c6x/kernel/sys_c6x.c | 74 ++
16191 arch/c6x/kernel/time.c | 65 ++
16192 arch/c6x/kernel/traps.c | 423 ++++++++++
16193 arch/c6x/kernel/vectors.S | 81 ++
16194 arch/c6x/kernel/vmlinux.lds.S | 162 ++++
16195 arch/c6x/lib/Makefile | 7 +
16196 arch/c6x/lib/checksum.c | 36 +
16197 arch/c6x/lib/csum_64plus.S | 419 ++++++++++
16198 arch/c6x/lib/divi.S | 53 ++
16199 arch/c6x/lib/divremi.S | 46 ++
16200 arch/c6x/lib/divremu.S | 87 +++
16201 arch/c6x/lib/divu.S | 98 +++
16202 arch/c6x/lib/llshl.S | 37 +
16203 arch/c6x/lib/llshr.S | 38 +
16204 arch/c6x/lib/llshru.S | 38 +
16205 arch/c6x/lib/memcpy_64plus.S | 46 ++
16206 arch/c6x/lib/mpyll.S | 49 ++
16207 arch/c6x/lib/negll.S | 31 +
16208 arch/c6x/lib/pop_rts.S | 32 +
16209 arch/c6x/lib/push_rts.S | 31 +
16210 arch/c6x/lib/remi.S | 64 ++
16211 arch/c6x/lib/remu.S | 82 ++
16212 arch/c6x/lib/strasgi.S | 89 +++
16213 arch/c6x/lib/strasgi_64plus.S | 39 +
16214 arch/c6x/mm/Makefile | 5 +
16215 arch/c6x/mm/dma-coherent.c | 143 ++++
16216 arch/c6x/mm/init.c | 113 +++
16217 arch/c6x/platforms/Kconfig | 16 +
16218 arch/c6x/platforms/Makefile | 12 +
16219 arch/c6x/platforms/cache.c | 445 +++++++++++
16220 arch/c6x/platforms/dscr.c | 598 +++++++++++++++
16221 arch/c6x/platforms/emif.c | 88 +++
16222 arch/c6x/platforms/megamod-pic.c | 349 +++++++++
16223 arch/c6x/platforms/platform.c | 17 +
16224 arch/c6x/platforms/pll.c | 444 +++++++++++
16225 arch/c6x/platforms/plldata.c | 404 ++++++++++
16226 arch/c6x/platforms/timer64.c | 236 ++++++
16227 include/asm-generic/io.h | 2 +-
16228 include/asm-generic/page.h | 10 +-
16229 include/asm-generic/uaccess.h | 7 +-
16230 include/linux/elf-em.h | 1 +
16231 126 files changed, 12972 insertions(+), 5 deletions(-)
16232 create mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt
16233 create mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt
16234 create mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt
16235 create mode 100644 Documentation/devicetree/bindings/c6x/interrupt.txt
16236 create mode 100644 Documentation/devicetree/bindings/c6x/soc.txt
16237 create mode 100644 Documentation/devicetree/bindings/c6x/timer64.txt
16238 create mode 100644 arch/c6x/Kconfig
16239 create mode 100644 arch/c6x/Makefile
16240 create mode 100644 arch/c6x/boot/Makefile
16241 create mode 100644 arch/c6x/boot/dts/dsk6455.dts
16242 create mode 100644 arch/c6x/boot/dts/evmc6457.dts
16243 create mode 100644 arch/c6x/boot/dts/evmc6472.dts
16244 create mode 100644 arch/c6x/boot/dts/evmc6474.dts
16245 create mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi
16246 create mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi
16247 create mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi
16248 create mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi
16249 create mode 100644 arch/c6x/boot/linked_dtb.S
16250 create mode 100644 arch/c6x/configs/dsk6455_defconfig
16251 create mode 100644 arch/c6x/configs/evmc6457_defconfig
16252 create mode 100644 arch/c6x/configs/evmc6472_defconfig
16253 create mode 100644 arch/c6x/configs/evmc6474_defconfig
16254 create mode 100644 arch/c6x/include/asm/Kbuild
16255 create mode 100644 arch/c6x/include/asm/asm-offsets.h
16256 create mode 100644 arch/c6x/include/asm/bitops.h
16257 create mode 100644 arch/c6x/include/asm/byteorder.h
16258 create mode 100644 arch/c6x/include/asm/cache.h
16259 create mode 100644 arch/c6x/include/asm/cacheflush.h
16260 create mode 100644 arch/c6x/include/asm/checksum.h
16261 create mode 100644 arch/c6x/include/asm/clkdev.h
16262 create mode 100644 arch/c6x/include/asm/clock.h
16263 create mode 100644 arch/c6x/include/asm/delay.h
16264 create mode 100644 arch/c6x/include/asm/dma-mapping.h
16265 create mode 100644 arch/c6x/include/asm/dscr.h
16266 create mode 100644 arch/c6x/include/asm/elf.h
16267 create mode 100644 arch/c6x/include/asm/ftrace.h
16268 create mode 100644 arch/c6x/include/asm/hardirq.h
16269 create mode 100644 arch/c6x/include/asm/irq.h
16270 create mode 100644 arch/c6x/include/asm/irqflags.h
16271 create mode 100644 arch/c6x/include/asm/linkage.h
16272 create mode 100644 arch/c6x/include/asm/megamod-pic.h
16273 create mode 100644 arch/c6x/include/asm/memblock.h
16274 create mode 100644 arch/c6x/include/asm/mmu.h
16275 create mode 100644 arch/c6x/include/asm/module.h
16276 create mode 100644 arch/c6x/include/asm/mutex.h
16277 create mode 100644 arch/c6x/include/asm/page.h
16278 create mode 100644 arch/c6x/include/asm/pgtable.h
16279 create mode 100644 arch/c6x/include/asm/processor.h
16280 create mode 100644 arch/c6x/include/asm/procinfo.h
16281 create mode 100644 arch/c6x/include/asm/prom.h
16282 create mode 100644 arch/c6x/include/asm/ptrace.h
16283 create mode 100644 arch/c6x/include/asm/sections.h
16284 create mode 100644 arch/c6x/include/asm/setup.h
16285 create mode 100644 arch/c6x/include/asm/sigcontext.h
16286 create mode 100644 arch/c6x/include/asm/signal.h
16287 create mode 100644 arch/c6x/include/asm/soc.h
16288 create mode 100644 arch/c6x/include/asm/string.h
16289 create mode 100644 arch/c6x/include/asm/swab.h
16290 create mode 100644 arch/c6x/include/asm/syscall.h
16291 create mode 100644 arch/c6x/include/asm/syscalls.h
16292 create mode 100644 arch/c6x/include/asm/system.h
16293 create mode 100644 arch/c6x/include/asm/thread_info.h
16294 create mode 100644 arch/c6x/include/asm/timer64.h
16295 create mode 100644 arch/c6x/include/asm/timex.h
16296 create mode 100644 arch/c6x/include/asm/tlb.h
16297 create mode 100644 arch/c6x/include/asm/traps.h
16298 create mode 100644 arch/c6x/include/asm/uaccess.h
16299 create mode 100644 arch/c6x/include/asm/unaligned.h
16300 create mode 100644 arch/c6x/include/asm/unistd.h
16301 create mode 100644 arch/c6x/kernel/Makefile
16302 create mode 100644 arch/c6x/kernel/asm-offsets.c
16303 create mode 100644 arch/c6x/kernel/c6x_ksyms.c
16304 create mode 100644 arch/c6x/kernel/devicetree.c
16305 create mode 100644 arch/c6x/kernel/dma.c
16306 create mode 100644 arch/c6x/kernel/entry.S
16307 create mode 100644 arch/c6x/kernel/head.S
16308 create mode 100644 arch/c6x/kernel/irq.c
16309 create mode 100644 arch/c6x/kernel/module.c
16310 create mode 100644 arch/c6x/kernel/process.c
16311 create mode 100644 arch/c6x/kernel/ptrace.c
16312 create mode 100644 arch/c6x/kernel/setup.c
16313 create mode 100644 arch/c6x/kernel/signal.c
16314 create mode 100644 arch/c6x/kernel/soc.c
16315 create mode 100644 arch/c6x/kernel/switch_to.S
16316 create mode 100644 arch/c6x/kernel/sys_c6x.c
16317 create mode 100644 arch/c6x/kernel/time.c
16318 create mode 100644 arch/c6x/kernel/traps.c
16319 create mode 100644 arch/c6x/kernel/vectors.S
16320 create mode 100644 arch/c6x/kernel/vmlinux.lds.S
16321 create mode 100644 arch/c6x/lib/Makefile
16322 create mode 100644 arch/c6x/lib/checksum.c
16323 create mode 100644 arch/c6x/lib/csum_64plus.S
16324 create mode 100644 arch/c6x/lib/divi.S
16325 create mode 100644 arch/c6x/lib/divremi.S
16326 create mode 100644 arch/c6x/lib/divremu.S
16327 create mode 100644 arch/c6x/lib/divu.S
16328 create mode 100644 arch/c6x/lib/llshl.S
16329 create mode 100644 arch/c6x/lib/llshr.S
16330 create mode 100644 arch/c6x/lib/llshru.S
16331 create mode 100644 arch/c6x/lib/memcpy_64plus.S
16332 create mode 100644 arch/c6x/lib/mpyll.S
16333 create mode 100644 arch/c6x/lib/negll.S
16334 create mode 100644 arch/c6x/lib/pop_rts.S
16335 create mode 100644 arch/c6x/lib/push_rts.S
16336 create mode 100644 arch/c6x/lib/remi.S
16337 create mode 100644 arch/c6x/lib/remu.S
16338 create mode 100644 arch/c6x/lib/strasgi.S
16339 create mode 100644 arch/c6x/lib/strasgi_64plus.S
16340 create mode 100644 arch/c6x/mm/Makefile
16341 create mode 100644 arch/c6x/mm/dma-coherent.c
16342 create mode 100644 arch/c6x/mm/init.c
16343 create mode 100644 arch/c6x/platforms/Kconfig
16344 create mode 100644 arch/c6x/platforms/Makefile
16345 create mode 100644 arch/c6x/platforms/cache.c
16346 create mode 100644 arch/c6x/platforms/dscr.c
16347 create mode 100644 arch/c6x/platforms/emif.c
16348 create mode 100644 arch/c6x/platforms/megamod-pic.c
16349 create mode 100644 arch/c6x/platforms/platform.c
16350 create mode 100644 arch/c6x/platforms/pll.c
16351 create mode 100644 arch/c6x/platforms/plldata.c
16352 create mode 100644 arch/c6x/platforms/timer64.c
16353 $ git clone -s -l -n -q . ../rebase-tmp
16355 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
16357 * [new branch] quilt/akpm -> akpm
16358 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
16360 * [new branch] quilt/akpm-base -> akpm-base
16361 $ git checkout akpm
16362 Switched to branch 'akpm'
16363 $ git rebase --onto master akpm-base
16364 First, rewinding head to replay your work on top of it...
16365 Applying: include/linux/dmar.h: forward-declare struct acpi_dmar_header
16366 Applying: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug
16367 Applying: drm: fix kconfig unmet dependency warning
16368 Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
16369 Applying: readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
16370 Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
16371 Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
16372 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
16373 Applying: hp_accel: Add a new PNP id
16374 Applying: hp_accel: Add axis-mapping for HP ProBook / EliteBook
16375 Applying: x86: fix mmap random address range
16376 Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
16377 Applying: vrtc: change its year offset from 1960 to 1972
16378 Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
16379 Applying: mrst: battery fixes
16380 Applying: drivers/power/intel_mid_battery.c: fix build
16381 Applying: x86,mrst: add mapping for bma023
16382 Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
16383 Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
16384 Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
16385 Applying: x86: tlb flush avoid superflous leave_mm()
16386 Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
16387 Applying: arm, exec: remove redundant set_fs(USER_DS)
16388 Applying: audit: always follow va_copy() with va_end()
16389 Applying: btrfs: don't dereference extent_mapping if NULL
16390 Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
16391 Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
16392 Applying: ia64, exec: remove redundant set_fs(USER_DS)
16393 Applying: brlocks/lglocks: clean up code
16394 Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
16395 Applying: ipc/mqueue: cleanup definition names and locations
16396 Applying: ipc/mqueue: switch back to using non-max values on create
16397 Applying: ipc/mqueue: enforce hard limits
16398 Applying: ipc/mqueue: update maximums for the mqueue subsystem
16399 Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
16400 Applying: unicore32, exec: remove redundant set_fs(USER_DS)
16401 Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
16402 Applying: debugobjects: extend debugobjects to assert that an object is initialized
16403 Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
16404 Applying: ext4: use proper little-endian bitops
16405 Applying: ocfs2: avoid unaligned access to dqc_bitmap
16406 Applying: parisc, exec: remove redundant set_fs(USER_DS)
16407 Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
16408 Applying: scsi: fix a header to include linux/types.h
16409 Applying: drivers/scsi/megaraid.c: fix sparse warnings
16410 Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
16411 Applying: drivers/scsi/sd.c: use ida_simple_get() and ida_simple_remove() in place of boilerplate code
16412 Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
16413 Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
16414 Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
16415 Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
16416 Applying: loop: prevent information leak after failed read
16417 Applying: loop: cleanup set_status interface
16418 Applying: loop-cleanup-set_status-interface-checkpatch-fixes
16419 Applying: cciss: add half second delay to PCI PM reset code
16420 Applying: cciss: auto engage SCSI mid layer at driver load time
16421 Applying: slab: add taint flag outputting to debug paths.
16422 Applying: slub: add taint flag outputting to debug paths
16423 Applying: drivers/tty/serial/pch_uart.c: add console support
16424 Applying: Cross Memory Attach
16425 Applying: cross-memory-attach-update
16426 Applying: cross-memory-attach-v4
16427 Applying: mm: compaction: trivial clean up in acct_isolated()
16428 Applying: mm: change isolate mode from #define to bitwise type
16429 Applying: mm-change-isolate-mode-from-define-to-bitwise-type-fix
16430 Applying: mm: compaction: make isolate_lru_page() filter-aware
16431 Applying: mm-compaction-make-isolate_lru_page-filter-aware-fix
16432 Applying: mm: zone_reclaim: make isolate_lru_page() filter-aware
16433 Applying: mm-zone_reclaim-make-isolate_lru_page-filter-aware-fix
16434 Applying: mm: migration: clean up unmap_and_move()
16435 Applying: radix_tree: clean away saw_unset_tag leftovers
16436 Applying: vmscan: add block plug for page reclaim
16437 Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
16438 Applying: mm/page-writeback.c: document bdi_min_ratio
16439 Applying: oom: avoid killing kthreads if they assume the oom killed thread's mm
16440 Applying: oom: remove oom_disable_count
16441 Applying: oom: fix race while temporarily setting current's oom_score_adj
16442 Applying: tmpfs: add "tmpfs" to the Kconfig prompt to make it obvious.
16443 Applying: mm: output a list of loaded modules when we hit bad_page()
16444 Applying: mm: vmscan: drop nr_force_scan[] from get_scan_count
16445 Applying: mm: distinguish between mlocked and pinned pages
16446 Applying: mm: add comments to explain mm_struct fields
16447 Applying: mm-add-comments-to-explain-mm_struct-fields-fix
16448 Applying: mm: vmscan: do not writeback filesystem pages in direct reclaim
16449 Applying: mm: vmscan: remove dead code related to lumpy reclaim waiting on pages under writeback
16450 Applying: xfs: warn if direct reclaim tries to writeback pages
16451 Applying: ext4: warn if direct reclaim tries to writeback pages
16452 Applying: mm: vmscan: do not writeback filesystem pages in kswapd except in high priority
16453 Applying: mm: vmscan: throttle reclaim if encountering too many dirty pages under writeback
16454 Applying: mm-vmscan-throttle-reclaim-if-encountering-too-many-dirty-pages-under-writeback-update
16455 Applying: mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
16456 Applying: vmscan: count pages into balanced for zone with good watermark
16457 Applying: mm/debug-pagealloc.c: use plain __ratelimit() instead of printk_ratelimit()
16458 Applying: lib/string.c: introduce memchr_inv()
16459 Applying: lib-stringc-introduce-memchr_inv-fix-kernel-doc-for-memchr_inv
16460 Applying: mm/debug-pagealloc.c: use memchr_inv
16461 Applying: vmscan: fix initial shrinker size handling
16462 Applying: vmscan: use atomic-long for shrinker batching
16463 Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
16464 Applying: mm: avoid null pointer access in vm_struct via /proc/vmallocinfo
16465 Applying: vmscan: promote shared file mapped pages
16466 Applying: vmscan: activate executable pages after first usage
16467 Applying: memblock: add memblock_start_of_DRAM()
16468 Applying: memblock: add NO_BOOTMEM config symbol
16469 Applying: mremap: check for overflow using deltas
16470 Applying: mremap: avoid sending one IPI per page
16471 Applying: thp: mremap support and TLB optimization
16472 Applying: thp-mremap-support-and-tlb-optimization-fix
16473 Applying: thp-mremap-support-and-tlb-optimization-fix-fix
16474 Applying: thp-mremap-support-and-tlb-optimization-fix-fix-fix
16475 Applying: include/asm-generic/page.h: calculate virt_to_page and page_to_virt via predefined macro
16476 Applying: mm: iov_iter: have iov_iter_advance() decrement nr_segs appropriately
16477 Applying: mm: neaten warn_alloc_failed
16478 Applying: mm-neaten-warn_alloc_failed-fix
16479 Applying: debug-pagealloc: add support for highmem pages
16480 Applying: debug-pagealloc-add-support-for-highmem-pages-fix
16481 Applying: kswapd: avoid unnecessary rebalance after an unsuccessful balancing
16482 Applying: mm: add free_hot_cold_page_list() helper
16483 Applying: mm/memblock.c: small function definition fixes
16484 Applying: mm: compaction: compact unevictable pages
16485 Applying: mm-compaction-compact-unevictable-pages-checkpatch-fixes
16486 Applying: mm: compaction: accounting fix
16487 Applying: kswapd: assign new_order and new_classzone_idx after wakeup in sleeping
16488 Applying: mm: fix page-faults detection in swap-token logic
16489 Applying: mm/vmalloc.c: report more vmalloc failures
16490 Applying: mm: add extra free kbytes tunable
16491 Applying: mm-add-extra-free-kbytes-tunable-update
16492 Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
16493 Applying: mm: thp: tail page refcounting fix
16494 Applying: thp-tail-page-refcounting-fix-6
16495 Applying: ksm: fix the comment of try_to_unmap_one()
16496 Applying: mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix
16497 Applying: vmscan: fix shrinker callback bug in fs/super.c
16498 Applying: mm/mmap.c: eliminate the ret variable from mm_take_all_locks()
16499 Applying: mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix
16500 Applying: fs/buffer.c: add device information for error output in __find_get_block_slow()
16501 Applying: HWPOISON: convert pr_debug()s to pr_info()s
16502 Applying: mm: compaction: make compact_zone_order() static
16503 Applying: mm: fix kunmap_high() comment
16504 Applying: vmscan.c: fix invalid strict_strtoul() check in write_scan_unevictable_node()
16505 Applying: mm: disable user interface to manually rescue unevictable pages
16506 Applying: mm/memblock.c: quiet sparse noise
16507 Applying: mm/thrash.c: quiet sparse noise
16508 Applying: mm/mempolicy.c: quiet sparse noise
16509 Applying: mm/huge_memory.c: quiet sparse noise
16510 Applying: vmscan: add barrier to prevent evictable page in unevictable list
16511 Applying: selinuxfs: remove custom hex_to_bin()
16512 Applying: include/linux/security.h: fix security_inode_init_security() arg
16513 Applying: hpet: factor timer allocate from open
16514 Applying: alpha: wire up accept4 syscall
16515 Applying: alpha: wire up sendmmsg syscall
16516 Applying: intel_idle: fix API misuse
16517 Applying: intel_idle: disable auto_demotion for hotplugged CPUs
16518 Applying: fs/pipe.c: add ->statfs callback for pipefs
16519 Applying: lib/Kconfig.debug: fix help message for DEFAULT_HUNG_TASK_TIMEOUT
16520 Applying: hwmon: convert idr to ida and use ida_simple interface
16521 Applying: drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get()
16522 Applying: lis3lv02d: avoid divide by zero due to unchecked
16523 Applying: lis3: update maintainer information
16524 Applying: lis3: add support for HP EliteBook 2730p
16525 Applying: lis3: add support for HP EliteBook 8540w
16526 Applying: hp_accel: add HP ProBook 655x
16527 Applying: lis3: free regulators if probe() fails
16528 Applying: lis3: use consistent naming of variables
16529 Applying: lis3: change exported function to use passed parameter
16530 Applying: lis3: remove the references to the global variable in core driver
16531 Applying: lis3-remove-the-references-to-the-global-variable-in-core-driver-fix
16532 Applying: lis3lv02d: make regulator API usage unconditional
16533 Applying: driver/misc/fsa9480.c fix potential null-pointer dereference
16534 Applying: stop_machine: make stop_machine safe and efficient to call early
16535 Applying: stop_machine-make-stop_machine-safe-and-efficient-to-call-early-v3.
16536 Applying: watchdog: move watchdog_*_all_cpus under CONFIG_SYSCTL
16537 Applying: dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
16538 Applying: dynamic_debug: remove num_enabled accounting
16539 Applying: dynamic_debug: use a single printk() to emit messages
16540 Applying: dynamic_debug: fix undefined reference to `__netdev_printk'
16541 Applying: printk: add module parameter ignore_loglevel to control ignore_loglevel
16542 Applying: printk: add ignore_loglevel as module parameter
16543 Applying: printk: add console_suspend module parameter
16544 Applying: printk: fix bounds checking for log_prefix
16545 Applying: printk: remove bounds checking for log_prefix
16546 Applying: treewide: use __printf not __attribute__((format(printf,...)))
16547 Applying: treewide-use-__printf-not-__attribute__formatprintf-fix
16548 Applying: treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes
16549 Applying: fs/namei.c: remove unused getname_flags()
16550 Applying: poll: add poll_requested_events() function
16551 Applying: MAINTAINERS: add new entry for ideapad-laptop
16552 Applying: video/backlight: remove obsolete cleanup for clientdata
16553 Applying: backlight: fix broken regulator API usage in l4f00242t03
16554 Applying: drivers/video/backlight/l4f00242t03.c: use gpio_request_one() to simplify error handling
16555 Applying: backlight: rename corgibl_limit_intensity() to genericbl_limit_intensity()
16556 Applying: leds: Renesas TPU LED driver
16557 Applying: leds-renesas-tpu-led-driver-v2-fix
16558 Applying: drivers/leds/led-triggers.c: fix memory leak
16559 Applying: drivers/leds/leds-lm3530.c: remove obsolete cleanup for clientdata
16560 Applying: drivers/leds/leds-renesas-tpu.c: update driver to use workqueue
16561 Applying: drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
16562 Applying: drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
16563 Applying: lib/kstrtox: common code between kstrto*() and simple_strto*() functions
16564 Applying: lib/spinlock_debug.c: print owner on spinlock lockup
16565 Applying: lib/bitmap.c: quiet sparse noise about address space
16566 Applying: lib-bitmapc-quiet-sparse-noise-about-address-space-fix
16567 Applying: lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
16568 Applying: lib/idr.c: fix comment for ida_get_new_above()
16569 Applying: llist: using in_nmi requires including hardirq.h
16570 Applying: llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
16571 Applying: kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
16572 Applying: lib/crc: add slice by 8 algorithm to crc32.c
16573 Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
16574 Applying: epoll: fix spurious lockdep warnings
16575 Applying: epoll: limit paths
16576 Applying: binfmt_elf: fix PIE execution with randomization disabled
16577 Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
16578 Applying: oprofilefs: handle zero-length writes
16579 Applying: drivers/rtc/class.c: convert idr to ida and use ida_simple_get()
16580 Applying: rtc: add initial support for mcp7941x parts
16581 Applying: drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text
16582 Applying: minix: describe usage of different magic numbers
16583 Applying: cgroups: more safe tasklist locking in cgroup_attach_proc
16584 Applying: cgroups: don't attach task to subsystem if migration failed
16585 Applying: cgroup/kmemleak: Annotate alloc_page() for cgroup allocations
16586 Applying: cgroups: add res_counter_write_u64() API
16587 Applying: cgroups: new resource counter inheritance API
16588 Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
16589 Applying: cgroups: new cancel_attach_task() subsystem callback
16590 Applying: cgroups: ability to stop res charge propagation on bounded ancestor
16591 Applying: cgroups: add res counter common ancestor searching
16592 Applying: res_counter: allow charge failure pointer to be null
16593 Applying: cgroups: pull up res counter charge failure interpretation to caller
16594 Applying: cgroups: allow subsystems to cancel a fork
16595 Applying: cgroups: add a task counter subsystem
16596 Applying: memcg: rename mem variable to memcg
16597 Applying: memcg: fix oom schedule_timeout()
16598 Applying: memcg: replace ss->id_lock with a rwlock
16599 Applying: memcg: do not expose uninitialized mem_cgroup_per_node to world
16600 Applying: memcg: skip scanning active lists based on individual size
16601 Applying: memcg-skip-scanning-active-lists-based-on-individual-size-fix
16602 Applying: memcg: close race between charge and putback
16603 Applying: memcg: Fix race condition in memcg_check_events() with this_cpu usage
16604 Applying: cpusets: avoid looping when storing to mems_allowed if one node remains set
16605 Applying: procfs: report EISDIR when reading sysctl dirs in proc
16606 Applying: proc: fix races against execve() of /proc/PID/fd**
16607 Applying: proc-fix-races-against-execve-of-proc-pid-fd-fix
16608 Applying: proc: force dcache drop on unauthorized access
16609 Applying: ipc-introduce-shm_rmid_forced-sysctl-testing
16610 Applying: init: add root=PARTUUID=UUID/PARTNROFF=%d support
16611 Applying: init-add-root=partuuid=uuid-partnroff=%d-support-fix
16612 Applying: drivers/rapidio/rio-scan.c: use discovered bit to test if enumeration is complete
16613 Applying: arch/powerpc/sysdev/fsl_rio.c: release rapidio port I/O region resource if port failed to initialize
16614 Applying: RapidIO: add mport driver for Tsi721 bridge
16615 Applying: RapidIO: Tsi721 driver - fixes for the initial release
16616 Applying: RapidIO: fix potential null deref in rio_setup_device()
16617 Applying: drivers/net/rionet.c: fix ethernet address macros for LE platforms
16618 Applying: sysctl: add support for poll()
16619 Applying: sysctl-add-support-for-poll-fix
16620 Applying: sysctl: make CONFIG_SYSCTL_SYSCALL default to n
16621 Applying: pps: default echo function
16622 Applying: pps: new client driver using GPIO
16623 Applying: pps-new-client-driver-using-gpio-fix
16624 Applying: pps gpio client: add missing dependency
16625 Applying: w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
16626 Applying: drivers/power/ds2780_battery.c: create central point for calling w1 interface
16627 Applying: drivers/power/ds2780_battery.c: add a nolock function to w1 interface
16628 Applying: drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
16629 Applying: drivers/w1/w1_int.c: multiple masters used same init_name
16630 Applying: aio: allocate kiocbs in batches
16631 Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
16632 Applying: dio: separate fields only used in the submission path from struct dio
16633 Applying: dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes
16634 Applying: dio: fix a wrong comment
16635 Applying: dio: rearrange fields in dio/dio_submit to avoid holes
16636 Applying: dio: use a slab cache for struct dio
16637 Applying: dio: separate map_bh from dio
16638 Applying: dio: inline the complete submission path
16639 Applying: dio-inline-the-complete-submission-path-v2-checkpatch-fixes
16640 Applying: dio: merge direct_io_walker() into __blockdev_direct_IO()
16641 Applying: dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes
16642 Applying: dio: remove unnecessary dio argument from dio_pages_present()
16643 Applying: dio: remove unused dio parameter from dio_bio_add_page()
16644 Applying: vfs: cache request_queue in struct block_device
16645 Applying: dio: optimize cache misses in the submission path
16646 Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
16647 Applying: dio: using prefetch requires including prefetch.h
16648 Applying: ipc/mqueue: vlammoc requires vmalloc.h
16649 Applying: cgroups: ERR_PTR needs err.h
16650 Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
16652 $ git fetch -f ../rebase-tmp akpm:akpm
16654 + e086d6f...780ceed akpm -> akpm (forced update)
16655 $ rm -rf ../rebase-tmp
16657 $ git merge --no-ff akpm
16658 Merge made by recursive.
16659 Documentation/DocBook/debugobjects.tmpl | 50 +
16660 Documentation/blockdev/cciss.txt | 14 +-
16661 Documentation/cgroups/cgroups.txt | 13 +-
16662 Documentation/cgroups/memory.txt | 1 -
16663 Documentation/cgroups/resource_counter.txt | 20 +-
16664 Documentation/cgroups/task_counter.txt | 153 ++
16665 Documentation/feature-removal-schedule.txt | 35 -
16666 Documentation/kernel-parameters.txt | 8 +
16667 Documentation/rapidio/tsi721.txt | 49 +
16668 Documentation/sysctl/vm.txt | 16 +
16669 .../trace/postprocess/trace-vmscan-postprocess.pl | 8 +-
16671 arch/alpha/boot/misc.c | 3 +-
16672 arch/alpha/include/asm/console.h | 3 +-
16673 arch/alpha/include/asm/unistd.h | 4 +-
16674 arch/alpha/kernel/systbls.S | 2 +
16675 arch/arm/include/asm/processor.h | 1 -
16676 arch/arm/mach-imx/mach-mx27_3ds.c | 6 +-
16677 arch/arm/mach-imx/mach-mx31_3ds.c | 6 +-
16678 arch/arm/mach-ux500/mbox-db5500.c | 2 +-
16679 arch/frv/include/asm/system.h | 2 +-
16680 arch/ia64/include/asm/mca.h | 3 +-
16681 arch/ia64/include/asm/processor.h | 1 -
16682 arch/m68k/include/asm/natfeat.h | 3 +-
16683 arch/mn10300/include/asm/gdb-stub.h | 5 +-
16684 arch/parisc/include/asm/processor.h | 2 -
16685 arch/parisc/kernel/process.c | 1 -
16686 arch/powerpc/include/asm/systbl.h | 2 +
16687 arch/powerpc/include/asm/udbg.h | 3 +-
16688 arch/powerpc/include/asm/unistd.h | 4 +-
16689 arch/powerpc/mm/gup.c | 5 +-
16690 arch/powerpc/sysdev/fsl_rio.c | 1 +
16691 arch/s390/include/asm/debug.h | 11 +-
16692 arch/um/include/shared/user.h | 8 +-
16693 arch/unicore32/include/asm/processor.h | 1 -
16694 arch/x86/ia32/ia32entry.S | 2 +
16695 arch/x86/include/asm/mrst.h | 9 +
16696 arch/x86/include/asm/unistd_32.h | 4 +-
16697 arch/x86/include/asm/unistd_64.h | 4 +
16698 arch/x86/kernel/e820.c | 59 +-
16699 arch/x86/kernel/ptrace.c | 3 +-
16700 arch/x86/kernel/rtc.c | 5 +
16701 arch/x86/kernel/syscall_table_32.S | 2 +
16702 arch/x86/mm/gup.c | 5 +-
16703 arch/x86/mm/highmem_32.c | 2 +
16704 arch/x86/mm/mmap.c | 4 +-
16705 arch/x86/mm/pageattr.c | 2 +-
16706 arch/x86/mm/tlb.c | 16 +-
16707 arch/x86/platform/iris/iris.c | 67 +-
16708 arch/x86/platform/mrst/mrst.c | 1 +
16709 arch/x86/platform/mrst/vrtc.c | 4 +-
16710 block/blk-cgroup.c | 12 +-
16711 drivers/block/cciss.c | 3 +-
16712 drivers/block/cciss_scsi.c | 1 +
16713 drivers/block/loop.c | 47 +-
16714 drivers/char/hpet.c | 56 +-
16715 drivers/edac/mpc85xx_edac.c | 2 +-
16716 drivers/firmware/dmi_scan.c | 6 +-
16717 drivers/gpu/drm/Kconfig | 1 +
16718 drivers/gpu/vga/vgaarb.c | 18 +-
16719 drivers/hwmon/hwmon.c | 32 +-
16720 drivers/hwmon/ibmaem.c | 47 +-
16721 drivers/idle/intel_idle.c | 59 +-
16722 drivers/infiniband/core/umem.c | 6 +-
16723 drivers/infiniband/hw/ipath/ipath_user_pages.c | 6 +-
16724 drivers/infiniband/hw/qib/qib_user_pages.c | 4 +-
16725 drivers/isdn/hisax/callc.c | 4 +-
16726 drivers/isdn/hisax/hisax.h | 4 +-
16727 drivers/isdn/hisax/isdnl1.h | 2 +-
16728 drivers/isdn/hisax/isdnl3.c | 2 +-
16729 drivers/isdn/hisax/st5481_d.c | 4 +-
16730 drivers/leds/Kconfig | 12 +
16731 drivers/leds/Makefile | 1 +
16732 drivers/leds/led-triggers.c | 5 +-
16733 drivers/leds/leds-gpio.c | 2 +-
16734 drivers/leds/leds-lm3530.c | 1 -
16735 drivers/leds/leds-renesas-tpu.c | 357 +++
16736 drivers/message/fusion/mptbase.c | 7 +-
16737 drivers/message/fusion/mptbase.h | 1 +
16738 drivers/misc/fsa9480.c | 3 +-
16739 drivers/misc/lis3lv02d/lis3lv02d.c | 389 ++--
16740 drivers/misc/lis3lv02d/lis3lv02d.h | 9 +-
16741 drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 45 +-
16742 drivers/misc/lis3lv02d/lis3lv02d_spi.c | 2 +-
16743 drivers/net/ethernet/i825xx/3c505.c | 6 +-
16744 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +-
16745 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 -
16746 drivers/net/rionet.c | 4 +-
16747 drivers/net/wireless/ath/ath.h | 5 +-
16748 drivers/net/wireless/ath/ath5k/debug.h | 4 +-
16749 drivers/net/wireless/ath/ath6kl/debug.h | 4 +-
16750 drivers/net/wireless/b43/b43.h | 12 +-
16751 drivers/net/wireless/b43legacy/b43legacy.h | 16 +-
16752 drivers/oprofile/oprofilefs.c | 5 +-
16753 drivers/platform/x86/acerhdf.c | 1 +
16754 drivers/platform/x86/hp_accel.c | 15 +-
16755 drivers/power/ds2780_battery.c | 86 +-
16756 drivers/power/intel_mid_battery.c | 12 +-
16757 drivers/pps/clients/Kconfig | 9 +
16758 drivers/pps/clients/Makefile | 1 +
16759 drivers/pps/clients/pps-gpio.c | 227 ++
16760 drivers/pps/clients/pps-ktimer.c | 12 -
16761 drivers/pps/clients/pps_parport.c | 9 -
16762 drivers/pps/kapi.c | 20 +-
16763 drivers/rapidio/Kconfig | 6 +-
16764 drivers/rapidio/Makefile | 1 +
16765 drivers/rapidio/devices/Kconfig | 10 +
16766 drivers/rapidio/devices/Makefile | 5 +
16767 drivers/rapidio/devices/tsi721.c | 2360 ++++++++++++++++++++
16768 drivers/rapidio/devices/tsi721.h | 766 +++++++
16769 drivers/rapidio/rio-scan.c | 6 +-
16770 drivers/rtc/class.c | 32 +-
16771 drivers/rtc/rtc-ds1307.c | 27 +
16772 drivers/rtc/rtc-mc13xxx.c | 6 +-
16773 drivers/rtc/rtc-mrst.c | 19 +-
16774 drivers/scsi/aacraid/commctrl.c | 1 +
16775 drivers/scsi/megaraid.c | 8 +-
16776 drivers/scsi/mpt2sas/mpt2sas_base.c | 3 +-
16777 drivers/scsi/osd/osd_uld.c | 22 +-
16778 drivers/scsi/sd.c | 32 +-
16779 drivers/scsi/sg.c | 25 +-
16780 drivers/staging/iio/trigger.h | 3 +-
16781 drivers/tty/serial/Kconfig | 9 +
16782 drivers/tty/serial/pch_uart.c | 160 ++-
16783 drivers/video/backlight/adp8870_bl.c | 2 -
16784 drivers/video/backlight/generic_bl.c | 4 +-
16785 drivers/video/backlight/l4f00242t03.c | 70 +-
16786 drivers/w1/slaves/w1_ds2760.c | 48 +-
16787 drivers/w1/slaves/w1_ds2780.c | 96 +-
16788 drivers/w1/slaves/w1_ds2780.h | 2 +
16789 drivers/w1/w1_int.c | 1 +
16792 fs/binfmt_elf.c | 11 +-
16793 fs/block_dev.c | 3 +
16794 fs/btrfs/inode.c | 3 +-
16797 fs/dcache.c | 10 +-
16798 fs/direct-io.c | 690 +++---
16799 fs/ecryptfs/ecryptfs_kernel.h | 2 +-
16800 fs/eventpoll.c | 270 ++-
16802 fs/ext2/ext2.h | 8 +-
16803 fs/ext4/ext4.h | 51 +-
16804 fs/ext4/ialloc.c | 4 +-
16805 fs/ext4/inode.c | 6 +-
16806 fs/fat/fat.h | 9 +-
16807 fs/file_table.c | 23 +-
16808 fs/gfs2/glock.h | 2 +-
16809 fs/hpfs/hpfs_fn.h | 4 +-
16810 fs/internal.h | 3 +-
16811 fs/logfs/logfs.h | 1 -
16812 fs/logfs/super.c | 22 -
16814 fs/namespace.c | 124 +-
16815 fs/nilfs2/nilfs.h | 8 +-
16816 fs/ntfs/debug.h | 15 +-
16817 fs/ocfs2/ocfs2.h | 47 +
16818 fs/ocfs2/quota_local.c | 10 +-
16819 fs/ocfs2/super.h | 14 +-
16820 fs/partitions/ldm.c | 16 +-
16823 fs/proc/base.c | 127 +-
16824 fs/proc/proc_sysctl.c | 46 +
16825 fs/proc/task_mmu.c | 2 +
16826 fs/read_write.c | 8 +-
16827 fs/select.c | 38 +-
16830 fs/udf/udfdecl.h | 4 +-
16831 fs/ufs/ufs.h | 9 +-
16832 fs/xfs/xfs_aops.c | 8 +-
16833 fs/xfs/xfs_message.h | 42 +-
16834 include/asm-generic/bug.h | 11 +-
16835 include/asm-generic/page.h | 4 +-
16836 include/drm/drmP.h | 10 +-
16837 include/linux/aio.h | 1 +
16838 include/linux/audit.h | 11 +-
16839 include/linux/bio.h | 6 +-
16840 include/linux/blktrace_api.h | 2 +-
16841 include/linux/cgroup.h | 30 +-
16842 include/linux/cgroup_subsys.h | 8 +
16843 include/linux/compaction.h | 8 -
16844 include/linux/compat.h | 3 +-
16845 include/linux/debugobjects.h | 6 +
16846 include/linux/device.h | 110 +-
16847 include/linux/dmar.h | 2 +
16848 include/linux/dynamic_debug.h | 85 +-
16849 include/linux/eventpoll.h | 1 +
16850 include/linux/ext3_fs.h | 16 +-
16851 include/linux/fs.h | 16 +-
16852 include/linux/fscache-cache.h | 8 +-
16853 include/linux/gameport.h | 8 +-
16854 include/linux/gfp.h | 1 +
16855 include/linux/hpet.h | 1 +
16856 include/linux/huge_mm.h | 5 +
16857 include/linux/ipc_namespace.h | 40 +-
16858 include/linux/kallsyms.h | 5 +-
16859 include/linux/kdb.h | 9 +-
16860 include/linux/kernel.h | 48 +-
16861 include/linux/kexec.h | 4 +-
16862 include/linux/kmod.h | 4 +-
16863 include/linux/kobject.h | 26 +-
16864 include/linux/kthread.h | 4 +-
16865 include/linux/lglock.h | 152 +--
16866 include/linux/libata.h | 18 +-
16867 include/linux/lis3lv02d.h | 1 -
16868 include/linux/llist.h | 4 +-
16869 include/linux/magic.h | 10 +-
16870 include/linux/memblock.h | 1 +
16871 include/linux/memcontrol.h | 47 +-
16872 include/linux/mm.h | 60 +-
16873 include/linux/mm_types.h | 36 +-
16874 include/linux/mmiotrace.h | 8 +-
16875 include/linux/mmzone.h | 17 +-
16876 include/linux/namei.h | 1 +
16877 include/linux/netdevice.h | 34 +-
16878 include/linux/oom.h | 1 +
16879 include/linux/platform_data/leds-renesas-tpu.h | 14 +
16880 include/linux/poll.h | 7 +-
16881 include/linux/pps-gpio.h | 32 +
16882 include/linux/printk.h | 12 +-
16883 include/linux/quotaops.h | 2 +-
16884 include/linux/res_counter.h | 27 +-
16885 include/linux/rio_ids.h | 1 +
16886 include/linux/security.h | 2 +-
16887 include/linux/seq_file.h | 3 +-
16888 include/linux/shrinker.h | 3 +-
16889 include/linux/spi/l4f00242t03.h | 2 -
16890 include/linux/string.h | 1 +
16891 include/linux/swap.h | 43 +-
16892 include/linux/syscalls.h | 13 +
16893 include/linux/sysctl.h | 22 +
16894 include/linux/trace_seq.h | 8 +-
16895 include/linux/utsname.h | 16 +
16896 include/linux/vmalloc.h | 1 +
16897 include/linux/writeback.h | 2 -
16898 include/net/bluetooth/bluetooth.h | 2 +-
16899 include/net/netfilter/nf_log.h | 3 +-
16900 include/net/sock.h | 4 +-
16901 include/scsi/scsi_netlink.h | 2 +-
16902 include/sound/core.h | 4 +-
16903 include/sound/info.h | 4 +-
16904 include/sound/seq_kernel.h | 4 +-
16905 include/trace/events/vmscan.h | 8 +-
16906 include/xen/hvc-console.h | 4 +-
16907 include/xen/xenbus.h | 12 +-
16908 init/Kconfig | 13 +-
16909 init/do_mounts.c | 48 +-
16910 init/do_mounts_rd.c | 14 +
16911 ipc/mq_sysctl.c | 31 +-
16912 ipc/mqueue.c | 24 +-
16914 kernel/Makefile | 3 +-
16915 kernel/audit.c | 5 +-
16916 kernel/cgroup.c | 93 +-
16917 kernel/cgroup_freezer.c | 9 +-
16918 kernel/cgroup_task_counter.c | 240 ++
16919 kernel/cpuset.c | 15 +-
16920 kernel/events/core.c | 11 +-
16921 kernel/exit.c | 4 +-
16922 kernel/fork.c | 18 +-
16923 kernel/lglock.c | 101 +
16924 kernel/printk.c | 10 +-
16925 kernel/res_counter.c | 97 +-
16926 kernel/sched.c | 6 +-
16927 kernel/stop_machine.c | 22 +
16929 kernel/sys_ni.c | 4 +
16930 kernel/sysctl.c | 11 +-
16931 kernel/timer.c | 54 +-
16932 kernel/utsname_sysctl.c | 23 +
16933 kernel/watchdog.c | 4 +-
16934 lib/Kconfig.debug | 5 +-
16935 lib/bitmap.c | 10 +-
16936 lib/crc32.c | 370 +++-
16937 lib/crc32defs.h | 16 +-
16938 lib/debugobjects.c | 33 +
16939 lib/dynamic_debug.c | 91 +-
16940 lib/gen_crc32table.c | 59 +-
16942 lib/kstrtox.c | 75 +-
16943 lib/kstrtox.h | 8 +
16944 lib/percpu_counter.c | 2 +
16945 lib/radix-tree.c | 10 +-
16946 lib/spinlock_debug.c | 19 +-
16947 lib/string.c | 54 +
16948 lib/vsprintf.c | 33 +-
16951 mm/backing-dev.c | 5 +-
16952 mm/compaction.c | 37 +-
16953 mm/debug-pagealloc.c | 56 +-
16955 mm/highmem.c | 2 +-
16956 mm/huge_memory.c | 87 +-
16957 mm/internal.h | 46 +
16959 mm/memblock.c | 11 +-
16960 mm/memcontrol.c | 1009 +++++-----
16961 mm/memory-failure.c | 12 +-
16962 mm/memory.c | 15 +-
16963 mm/mempolicy.c | 2 +-
16964 mm/migrate.c | 75 +-
16966 mm/mremap.c | 42 +-
16967 mm/oom_kill.c | 47 +-
16968 mm/page-writeback.c | 126 +-
16969 mm/page_alloc.c | 66 +-
16970 mm/page_cgroup.c | 7 +-
16971 mm/process_vm_access.c | 496 ++++
16977 mm/swapfile.c | 2 +-
16979 mm/vmalloc.c | 80 +-
16980 mm/vmscan.c | 360 ++--
16982 net/netfilter/nf_conntrack_netlink.c | 5 +
16983 net/nfc/nfc.h | 2 +-
16984 net/rds/rds.h | 8 +-
16985 net/sunrpc/svc.c | 5 +-
16986 scripts/checkpatch.pl | 6 +-
16987 security/keys/compat.c | 2 +-
16988 security/keys/keyctl.c | 2 +-
16989 security/selinux/selinuxfs.c | 14 +-
16990 sound/firewire/cmp.c | 2 +-
16991 332 files changed, 9925 insertions(+), 3513 deletions(-)
16992 create mode 100644 Documentation/cgroups/task_counter.txt
16993 create mode 100644 Documentation/rapidio/tsi721.txt
16994 create mode 100644 drivers/leds/leds-renesas-tpu.c
16995 create mode 100644 drivers/pps/clients/pps-gpio.c
16996 create mode 100644 drivers/rapidio/devices/Kconfig
16997 create mode 100644 drivers/rapidio/devices/Makefile
16998 create mode 100644 drivers/rapidio/devices/tsi721.c
16999 create mode 100644 drivers/rapidio/devices/tsi721.h
17000 create mode 100644 include/linux/platform_data/leds-renesas-tpu.h
17001 create mode 100644 include/linux/pps-gpio.h
17002 create mode 100644 kernel/cgroup_task_counter.c
17003 create mode 100644 kernel/lglock.c
17004 create mode 100644 lib/kstrtox.h
17005 create mode 100644 mm/process_vm_access.c