2 Tue Aug 9 10:53:26 EST 2011
5 $ git reset --hard stable
6 HEAD is now at 322a8b0 Linux 3.1-rc1
8 $ git merge origin/master
9 Updating 322a8b0..2f84dd7
11 fs/autofs4/autofs_i.h | 24 +++++++-----------------
12 fs/autofs4/waitq.c | 2 +-
13 include/linux/cred.h | 6 +++---
14 3 files changed, 11 insertions(+), 21 deletions(-)
16 $ git merge fixes/fixes
18 Merging kbuild-current/rc-fixes
19 $ git merge kbuild-current/rc-fixes
21 Merging arm-current/master
22 $ git merge arm-current/master
24 Merging m68k-current/for-linus
25 $ git merge m68k-current/for-linus
27 Merging powerpc-merge/merge
28 $ git merge powerpc-merge/merge
29 Auto-merging MAINTAINERS
30 Merge made by recursive.
32 arch/powerpc/include/asm/jump_label.h | 2 -
33 arch/powerpc/include/asm/kdump.h | 10 -------
34 arch/powerpc/include/asm/reg.h | 8 +++--
35 arch/powerpc/kernel/cputable.c | 11 ++++---
36 arch/powerpc/kernel/iomap.c | 2 +
37 arch/powerpc/kernel/machine_kexec.c | 10 +++++--
38 arch/powerpc/kernel/perf_callchain.c | 20 +++++++++++--
39 arch/powerpc/kernel/prom_init.c | 14 +++++----
40 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +-
41 arch/powerpc/platforms/Kconfig | 2 +-
42 arch/powerpc/platforms/pseries/dtl.c | 2 +-
43 arch/powerpc/platforms/pseries/hotplug-cpu.c | 4 +-
44 arch/powerpc/platforms/pseries/io_event_irq.c | 8 ++---
45 arch/powerpc/platforms/pseries/kexec.c | 34 +++++++++++++++--------
46 arch/powerpc/platforms/pseries/lpar.c | 19 ++++++-------
47 arch/powerpc/platforms/pseries/plpar_wrappers.h | 12 ++++----
48 arch/powerpc/platforms/pseries/setup.c | 5 ++-
49 arch/powerpc/sysdev/ppc4xx_pci.c | 5 ++-
50 19 files changed, 99 insertions(+), 77 deletions(-)
51 Merging 52xx-and-virtex-current/powerpc/merge
52 $ git merge 52xx-and-virtex-current/powerpc/merge
54 Merging sparc-current/master
55 $ git merge sparc-current/master
57 Merging scsi-rc-fixes/master
58 $ git merge scsi-rc-fixes/master
60 Merging net-current/master
61 $ git merge net-current/master
62 Merge made by recursive.
63 Documentation/networking/bonding.txt | 29 +++++++++++++++++++++++++++++
64 drivers/net/gianfar_ptp.c | 9 ++-------
65 drivers/net/phy/dp83640.c | 5 ++---
66 drivers/net/slip.c | 2 +-
67 drivers/net/usb/rtl8150.c | 1 -
68 fs/compat_ioctl.c | 1 +
69 include/linux/netlink.h | 2 +-
70 include/linux/socket.h | 6 ++++--
71 include/net/inet_sock.h | 2 +-
72 net/ipv4/ip_output.c | 1 +
73 net/ipv4/ip_sockglue.c | 9 +++++----
74 net/ipv4/netfilter.c | 18 ++++++++----------
75 net/ipv4/raw.c | 3 ++-
76 net/ipv4/route.c | 3 ++-
77 net/netfilter/nf_queue.c | 1 +
78 15 files changed, 60 insertions(+), 32 deletions(-)
79 Merging sound-current/for-linus
80 $ git merge sound-current/for-linus
81 Auto-merging include/sound/wm8996.h
82 Removing sound/soc/codecs/wm8915.c
83 Removing sound/soc/codecs/wm8915.h
84 Merge made by recursive.
85 arch/arm/mach-s3c64xx/mach-crag6410.c | 18 +-
86 include/sound/{wm8915.h => wm8996.h} | 28 +-
87 sound/core/timer.c | 5 +
88 sound/oss/pas2_pcm.c | 8 +-
89 sound/oss/pss.c | 6 +-
90 sound/pci/Kconfig | 10 +-
91 sound/pci/asihpi/hpicmn.c | 5 +-
92 sound/pci/hda/alc269_quirks.c | 7 -
93 sound/pci/hda/patch_realtek.c | 26 +
94 sound/pci/hda/patch_via.c | 2 +-
95 sound/pci/rme9652/hdspm.c | 19 +-
96 sound/soc/codecs/Kconfig | 8 +-
97 sound/soc/codecs/Makefile | 4 +-
98 sound/soc/codecs/sgtl5000.c | 128 +-
99 sound/soc/codecs/wm8915.c | 2995 --------------------------
100 sound/soc/codecs/wm8915.h | 3717 ---------------------------------
101 sound/soc/codecs/wm8996.c | 2994 ++++++++++++++++++++++++++
102 sound/soc/codecs/wm8996.h | 3717 +++++++++++++++++++++++++++++++++
103 sound/soc/codecs/wm_hubs.c | 3 +-
104 sound/soc/samsung/Kconfig | 2 +-
105 sound/soc/samsung/speyside.c | 32 +-
106 sound/usb/caiaq/input.c | 2 +-
107 sound/usb/endpoint.c | 2 +-
108 sound/usb/mixer.c | 25 +-
109 sound/usb/mixer.h | 1 +
110 sound/usb/quirks-table.h | 6 +
111 sound/usb/quirks.c | 2 +-
112 27 files changed, 6876 insertions(+), 6896 deletions(-)
113 rename include/sound/{wm8915.h => wm8996.h} (63%)
114 delete mode 100644 sound/soc/codecs/wm8915.c
115 delete mode 100644 sound/soc/codecs/wm8915.h
116 create mode 100644 sound/soc/codecs/wm8996.c
117 create mode 100644 sound/soc/codecs/wm8996.h
118 Merging pci-current/for-linus
119 $ git merge pci-current/for-linus
120 Merge made by recursive.
121 arch/x86/pci/acpi.c | 9 ++
122 drivers/pci/hotplug/pcihp_slot.c | 45 +----------
123 drivers/pci/pci.c | 67 +++++++++++++++
124 drivers/pci/pci.h | 4 +
125 drivers/pci/probe.c | 146 +++++++++++++++++++++++++++++++++
126 drivers/pci/setup-bus.c | 166 ++++++++++++++++++++++++++-----------
127 drivers/pci/setup-res.c | 152 ++++++++++++++++++++++-------------
128 include/linux/pci.h | 16 ++++-
129 8 files changed, 453 insertions(+), 152 deletions(-)
130 Merging wireless-current/master
131 $ git merge wireless-current/master
133 Merging driver-core.current/driver-core-linus
134 $ git merge driver-core.current/driver-core-linus
135 Merge made by recursive.
136 drivers/base/devtmpfs.c | 2 +-
137 drivers/base/platform.c | 2 +-
138 drivers/firmware/google/gsmi.c | 2 +-
139 3 files changed, 3 insertions(+), 3 deletions(-)
140 Merging tty.current/tty-linus
141 $ git merge tty.current/tty-linus
142 Merge made by recursive.
143 drivers/tty/serial/samsung.c | 8 ++++++--
144 1 files changed, 6 insertions(+), 2 deletions(-)
145 Merging usb.current/usb-linus
146 $ git merge usb.current/usb-linus
147 Merge made by recursive.
148 drivers/usb/class/usbtmc.c | 2 +-
149 drivers/usb/core/config.c | 11 ++--
150 drivers/usb/gadget/Kconfig | 2 +-
151 drivers/usb/gadget/at91_udc.c | 1 +
152 drivers/usb/gadget/composite.c | 6 +-
153 drivers/usb/gadget/f_hid.c | 7 ++
154 drivers/usb/gadget/fusb300_udc.c | 101 --------------------------------
155 drivers/usb/gadget/net2272.c | 2 +-
156 drivers/usb/gadget/s3c2410_udc.c | 1 +
157 drivers/usb/host/ehci-hub.c | 12 ++++
158 drivers/usb/host/ehci-mxc.c | 1 +
159 drivers/usb/host/ehci-omap.c | 16 +++++
160 drivers/usb/host/isp1760-hcd.c | 3 +
161 drivers/usb/host/pci-quirks.c | 4 +-
162 drivers/usb/host/xhci.c | 19 +++++--
163 drivers/usb/musb/Kconfig | 3 -
164 drivers/usb/musb/musb_gadget.c | 5 ++
165 drivers/usb/musb/tusb6010_omap.c | 2 +-
166 drivers/usb/renesas_usbhs/mod_gadget.c | 3 +-
167 drivers/usb/serial/ftdi_sio.c | 7 ++-
168 drivers/usb/serial/option.c | 12 ++++
169 drivers/usb/serial/qcserial.c | 1 +
170 drivers/usb/storage/unusual_devs.h | 10 +++
171 23 files changed, 106 insertions(+), 125 deletions(-)
172 Merging staging.current/staging-linus
173 $ git merge staging.current/staging-linus
174 Auto-merging drivers/staging/zcache/zcache-main.c
175 Merge made by recursive.
176 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 2 +-
177 drivers/staging/dt3155v4l/dt3155v4l.c | 1 +
178 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 1 +
179 drivers/staging/gma500/gem_glue.c | 23 +----
180 drivers/staging/gma500/gem_glue.h | 2 -
181 drivers/staging/hv/blkvsc_drv.c | 4 +-
182 drivers/staging/iio/accel/adis16203_core.c | 8 +-
183 drivers/staging/iio/accel/adis16204_core.c | 8 +-
184 drivers/staging/iio/accel/adis16209_core.c | 8 +-
185 drivers/staging/iio/accel/adis16240_core.c | 8 +-
186 drivers/staging/iio/gyro/adis16260_core.c | 8 +-
187 drivers/staging/nvec/TODO | 6 +-
188 drivers/staging/rtl8192u/r819xU_firmware.c | 9 +-
189 drivers/staging/rts_pstor/rtsx.c | 109 ++++++++------------
190 drivers/staging/rts_pstor/rtsx.h | 9 ++-
191 drivers/staging/solo6x10/core.c | 1 +
192 drivers/staging/solo6x10/enc.c | 1 +
193 drivers/staging/solo6x10/g723.c | 1 +
194 drivers/staging/solo6x10/p2m.c | 1 +
195 drivers/staging/solo6x10/solo6x10.h | 1 +
196 drivers/staging/speakup/devsynth.c | 5 +-
197 drivers/staging/zcache/Makefile | 2 +-
198 drivers/staging/zcache/{zcache.c => zcache-main.c} | 13 ++-
199 23 files changed, 112 insertions(+), 119 deletions(-)
200 rename drivers/staging/zcache/{zcache.c => zcache-main.c} (99%)
201 Merging cpufreq-current/fixes
202 $ git merge cpufreq-current/fixes
204 Merging input-current/for-linus
205 $ git merge input-current/for-linus
206 Auto-merging drivers/input/joystick/analog.c
207 Merge made by recursive.
208 drivers/input/joystick/analog.c | 2 +-
209 1 files changed, 1 insertions(+), 1 deletions(-)
210 Merging md-current/for-linus
211 $ git merge md-current/for-linus
213 Merging audit-current/for-linus
214 $ git merge audit-current/for-linus
216 Merging crypto-current/master
217 $ git merge crypto-current/master
219 Merging ide-curent/master
220 $ git merge ide-curent/master
223 $ git merge dwmw2/master
225 Merging sh-current/sh-fixes-for-linus
226 $ git merge sh-current/sh-fixes-for-linus
227 Merge made by recursive.
228 arch/sh/include/asm/ptrace.h | 2 +-
229 arch/sh/kernel/idle.c | 2 +-
230 drivers/clocksource/sh_cmt.c | 34 +++++++++++++++++++-
231 drivers/sh/intc/chip.c | 3 ++
232 drivers/tty/serial/sh-sci.c | 69 +++++++++++++++++++++++++++++++++++------
233 5 files changed, 96 insertions(+), 14 deletions(-)
234 Merging rmobile-current/rmobile-fixes-for-linus
235 $ git merge rmobile-current/rmobile-fixes-for-linus
236 Merge made by recursive.
237 arch/arm/boot/compressed/mmcif-sh7372.c | 2 +-
238 arch/arm/boot/compressed/sdhi-sh7372.c | 2 +-
239 arch/arm/mach-shmobile/board-ag5evm.c | 3 ++-
240 arch/arm/mach-shmobile/board-mackerel.c | 4 ++++
241 arch/arm/mach-shmobile/clock-sh7372.c | 8 ++++----
242 arch/arm/mach-shmobile/setup-sh7372.c | 30 +++++++++++++++---------------
243 6 files changed, 27 insertions(+), 22 deletions(-)
244 Merging fbdev-current/fbdev-fixes-for-linus
245 $ git merge fbdev-current/fbdev-fixes-for-linus
246 Auto-merging drivers/video/msm/mdp.c
247 Auto-merging drivers/video/udlfb.c
248 Merge made by recursive.
249 drivers/video/carminefb.c | 6 +++---
250 drivers/video/msm/mdp.c | 4 +++-
251 drivers/video/s3c2410fb.c | 1 -
252 drivers/video/udlfb.c | 21 +++++++++++++++------
253 4 files changed, 21 insertions(+), 11 deletions(-)
254 Merging devicetree-current/devicetree/merge
255 $ git merge devicetree-current/devicetree/merge
257 Merging spi-current/spi/merge
258 $ git merge spi-current/spi/merge
261 $ git merge arm/for-next
262 Merge made by recursive.
263 arch/arm/include/asm/pgalloc.h | 2 +-
264 arch/arm/include/asm/pgtable.h | 23 +++++++++-------
265 arch/arm/include/asm/tlb.h | 1 +
266 arch/arm/kernel/module.c | 4 +++
267 arch/arm/mm/alignment.c | 56 +++++++++++++++++++++++++++++----------
268 arch/arm/mm/init.c | 2 +-
269 arch/arm/mm/proc-arm946.S | 3 +-
270 drivers/dma/amba-pl08x.c | 1 +
271 8 files changed, 64 insertions(+), 28 deletions(-)
272 Merging arm-lpae/for-next
273 $ git merge arm-lpae/for-next
274 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
275 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
276 Resolved 'arch/arm/include/asm/proc-fns.h' using previous resolution.
277 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
278 Resolved 'arch/arm/mm/context.c' using previous resolution.
279 Resolved 'arch/arm/mm/proc-v7.S' using previous resolution.
280 Auto-merging arch/arm/Kconfig
281 Auto-merging arch/arm/boot/compressed/head.S
282 Auto-merging arch/arm/include/asm/assembler.h
283 Auto-merging arch/arm/include/asm/memory.h
284 Auto-merging arch/arm/include/asm/pgalloc.h
285 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
286 Auto-merging arch/arm/include/asm/pgtable.h
287 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
288 Auto-merging arch/arm/include/asm/proc-fns.h
289 CONFLICT (content): Merge conflict in arch/arm/include/asm/proc-fns.h
290 Auto-merging arch/arm/include/asm/setup.h
291 Auto-merging arch/arm/include/asm/tlb.h
292 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
293 Auto-merging arch/arm/include/asm/tlbflush.h
294 Auto-merging arch/arm/kernel/head.S
295 Auto-merging arch/arm/kernel/module.c
296 Auto-merging arch/arm/kernel/setup.c
297 Auto-merging arch/arm/kernel/sleep.S
298 Auto-merging arch/arm/mm/Kconfig
299 Auto-merging arch/arm/mm/alignment.c
300 Auto-merging arch/arm/mm/context.c
301 CONFLICT (content): Merge conflict in arch/arm/mm/context.c
302 Auto-merging arch/arm/mm/dma-mapping.c
303 Auto-merging arch/arm/mm/fault.c
304 Auto-merging arch/arm/mm/mm.h
305 Auto-merging arch/arm/mm/mmu.c
306 Auto-merging arch/arm/mm/proc-macros.S
307 Auto-merging arch/arm/mm/proc-v7.S
308 CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S
309 Automatic merge failed; fix conflicts and then commit the result.
311 [master bc70b40] Merge remote-tracking branch 'arm-lpae/for-next'
312 $ git diff -M --stat --summary HEAD^..
313 arch/arm/Kconfig | 2 +-
314 arch/arm/boot/compressed/head.S | 1 +
315 arch/arm/include/asm/assembler.h | 11 +
316 arch/arm/include/asm/memory.h | 4 +-
317 arch/arm/include/asm/page.h | 44 +---
318 arch/arm/include/asm/pgalloc.h | 28 ++-
319 arch/arm/include/asm/pgtable-2level-hwdef.h | 93 ++++++
320 arch/arm/include/asm/pgtable-2level-types.h | 69 +++++
321 arch/arm/include/asm/pgtable-2level.h | 143 +++++++++
322 arch/arm/include/asm/pgtable-3level-hwdef.h | 82 ++++++
323 arch/arm/include/asm/pgtable-3level-types.h | 71 +++++
324 arch/arm/include/asm/pgtable-3level.h | 107 +++++++
325 arch/arm/include/asm/pgtable-hwdef.h | 81 +-----
326 arch/arm/include/asm/pgtable.h | 211 +++++---------
327 arch/arm/include/asm/proc-fns.h | 21 ++
328 arch/arm/include/asm/setup.h | 8 +
329 arch/arm/include/asm/tlb.h | 11 +-
330 arch/arm/include/asm/tlbflush.h | 4 +-
331 arch/arm/include/asm/types.h | 11 +-
332 arch/arm/kernel/head.S | 119 ++++++---
333 arch/arm/kernel/module.c | 2 +-
334 arch/arm/kernel/setup.c | 10 +
335 arch/arm/kernel/sleep.S | 2 +
336 arch/arm/mm/Kconfig | 13 +
337 arch/arm/mm/Makefile | 4 +
338 arch/arm/mm/alignment.c | 8 +-
339 arch/arm/mm/context.c | 19 +-
340 arch/arm/mm/dma-mapping.c | 6 +-
341 arch/arm/mm/fault.c | 87 ++++++
342 arch/arm/mm/idmap.c | 36 +++-
343 arch/arm/mm/ioremap.c | 17 +-
344 arch/arm/mm/mm.h | 4 +-
345 arch/arm/mm/mmu.c | 51 +++-
346 arch/arm/mm/pgd.c | 51 +++-
347 arch/arm/mm/proc-macros.S | 5 +-
348 arch/arm/mm/proc-v7.S | 10 +-
349 arch/arm/mm/proc-v7lpae.S | 422 +++++++++++++++++++++++++++
350 37 files changed, 1521 insertions(+), 347 deletions(-)
351 create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
352 create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
353 create mode 100644 arch/arm/include/asm/pgtable-2level.h
354 create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
355 create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
356 create mode 100644 arch/arm/include/asm/pgtable-3level.h
357 create mode 100644 arch/arm/mm/proc-v7lpae.S
358 Merging arm-soc/for-next
359 $ git merge arm-soc/for-next
360 Resolved 'arch/arm/mach-exynos4/pm.c' using previous resolution.
361 Resolved 'arch/arm/mach-imx/mm-imx25.c' using previous resolution.
362 Resolved 'arch/arm/mach-imx/mm-imx31.c' using previous resolution.
363 Resolved 'arch/arm/mach-imx/mm-imx35.c' using previous resolution.
364 Resolved 'arch/arm/mach-mx5/mm.c' using previous resolution.
365 Resolved 'arch/arm/mach-omap2/cm-regbits-44xx.h' using previous resolution.
366 Auto-merging arch/arm/mach-exynos4/pm.c
367 CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/pm.c
368 Auto-merging arch/arm/mach-imx/mm-imx25.c
369 CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx25.c
370 Auto-merging arch/arm/mach-imx/mm-imx31.c
371 CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx31.c
372 Auto-merging arch/arm/mach-imx/mm-imx35.c
373 CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx35.c
374 Auto-merging arch/arm/mach-mx5/mm.c
375 CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
376 Auto-merging arch/arm/mach-omap2/cm-regbits-44xx.h
377 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/cm-regbits-44xx.h
378 Automatic merge failed; fix conflicts and then commit the result.
380 [master b3bc857] Merge remote-tracking branch 'arm-soc/for-next'
381 $ git diff -M --stat --summary HEAD^..
382 Merging at91/at91-next
383 $ git merge at91/at91-next
385 Merging davinci/davinci-next
386 $ git merge davinci/davinci-next
388 Merging i.MX/for-next
389 $ git merge i.MX/for-next
391 Merging linux-spec/for-next
392 $ git merge linux-spec/for-next
395 $ git merge msm/for-next
396 Resolved 'arch/arm/mach-msm/io.c' using previous resolution.
397 Auto-merging arch/arm/mach-msm/Makefile
398 Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
399 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
400 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
401 Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
402 Auto-merging arch/arm/mach-msm/io.c
403 CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
404 Automatic merge failed; fix conflicts and then commit the result.
406 [master e968f03] Merge remote-tracking branch 'msm/for-next'
407 $ git diff -M --stat --summary HEAD^..
408 arch/arm/mach-msm/Makefile | 5 +-
409 arch/arm/mach-msm/acpuclock-arm11.c | 2 +-
410 arch/arm/mach-msm/board-halibut.c | 1 +
411 arch/arm/mach-msm/board-mahimahi.c | 1 +
412 arch/arm/mach-msm/board-msm7x30.c | 1 +
413 arch/arm/mach-msm/board-msm8960.c | 18 +
414 arch/arm/mach-msm/board-msm8x60.c | 9 +-
415 arch/arm/mach-msm/board-qsd8x50.c | 1 +
416 arch/arm/mach-msm/board-trout.c | 1 +
417 arch/arm/mach-msm/clock-dummy.c | 81 +++++
418 arch/arm/mach-msm/clock.h | 11 +
419 arch/arm/mach-msm/devices-msm7x00.c | 21 ++-
420 arch/arm/mach-msm/devices-msm7x30.c | 21 ++-
421 arch/arm/mach-msm/devices-msm8960.c | 181 +++++++++++
422 arch/arm/mach-msm/devices-msm8x60.c | 56 ++++
423 arch/arm/mach-msm/devices-qsd8x50.c | 21 ++-
424 arch/arm/mach-msm/devices.h | 8 +
425 arch/arm/mach-msm/dma.c | 391 ++++++++++++++++++-----
426 arch/arm/mach-msm/include/mach/dma.h | 84 +++---
427 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 5 +-
428 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 5 +-
429 arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 3 +
430 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 5 +-
431 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 6 +
432 arch/arm/mach-msm/io.c | 3 -
433 25 files changed, 808 insertions(+), 133 deletions(-)
434 create mode 100644 arch/arm/mach-msm/clock-dummy.c
435 create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
436 Merging omap/for-next
437 $ git merge omap/for-next
440 $ git merge pxa/for-next
442 Merging samsung/next-samsung
443 $ git merge samsung/next-samsung
446 $ git merge s5p/for-next
447 Resolved 'arch/arm/mach-exynos4/Kconfig' using previous resolution.
448 Resolved 'arch/arm/mach-exynos4/mach-smdkc210.c' using previous resolution.
449 Auto-merging arch/arm/mach-exynos4/Kconfig
450 CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig
451 Auto-merging arch/arm/mach-exynos4/Makefile
452 Auto-merging arch/arm/mach-exynos4/mach-smdkc210.c
453 CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-smdkc210.c
454 Automatic merge failed; fix conflicts and then commit the result.
456 [master 7166e1d] Merge remote-tracking branch 's5p/for-next'
457 $ git diff -M --stat --summary HEAD^..
458 arch/arm/configs/exynos4_defconfig | 1 +
459 arch/arm/mach-exynos4/Kconfig | 10 +++
460 arch/arm/mach-exynos4/Makefile | 1 +
461 arch/arm/mach-exynos4/mach-origen.c | 108 +++++++++++++++++++++++++++++++++++
462 4 files changed, 120 insertions(+), 0 deletions(-)
463 create mode 100644 arch/arm/mach-exynos4/mach-origen.c
464 Merging tegra/for-next
465 $ git merge tegra/for-next
467 Merging ux500-core/ux500-core
468 $ git merge ux500-core/ux500-core
469 Merge made by recursive.
470 Merging xilinx/arm-next
471 $ git merge xilinx/arm-next
473 Merging blackfin/for-linus
474 $ git merge blackfin/for-linus
475 Merge made by recursive.
476 arch/blackfin/include/asm/uaccess.h | 6 +++---
477 arch/blackfin/mach-bf533/boards/H8606.c | 3 ++-
478 2 files changed, 5 insertions(+), 4 deletions(-)
479 Merging cris/for-next
480 $ git merge cris/for-next
481 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
482 Auto-merging drivers/net/cris/eth_v10.c
483 Merge made by recursive.
484 Documentation/cris/README | 62 +++++++++++++++---------------
485 arch/cris/arch-v32/drivers/cryptocop.c | 6 +--
486 arch/cris/arch-v32/kernel/ptrace.c | 2 -
487 arch/cris/include/arch-v32/arch/cache.h | 2 +-
488 drivers/net/cris/eth_v10.c | 1 -
489 5 files changed, 34 insertions(+), 39 deletions(-)
491 $ git merge ia64/test
493 Merging m68k/for-next
494 $ git merge m68k/for-next
496 Merging m68knommu/for-next
497 $ git merge m68knommu/for-next
498 Merge made by recursive.
499 Merging microblaze/next
500 $ git merge microblaze/next
502 Merging mips/mips-for-linux-next
503 $ git merge mips/mips-for-linux-next
504 Removing arch/mips/nxp/pnx8550/common/pci.c
505 Removing arch/mips/nxp/pnx8550/common/setup.c
506 Merge made by recursive.
507 arch/mips/Kconfig | 1 +
508 arch/mips/Makefile | 2 +
509 arch/mips/alchemy/common/platform.c | 2 +-
510 arch/mips/alchemy/common/power.c | 22 ++-
511 arch/mips/ar7/irq.c | 3 +-
512 arch/mips/bcm63xx/irq.c | 1 +
513 arch/mips/cobalt/irq.c | 1 +
514 arch/mips/dec/setup.c | 4 +
515 arch/mips/emma/markeins/irq.c | 2 +-
516 arch/mips/include/asm/cacheflush.h | 24 ++++
517 arch/mips/include/asm/io.h | 12 +--
518 .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 -
519 arch/mips/include/asm/mipsprom.h | 6 +-
520 arch/mips/include/asm/prom.h | 6 +-
521 arch/mips/kernel/ftrace.c | 39 +++---
522 arch/mips/kernel/scall32-o32.S | 2 +-
523 arch/mips/kernel/signal.c | 3 +
524 arch/mips/kernel/traps.c | 6 +-
525 arch/mips/lantiq/irq.c | 6 +-
526 arch/mips/lasat/interrupt.c | 1 +
527 arch/mips/loongson/fuloong-2e/irq.c | 1 +
528 arch/mips/loongson/lemote-2f/irq.c | 3 +-
529 arch/mips/mm/c-octeon.c | 6 +
530 arch/mips/mm/c-r3k.c | 7 +
531 arch/mips/mm/c-r4k.c | 35 +++++
532 arch/mips/mm/c-tx39.c | 7 +
533 arch/mips/mm/cache.c | 5 +
534 arch/mips/mm/tlbex.c | 3 +-
535 arch/mips/mti-malta/malta-int.c | 6 +-
536 arch/mips/netlogic/Platform | 5 +
537 arch/mips/netlogic/xlr/setup.c | 4 +-
538 arch/mips/netlogic/xlr/smp.c | 2 +-
539 arch/mips/netlogic/xlr/smpboot.S | 16 ++-
540 arch/mips/nxp/pnx8550/common/pci.c | 134 ------------------
541 arch/mips/nxp/pnx8550/common/setup.c | 143 --------------------
542 arch/mips/pci/pci-lantiq.c | 9 +-
543 arch/mips/pci/pci-rc32434.c | 2 +-
544 arch/mips/pmc-sierra/msp71xx/msp_irq.c | 6 +-
545 arch/mips/pmc-sierra/msp71xx/msp_setup.c | 1 +
546 arch/mips/pmc-sierra/yosemite/py-console.c | 12 +--
547 arch/mips/pnx8550/common/int.c | 2 +-
548 arch/mips/pnx8550/common/prom.c | 2 +-
549 arch/mips/sgi-ip22/ip22-int.c | 10 +-
550 arch/mips/sgi-ip27/ip27-irq.c | 4 +-
551 arch/mips/sni/rm200.c | 1 +
552 arch/mips/vr41xx/common/irq.c | 1 +
553 drivers/mtd/maps/lantiq-flash.c | 4 +-
554 47 files changed, 204 insertions(+), 371 deletions(-)
555 delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c
556 delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c
557 Merging openrisc/for-upstream
558 $ git merge openrisc/for-upstream
560 Merging parisc/for-next
561 $ git merge parisc/for-next
564 $ git merge powerpc/next
569 Merging 52xx-and-virtex/powerpc/next
570 $ git merge 52xx-and-virtex/powerpc/next
571 Merge made by recursive.
572 arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++
573 arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++-
574 arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
575 3 files changed, 249 insertions(+), 8 deletions(-)
576 create mode 100644 arch/powerpc/boot/dts/charon.dts
578 $ git merge galak/next
580 Merging s390/features
581 $ git merge s390/features
582 Merge made by recursive.
583 drivers/s390/cio/ccwreq.c | 23 ++++++++++++++++++++---
584 1 files changed, 20 insertions(+), 3 deletions(-)
586 $ git merge sh/sh-latest
587 Merge made by recursive.
588 arch/sh/boards/mach-ecovec24/setup.c | 4 ++++
589 1 files changed, 4 insertions(+), 0 deletions(-)
590 Merging rmobile/rmobile-latest
591 $ git merge rmobile/rmobile-latest
594 $ git merge sparc/master
597 $ git merge tile/master
599 Merging unicore32/unicore32
600 $ git merge unicore32/unicore32
601 Merge made by recursive.
602 arch/unicore32/include/asm/bitops.h | 12 ++++++------
603 arch/unicore32/kernel/ksyms.c | 4 ++--
604 arch/unicore32/lib/findbit.S | 14 ++++++++------
605 3 files changed, 16 insertions(+), 14 deletions(-)
606 Merging xtensa/master
607 $ git merge xtensa/master
609 Merging ceph/for-next
610 $ git merge ceph/for-next
611 Resolved 'fs/ceph/export.c' using previous resolution.
612 Auto-merging fs/ceph/export.c
613 CONFLICT (content): Merge conflict in fs/ceph/export.c
614 Automatic merge failed; fix conflicts and then commit the result.
616 [master b7fcc60] Merge remote-tracking branch 'ceph/for-next'
617 $ git diff -M --stat --summary HEAD^..
619 $ git merge cifs/master
621 Merge made by recursive.
622 Merging configfs/linux-next
623 $ git merge configfs/linux-next
625 Merging ecryptfs/next
626 $ git merge ecryptfs/next
628 Merging ext3/for_next
629 $ git merge ext3/for_next
635 $ git merge fatfs/master
637 Merging fuse/for-next
638 $ git merge fuse/for-next
639 Auto-merging fs/fuse/file.c
640 Auto-merging fs/fuse/fuse_i.h
641 Auto-merging fs/fuse/inode.c
642 Merge made by recursive.
643 fs/fuse/file.c | 84 ++++++++------------------------------------------
644 fs/fuse/fuse_i.h | 8 ++++-
645 fs/fuse/inode.c | 10 +++++-
646 include/linux/fuse.h | 9 +++++-
647 4 files changed, 36 insertions(+), 75 deletions(-)
649 $ git merge gfs2/master
650 Merge made by recursive.
651 fs/gfs2/dir.c | 32 +++++++++-----------------------
652 fs/gfs2/file.c | 36 ++++++++++++++++++++++++++----------
653 fs/gfs2/glops.c | 29 ++++++++++++++++++++++-------
654 fs/gfs2/incore.h | 1 +
655 fs/gfs2/inode.c | 6 ++++--
656 fs/gfs2/super.c | 28 +++++++++++++++++-----------
657 6 files changed, 79 insertions(+), 53 deletions(-)
658 Merging hfsplus/for-next
659 $ git merge hfsplus/for-next
663 Merge made by recursive.
664 fs/jfs/jfs_umount.c | 4 ++--
665 1 files changed, 2 insertions(+), 2 deletions(-)
667 $ git merge logfs/master
668 Auto-merging fs/logfs/logfs.h
669 Merge made by recursive.
670 fs/logfs/dev_mtd.c | 26 ++++++++++++--------------
671 fs/logfs/logfs.h | 1 +
672 fs/logfs/readwrite.c | 4 ++++
673 fs/logfs/segment.c | 14 ++++++++++----
674 fs/logfs/super.c | 1 +
675 5 files changed, 28 insertions(+), 18 deletions(-)
676 Merging nfs/linux-next
677 $ git merge nfs/linux-next
678 Merge made by recursive.
679 fs/nfs/blocklayout/blocklayout.c | 1 +
680 fs/nfs/callback.h | 2 +-
681 fs/nfs/callback_proc.c | 25 +++++++++++++++++++------
682 fs/nfs/callback_xdr.c | 24 +++++++-----------------
683 fs/nfs/objlayout/objio_osd.c | 28 ++++++++++++----------------
684 fs/nfs/objlayout/pnfs_osd_xdr_cli.c | 3 +++
685 6 files changed, 43 insertions(+), 40 deletions(-)
686 Merging nfsd/nfsd-next
687 $ git merge nfsd/nfsd-next
689 Merging nilfs2/for-next
690 $ git merge nilfs2/for-next
692 Merging ocfs2/linux-next
693 $ git merge ocfs2/linux-next
694 Auto-merging fs/ocfs2/move_extents.c
695 Auto-merging fs/ocfs2/super.c
696 Merge made by recursive.
697 fs/ocfs2/dlmglue.c | 21 +++++++++++++++------
698 fs/ocfs2/ioctl.c | 8 ++++----
699 fs/ocfs2/move_extents.c | 2 +-
700 fs/ocfs2/ocfs2.h | 4 ++--
701 fs/ocfs2/super.c | 3 ++-
702 5 files changed, 24 insertions(+), 14 deletions(-)
703 Merging omfs/for-next
704 $ git merge omfs/for-next
706 Merging squashfs/master
707 $ git merge squashfs/master
710 $ git merge udf/for_next
712 Merging v9fs/for-next
713 $ git merge v9fs/for-next
714 Merge made by recursive.
716 fs/9p/v9fs_vfs.h | 6 ++-
717 fs/9p/vfs_file.c | 2 +-
718 fs/9p/vfs_inode.c | 111 ++++++++++++++++++++++++++++-------------------
719 fs/9p/vfs_inode_dotl.c | 80 +++++++++++++++++++++++++++++------
720 fs/9p/vfs_super.c | 2 +-
721 include/net/9p/9p.h | 29 ++++++++++---
722 net/9p/Kconfig | 5 --
724 net/9p/protocol.c | 7 ---
725 10 files changed, 162 insertions(+), 84 deletions(-)
726 Merging ubifs/linux-next
727 $ git merge ubifs/linux-next
730 $ git merge xfs/master
731 Merge made by recursive.
732 fs/xfs/linux-2.6/xfs_buf.c | 15 +++++++--------
733 fs/xfs/linux-2.6/xfs_buf.h | 32 +++++++++++---------------------
734 fs/xfs/linux-2.6/xfs_sync.c | 2 +-
735 fs/xfs/quota/xfs_dquot.c | 16 ++++++----------
736 fs/xfs/quota/xfs_qm.c | 2 +-
737 fs/xfs/xfs_ag.h | 6 +++---
738 fs/xfs/xfs_alloc.c | 7 +++----
739 fs/xfs/xfs_attr.c | 3 +--
740 fs/xfs/xfs_bmap.c | 3 +--
741 fs/xfs/xfs_btree.c | 17 ++++++-----------
742 fs/xfs/xfs_btree.h | 2 +-
743 fs/xfs/xfs_buf_item.c | 23 ++++++++++-------------
744 fs/xfs/xfs_da_btree.c | 12 ++++++------
745 fs/xfs/xfs_dinode.h | 2 +-
746 fs/xfs/xfs_ialloc.c | 5 ++---
747 fs/xfs/xfs_inode.c | 4 ++--
748 fs/xfs/xfs_log.c | 14 +++++---------
749 fs/xfs/xfs_log_recover.c | 32 +++++++++++++-------------------
750 fs/xfs/xfs_mount.c | 4 ++--
751 fs/xfs/xfs_rtalloc.c | 32 ++++++++++++++++----------------
752 fs/xfs/xfs_rtalloc.h | 2 +-
753 fs/xfs/xfs_rw.c | 8 ++++----
754 fs/xfs/xfs_sb.h | 2 +-
755 fs/xfs/xfs_trans_buf.c | 28 +++++++++-------------------
756 fs/xfs/xfs_vnodeops.c | 10 +++++-----
757 25 files changed, 118 insertions(+), 165 deletions(-)
759 $ git merge vfs/for-next
761 Merging vfs-scale/vfs-scale-working
762 $ git merge vfs-scale/vfs-scale-working
764 Merging pci/linux-next
765 $ git merge pci/linux-next
768 $ git merge hid/for-next
769 Merge made by recursive.
770 .../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 7 +
771 drivers/hid/Kconfig | 17 +-
772 drivers/hid/Makefile | 2 +-
773 drivers/hid/hid-axff.c | 36 ++-
774 drivers/hid/hid-ids.h | 1 +
775 drivers/hid/hid-lg.c | 29 +-
776 drivers/hid/hid-lg.h | 4 +-
777 drivers/hid/hid-lg4ff.c | 403 ++++++++++++++++++--
778 drivers/hid/hid-lgff.c | 13 -
779 drivers/hid/hid-prodikeys.c | 8 +-
780 drivers/hid/hid-zydacron.c | 4 +-
781 11 files changed, 452 insertions(+), 72 deletions(-)
782 create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
784 $ git merge quilt/i2c
786 Merging bjdooks-i2c/next-i2c
787 $ git merge bjdooks-i2c/next-i2c
789 Merging quilt/jdelvare-hwmon
790 $ git merge quilt/jdelvare-hwmon
792 Merging hwmon-staging/hwmon-next
793 $ git merge hwmon-staging/hwmon-next
794 Merge made by recursive.
795 drivers/hwmon/pmbus/lm25066.c | 12 ++++++++++++
796 drivers/hwmon/pmbus/pmbus.h | 1 +
797 drivers/hwmon/pmbus/pmbus_core.c | 20 +++++++++++++++++++-
798 3 files changed, 32 insertions(+), 1 deletions(-)
799 Merging quilt/kernel-doc
800 $ git merge quilt/kernel-doc
801 Auto-merging Documentation/kernel-parameters.txt
802 Merge made by recursive.
803 Documentation/00-INDEX | 2 +
804 Documentation/SubmittingPatches | 2 +-
805 Documentation/email-clients.txt | 12 ++---
806 Documentation/kernel-docs.txt | 11 -----
807 Documentation/kernel-parameters.txt | 52 +++++++++++++++---------
808 Documentation/ramoops.txt | 76 +++++++++++++++++++++++++++++++++++
809 6 files changed, 116 insertions(+), 39 deletions(-)
810 create mode 100644 Documentation/ramoops.txt
811 Merging docs/docs-move
812 $ git merge docs/docs-move
813 Merge made by recursive.
814 Documentation/PCI/MSI-HOWTO.txt | 89 +++++++++++++++++++--------------------
815 1 files changed, 44 insertions(+), 45 deletions(-)
816 Merging v4l-dvb/master
817 $ git merge v4l-dvb/master
819 Merging kbuild/for-next
820 $ git merge kbuild/for-next
821 Merge made by recursive.
822 scripts/kconfig/menu.c | 13 +++++--------
823 scripts/kconfig/nconf.c | 2 --
824 2 files changed, 5 insertions(+), 10 deletions(-)
825 Merging kconfig/for-next
826 $ git merge kconfig/for-next
828 Merge made by recursive.
830 $ git merge ide/master
833 $ git merge libata/NEXT
835 Merging infiniband/for-next
836 $ git merge infiniband/for-next
839 $ git merge acpi/test
841 Merging idle-test/idle-test
842 $ git merge idle-test/idle-test
844 Merging powertools/tools-test
845 $ git merge powertools/tools-test
847 Merging cpupowerutils/master
848 $ git merge cpupowerutils/master
850 Merging ieee1394/for-next
851 $ git merge ieee1394/for-next
853 Merging ubi/linux-next
854 $ git merge ubi/linux-next
859 Merging swiotlb/master
860 $ git merge swiotlb/master
861 Merge made by recursive.
863 $ git merge ibft/master
864 Merge made by recursive.
866 $ git merge scsi/master
868 Merging iscsi-target/for-next
869 $ git merge iscsi-target/for-next
871 Merging slave-dma/next
872 $ git merge slave-dma/next
873 Merge made by recursive.
874 drivers/dma/dmatest.c | 6 ++++++
875 include/linux/dmaengine.h | 11 +++++++++++
876 2 files changed, 17 insertions(+), 0 deletions(-)
877 Merging async_tx/next
878 $ git merge async_tx/next
881 $ git merge net/master
882 Removing drivers/net/bna/bfi_ctreg.h
883 Merge made by recursive.
884 Documentation/devicetree/bindings/net/smsc911x.txt | 38 ++
885 drivers/net/benet/be.h | 123 ++--
886 drivers/net/benet/be_cmds.c | 160 ++----
887 drivers/net/benet/be_cmds.h | 91 +---
888 drivers/net/benet/be_ethtool.c | 154 ++---
889 drivers/net/benet/be_hw.h | 21 +-
890 drivers/net/benet/be_main.c | 481 +++++++--------
891 drivers/net/bna/bfa_ioc.c | 2 +-
892 drivers/net/bna/bfa_ioc_ct.c | 118 ++--
893 drivers/net/bna/bfi_ctreg.h | 646 --------------------
894 drivers/net/bna/bfi_reg.h | 452 ++++++++++++++
895 drivers/net/bna/bna_hw.h | 6 +-
896 drivers/net/bna/bnad_ethtool.c | 319 ----------
897 drivers/net/ipg.c | 197 +++---
898 drivers/net/netxen/netxen_nic.h | 6 +
899 drivers/net/netxen/netxen_nic_init.c | 8 +-
900 drivers/net/netxen/netxen_nic_main.c | 103 +++-
901 drivers/net/qla3xxx.c | 2 +-
902 drivers/net/qlcnic/qlcnic.h | 6 +-
903 drivers/net/qlcnic/qlcnic_ethtool.c | 22 +-
904 drivers/net/qlcnic/qlcnic_hw.c | 4 +-
905 drivers/net/qlcnic/qlcnic_init.c | 3 +-
906 drivers/net/qlcnic/qlcnic_main.c | 40 +-
907 drivers/net/slip.c | 29 +-
908 drivers/net/slip.h | 9 -
909 drivers/net/smsc911x.c | 85 +++-
910 drivers/net/ucc_geth.c | 10 +-
911 drivers/net/usb/lg-vl600.c | 19 +
912 drivers/net/via-velocity.c | 146 +++--
913 include/net/addrconf.h | 2 +-
914 include/net/if_inet6.h | 1 +
915 net/802/garp.c | 4 +-
917 net/8021q/vlan.c | 2 +-
918 net/bridge/netfilter/ebtable_broute.c | 4 +-
919 net/caif/cfmuxl.c | 6 +-
920 net/can/af_can.c | 4 +-
921 net/core/dev.c | 4 +-
922 net/core/fib_rules.c | 2 +-
923 net/core/filter.c | 2 +-
924 net/core/net-sysfs.c | 4 +-
925 net/core/netpoll.c | 4 +-
926 net/core/sock.c | 4 +-
927 net/dccp/ccids/ccid2.c | 84 ++-
928 net/dccp/ccids/ccid2.h | 6 +
929 net/dccp/dccp.h | 1 +
930 net/dccp/feat.c | 202 ++++++-
931 net/dccp/feat.h | 1 +
932 net/dccp/proto.c | 1 -
933 net/decnet/dn_dev.c | 6 +-
934 net/ipv4/devinet.c | 6 +-
935 net/ipv4/fib_trie.c | 12 +-
936 net/ipv4/gre.c | 4 +-
937 net/ipv4/igmp.c | 10 +-
938 net/ipv4/ipip.c | 10 +-
939 net/ipv4/ipmr.c | 4 +-
940 net/ipv4/netfilter/nf_nat_amanda.c | 4 +-
941 net/ipv4/netfilter/nf_nat_core.c | 24 +-
942 net/ipv4/netfilter/nf_nat_ftp.c | 4 +-
943 net/ipv4/netfilter/nf_nat_h323.c | 36 +-
944 net/ipv4/netfilter/nf_nat_irc.c | 4 +-
945 net/ipv4/netfilter/nf_nat_pptp.c | 16 +-
946 net/ipv4/netfilter/nf_nat_sip.c | 28 +-
947 net/ipv4/netfilter/nf_nat_snmp_basic.c | 4 +-
948 net/ipv4/netfilter/nf_nat_standalone.c | 6 +-
949 net/ipv4/netfilter/nf_nat_tftp.c | 4 +-
950 net/ipv6/addrconf.c | 73 ++-
951 net/ipv6/exthdrs.c | 7 +-
952 net/ipv6/icmp.c | 25 +-
953 net/ipv6/inet6_connection_sock.c | 9 +-
954 net/ipv6/ip6_tunnel.c | 37 +-
955 net/ipv6/ndisc.c | 31 +-
956 net/ipv6/raw.c | 4 +-
957 net/ipv6/sit.c | 12 +-
958 net/mac80211/agg-rx.c | 4 +-
959 net/mac80211/cfg.c | 8 +-
960 net/mac80211/ibss.c | 6 +-
961 net/mac80211/iface.c | 2 +-
962 net/mac80211/sta_info.c | 8 +-
963 net/netfilter/core.c | 4 +-
964 net/netfilter/nf_conntrack_core.c | 12 +-
965 net/netfilter/nf_conntrack_ecache.c | 8 +-
966 net/netfilter/nf_conntrack_extend.c | 4 +-
967 net/netfilter/nf_conntrack_helper.c | 6 +-
968 net/netfilter/nf_conntrack_netlink.c | 6 +-
969 net/netfilter/nf_log.c | 10 +-
970 net/netfilter/nf_queue.c | 6 +-
971 net/netfilter/nfnetlink.c | 6 +-
972 net/netlabel/netlabel_domainhash.c | 6 +-
973 net/netlabel/netlabel_unlabeled.c | 6 +-
974 net/phonet/af_phonet.c | 4 +-
975 net/phonet/pn_dev.c | 6 +-
976 net/phonet/socket.c | 6 +-
978 net/sunrpc/auth_gss/auth_gss.c | 4 +-
979 net/xfrm/xfrm_user.c | 4 +-
980 96 files changed, 2009 insertions(+), 2143 deletions(-)
981 create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
982 delete mode 100644 drivers/net/bna/bfi_ctreg.h
983 create mode 100644 drivers/net/bna/bfi_reg.h
984 Merging wireless/master
985 $ git merge wireless/master
986 Auto-merging arch/mips/Kconfig
987 Auto-merging net/mac80211/cfg.c
988 Merge made by recursive.
989 arch/mips/Kconfig | 8 +-
990 arch/mips/bcm47xx/Kconfig | 31 ++
991 arch/mips/bcm47xx/Makefile | 3 +-
992 arch/mips/bcm47xx/gpio.c | 82 ++++--
993 arch/mips/bcm47xx/irq.c | 12 +
994 arch/mips/bcm47xx/nvram.c | 29 ++-
995 arch/mips/bcm47xx/serial.c | 46 +++-
996 arch/mips/bcm47xx/setup.c | 90 +++++-
997 arch/mips/bcm47xx/time.c | 16 +-
998 arch/mips/bcm47xx/wgt634u.c | 14 +-
999 arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 26 ++-
1000 arch/mips/include/asm/mach-bcm47xx/gpio.h | 108 ++++++-
1001 arch/mips/pci/pci-bcm47xx.c | 6 +
1002 drivers/bcma/Kconfig | 13 +
1003 drivers/bcma/Makefile | 2 +
1004 drivers/bcma/bcma_private.h | 16 +
1005 drivers/bcma/core.c | 2 +
1006 drivers/bcma/driver_chipcommon.c | 53 ++++
1007 drivers/bcma/driver_chipcommon_pmu.c | 133 ++++++++
1008 drivers/bcma/driver_mips.c | 256 ++++++++++++++++
1009 drivers/bcma/driver_pci.c | 14 +-
1010 drivers/bcma/host_soc.c | 183 +++++++++++
1011 drivers/bcma/main.c | 70 +++++-
1012 drivers/bcma/scan.c | 348 +++++++++++++++-------
1013 drivers/net/wireless/ath/ath5k/ahb.c | 4 +-
1014 drivers/net/wireless/ath/ath5k/ani.c | 1 -
1015 drivers/net/wireless/ath/ath5k/ani.h | 4 +
1016 drivers/net/wireless/ath/ath5k/ath5k.h | 98 +------
1017 drivers/net/wireless/ath/ath5k/attach.c | 18 +-
1018 drivers/net/wireless/ath/ath5k/base.c | 31 +--
1019 drivers/net/wireless/ath/ath5k/base.h | 55 +++-
1020 drivers/net/wireless/ath/ath5k/caps.c | 2 +-
1021 drivers/net/wireless/ath/ath5k/debug.c | 15 +-
1022 drivers/net/wireless/ath/ath5k/desc.c | 1 -
1023 drivers/net/wireless/ath/ath5k/dma.c | 1 -
1024 drivers/net/wireless/ath/ath5k/eeprom.c | 10 +-
1025 drivers/net/wireless/ath/ath5k/gpio.c | 1 -
1026 drivers/net/wireless/ath/ath5k/initvals.c | 1 -
1027 drivers/net/wireless/ath/ath5k/led.c | 1 -
1028 drivers/net/wireless/ath/ath5k/mac80211-ops.c | 5 +-
1029 drivers/net/wireless/ath/ath5k/pci.c | 4 +-
1030 drivers/net/wireless/ath/ath5k/pcu.c | 5 +-
1031 drivers/net/wireless/ath/ath5k/phy.c | 91 +++---
1032 drivers/net/wireless/ath/ath5k/qcu.c | 10 +-
1033 drivers/net/wireless/ath/ath5k/reset.c | 79 ++---
1034 drivers/net/wireless/ath/ath5k/rfkill.c | 2 +-
1035 drivers/net/wireless/ath/ath5k/sysfs.c | 1 -
1036 drivers/net/wireless/ath/ath5k/trace.h | 3 +-
1037 drivers/net/wireless/ath/ath9k/ahb.c | 2 +-
1038 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 20 +--
1039 drivers/net/wireless/ath/ath9k/ath9k.h | 2 +-
1040 drivers/net/wireless/ath/ath9k/calib.c | 15 +
1041 drivers/net/wireless/ath/ath9k/calib.h | 1 +
1042 drivers/net/wireless/ath/ath9k/eeprom_4k.c | 18 +-
1043 drivers/net/wireless/ath/ath9k/eeprom_9287.c | 16 +-
1044 drivers/net/wireless/ath/ath9k/eeprom_def.c | 19 +-
1045 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 -
1046 drivers/net/wireless/ath/ath9k/hw.c | 10 +-
1047 drivers/net/wireless/ath/ath9k/hw.h | 2 +-
1048 drivers/net/wireless/ath/ath9k/init.c | 7 +-
1049 drivers/net/wireless/ath/ath9k/main.c | 2 +-
1050 drivers/net/wireless/ath/ath9k/pci.c | 4 +-
1051 drivers/net/wireless/ath/ath9k/recv.c | 4 +-
1052 drivers/net/wireless/ath/regd.h | 2 +-
1053 drivers/net/wireless/ath/regd_common.h | 2 +-
1054 drivers/net/wireless/b43/main.c | 1 -
1055 drivers/net/wireless/b43legacy/b43legacy.h | 1 -
1056 drivers/net/wireless/b43legacy/dma.c | 374 +++++------------------
1057 drivers/net/wireless/b43legacy/dma.h | 107 -------
1058 drivers/net/wireless/b43legacy/main.c | 4 +-
1059 drivers/net/wireless/ipw2x00/ipw2200.c | 1 +
1060 drivers/net/wireless/iwlegacy/iwl-3945-led.c | 1 -
1061 drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 1 -
1062 drivers/net/wireless/iwlegacy/iwl-3945.c | 1 -
1063 drivers/net/wireless/iwlegacy/iwl-4965-led.c | 1 -
1064 drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 1 -
1065 drivers/net/wireless/iwlegacy/iwl-4965.c | 1 -
1066 drivers/net/wireless/iwlegacy/iwl-led.c | 1 -
1067 drivers/net/wireless/iwlegacy/iwl3945-base.c | 1 -
1068 drivers/net/wireless/iwlegacy/iwl4965-base.c | 1 -
1069 drivers/net/wireless/iwlwifi/Kconfig | 17 -
1070 drivers/net/wireless/iwlwifi/iwl-1000.c | 16 +-
1071 drivers/net/wireless/iwlwifi/iwl-2000.c | 24 +-
1072 drivers/net/wireless/iwlwifi/iwl-5000.c | 13 +-
1073 drivers/net/wireless/iwlwifi/iwl-6000.c | 20 +-
1074 drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 69 +++--
1075 drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +-
1076 drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 47 +--
1077 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 1 -
1078 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 23 +--
1079 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 30 +--
1080 drivers/net/wireless/iwlwifi/iwl-agn.c | 388 +++++++++++-------------
1081 drivers/net/wireless/iwlwifi/iwl-agn.h | 1 +
1082 drivers/net/wireless/iwlwifi/iwl-commands.h | 34 ++-
1083 drivers/net/wireless/iwlwifi/iwl-core.c | 5 +
1084 drivers/net/wireless/iwlwifi/iwl-core.h | 5 +
1085 drivers/net/wireless/iwlwifi/iwl-dev.h | 29 ++-
1086 drivers/net/wireless/iwlwifi/iwl-led.c | 1 -
1087 drivers/net/wireless/iwlwifi/iwl-scan.c | 19 +-
1088 drivers/net/wireless/iwlwifi/iwl-trans.c | 10 +-
1089 drivers/net/wireless/libertas/cfg.c | 36 ++-
1090 drivers/net/wireless/libertas/dev.h | 12 +-
1091 drivers/net/wireless/libertas/ethtool.c | 1 +
1092 drivers/net/wireless/libertas/if_usb.c | 11 +-
1093 drivers/net/wireless/libertas/main.c | 14 +-
1094 drivers/net/wireless/libertas/mesh.c | 68 +++--
1095 drivers/net/wireless/libertas/mesh.h | 27 +-
1096 drivers/net/wireless/libertas/rx.c | 1 +
1097 drivers/net/wireless/libertas/tx.c | 1 +
1098 drivers/net/wireless/mwifiex/cfg80211.c | 2 +-
1099 drivers/net/wireless/mwifiex/init.c | 4 +-
1100 drivers/net/wireless/mwifiex/ioctl.h | 5 +-
1101 drivers/net/wireless/mwifiex/main.h | 6 +-
1102 drivers/net/wireless/mwifiex/scan.c | 6 +-
1103 drivers/net/wireless/mwifiex/sta_event.c | 6 +-
1104 drivers/net/wireless/mwifiex/sta_ioctl.c | 30 +--
1105 drivers/net/wireless/orinoco/wext.c | 1 +
1106 drivers/net/wireless/rndis_wlan.c | 2 -
1107 drivers/net/wireless/wl1251/cmd.h | 2 +-
1108 drivers/net/wireless/wl1251/wl12xx_80211.h | 2 +-
1109 drivers/net/wireless/wl12xx/cmd.h | 4 +-
1110 drivers/net/wireless/wl12xx/main.c | 2 +-
1111 drivers/net/wireless/wl12xx/scan.h | 6 +-
1112 drivers/net/wireless/wl12xx/wl12xx.h | 4 +-
1113 drivers/net/wireless/wl12xx/wl12xx_80211.h | 2 +-
1114 drivers/watchdog/bcm47xx_wdt.c | 27 ++-
1115 include/linux/bcma/bcma.h | 9 +-
1116 include/linux/bcma/bcma_driver_chipcommon.h | 67 ++++
1117 include/linux/bcma/bcma_driver_mips.h | 51 +++
1118 include/linux/bcma/bcma_soc.h | 16 +
1119 include/net/cfg80211-wext.h | 55 ++++
1120 include/net/cfg80211.h | 112 -------
1121 include/net/mac80211.h | 11 -
1122 net/mac80211/agg-tx.c | 18 +-
1123 net/mac80211/cfg.c | 39 ---
1124 net/mac80211/driver-ops.h | 31 --
1125 net/mac80211/ieee80211_i.h | 1 -
1126 net/mac80211/main.c | 1 +
1127 net/mac80211/mesh_hwmp.c | 6 +-
1128 net/mac80211/status.c | 3 -
1129 net/wireless/scan.c | 1 +
1130 net/wireless/wext-compat.c | 137 ++++-----
1131 net/wireless/wext-compat.h | 8 +
1132 net/wireless/wext-sme.c | 3 +-
1133 144 files changed, 2504 insertions(+), 1731 deletions(-)
1134 create mode 100644 arch/mips/bcm47xx/Kconfig
1135 create mode 100644 drivers/bcma/driver_mips.c
1136 create mode 100644 drivers/bcma/host_soc.c
1137 create mode 100644 include/linux/bcma/bcma_driver_mips.h
1138 create mode 100644 include/linux/bcma/bcma_soc.h
1139 create mode 100644 include/net/cfg80211-wext.h
1140 Merging bluetooth/master
1141 $ git merge bluetooth/master
1142 Auto-merging net/bluetooth/hci_core.c
1143 Auto-merging net/bluetooth/l2cap_core.c
1144 Merge made by recursive.
1145 drivers/bluetooth/ath3k.c | 1 +
1146 drivers/bluetooth/btusb.c | 4 +-
1147 include/net/bluetooth/l2cap.h | 3 +-
1148 net/bluetooth/af_bluetooth.c | 36 +++++-
1149 net/bluetooth/bnep/core.c | 11 ++-
1150 net/bluetooth/cmtp/core.c | 11 ++-
1151 net/bluetooth/hci_conn.c | 14 +-
1152 net/bluetooth/hci_core.c | 6 +-
1153 net/bluetooth/hidp/core.c | 10 ++-
1154 net/bluetooth/l2cap_core.c | 263 ++++++++++++++---------------------------
1155 net/bluetooth/l2cap_sock.c | 30 +++---
1156 net/bluetooth/rfcomm/core.c | 22 ++--
1157 net/bluetooth/rfcomm/sock.c | 28 ++--
1158 net/bluetooth/sco.c | 28 ++--
1159 14 files changed, 214 insertions(+), 253 deletions(-)
1161 $ git merge mtd/master
1163 Merging l2-mtd/master
1164 $ git merge l2-mtd/master
1165 Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution.
1166 Resolved 'drivers/mtd/maps/pxa2xx-flash.c' using previous resolution.
1167 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
1168 Auto-merging arch/arm/mach-at91/board-cam60.c
1169 Auto-merging arch/arm/mach-at91/board-cap9adk.c
1170 Auto-merging arch/arm/mach-at91/board-kb9202.c
1171 Auto-merging arch/arm/mach-at91/board-neocore926.c
1172 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
1173 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
1174 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
1175 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
1176 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
1177 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
1178 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
1179 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
1180 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
1181 Auto-merging arch/arm/mach-at91/board-snapper9260.c
1182 Auto-merging arch/arm/mach-at91/board-usb-a9260.c
1183 Auto-merging arch/arm/mach-at91/board-usb-a9263.c
1184 Auto-merging arch/arm/mach-at91/board-yl-9200.c
1185 Auto-merging arch/arm/mach-davinci/board-da830-evm.c
1186 Auto-merging arch/arm/mach-davinci/board-da850-evm.c
1187 Auto-merging arch/arm/mach-davinci/board-dm355-evm.c
1188 Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c
1189 Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
1190 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
1191 Auto-merging arch/arm/mach-davinci/board-mityomapl138.c
1192 Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c
1193 Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c
1194 Auto-merging arch/arm/mach-pxa/cm-x300.c
1195 Auto-merging arch/arm/mach-pxa/littleton.c
1196 Auto-merging arch/arm/mach-pxa/raumfeld.c
1197 Auto-merging arch/arm/mach-pxa/zylonite.c
1198 Auto-merging drivers/mtd/devices/sst25l.c
1199 Auto-merging drivers/mtd/maps/bfin-async-flash.c
1200 Removing drivers/mtd/maps/ceiva.c
1201 Removing drivers/mtd/maps/edb7312.c
1202 Auto-merging drivers/mtd/maps/ixp2000.c
1203 Auto-merging drivers/mtd/maps/lantiq-flash.c
1204 CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
1205 Auto-merging drivers/mtd/maps/pxa2xx-flash.c
1206 CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c
1207 Auto-merging drivers/mtd/mtdchar.c
1208 Auto-merging drivers/mtd/nand/atmel_nand.c
1209 Auto-merging drivers/mtd/nand/bcm_umi_nand.c
1210 Removing drivers/mtd/nand/edb7312.c
1211 Auto-merging drivers/mtd/nand/fsl_elbc_nand.c
1212 Auto-merging drivers/mtd/nand/mpc5121_nfc.c
1213 Automatic merge failed; fix conflicts and then commit the result.
1215 [master 229eaa8] Merge remote-tracking branch 'l2-mtd/master'
1216 $ git diff -M --stat --summary HEAD^..
1217 Documentation/DocBook/mtdnand.tmpl | 5 +-
1218 .../devicetree/bindings/mtd/atmel-dataflash.txt | 14 +
1219 arch/arm/mach-at91/board-afeb-9260v1.c | 9 +-
1220 arch/arm/mach-at91/board-cam60.c | 9 +-
1221 arch/arm/mach-at91/board-cap9adk.c | 9 +-
1222 arch/arm/mach-at91/board-kb9202.c | 9 +-
1223 arch/arm/mach-at91/board-neocore926.c | 9 +-
1224 arch/arm/mach-at91/board-qil-a9260.c | 9 +-
1225 arch/arm/mach-at91/board-rm9200dk.c | 9 +-
1226 arch/arm/mach-at91/board-sam9-l9260.c | 9 +-
1227 arch/arm/mach-at91/board-sam9260ek.c | 9 +-
1228 arch/arm/mach-at91/board-sam9261ek.c | 9 +-
1229 arch/arm/mach-at91/board-sam9263ek.c | 9 +-
1230 arch/arm/mach-at91/board-sam9g20ek.c | 9 +-
1231 arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +-
1232 arch/arm/mach-at91/board-sam9rlek.c | 9 +-
1233 arch/arm/mach-at91/board-snapper9260.c | 10 +-
1234 arch/arm/mach-at91/board-usb-a9260.c | 9 +-
1235 arch/arm/mach-at91/board-usb-a9263.c | 9 +-
1236 arch/arm/mach-at91/board-yl-9200.c | 9 +-
1237 arch/arm/mach-at91/include/mach/board.h | 3 +-
1238 arch/arm/mach-davinci/board-da830-evm.c | 2 +-
1239 arch/arm/mach-davinci/board-da850-evm.c | 2 +-
1240 arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
1241 arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
1242 arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
1243 arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
1244 arch/arm/mach-davinci/board-mityomapl138.c | 3 +-
1245 arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
1246 arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +-
1247 arch/arm/mach-davinci/include/mach/nand.h | 4 +-
1248 arch/arm/mach-ep93xx/ts72xx.c | 23 +-
1249 arch/arm/mach-mmp/aspenite.c | 5 +-
1250 arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
1251 arch/arm/mach-pxa/cm-x300.c | 5 +-
1252 arch/arm/mach-pxa/colibri-pxa3xx.c | 5 +-
1253 arch/arm/mach-pxa/littleton.c | 5 +-
1254 arch/arm/mach-pxa/mxm8x10.c | 9 +-
1255 arch/arm/mach-pxa/raumfeld.c | 5 +-
1256 arch/arm/mach-pxa/zylonite.c | 5 +-
1257 arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 20 +-
1258 arch/avr32/boards/atngw100/setup.c | 8 +-
1259 arch/avr32/boards/atstk1000/atstk1002.c | 9 +-
1260 arch/avr32/mach-at32ap/include/mach/board.h | 3 +-
1261 arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +-
1262 arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +-
1263 drivers/mtd/Kconfig | 16 +-
1264 drivers/mtd/Makefile | 2 +-
1265 drivers/mtd/afs.c | 4 +-
1266 drivers/mtd/ar7part.c | 2 +-
1267 drivers/mtd/chips/cfi_cmdset_0002.c | 31 +-
1268 drivers/mtd/chips/fwh_lock.h | 3 +-
1269 drivers/mtd/chips/jedec_probe.c | 34 +-
1270 drivers/mtd/cmdlinepart.c | 7 +-
1271 drivers/mtd/devices/doc2000.c | 13 +-
1272 drivers/mtd/devices/doc2001.c | 7 +-
1273 drivers/mtd/devices/doc2001plus.c | 7 +-
1274 drivers/mtd/devices/docecc.c | 2 +-
1275 drivers/mtd/devices/lart.c | 18 +-
1276 drivers/mtd/devices/m25p80.c | 84 +--
1277 drivers/mtd/devices/mtd_dataflash.c | 91 +-
1278 drivers/mtd/devices/sst25l.c | 42 +-
1279 drivers/mtd/ftl.c | 40 +-
1280 drivers/mtd/inftlcore.c | 59 +-
1281 drivers/mtd/inftlmount.c | 116 +--
1282 drivers/mtd/maps/Kconfig | 22 -
1283 drivers/mtd/maps/Makefile | 2 -
1284 drivers/mtd/maps/bfin-async-flash.c | 16 +-
1285 drivers/mtd/maps/ceiva.c | 341 -------
1286 drivers/mtd/maps/dc21285.c | 9 +-
1287 drivers/mtd/maps/edb7312.c | 134 ---
1288 drivers/mtd/maps/gpio-addr-flash.c | 16 +-
1289 drivers/mtd/maps/h720x-flash.c | 23 +-
1290 drivers/mtd/maps/impa7.c | 28 +-
1291 drivers/mtd/maps/intel_vr_nor.c | 7 +-
1292 drivers/mtd/maps/ixp2000.c | 11 +-
1293 drivers/mtd/maps/ixp4xx.c | 29 +-
1294 drivers/mtd/maps/lantiq-flash.c | 17 +-
1295 drivers/mtd/maps/latch-addr-flash.c | 24 +-
1296 drivers/mtd/maps/pcmciamtd.c | 124 +--
1297 drivers/mtd/maps/physmap.c | 38 +-
1298 drivers/mtd/maps/physmap_of.c | 80 +--
1299 drivers/mtd/maps/plat-ram.c | 23 +-
1300 drivers/mtd/maps/pxa2xx-flash.c | 22 +-
1301 drivers/mtd/maps/rbtx4939-flash.c | 24 +-
1302 drivers/mtd/maps/sa1100-flash.c | 30 +-
1303 drivers/mtd/maps/solutionengine.c | 30 +-
1304 drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +-
1305 drivers/mtd/mtdblock.c | 18 +-
1306 drivers/mtd/mtdchar.c | 37 +-
1307 drivers/mtd/mtdconcat.c | 2 +-
1308 drivers/mtd/mtdcore.c | 69 +-
1309 drivers/mtd/mtdcore.h | 3 +
1310 drivers/mtd/mtdpart.c | 52 +-
1311 drivers/mtd/mtdsuper.c | 20 +-
1312 drivers/mtd/mtdswap.c | 5 +-
1313 drivers/mtd/nand/Kconfig | 14 +-
1314 drivers/mtd/nand/Makefile | 1 -
1315 drivers/mtd/nand/atmel_nand.c | 74 +--
1316 drivers/mtd/nand/au1550nd.c | 29 +-
1317 drivers/mtd/nand/autcpu12.c | 4 +-
1318 drivers/mtd/nand/bcm_umi_nand.c | 24 +-
1319 drivers/mtd/nand/cafe_nand.c | 18 +-
1320 drivers/mtd/nand/cmx270_nand.c | 23 +-
1321 drivers/mtd/nand/cs553x_nand.c | 15 +-
1322 drivers/mtd/nand/davinci_nand.c | 39 +-
1323 drivers/mtd/nand/denali.c | 6 +-
1324 drivers/mtd/nand/diskonchip.c | 6 +-
1325 drivers/mtd/nand/edb7312.c | 203 ----
1326 drivers/mtd/nand/fsl_elbc_nand.c | 56 +-
1327 drivers/mtd/nand/fsl_upm.c | 16 +-
1328 drivers/mtd/nand/fsmc_nand.c | 77 +--
1329 drivers/mtd/nand/h1910.c | 19 +-
1330 drivers/mtd/nand/jz4740_nand.c | 18 +-
1331 drivers/mtd/nand/mpc5121_nfc.c | 22 +-
1332 drivers/mtd/nand/mxc_nand.c | 33 +-
1333 drivers/mtd/nand/nand_base.c | 996 ++++++++++----------
1334 drivers/mtd/nand/nand_bbt.c | 516 +++++------
1335 drivers/mtd/nand/nand_bch.c | 4 +-
1336 drivers/mtd/nand/nand_ecc.c | 10 +-
1337 drivers/mtd/nand/nandsim.c | 4 +-
1338 drivers/mtd/nand/ndfc.c | 22 +-
1339 drivers/mtd/nand/nomadik_nand.c | 1 +
1340 drivers/mtd/nand/nuc900_nand.c | 1 +
1341 drivers/mtd/nand/omap2.c | 22 +-
1342 drivers/mtd/nand/orion_nand.c | 16 +-
1343 drivers/mtd/nand/pasemi_nand.c | 3 +-
1344 drivers/mtd/nand/plat_nand.c | 24 +-
1345 drivers/mtd/nand/ppchameleonevb.c | 47 +-
1346 drivers/mtd/nand/pxa3xx_nand.c | 471 ++++++----
1347 drivers/mtd/nand/rtc_from4.c | 5 +-
1348 drivers/mtd/nand/s3c2410.c | 27 +-
1349 drivers/mtd/nand/sharpsl.c | 13 +-
1350 drivers/mtd/nand/socrates_nand.c | 28 +-
1351 drivers/mtd/nand/tmio_nand.c | 17 +-
1352 drivers/mtd/nand/txx9ndfmc.c | 8 +-
1353 drivers/mtd/nftlcore.c | 27 +-
1354 drivers/mtd/nftlmount.c | 26 +-
1355 drivers/mtd/ofpart.c | 112 +++-
1356 drivers/mtd/onenand/generic.c | 14 +-
1357 drivers/mtd/onenand/omap2.c | 16 +-
1358 drivers/mtd/onenand/onenand_base.c | 62 +-
1359 drivers/mtd/onenand/onenand_bbt.c | 6 +-
1360 drivers/mtd/onenand/samsung.c | 13 +-
1361 drivers/mtd/redboot.c | 13 +-
1362 drivers/mtd/sm_ftl.c | 18 +-
1363 drivers/mtd/ssfdc.c | 44 +-
1364 drivers/mtd/tests/mtd_readtest.c | 3 +-
1365 fs/jffs2/scan.c | 4 +-
1366 fs/jffs2/wbuf.c | 3 +-
1367 include/linux/mtd/bbm.h | 39 +-
1368 include/linux/mtd/mtd.h | 38 +-
1369 include/linux/mtd/nand.h | 76 +-
1370 include/linux/mtd/onenand.h | 4 +
1371 include/linux/mtd/partitions.h | 46 +-
1372 include/linux/mtd/physmap.h | 17 -
1373 156 files changed, 2072 insertions(+), 3624 deletions(-)
1374 create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
1375 delete mode 100644 drivers/mtd/maps/ceiva.c
1376 delete mode 100644 drivers/mtd/maps/edb7312.c
1377 delete mode 100644 drivers/mtd/nand/edb7312.c
1378 Merging crypto/master
1379 $ git merge crypto/master
1381 Merging sound/for-next
1382 $ git merge sound/for-next
1384 Merge made by recursive.
1385 Merging sound-asoc/for-next
1386 $ git merge sound-asoc/for-next
1387 Merge made by recursive.
1388 .../bindings/sound/soc/codecs/fsl-sgtl5000.txt | 11 +
1389 Documentation/devicetree/bindings/sound/wm8731.txt | 18 +
1390 arch/mips/alchemy/devboards/db1200/platform.c | 16 +
1391 arch/mips/alchemy/devboards/db1x00/platform.c | 48 ++
1392 include/linux/mfd/wm8994/registers.h | 1 +
1393 include/sound/soc-dapm.h | 2 +
1394 include/sound/soc.h | 9 +
1395 sound/mips/Kconfig | 5 +-
1396 sound/soc/Kconfig | 3 +
1397 sound/soc/Makefile | 1 +
1398 sound/soc/au1x/Kconfig | 28 +
1399 sound/soc/au1x/Makefile | 10 +
1400 sound/soc/au1x/ac97c.c | 365 +++++++++++
1401 sound/soc/au1x/db1000.c | 75 +++
1402 sound/soc/au1x/db1200.c | 64 ++-
1403 sound/soc/au1x/dbdma2.c | 91 +---
1404 sound/soc/au1x/dma.c | 377 +++++++++++
1405 sound/soc/au1x/i2sc.c | 347 ++++++++++
1406 sound/soc/au1x/psc-ac97.c | 48 +-
1407 sound/soc/au1x/psc-i2s.c | 42 +-
1408 sound/soc/au1x/psc.h | 16 +-
1409 sound/soc/codecs/sgtl5000.c | 8 +
1410 sound/soc/codecs/wm1250-ev1.c | 20 +-
1411 sound/soc/codecs/wm8523.c | 2 +-
1412 sound/soc/codecs/wm8580.c | 2 +-
1413 sound/soc/codecs/wm8731.c | 10 +
1414 sound/soc/codecs/wm8993.c | 3 +-
1415 sound/soc/codecs/wm8994.c | 6 +-
1416 sound/soc/codecs/wm_hubs.c | 32 +-
1417 sound/soc/codecs/wm_hubs.h | 3 +-
1418 sound/soc/mxs/Kconfig | 20 +
1419 sound/soc/mxs/Makefile | 10 +
1420 sound/soc/mxs/mxs-pcm.c | 359 +++++++++++
1421 sound/soc/mxs/mxs-pcm.h | 43 ++
1422 sound/soc/mxs/mxs-saif.c | 677 ++++++++++++++++++++
1423 sound/soc/mxs/mxs-saif.h | 130 ++++
1424 sound/soc/mxs/mxs-sgtl5000.c | 165 +++++
1425 sound/soc/soc-core.c | 4 +-
1426 sound/soc/soc-dapm.c | 6 +-
1427 sound/soc/soc-io.c | 321 ++--------
1428 40 files changed, 2953 insertions(+), 445 deletions(-)
1429 create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
1430 create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
1431 create mode 100644 sound/soc/au1x/ac97c.c
1432 create mode 100644 sound/soc/au1x/db1000.c
1433 create mode 100644 sound/soc/au1x/dma.c
1434 create mode 100644 sound/soc/au1x/i2sc.c
1435 create mode 100644 sound/soc/mxs/Kconfig
1436 create mode 100644 sound/soc/mxs/Makefile
1437 create mode 100644 sound/soc/mxs/mxs-pcm.c
1438 create mode 100644 sound/soc/mxs/mxs-pcm.h
1439 create mode 100644 sound/soc/mxs/mxs-saif.c
1440 create mode 100644 sound/soc/mxs/mxs-saif.h
1441 create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
1442 Merging cpufreq/next
1443 $ git merge cpufreq/next
1446 $ git merge quilt/rr
1447 Merge made by recursive.
1448 Documentation/virtual/00-INDEX | 3 +
1449 Documentation/virtual/lguest/lguest.c | 3 +
1450 Documentation/virtual/virtio-spec.txt | 2200 +++++++++++++++++++++++++++++++++
1451 arch/x86/lguest/boot.c | 10 +
1452 drivers/lguest/core.c | 2 +-
1453 5 files changed, 2217 insertions(+), 1 deletions(-)
1454 create mode 100644 Documentation/virtual/virtio-spec.txt
1456 $ git merge input/next
1457 Auto-merging drivers/input/misc/Kconfig
1458 Auto-merging drivers/input/misc/Makefile
1459 Merge made by recursive.
1460 drivers/input/misc/Kconfig | 34 +++--
1461 drivers/input/misc/Makefile | 3 +-
1462 drivers/input/misc/pm8xxx-vibrator.c | 296 ++++++++++++++++++++++++++++++++++
1463 3 files changed, 321 insertions(+), 12 deletions(-)
1464 create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
1465 Merging input-mt/next
1466 $ git merge input-mt/next
1468 Merging lsm/for-next
1469 $ git merge lsm/for-next
1471 Merging block/for-next
1472 $ git merge block/for-next
1473 Auto-merging Documentation/kernel-parameters.txt
1474 Merge made by recursive.
1475 Documentation/kernel-parameters.txt | 9 +-
1476 block/Kconfig | 10 ++
1477 block/Makefile | 1 +
1478 block/blk-softirq.c | 8 +-
1479 block/blk-throttle.c | 4 +-
1480 block/bsg-lib.c | 298 +++++++++++++++++++++++++++++++++++
1481 block/cfq-iosched.c | 3 +
1482 block/genhd.c | 8 +-
1483 drivers/block/Kconfig | 15 ++
1484 drivers/block/drbd/drbd_nl.c | 4 +-
1485 drivers/block/loop.c | 297 ++++++++++++++++++++++++-----------
1486 drivers/block/swim3.c | 1 +
1487 drivers/cdrom/cdrom.c | 8 +-
1488 include/linux/blkdev.h | 4 +
1489 include/linux/bsg-lib.h | 73 +++++++++
1490 include/linux/loop.h | 5 +-
1491 include/linux/miscdevice.h | 1 +
1492 17 files changed, 640 insertions(+), 109 deletions(-)
1493 create mode 100644 block/bsg-lib.c
1494 create mode 100644 include/linux/bsg-lib.h
1495 Merging quilt/device-mapper
1496 $ git merge quilt/device-mapper
1497 Merge made by recursive.
1498 Documentation/device-mapper/persistent-data.txt | 84 +
1499 Documentation/device-mapper/thin-provisioning.txt | 275 +++
1500 drivers/md/Kconfig | 9 +
1501 drivers/md/Makefile | 3 +
1502 drivers/md/dm-flakey.c | 4 +-
1503 drivers/md/dm-kcopyd.c | 31 +-
1504 drivers/md/dm-table.c | 65 +-
1505 drivers/md/dm-thin-metadata.c | 1404 ++++++++++++
1506 drivers/md/dm-thin-metadata.h | 168 ++
1507 drivers/md/dm-thin.c | 2277 ++++++++++++++++++++
1508 drivers/md/dm.c | 11 +
1509 drivers/md/persistent-data/Kconfig | 7 +
1510 drivers/md/persistent-data/Makefile | 9 +
1511 drivers/md/persistent-data/dm-block-manager.c | 998 +++++++++
1512 drivers/md/persistent-data/dm-block-manager.h | 134 ++
1513 drivers/md/persistent-data/dm-btree-internal.h | 133 ++
1514 drivers/md/persistent-data/dm-btree-remove.c | 571 +++++
1515 drivers/md/persistent-data/dm-btree-spine.c | 222 ++
1516 drivers/md/persistent-data/dm-btree.c | 860 ++++++++
1517 drivers/md/persistent-data/dm-btree.h | 158 ++
1518 .../persistent-data/dm-persistent-data-internal.h | 20 +
1519 drivers/md/persistent-data/dm-space-map-common.h | 94 +
1520 drivers/md/persistent-data/dm-space-map-disk.c | 663 ++++++
1521 drivers/md/persistent-data/dm-space-map-disk.h | 25 +
1522 drivers/md/persistent-data/dm-space-map-metadata.c | 956 ++++++++
1523 drivers/md/persistent-data/dm-space-map-metadata.h | 33 +
1524 drivers/md/persistent-data/dm-space-map.h | 118 +
1525 .../md/persistent-data/dm-transaction-manager.c | 414 ++++
1526 .../md/persistent-data/dm-transaction-manager.h | 130 ++
1527 include/linux/device-mapper.h | 35 +-
1528 include/linux/dm-kcopyd.h | 4 +
1529 31 files changed, 9895 insertions(+), 20 deletions(-)
1530 create mode 100644 Documentation/device-mapper/persistent-data.txt
1531 create mode 100644 Documentation/device-mapper/thin-provisioning.txt
1532 create mode 100644 drivers/md/dm-thin-metadata.c
1533 create mode 100644 drivers/md/dm-thin-metadata.h
1534 create mode 100644 drivers/md/dm-thin.c
1535 create mode 100644 drivers/md/persistent-data/Kconfig
1536 create mode 100644 drivers/md/persistent-data/Makefile
1537 create mode 100644 drivers/md/persistent-data/dm-block-manager.c
1538 create mode 100644 drivers/md/persistent-data/dm-block-manager.h
1539 create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
1540 create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
1541 create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
1542 create mode 100644 drivers/md/persistent-data/dm-btree.c
1543 create mode 100644 drivers/md/persistent-data/dm-btree.h
1544 create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
1545 create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
1546 create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
1547 create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
1548 create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
1549 create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
1550 create mode 100644 drivers/md/persistent-data/dm-space-map.h
1551 create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
1552 create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
1553 Merging embedded/master
1554 $ git merge embedded/master
1556 Merging firmware/master
1557 $ git merge firmware/master
1559 Merging pcmcia/master
1560 $ git merge pcmcia/master
1562 Merging battery/master
1563 $ git merge battery/master
1566 $ git merge leds/for-mm
1567 Resolved 'drivers/leds/Kconfig' using previous resolution.
1568 Auto-merging drivers/leds/Kconfig
1569 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
1570 Automatic merge failed; fix conflicts and then commit the result.
1572 [master 61722c9] Merge remote-tracking branch 'leds/for-mm'
1573 $ git diff -M --stat --summary HEAD^..
1574 Merging backlight/for-mm
1575 $ git merge backlight/for-mm
1577 Merging mmc/mmc-next
1578 $ git merge mmc/mmc-next
1579 Resolved 'drivers/mmc/host/sdhci-esdhc-imx.c' using previous resolution.
1580 Auto-merging drivers/mmc/host/dw_mmc.c
1581 Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
1582 CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-esdhc-imx.c
1583 Automatic merge failed; fix conflicts and then commit the result.
1585 [master 80b3063] Merge remote-tracking branch 'mmc/mmc-next'
1586 $ git diff -M --stat --summary HEAD^..
1587 drivers/misc/cb710/core.c | 3 +-
1588 drivers/mmc/card/mmc_test.c | 56 +++++++++++++++++++----------------
1589 drivers/mmc/core/host.c | 11 +++++++
1590 drivers/mmc/core/mmc.c | 2 +-
1591 drivers/mmc/host/dw_mmc.c | 2 +-
1592 drivers/mmc/host/sdhci-esdhc-imx.c | 43 ++++++++++++++++++++++------
1593 drivers/mmc/host/sdhci-pxav3.c | 3 +-
1594 drivers/mmc/host/sdhci-s3c.c | 4 ++
1595 drivers/mmc/host/sdhci.c | 53 +++++++++++++++------------------
1596 drivers/mmc/host/tmio_mmc.c | 2 -
1597 10 files changed, 109 insertions(+), 70 deletions(-)
1598 Merging kgdb/kgdb-next
1599 $ git merge kgdb/kgdb-next
1600 Merge made by recursive.
1601 Merging slab/for-next
1602 $ git merge slab/for-next
1604 Merge made by recursive.
1605 Merging uclinux/for-next
1606 $ git merge uclinux/for-next
1609 $ git merge md/for-next
1610 Merge made by recursive.
1611 drivers/md/md.c | 12 +++++++++++-
1612 drivers/md/raid5.c | 6 ++----
1613 2 files changed, 13 insertions(+), 5 deletions(-)
1614 Merging mfd/for-next
1615 $ git merge mfd/for-next
1617 Merging hdlc/hdlc-next
1618 $ git merge hdlc/hdlc-next
1620 Merging drm/drm-next
1621 $ git merge drm/drm-next
1623 Merging fbdev/master
1624 $ git merge fbdev/master
1625 Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c
1626 Auto-merging arch/powerpc/platforms/86xx/mpc8610_hpcd.c
1627 Auto-merging arch/powerpc/sysdev/fsl_soc.h
1628 Auto-merging drivers/staging/xgifb/XGI_main_26.c
1629 Auto-merging drivers/video/atmel_lcdfb.c
1630 Auto-merging drivers/video/backlight/adp8860_bl.c
1631 Auto-merging drivers/video/controlfb.c
1632 Auto-merging drivers/video/fb_defio.c
1633 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
1634 Auto-merging drivers/video/platinumfb.c
1635 Auto-merging drivers/video/via/viafbdev.c
1636 Merge made by recursive.
1637 arch/powerpc/platforms/512x/mpc512x_shared.c | 22 +-
1638 arch/powerpc/platforms/85xx/p1022_ds.c | 47 +--
1639 arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 55 ++--
1640 arch/powerpc/sysdev/fsl_soc.h | 25 +-
1641 drivers/staging/xgifb/XGI_main_26.c | 22 +-
1642 drivers/video/68328fb.c | 4 +-
1643 drivers/video/Kconfig | 16 +-
1644 drivers/video/Makefile | 1 +
1645 drivers/video/acornfb.c | 5 +-
1646 drivers/video/arkfb.c | 9 +-
1647 drivers/video/atmel_lcdfb.c | 15 +-
1648 drivers/video/aty/radeon_base.c | 10 +-
1649 drivers/video/au1200fb.c | 297 ++++++--------
1650 drivers/video/backlight/adp8860_bl.c | 1 -
1651 drivers/video/backlight/adp8870_bl.c | 1 -
1652 drivers/video/controlfb.c | 2 +-
1653 drivers/video/da8xx-fb.c | 155 +++++++-
1654 drivers/video/fb-puv3.c | 4 +-
1655 drivers/video/fb_defio.c | 3 +-
1656 drivers/video/fsl-diu-fb.c | 74 +++-
1657 drivers/video/g364fb.c | 5 +-
1658 drivers/video/grvga.c | 579 ++++++++++++++++++++++++++
1659 drivers/video/gxt4500.c | 4 +-
1660 drivers/video/hgafb.c | 4 +-
1661 drivers/video/imsttfb.c | 2 +-
1662 drivers/video/intelfb/intelfbhw.c | 6 +-
1663 drivers/video/mb862xx/mb862xxfbdrv.c | 2 +-
1664 drivers/video/mx3fb.c | 6 +-
1665 drivers/video/neofb.c | 4 +-
1666 drivers/video/platinumfb.c | 2 +-
1667 drivers/video/pm2fb.c | 6 +-
1668 drivers/video/pm3fb.c | 6 +-
1669 drivers/video/pxa3xx-gcu.c | 2 -
1670 drivers/video/s3c-fb.c | 2 +-
1671 drivers/video/s3fb.c | 9 +-
1672 drivers/video/savage/savagefb_driver.c | 16 +-
1673 drivers/video/sis/sis_main.c | 30 +-
1674 drivers/video/skeletonfb.c | 2 +-
1675 drivers/video/sm501fb.c | 6 +-
1676 drivers/video/tridentfb.c | 4 +-
1677 drivers/video/valkyriefb.c | 2 +-
1678 drivers/video/vfb.c | 4 +-
1679 drivers/video/vga16fb.c | 2 +-
1680 drivers/video/via/via_modesetting.h | 5 +
1681 drivers/video/via/viafbdev.c | 16 +-
1682 drivers/video/vt8500lcdfb.c | 4 +-
1683 drivers/video/vt8623fb.c | 9 +-
1684 drivers/video/xilinxfb.c | 1 -
1685 48 files changed, 1110 insertions(+), 398 deletions(-)
1686 create mode 100644 drivers/video/grvga.c
1687 Merging viafb/viafb-next
1688 $ git merge viafb/viafb-next
1689 Auto-merging drivers/video/via/viafbdev.c
1690 Merge made by recursive.
1691 drivers/video/via/dvi.c | 34 +--
1692 drivers/video/via/dvi.h | 3 +-
1693 drivers/video/via/global.c | 2 +
1694 drivers/video/via/global.h | 2 +
1695 drivers/video/via/hw.c | 544 ++++++-----------------------------
1696 drivers/video/via/hw.h | 285 +------------------
1697 drivers/video/via/lcd.c | 53 ++--
1698 drivers/video/via/lcd.h | 7 +-
1699 drivers/video/via/share.h | 23 +--
1700 drivers/video/via/via-core.c | 2 +-
1701 drivers/video/via/via_modesetting.c | 104 +++++++
1702 drivers/video/via/via_modesetting.h | 18 ++
1703 drivers/video/via/viafbdev.c | 40 +--
1704 drivers/video/via/viamode.c | 60 +++-
1705 drivers/video/via/viamode.h | 4 +-
1706 15 files changed, 323 insertions(+), 858 deletions(-)
1707 Merging omap_dss2/for-next
1708 $ git merge omap_dss2/for-next
1710 Merging voltage/for-next
1711 $ git merge voltage/for-next
1712 Merge made by recursive.
1713 drivers/regulator/88pm8607.c | 2 +-
1714 drivers/regulator/aat2870-regulator.c | 1 +
1715 drivers/regulator/max8649.c | 2 +-
1716 drivers/regulator/max8952.c | 3 ---
1717 drivers/regulator/tps65023-regulator.c | 11 +++++++++++
1718 drivers/regulator/tps6507x-regulator.c | 8 +-------
1719 drivers/regulator/tps65912-regulator.c | 2 --
1720 include/linux/regulator/consumer.h | 2 +-
1721 8 files changed, 16 insertions(+), 15 deletions(-)
1722 Merging security-testing/next
1723 $ git merge security-testing/next
1725 Merge made by recursive.
1726 Merging selinux/master
1727 $ git merge selinux/master
1729 Merging lblnet/master
1730 $ git merge lblnet/master
1732 Merging agp/agp-next
1733 $ git merge agp/agp-next
1734 Merge made by recursive.
1735 Merging watchdog/master
1736 $ git merge watchdog/master
1739 $ git merge bdev/master
1741 Merging dwmw2-iommu/master
1742 $ git merge dwmw2-iommu/master
1744 Merging cputime/cputime
1745 $ git merge cputime/cputime
1747 Merging osd/linux-next
1748 $ git merge osd/linux-next
1750 Merging jc_docs/docs-next
1751 $ git merge jc_docs/docs-next
1753 Merging nommu/master
1754 $ git merge nommu/master
1756 Merging trivial/for-next
1757 $ git merge trivial/for-next
1758 Auto-merging fs/eventpoll.c
1759 Auto-merging lib/idr.c
1760 Merge made by recursive.
1761 Documentation/ABI/removed/o2cb | 2 +-
1762 Documentation/ABI/testing/sysfs-bus-bcma | 8 ++++----
1763 .../testing/sysfs-class-backlight-driver-adp8870 | 16 ++++++++--------
1764 Documentation/cpu-freq/governors.txt | 2 +-
1765 drivers/cpufreq/cpufreq_ondemand.c | 2 +-
1766 fs/eventpoll.c | 2 +-
1768 7 files changed, 17 insertions(+), 17 deletions(-)
1769 Merging audit/for-next
1770 $ git merge audit/for-next
1772 Merging suspend/linux-next
1773 $ git merge suspend/linux-next
1774 Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
1775 Merge made by recursive.
1776 Documentation/power/runtime_pm.txt | 1 +
1777 arch/arm/mach-shmobile/pm-sh7372.c | 42 +------
1778 arch/arm/mach-shmobile/setup-sh7372.c | 3 +
1779 drivers/base/power/domain.c | 246 ++++++++++++++++++++-------------
1780 drivers/base/power/runtime.c | 15 ++-
1781 include/linux/pm_domain.h | 15 ++-
1782 6 files changed, 180 insertions(+), 142 deletions(-)
1783 Merging apm/for-next
1784 $ git merge apm/for-next
1786 Merging fsnotify/for-next
1787 $ git merge fsnotify/for-next
1788 Auto-merging fs/cachefiles/namei.c
1789 Auto-merging fs/nfsd/vfs.c
1790 Auto-merging fs/notify/fanotify/fanotify_user.c
1791 Auto-merging fs/notify/group.c
1792 Auto-merging fs/notify/mark.c
1793 Auto-merging include/linux/fsnotify_backend.h
1794 Merge made by recursive.
1795 fs/cachefiles/namei.c | 1 -
1796 fs/cachefiles/xattr.c | 1 -
1798 fs/notify/dnotify/dnotify.c | 15 +++---
1799 fs/notify/fanotify/fanotify.c | 24 +++++----
1800 fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++-----------
1801 fs/notify/group.c | 1 +
1802 fs/notify/mark.c | 36 +++++--------
1803 include/linux/fanotify.h | 5 ++-
1804 include/linux/fsnotify_backend.h | 14 ++++-
1805 10 files changed, 121 insertions(+), 80 deletions(-)
1806 Merging irda/for-next
1807 $ git merge irda/for-next
1809 Merging i7core_edac/linux_next
1810 $ git merge i7core_edac/linux_next
1811 Auto-merging drivers/edac/i7core_edac.c
1812 Merge made by recursive.
1813 drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++---
1814 1 files changed, 20 insertions(+), 3 deletions(-)
1815 Merging i7300_edac/linux_next
1816 $ git merge i7300_edac/linux_next
1817 Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
1818 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
1819 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
1820 Removing drivers/edac/edac_mce.c
1821 Auto-merging drivers/edac/i7core_edac.c
1822 Auto-merging include/linux/edac.h
1823 Removing include/linux/edac_mce.h
1824 Automatic merge failed; fix conflicts and then commit the result.
1826 [master 3a22c24] Merge remote-tracking branch 'i7300_edac/linux_next'
1827 $ git diff -M --stat --summary HEAD^..
1828 arch/x86/kernel/cpu/mcheck/mce.c | 18 +--
1829 drivers/edac/Kconfig | 3 -
1830 drivers/edac/Makefile | 1 -
1831 drivers/edac/edac_core.h | 350 +-------------------------------------
1832 drivers/edac/edac_mce.c | 61 -------
1833 drivers/edac/i7core_edac.c | 262 ++++++++++++++++++++++++----
1834 include/linux/edac.h | 350 ++++++++++++++++++++++++++++++++++++++
1835 include/linux/edac_mce.h | 31 ----
1836 8 files changed, 583 insertions(+), 493 deletions(-)
1837 delete mode 100644 drivers/edac/edac_mce.c
1838 delete mode 100644 include/linux/edac_mce.h
1839 Merging devicetree/devicetree/next
1840 $ git merge devicetree/devicetree/next
1841 Resolved 'drivers/of/base.c' using previous resolution.
1842 Auto-merging drivers/of/base.c
1843 CONFLICT (content): Merge conflict in drivers/of/base.c
1844 Automatic merge failed; fix conflicts and then commit the result.
1846 [master 300bed5] Merge remote-tracking branch 'devicetree/devicetree/next'
1847 $ git diff -M --stat --summary HEAD^..
1848 Merging spi/spi/next
1849 $ git merge spi/spi/next
1851 Merging gpio/gpio/next
1852 $ git merge gpio/gpio/next
1854 Merging tip/auto-latest
1855 $ git merge tip/auto-latest
1857 Merging rcu/rcu/next
1858 $ git merge rcu/rcu/next
1860 Merging kvm/linux-next
1861 $ git merge kvm/linux-next
1862 Merge made by recursive.
1863 arch/x86/kvm/Kconfig | 1 +
1864 1 files changed, 1 insertions(+), 0 deletions(-)
1865 Merging oprofile/for-next
1866 $ git merge oprofile/for-next
1868 Merging ptrace/ptrace
1869 $ git merge ptrace/ptrace
1871 Merging xen/upstream/xen
1872 $ git merge xen/upstream/xen
1874 Merging xen-two/linux-next
1875 $ git merge xen-two/linux-next
1876 Merge made by recursive.
1877 Merging xen-pvhvm/linux-next
1878 $ git merge xen-pvhvm/linux-next
1880 Merging edac-amd/for-next
1881 $ git merge edac-amd/for-next
1883 Merging percpu/for-next
1884 $ git merge percpu/for-next
1885 Merge made by recursive.
1886 mm/percpu-vm.c | 5 ++---
1887 mm/percpu.c | 17 +++++++++--------
1888 2 files changed, 11 insertions(+), 11 deletions(-)
1889 Merging workqueues/for-next
1890 $ git merge workqueues/for-next
1892 Merging sfi/sfi-test
1893 $ git merge sfi/sfi-test
1895 Merging asm-generic/next
1896 $ git merge asm-generic/next
1898 Merging drivers-x86/linux-next
1899 $ git merge drivers-x86/linux-next
1901 Merging hwpoison/hwpoison
1902 $ git merge hwpoison/hwpoison
1904 Merging sysctl/master
1905 $ git merge sysctl/master
1906 Auto-merging fs/proc/proc_sysctl.c
1907 Merge made by recursive.
1908 fs/proc/proc_sysctl.c | 14 ++------------
1909 1 files changed, 2 insertions(+), 12 deletions(-)
1910 Merging namespace/master
1911 $ git merge namespace/master
1912 Auto-merging fs/proc/inode.c
1913 Merge made by recursive.
1914 fs/proc/inode.c | 6 +-
1915 fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++-------
1916 2 files changed, 142 insertions(+), 24 deletions(-)
1917 Merging regmap/for-next
1918 $ git merge regmap/for-next
1919 Merge made by recursive.
1920 drivers/base/regmap/Makefile | 1 +
1921 drivers/base/regmap/internal.h | 61 +++++++++++++++
1922 drivers/base/regmap/regmap-debugfs.c | 135 ++++++++++++++++++++++++++++++++++
1923 drivers/base/regmap/regmap.c | 97 ++++++++++++++++--------
1924 include/linux/regmap.h | 23 ++++++
1925 include/trace/events/regmap.h | 112 ++++++++++++++++++++++++++++
1926 6 files changed, 396 insertions(+), 33 deletions(-)
1927 create mode 100644 drivers/base/regmap/internal.h
1928 create mode 100644 drivers/base/regmap/regmap-debugfs.c
1929 create mode 100644 include/trace/events/regmap.h
1930 Merging driver-core/driver-core-next
1931 $ git merge driver-core/driver-core-next
1933 Merging tty/tty-next
1934 $ git merge tty/tty-next
1936 Merging usb/usb-next
1937 $ git merge usb/usb-next
1939 Merging staging/staging-next
1940 $ git merge staging/staging-next
1942 Merging bkl-config/config
1943 $ git merge bkl-config/config
1945 Merging tmem/linux-next
1946 $ git merge tmem/linux-next
1947 Auto-merging include/linux/swap.h
1948 Auto-merging mm/Kconfig
1949 Auto-merging mm/swapfile.c
1950 Merge made by recursive.
1951 .../ABI/testing/sysfs-kernel-mm-frontswap | 16 +
1952 Documentation/vm/frontswap.txt | 210 ++++++++++++
1953 include/linux/frontswap.h | 92 ++++++
1954 include/linux/swap.h | 2 +
1955 include/linux/swapfile.h | 13 +
1958 mm/frontswap.c | 335 ++++++++++++++++++++
1960 mm/swapfile.c | 65 +++-
1961 10 files changed, 751 insertions(+), 12 deletions(-)
1962 create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
1963 create mode 100644 Documentation/vm/frontswap.txt
1964 create mode 100644 include/linux/frontswap.h
1965 create mode 100644 include/linux/swapfile.h
1966 create mode 100644 mm/frontswap.c
1967 Merging writeback/next
1968 $ git merge writeback/next
1970 Merging arm-dt/devicetree/arm-next
1971 $ git merge arm-dt/devicetree/arm-next
1973 Merging scsi-post-merge/merge-base:master
1974 Merging moduleh/module.h-split
1975 $ git merge moduleh/module.h-split
1976 Auto-merging arch/arm/kernel/armksyms.c
1977 Auto-merging arch/arm/kernel/process.c
1978 Auto-merging arch/arm/kernel/setup.c
1979 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
1980 Auto-merging arch/arm/mach-msm/io.c
1981 Auto-merging arch/arm/mach-omap2/display.c
1982 Auto-merging arch/arm/mm/init.c
1983 Auto-merging arch/mips/bcm47xx/gpio.c
1984 Auto-merging arch/mips/bcm47xx/setup.c
1985 Auto-merging arch/mips/kernel/traps.c
1986 Auto-merging arch/powerpc/kernel/cputable.c
1987 Auto-merging arch/powerpc/kernel/iomap.c
1988 Auto-merging arch/powerpc/platforms/pseries/hotplug-cpu.c
1989 Auto-merging arch/powerpc/platforms/pseries/io_event_irq.c
1990 Auto-merging arch/powerpc/platforms/pseries/lpar.c
1991 Auto-merging arch/powerpc/platforms/pseries/plpar_wrappers.h
1992 Auto-merging arch/powerpc/platforms/pseries/setup.c
1993 Auto-merging arch/sparc/kernel/cpu.c
1994 Auto-merging arch/sparc/kernel/hvapi.c
1995 Auto-merging arch/sparc/kernel/setup_64.c
1996 Auto-merging arch/sparc/kernel/sparc_ksyms_64.c
1997 Auto-merging drivers/acpi/ec_sys.c
1998 Auto-merging drivers/acpi/sysfs.c
1999 Auto-merging drivers/base/power/runtime.c
2000 Auto-merging drivers/bcma/core.c
2001 Auto-merging drivers/bcma/driver_chipcommon.c
2002 Auto-merging drivers/bcma/driver_pci.c
2003 Auto-merging drivers/bcma/main.c
2004 Auto-merging drivers/char/ramoops.c
2005 Auto-merging drivers/clocksource/sh_cmt.c
2006 Auto-merging drivers/dma/intel_mid_dma.c
2007 Auto-merging drivers/dma/ipu/ipu_idmac.c
2008 Auto-merging drivers/dma/ste_dma40.c
2009 CONFLICT (content): Merge conflict in drivers/dma/ste_dma40.c
2010 Auto-merging drivers/firmware/google/gsmi.c
2011 Auto-merging drivers/hid/hid-axff.c
2012 Auto-merging drivers/input/touchscreen/ad7879.c
2013 Auto-merging drivers/md/dm-log-userspace-base.c
2014 Auto-merging drivers/md/dm-raid.c
2015 Auto-merging drivers/md/dm-snap-persistent.c
2016 Auto-merging drivers/md/md.c
2017 Auto-merging drivers/md/raid5.c
2018 Auto-merging drivers/mfd/ab3550-core.c
2019 Auto-merging drivers/mfd/ab8500-debugfs.c
2020 Auto-merging drivers/mfd/twl-core.c
2021 Auto-merging drivers/mmc/card/mmc_test.c
2022 Auto-merging drivers/mmc/core/host.c
2023 Auto-merging drivers/mmc/core/mmc.c
2024 Auto-merging drivers/mmc/host/sdhci-pxav3.c
2025 Auto-merging drivers/mmc/host/sdhci.c
2026 Auto-merging drivers/mtd/ar7part.c
2027 Auto-merging drivers/mtd/cmdlinepart.c
2028 Auto-merging drivers/mtd/mtdsuper.c
2029 Auto-merging drivers/mtd/nand/cafe_nand.c
2030 Auto-merging drivers/mtd/nand/cmx270_nand.c
2031 Auto-merging drivers/mtd/nand/diskonchip.c
2032 Auto-merging drivers/mtd/nand/nand_bbt.c
2033 Auto-merging drivers/mtd/nand/omap2.c
2034 Auto-merging drivers/mtd/onenand/onenand_bbt.c
2035 Auto-merging drivers/mtd/redboot.c
2036 Auto-merging drivers/net/mlx4/port.c
2037 Auto-merging drivers/pci/hotplug/pcihp_slot.c
2038 Auto-merging drivers/pci/setup-res.c
2039 Auto-merging drivers/pcmcia/pxa2xx_cm_x255.c
2040 Auto-merging drivers/pcmcia/pxa2xx_cm_x270.c
2041 Auto-merging drivers/platform/x86/intel_scu_ipc.c
2042 Auto-merging drivers/platform/x86/msi-wmi.c
2043 Auto-merging drivers/power/max17042_battery.c
2044 Auto-merging drivers/power/max8903_charger.c
2045 Auto-merging drivers/regulator/88pm8607.c
2046 Auto-merging drivers/regulator/dummy.c
2047 Auto-merging drivers/s390/cio/qdio_debug.c
2048 Auto-merging drivers/staging/dt3155v4l/dt3155v4l.c
2049 CONFLICT (content): Merge conflict in drivers/staging/dt3155v4l/dt3155v4l.c
2050 Auto-merging drivers/staging/iio/accel/adis16203_core.c
2051 Auto-merging drivers/staging/iio/accel/adis16204_core.c
2052 Auto-merging drivers/staging/iio/accel/adis16209_core.c
2053 Auto-merging drivers/staging/iio/accel/adis16240_core.c
2054 Auto-merging drivers/staging/iio/gyro/adis16260_core.c
2055 Auto-merging drivers/usb/gadget/composite.c
2056 Auto-merging drivers/usb/gadget/fusb300_udc.c
2057 Auto-merging drivers/usb/host/pci-quirks.c
2058 Auto-merging drivers/usb/serial/qcserial.c
2059 Auto-merging drivers/video/atmel_lcdfb.c
2060 Auto-merging drivers/video/carminefb.c
2061 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
2062 Auto-merging drivers/video/msm/mdp.c
2063 Auto-merging drivers/video/omap2/dss/dispc.c
2064 Auto-merging drivers/video/omap2/dss/dpi.c
2065 Auto-merging drivers/video/omap2/dss/dsi.c
2066 Auto-merging drivers/video/omap2/dss/dss.c
2067 Auto-merging drivers/video/omap2/dss/rfbi.c
2068 Auto-merging drivers/video/omap2/dss/sdi.c
2069 Auto-merging drivers/video/omap2/omapfb/omapfb-ioctl.c
2070 Auto-merging fs/exofs/super.c
2071 AutoRecorded preimage for 'include/linux/dmaengine.h'
2072 Resolved 'drivers/dma/ste_dma40.c' using previous resolution.
2073 Resolved 'drivers/staging/dt3155v4l/dt3155v4l.c' using previous resolution.
2074 -merging fs/logfs/super.c
2075 Auto-merging include/linux/bcma/bcma.h
2076 Auto-merging include/linux/blkdev.h
2077 Auto-merging include/linux/cpuidle.h
2078 Auto-merging include/linux/dmaengine.h
2079 CONFLICT (content): Merge conflict in include/linux/dmaengine.h
2080 Auto-merging include/linux/mtd/mtd.h
2081 Auto-merging include/linux/regulator/driver.h
2082 Auto-merging kernel/debug/kdb/kdb_debugger.c
2083 Auto-merging kernel/futex.c
2084 Auto-merging kernel/lockdep.c
2085 Auto-merging kernel/resource.c
2086 Auto-merging mm/memcontrol.c
2087 Auto-merging mm/memory-failure.c
2088 Auto-merging mm/swapfile.c
2089 Auto-merging sound/core/timer.c
2090 Auto-merging sound/pci/asihpi/hpioctl.c
2091 Automatic merge failed; fix conflicts and then commit the result.
2093 Recorded resolution for 'include/linux/dmaengine.h'.
2094 [master fc0eaf1] Merge remote-tracking branch 'moduleh/module.h-split'
2095 $ git diff -M --stat --summary HEAD^..
2096 arch/alpha/kernel/core_irongate.c | 1 +
2097 arch/alpha/kernel/pci-sysfs.c | 1 +
2098 arch/alpha/kernel/pci_iommu.c | 1 +
2099 arch/alpha/kernel/setup.c | 1 +
2100 arch/arm/common/it8152.c | 1 +
2101 arch/arm/common/scoop.c | 1 +
2102 arch/arm/kernel/armksyms.c | 2 +-
2103 arch/arm/kernel/bios32.c | 2 +-
2104 arch/arm/kernel/devtree.c | 2 +-
2105 arch/arm/kernel/elf.c | 2 +-
2106 arch/arm/kernel/io.c | 2 +-
2107 arch/arm/kernel/irq.c | 1 -
2108 arch/arm/kernel/leds.c | 3 +-
2109 arch/arm/kernel/perf_event.c | 2 +-
2110 arch/arm/kernel/pj4-cp0.c | 1 -
2111 arch/arm/kernel/process.c | 2 +-
2112 arch/arm/kernel/ptrace.c | 1 +
2113 arch/arm/kernel/return_address.c | 2 +-
2114 arch/arm/kernel/setup.c | 2 +-
2115 arch/arm/kernel/stacktrace.c | 2 +-
2116 arch/arm/kernel/sys_arm.c | 2 +-
2117 arch/arm/kernel/time.c | 2 +-
2118 arch/arm/kernel/unwind.c | 2 +-
2119 arch/arm/kernel/xscale-cp0.c | 1 -
2120 arch/arm/mach-at91/cpuidle.c | 1 +
2121 arch/arm/mach-bcmring/dma.c | 1 +
2122 arch/arm/mach-bcmring/mm.c | 1 +
2123 arch/arm/mach-davinci/board-dm644x-evm.c | 1 +
2124 arch/arm/mach-davinci/board-dm646x-evm.c | 1 +
2125 arch/arm/mach-davinci/cdce949.c | 1 +
2126 arch/arm/mach-davinci/cpufreq.c | 1 +
2127 arch/arm/mach-davinci/cpuidle.c | 1 +
2128 arch/arm/mach-ep93xx/core.c | 1 +
2129 arch/arm/mach-exynos4/dev-sysmmu.c | 1 +
2130 arch/arm/mach-footbridge/dc21285.c | 1 +
2131 arch/arm/mach-imx/mach-mx31lilly.c | 1 +
2132 arch/arm/mach-imx/mach-mx31lite.c | 1 +
2133 arch/arm/mach-imx/mach-mx31moboard.c | 1 +
2134 arch/arm/mach-iop13xx/pci.c | 1 +
2135 arch/arm/mach-ixp2000/core.c | 1 +
2136 arch/arm/mach-ixp4xx/common-pci.c | 1 +
2137 arch/arm/mach-ixp4xx/common.c | 1 +
2138 arch/arm/mach-kirkwood/cpuidle.c | 1 +
2139 arch/arm/mach-msm/io.c | 1 +
2140 arch/arm/mach-netx/xc.c | 1 +
2141 arch/arm/mach-omap1/board-ams-delta.c | 1 +
2142 arch/arm/mach-omap1/board-sx1.c | 1 +
2143 arch/arm/mach-omap1/board-voiceblue.c | 1 +
2144 arch/arm/mach-omap1/mailbox.c | 1 +
2145 arch/arm/mach-omap2/board-omap3evm.c | 1 +
2146 arch/arm/mach-omap2/clockdomain.c | 1 +
2147 arch/arm/mach-omap2/display.c | 1 +
2148 arch/arm/mach-omap2/gpmc-onenand.c | 1 +
2149 arch/arm/mach-omap2/pm.c | 1 +
2150 arch/arm/mach-omap2/prcm.c | 1 +
2151 arch/arm/mach-omap2/usb-tusb6010.c | 2 +
2152 arch/arm/mach-omap2/voltage.c | 1 +
2153 arch/arm/mach-orion5x/dns323-setup.c | 2 +-
2154 arch/arm/mach-orion5x/pci.c | 1 +
2155 arch/arm/mach-pxa/corgi.c | 1 +
2156 arch/arm/mach-pxa/poodle.c | 1 +
2157 arch/arm/mach-pxa/spitz.c | 1 +
2158 arch/arm/mach-s3c2410/mach-h1940.c | 1 +
2159 arch/arm/mach-s3c64xx/dev-audio.c | 1 +
2160 arch/arm/mach-sa1100/collie.c | 1 +
2161 arch/arm/mach-sa1100/jornada720.c | 1 +
2162 arch/arm/mach-shmobile/clock.c | 1 +
2163 arch/arm/mach-tegra/pcie.c | 1 +
2164 arch/arm/mm/fault-armv.c | 1 -
2165 arch/arm/mm/init.c | 1 +
2166 arch/arm/plat-iop/gpio.c | 1 +
2167 arch/arm/plat-iop/time.c | 1 +
2168 arch/arm/plat-omap/clock.c | 1 +
2169 arch/arm/plat-omap/mailbox.c | 1 +
2170 arch/arm/plat-s3c24xx/devs.c | 1 +
2171 arch/arm/plat-s5p/dev-ehci.c | 1 +
2172 arch/arm/plat-s5p/dev-onenand.c | 2 +
2173 arch/arm/plat-samsung/dev-adc.c | 2 +
2174 arch/arm/plat-samsung/dev-asocdma.c | 1 +
2175 arch/arm/plat-samsung/dev-backlight.c | 1 +
2176 arch/arm/plat-samsung/dev-ide.c | 2 +
2177 arch/arm/plat-samsung/dev-nand.c | 1 +
2178 arch/arm/plat-samsung/dev-pwm.c | 1 +
2179 arch/arm/plat-samsung/dev-rtc.c | 1 +
2180 arch/arm/plat-samsung/dev-ts.c | 2 +
2181 arch/arm/plat-samsung/dev-usb.c | 1 +
2182 arch/arm/plat-samsung/dev-wdt.c | 3 +
2183 arch/arm/plat-samsung/platformdata.c | 1 +
2184 arch/arm/vfp/vfpmodule.c | 1 -
2185 arch/avr32/mach-at32ap/clock.c | 1 +
2186 arch/avr32/mach-at32ap/cpufreq.c | 1 +
2187 arch/avr32/mach-at32ap/intc.c | 1 +
2188 arch/avr32/mach-at32ap/pio.c | 1 +
2189 arch/avr32/mm/dma-coherent.c | 1 +
2190 arch/ia64/hp/common/hwsw_iommu.c | 1 +
2191 arch/ia64/kernel/dma-mapping.c | 1 +
2192 arch/ia64/kernel/topology.c | 1 +
2193 arch/ia64/sn/kernel/io_init.c | 1 +
2194 arch/ia64/sn/pci/pcibr/pcibr_dma.c | 1 +
2195 arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 +
2196 arch/ia64/sn/pci/tioca_provider.c | 1 +
2197 arch/m68k/atari/time.c | 1 +
2198 arch/m68k/kernel/dma_mm.c | 1 +
2199 arch/m68k/kernel/dma_no.c | 1 +
2200 arch/mips/bcm47xx/gpio.c | 1 +
2201 arch/mips/bcm47xx/setup.c | 1 +
2202 arch/mips/cavium-octeon/csrc-octeon.c | 1 +
2203 arch/mips/cavium-octeon/dma-octeon.c | 1 +
2204 arch/mips/cavium-octeon/flash_setup.c | 1 +
2205 arch/mips/kernel/8250-platform.c | 1 -
2206 arch/mips/kernel/cpu-probe.c | 3 +-
2207 arch/mips/kernel/i8253.c | 2 +-
2208 arch/mips/kernel/init_task.c | 2 +-
2209 arch/mips/kernel/irq-msc01.c | 1 -
2210 arch/mips/kernel/irq.c | 1 -
2211 arch/mips/kernel/mips-mt.c | 2 +-
2212 arch/mips/kernel/mips_ksyms.c | 2 +-
2213 arch/mips/kernel/module.c | 1 -
2214 arch/mips/kernel/process.c | 2 +-
2215 arch/mips/kernel/prom.c | 2 +-
2216 arch/mips/kernel/reset.c | 2 +-
2217 arch/mips/kernel/rtlx.c | 1 -
2218 arch/mips/kernel/setup.c | 2 +-
2219 arch/mips/kernel/spinlock_test.c | 2 +-
2220 arch/mips/kernel/stacktrace.c | 2 +-
2221 arch/mips/kernel/time.c | 2 +-
2222 arch/mips/kernel/traps.c | 1 -
2223 arch/mips/kernel/unaligned.c | 1 -
2224 arch/mips/kernel/vpe.c | 1 -
2225 arch/mips/loongson/common/platform.c | 1 +
2226 arch/mips/pci/pci-ip27.c | 1 +
2227 arch/mips/pci/pci.c | 1 +
2228 arch/mips/powertv/pci/fixup-powertv.c | 1 +
2229 arch/mips/powertv/powertv-usb.c | 1 +
2230 arch/mips/rb532/gpio.c | 1 +
2231 arch/mips/rb532/setup.c | 1 +
2232 arch/mips/txx9/generic/spi_eeprom.c | 1 +
2233 arch/mips/txx9/rbtx4939/setup.c | 1 +
2234 arch/mips/vr41xx/common/giu.c | 1 +
2235 arch/mips/vr41xx/common/rtc.c | 1 +
2236 arch/parisc/kernel/drivers.c | 1 +
2237 arch/parisc/kernel/pci-dma.c | 1 +
2238 arch/parisc/kernel/setup.c | 1 +
2239 arch/parisc/lib/iomap.c | 1 +
2240 arch/powerpc/include/asm/lv1call.h | 1 +
2241 arch/powerpc/include/asm/machdep.h | 1 +
2242 arch/powerpc/include/asm/spu.h | 1 +
2243 arch/powerpc/kernel/btext.c | 2 +-
2244 arch/powerpc/kernel/clock.c | 2 +-
2245 arch/powerpc/kernel/cputable.c | 2 +-
2246 arch/powerpc/kernel/crash.c | 1 +
2247 arch/powerpc/kernel/dma-iommu.c | 1 +
2248 arch/powerpc/kernel/dma.c | 1 +
2249 arch/powerpc/kernel/firmware.c | 3 +-
2250 arch/powerpc/kernel/hw_breakpoint.c | 1 -
2251 arch/powerpc/kernel/ibmebus.c | 2 +
2252 arch/powerpc/kernel/init_task.c | 2 +-
2253 arch/powerpc/kernel/io-workarounds.c | 1 +
2254 arch/powerpc/kernel/io.c | 2 +-
2255 arch/powerpc/kernel/iomap.c | 1 +
2256 arch/powerpc/kernel/irq.c | 2 +-
2257 arch/powerpc/kernel/isa-bridge.c | 1 +
2258 arch/powerpc/kernel/kvm.c | 1 +
2259 arch/powerpc/kernel/module.c | 1 -
2260 arch/powerpc/kernel/of_platform.c | 2 +-
2261 arch/powerpc/kernel/paca.c | 2 +-
2262 arch/powerpc/kernel/pci-common.c | 1 +
2263 arch/powerpc/kernel/pci_32.c | 1 +
2264 arch/powerpc/kernel/pci_64.c | 1 +
2265 arch/powerpc/kernel/pci_dn.c | 1 +
2266 arch/powerpc/kernel/pci_of_scan.c | 1 +
2267 arch/powerpc/kernel/pmc.c | 2 +-
2268 arch/powerpc/kernel/ppc_ksyms.c | 2 +-
2269 arch/powerpc/kernel/process.c | 2 +-
2270 arch/powerpc/kernel/prom.c | 2 +-
2271 arch/powerpc/kernel/prom_parse.c | 1 -
2272 arch/powerpc/kernel/ptrace.c | 1 -
2273 arch/powerpc/kernel/rtas.c | 2 +-
2274 arch/powerpc/kernel/setup-common.c | 2 +-
2275 arch/powerpc/kernel/setup_64.c | 2 +-
2276 arch/powerpc/kernel/signal_64.c | 1 -
2277 arch/powerpc/kernel/smp.c | 2 +-
2278 arch/powerpc/kernel/stacktrace.c | 2 +-
2279 arch/powerpc/kernel/swsusp_64.c | 1 +
2280 arch/powerpc/kernel/sysfs.c | 2 +-
2281 arch/powerpc/kernel/time.c | 2 +-
2282 arch/powerpc/kernel/vdso.c | 1 -
2283 arch/powerpc/kernel/vio.c | 3 +-
2284 arch/powerpc/kvm/44x.c | 1 +
2285 arch/powerpc/kvm/book3s.c | 1 +
2286 arch/powerpc/kvm/book3s_exports.c | 2 +-
2287 arch/powerpc/kvm/book3s_hv.c | 1 +
2288 arch/powerpc/kvm/book3s_hv_builtin.c | 1 +
2289 arch/powerpc/kvm/book3s_pr.c | 1 +
2290 arch/powerpc/kvm/powerpc.c | 1 -
2291 arch/powerpc/lib/checksum_wrappers_64.c | 2 +-
2292 arch/powerpc/lib/devres.c | 2 +-
2293 arch/powerpc/lib/locks.c | 2 +-
2294 arch/powerpc/lib/rheap.c | 2 +-
2295 arch/powerpc/mm/dma-noncoherent.c | 1 +
2296 arch/powerpc/mm/hash_utils_64.c | 1 +
2297 arch/powerpc/mm/mem.c | 2 +-
2298 arch/powerpc/mm/mmu_context_hash32.c | 1 +
2299 arch/powerpc/mm/mmu_context_hash64.c | 2 +-
2300 arch/powerpc/mm/numa.c | 2 +-
2301 arch/powerpc/mm/pgtable_64.c | 1 +
2302 arch/powerpc/mm/slice.c | 2 +-
2303 arch/powerpc/mm/tlb_hash32.c | 1 +
2304 arch/powerpc/mm/tlb_nohash.c | 1 +
2305 arch/powerpc/platforms/44x/warp.c | 1 +
2306 arch/powerpc/platforms/512x/clock.c | 1 +
2307 arch/powerpc/platforms/52xx/mpc52xx_common.c | 1 +
2308 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 +
2309 arch/powerpc/platforms/83xx/suspend.c | 1 +
2310 arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 -
2311 arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 -
2312 arch/powerpc/platforms/85xx/sbc8548.c | 1 -
2313 arch/powerpc/platforms/86xx/gef_gpio.c | 1 +
2314 arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 -
2315 arch/powerpc/platforms/cell/axon_msi.c | 1 +
2316 arch/powerpc/platforms/cell/beat.c | 2 +-
2317 arch/powerpc/platforms/cell/beat_spu_priv1.c | 2 -
2318 arch/powerpc/platforms/cell/beat_wrapper.h | 1 +
2319 arch/powerpc/platforms/cell/cbe_cpufreq.c | 1 +
2320 arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c | 1 +
2321 arch/powerpc/platforms/cell/cbe_powerbutton.c | 1 +
2322 arch/powerpc/platforms/cell/cbe_regs.c | 2 +-
2323 arch/powerpc/platforms/cell/celleb_setup.c | 1 +
2324 arch/powerpc/platforms/cell/cpufreq_spudemand.c | 1 +
2325 arch/powerpc/platforms/cell/interrupt.c | 2 +-
2326 arch/powerpc/platforms/cell/pmu.c | 1 +
2327 arch/powerpc/platforms/cell/qpace_setup.c | 1 +
2328 arch/powerpc/platforms/cell/setup.c | 1 +
2329 arch/powerpc/platforms/cell/smp.c | 1 -
2330 arch/powerpc/platforms/cell/spu_callbacks.c | 2 +-
2331 arch/powerpc/platforms/cell/spu_fault.c | 2 +-
2332 arch/powerpc/platforms/cell/spu_manage.c | 2 +-
2333 arch/powerpc/platforms/cell/spu_notify.c | 3 +-
2334 arch/powerpc/platforms/cell/spu_priv1_mmio.c | 1 -
2335 arch/powerpc/platforms/cell/spufs/backing_ops.c | 1 -
2336 arch/powerpc/platforms/cell/spufs/context.c | 2 +-
2337 arch/powerpc/platforms/cell/spufs/coredump.c | 1 -
2338 arch/powerpc/platforms/cell/spufs/fault.c | 1 -
2339 arch/powerpc/platforms/cell/spufs/file.c | 2 +-
2340 arch/powerpc/platforms/cell/spufs/hw_ops.c | 1 -
2341 arch/powerpc/platforms/cell/spufs/sched.c | 1 -
2342 arch/powerpc/platforms/cell/spufs/switch.c | 2 +-
2343 arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +-
2344 arch/powerpc/platforms/embedded6xx/holly.c | 1 +
2345 arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 1 +
2346 arch/powerpc/platforms/iseries/hvlpconfig.c | 2 +-
2347 arch/powerpc/platforms/iseries/iommu.c | 2 +-
2348 arch/powerpc/platforms/iseries/ksyms.c | 2 +-
2349 arch/powerpc/platforms/iseries/lpardata.c | 1 -
2350 arch/powerpc/platforms/iseries/lpevents.c | 2 +-
2351 arch/powerpc/platforms/iseries/mf.c | 1 +
2352 arch/powerpc/platforms/iseries/pci.c | 1 -
2353 arch/powerpc/platforms/iseries/setup.c | 1 +
2354 arch/powerpc/platforms/iseries/smp.c | 1 -
2355 arch/powerpc/platforms/iseries/vio.c | 2 +-
2356 arch/powerpc/platforms/iseries/viopath.c | 2 +-
2357 arch/powerpc/platforms/maple/setup.c | 1 +
2358 arch/powerpc/platforms/pasemi/cpufreq.c | 1 +
2359 arch/powerpc/platforms/pasemi/dma_lib.c | 3 +-
2360 arch/powerpc/platforms/pasemi/setup.c | 1 +
2361 arch/powerpc/platforms/powermac/backlight.c | 1 +
2362 arch/powerpc/platforms/powermac/feature.c | 1 +
2363 arch/powerpc/platforms/powermac/low_i2c.c | 2 +-
2364 arch/powerpc/platforms/powermac/nvram.c | 2 +-
2365 arch/powerpc/platforms/powermac/pic.c | 1 -
2366 arch/powerpc/platforms/powermac/setup.c | 1 +
2367 arch/powerpc/platforms/ps3/exports.c | 2 -
2368 arch/powerpc/platforms/ps3/interrupt.c | 2 +-
2369 arch/powerpc/platforms/ps3/mm.c | 2 +-
2370 arch/powerpc/platforms/ps3/os-area.c | 1 +
2371 arch/powerpc/platforms/ps3/setup.c | 1 +
2372 arch/powerpc/platforms/ps3/spu.c | 1 +
2373 arch/powerpc/platforms/ps3/system-bus.c | 2 +-
2374 arch/powerpc/platforms/pseries/eeh.c | 2 +
2375 arch/powerpc/platforms/pseries/eeh_event.c | 1 +
2376 arch/powerpc/platforms/pseries/eeh_sysfs.c | 1 +
2377 arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 +
2378 arch/powerpc/platforms/pseries/hvconsole.c | 3 +-
2379 arch/powerpc/platforms/pseries/io_event_irq.c | 2 +-
2380 arch/powerpc/platforms/pseries/iommu.c | 1 +
2381 arch/powerpc/platforms/pseries/lpar.c | 1 +
2382 arch/powerpc/platforms/pseries/mobility.c | 1 +
2383 arch/powerpc/platforms/pseries/pci_dlpar.c | 1 +
2384 arch/powerpc/platforms/pseries/plpar_wrappers.h | 3 +
2385 arch/powerpc/platforms/pseries/setup.c | 2 +-
2386 arch/powerpc/platforms/pseries/smp.c | 1 -
2387 arch/powerpc/platforms/pseries/suspend.c | 1 +
2388 arch/powerpc/sysdev/bestcomm/sram.c | 2 +-
2389 arch/powerpc/sysdev/cpm_common.c | 1 +
2390 arch/powerpc/sysdev/dcr.c | 1 +
2391 arch/powerpc/sysdev/fsl_gtm.c | 1 +
2392 arch/powerpc/sysdev/fsl_lbc.c | 3 +-
2393 arch/powerpc/sysdev/fsl_pmc.c | 1 +
2394 arch/powerpc/sysdev/fsl_rio.c | 2 +-
2395 arch/powerpc/sysdev/fsl_soc.c | 2 +-
2396 arch/powerpc/sysdev/mpc5xxx_clocks.c | 1 +
2397 arch/powerpc/sysdev/mpc8xx_pic.c | 1 -
2398 arch/powerpc/sysdev/mv64x60_pci.c | 1 +
2399 arch/powerpc/sysdev/pmi.c | 1 +
2400 arch/powerpc/sysdev/ppc4xx_msi.c | 1 +
2401 arch/powerpc/sysdev/qe_lib/gpio.c | 1 +
2402 arch/powerpc/sysdev/qe_lib/ucc.c | 2 +-
2403 arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2 +-
2404 arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2 +-
2405 arch/powerpc/sysdev/qe_lib/usb.c | 1 +
2406 arch/powerpc/sysdev/rtc_cmos_setup.c | 1 +
2407 arch/powerpc/sysdev/scom.c | 1 +
2408 arch/powerpc/sysdev/simple_gpio.c | 1 -
2409 arch/powerpc/sysdev/tsi108_dev.c | 2 +-
2410 arch/powerpc/xmon/xmon.c | 2 +-
2411 arch/s390/crypto/sha_common.c | 1 +
2412 arch/s390/mm/init.c | 1 +
2413 arch/sh/drivers/dma/dma-sysfs.c | 1 +
2414 arch/sh/drivers/pci/pci.c | 1 +
2415 arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 +
2416 arch/sh/kernel/perf_event.c | 1 +
2417 arch/sh/kernel/topology.c | 1 +
2418 arch/sh/mm/init.c | 1 +
2419 arch/sparc/include/asm/termios.h | 1 -
2420 arch/sparc/kernel/auxio_32.c | 1 +
2421 arch/sparc/kernel/btext.c | 1 -
2422 arch/sparc/kernel/central.c | 1 +
2423 arch/sparc/kernel/cpu.c | 2 +-
2424 arch/sparc/kernel/cpumap.c | 2 +-
2425 arch/sparc/kernel/dma.c | 1 -
2426 arch/sparc/kernel/ebus.c | 2 +-
2427 arch/sparc/kernel/hvapi.c | 2 +-
2428 arch/sparc/kernel/idprom.c | 2 +-
2429 arch/sparc/kernel/iommu.c | 2 +-
2430 arch/sparc/kernel/irq_32.c | 1 +
2431 arch/sparc/kernel/irq_64.c | 1 -
2432 arch/sparc/kernel/ldc.c | 2 +-
2433 arch/sparc/kernel/leon_kernel.c | 1 -
2434 arch/sparc/kernel/leon_pci_grpci2.c | 1 -
2435 arch/sparc/kernel/nmi.c | 2 +-
2436 arch/sparc/kernel/of_device_32.c | 1 -
2437 arch/sparc/kernel/of_device_64.c | 3 +-
2438 arch/sparc/kernel/of_device_common.c | 2 +-
2439 arch/sparc/kernel/pci.c | 2 +-
2440 arch/sparc/kernel/pci_fire.c | 1 +
2441 arch/sparc/kernel/pci_psycho.c | 1 +
2442 arch/sparc/kernel/pci_sabre.c | 1 +
2443 arch/sparc/kernel/pci_schizo.c | 1 +
2444 arch/sparc/kernel/pci_sun4v.c | 1 +
2445 arch/sparc/kernel/pcic.c | 1 +
2446 arch/sparc/kernel/pcr.c | 3 +-
2447 arch/sparc/kernel/pmc.c | 1 +
2448 arch/sparc/kernel/power.c | 2 +-
2449 arch/sparc/kernel/process_64.c | 2 +-
2450 arch/sparc/kernel/prom_32.c | 1 -
2451 arch/sparc/kernel/prom_64.c | 1 -
2452 arch/sparc/kernel/prom_common.c | 2 +-
2453 arch/sparc/kernel/reboot.c | 2 +-
2454 arch/sparc/kernel/sbus.c | 1 +
2455 arch/sparc/kernel/setup_32.c | 1 +
2456 arch/sparc/kernel/setup_64.c | 1 +
2457 arch/sparc/kernel/smp_64.c | 2 +-
2458 arch/sparc/kernel/sparc_ksyms_64.c | 2 +-
2459 arch/sparc/kernel/stacktrace.c | 2 +-
2460 arch/sparc/kernel/sys_sparc32.c | 1 -
2461 arch/sparc/kernel/sys_sparc_64.c | 2 +-
2462 arch/sparc/kernel/time_64.c | 2 +-
2463 arch/sparc/kernel/traps_32.c | 1 +
2464 arch/sparc/kernel/unaligned_32.c | 1 -
2465 arch/sparc/kernel/vio.c | 1 +
2466 arch/sparc/kernel/viohs.c | 2 +-
2467 arch/sparc/mm/fault_32.c | 1 -
2468 arch/sparc/mm/generic_32.c | 1 +
2469 arch/sparc/mm/generic_64.c | 1 +
2470 arch/sparc/mm/highmem.c | 1 +
2471 arch/sparc/mm/hugetlbpage.c | 1 -
2472 arch/x86/crypto/aes_glue.c | 1 +
2473 arch/x86/crypto/aesni-intel_glue.c | 1 +
2474 arch/x86/kernel/cpu/amd.c | 1 +
2475 arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 +
2476 arch/x86/kernel/devicetree.c | 1 +
2477 arch/x86/kernel/e820.c | 1 +
2478 arch/x86/kernel/hpet.c | 1 +
2479 arch/x86/kernel/irq.c | 1 +
2480 arch/x86/kernel/pci-dma.c | 1 +
2481 arch/x86/kernel/probe_roms.c | 4 +-
2482 arch/x86/kernel/rtc.c | 1 +
2483 arch/x86/kernel/smp.c | 1 +
2484 arch/x86/kernel/time.c | 1 +
2485 arch/x86/kernel/topology.c | 1 +
2486 arch/x86/kernel/vsyscall_64.c | 1 +
2487 arch/x86/pci/i386.c | 1 +
2488 arch/x86/pci/legacy.c | 1 +
2489 arch/x86/platform/efi/efi.c | 1 +
2490 arch/x86/platform/efi/efi_32.c | 1 +
2491 arch/x86/platform/mrst/vrtc.c | 1 +
2492 arch/x86/platform/olpc/olpc-xo1-pm.c | 1 +
2493 arch/x86/platform/uv/bios_uv.c | 1 +
2494 arch/x86/power/cpu.c | 1 +
2495 arch/x86/video/fbdev.c | 1 +
2496 block/blk-integrity.c | 1 +
2498 crypto/async_tx/async_memcpy.c | 1 +
2499 crypto/async_tx/async_pq.c | 1 +
2500 crypto/async_tx/async_raid6_recov.c | 1 +
2501 crypto/async_tx/async_tx.c | 1 +
2502 crypto/async_tx/async_xor.c | 1 +
2503 crypto/async_tx/raid6test.c | 1 +
2504 crypto/crypto_wq.c | 1 +
2509 drivers/acpi/acpica/hwsleep.c | 1 +
2510 drivers/acpi/ec_sys.c | 1 +
2511 drivers/acpi/sbshc.c | 1 +
2512 drivers/acpi/sysfs.c | 2 +-
2513 drivers/ata/libata-eh.c | 1 +
2514 drivers/ata/libata-pmp.c | 1 +
2515 drivers/ata/libata-scsi.c | 1 +
2516 drivers/ata/libata-sff.c | 1 +
2517 drivers/base/base.h | 1 +
2518 drivers/base/dma-coherent.c | 1 +
2519 drivers/base/dma-mapping.c | 1 +
2520 drivers/base/hypervisor.c | 1 +
2521 drivers/base/power/generic_ops.c | 1 +
2522 drivers/base/power/main.c | 1 +
2523 drivers/base/power/runtime.c | 1 +
2524 drivers/base/power/sysfs.c | 1 +
2525 drivers/base/power/trace.c | 1 +
2526 drivers/base/power/wakeup.c | 1 +
2527 drivers/base/transport_class.c | 1 +
2528 drivers/bcma/core.c | 1 +
2529 drivers/bcma/driver_chipcommon.c | 1 +
2530 drivers/bcma/driver_pci.c | 1 +
2531 drivers/bcma/host_pci.c | 1 +
2532 drivers/bcma/main.c | 1 +
2533 drivers/block/aoe/aoechr.c | 1 +
2534 drivers/block/ps3disk.c | 1 +
2535 drivers/block/ps3vram.c | 1 +
2536 drivers/block/virtio_blk.c | 1 +
2537 drivers/char/hw_random/virtio-rng.c | 1 +
2538 drivers/char/ramoops.c | 1 +
2539 drivers/char/ttyprintk.c | 1 +
2540 drivers/char/virtio_console.c | 1 +
2541 drivers/clocksource/sh_cmt.c | 1 +
2542 drivers/clocksource/sh_mtu2.c | 1 +
2543 drivers/clocksource/sh_tmu.c | 1 +
2544 drivers/cpufreq/cpufreq_stats.c | 1 +
2545 drivers/cpufreq/s3c64xx-cpufreq.c | 1 +
2546 drivers/crypto/mv_cesa.c | 1 +
2547 drivers/dca/dca-core.c | 1 +
2548 drivers/dca/dca-sysfs.c | 1 +
2549 drivers/dma/intel_mid_dma.c | 1 +
2550 drivers/dma/ipu/ipu_idmac.c | 1 +
2551 drivers/dma/ste_dma40.c | 1 +
2552 drivers/edac/mce_amd_inj.c | 1 +
2553 drivers/firewire/core-iso.c | 1 +
2554 drivers/firmware/google/gsmi.c | 1 +
2555 drivers/firmware/sigma.c | 1 +
2556 drivers/gpio/gpio-74x164.c | 1 +
2557 drivers/gpio/gpio-ep93xx.c | 1 +
2558 drivers/gpio/gpio-mc33880.c | 1 +
2559 drivers/gpio/gpio-mcp23s08.c | 1 +
2560 drivers/gpio/gpio-ml-ioh.c | 1 +
2561 drivers/gpio/gpio-mpc5200.c | 1 +
2562 drivers/gpio/gpio-mxc.c | 1 +
2563 drivers/gpio/gpio-mxs.c | 1 +
2564 drivers/gpio/gpio-pcf857x.c | 1 +
2565 drivers/gpio/gpio-pch.c | 1 +
2566 drivers/gpio/gpio-xilinx.c | 1 +
2567 drivers/gpu/drm/ttm/ttm_tt.c | 1 +
2568 drivers/hid/hid-axff.c | 1 +
2569 drivers/hid/hid-debug.c | 1 +
2570 drivers/hid/hid-dr.c | 1 +
2571 drivers/hid/hid-emsff.c | 1 +
2572 drivers/hid/hid-gaff.c | 1 +
2573 drivers/hid/hid-holtekff.c | 1 +
2574 drivers/hid/hid-picolcd.c | 1 +
2575 drivers/hid/hid-pl.c | 1 +
2576 drivers/hid/hid-roccat-common.c | 1 +
2577 drivers/hid/hid-roccat.c | 1 +
2578 drivers/hid/hid-sjoy.c | 1 +
2579 drivers/hid/hid-tmff.c | 1 +
2580 drivers/hid/hid-zpff.c | 1 +
2581 drivers/hid/usbhid/hid-quirks.c | 1 +
2582 drivers/hwmon/ultra45_env.c | 1 +
2583 drivers/i2c/busses/i2c-pxa-pci.c | 1 +
2584 drivers/i2c/busses/i2c-sh7760.c | 1 +
2585 drivers/i2c/busses/i2c-tegra.c | 1 +
2586 drivers/i2c/i2c-boardinfo.c | 1 +
2587 drivers/ide/buddha.c | 1 +
2588 drivers/ide/cmd640.c | 1 +
2589 drivers/ide/ide-acpi.c | 1 +
2590 drivers/ide/ide-atapi.c | 1 +
2591 drivers/ide/ide-disk_proc.c | 1 +
2592 drivers/ide/ide-dma-sff.c | 1 +
2593 drivers/ide/ide-dma.c | 1 +
2594 drivers/ide/ide-eh.c | 1 +
2595 drivers/ide/ide-floppy_proc.c | 1 +
2596 drivers/ide/ide-io-std.c | 1 +
2597 drivers/ide/ide-ioctls.c | 1 +
2598 drivers/ide/ide-legacy.c | 1 +
2599 drivers/ide/ide-lib.c | 1 +
2600 drivers/ide/ide-pnp.c | 1 +
2601 drivers/ide/ide-taskfile.c | 1 +
2602 drivers/ide/ide-xfer-mode.c | 1 +
2603 drivers/ide/macide.c | 1 +
2604 drivers/ide/pmac.c | 1 +
2605 drivers/ide/q40ide.c | 1 +
2606 drivers/ide/setup-pci.c | 1 +
2607 drivers/ide/tc86c001.c | 1 +
2608 drivers/idle/intel_idle.c | 1 +
2609 drivers/infiniband/core/cm.c | 1 +
2610 drivers/infiniband/core/fmr_pool.c | 1 +
2611 drivers/infiniband/core/mad.c | 1 +
2612 drivers/infiniband/core/multicast.c | 1 +
2613 drivers/infiniband/core/packer.c | 1 +
2614 drivers/infiniband/core/sysfs.c | 1 +
2615 drivers/infiniband/core/ud_header.c | 1 +
2616 drivers/infiniband/core/umem.c | 1 +
2617 drivers/infiniband/core/uverbs_marshall.c | 1 +
2618 drivers/infiniband/core/verbs.c | 1 +
2619 drivers/infiniband/hw/ipath/ipath_diag.c | 1 +
2620 drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 +
2621 drivers/infiniband/hw/ipath/ipath_sysfs.c | 1 +
2622 drivers/infiniband/hw/ipath/ipath_verbs.c | 1 +
2623 drivers/infiniband/hw/mthca/mthca_catas.c | 1 +
2624 drivers/infiniband/hw/mthca/mthca_cmd.c | 1 +
2625 drivers/infiniband/hw/mthca/mthca_provider.c | 2 +
2626 drivers/infiniband/hw/qib/qib_diag.c | 1 +
2627 drivers/infiniband/hw/qib/qib_file_ops.c | 1 +
2628 drivers/infiniband/hw/qib/qib_iba7220.c | 1 +
2629 drivers/infiniband/hw/qib/qib_iba7322.c | 1 +
2630 drivers/infiniband/hw/qib/qib_pcie.c | 1 +
2631 drivers/infiniband/hw/qib/qib_sd7220.c | 1 +
2632 drivers/infiniband/hw/qib/qib_verbs.c | 1 +
2633 drivers/input/input-compat.c | 1 +
2634 drivers/input/input-mt.c | 1 +
2635 drivers/input/input-polldev.c | 1 +
2636 drivers/input/joystick/as5011.c | 1 +
2637 drivers/input/keyboard/nomadik-ske-keypad.c | 1 +
2638 drivers/input/keyboard/tnetv107x-keypad.c | 1 +
2639 drivers/input/misc/ad714x.c | 1 +
2640 drivers/input/misc/adxl34x.c | 1 +
2641 drivers/input/misc/ati_remote2.c | 1 +
2642 drivers/input/misc/cma3000_d0x.c | 1 +
2643 drivers/input/misc/dm355evm_keys.c | 1 +
2644 drivers/input/sparse-keymap.c | 1 +
2645 drivers/input/touchscreen/ad7877.c | 1 +
2646 drivers/input/touchscreen/ad7879-spi.c | 1 +
2647 drivers/input/touchscreen/ad7879.c | 1 +
2648 drivers/input/touchscreen/ads7846.c | 1 +
2649 drivers/input/touchscreen/bu21013_ts.c | 1 +
2650 drivers/isdn/capi/kcapi_proc.c | 1 +
2651 drivers/leds/dell-led.c | 1 +
2652 drivers/leds/leds-88pm860x.c | 1 +
2653 drivers/leds/leds-asic3.c | 1 +
2654 drivers/leds/leds-atmel-pwm.c | 1 +
2655 drivers/leds/leds-cobalt-raq.c | 1 +
2656 drivers/leds/leds-fsg.c | 1 +
2657 drivers/leds/leds-gpio.c | 1 +
2658 drivers/leds/leds-lm3530.c | 1 +
2659 drivers/leds/leds-locomo.c | 1 +
2660 drivers/leds/leds-lt3593.c | 1 +
2661 drivers/leds/leds-net48xx.c | 1 +
2662 drivers/leds/leds-net5501.c | 1 +
2663 drivers/leds/leds-ns2.c | 1 +
2664 drivers/leds/leds-s3c24xx.c | 1 +
2665 drivers/leds/leds-wm831x-status.c | 1 +
2666 drivers/leds/leds-wm8350.c | 1 +
2667 drivers/leds/leds-wrap.c | 1 +
2668 drivers/lguest/lguest_device.c | 1 +
2669 drivers/md/dm-exception-store.c | 1 +
2670 drivers/md/dm-log-userspace-base.c | 1 +
2671 drivers/md/dm-path-selector.c | 1 +
2672 drivers/md/dm-raid.c | 1 +
2673 drivers/md/dm-round-robin.c | 1 +
2674 drivers/md/dm-service-time.c | 1 +
2675 drivers/md/dm-snap-persistent.c | 1 +
2676 drivers/md/dm-snap-transient.c | 1 +
2677 drivers/md/dm-uevent.c | 1 +
2678 drivers/md/faulty.c | 1 +
2679 drivers/md/linear.c | 1 +
2680 drivers/md/md.c | 1 +
2681 drivers/md/multipath.c | 1 +
2682 drivers/md/raid0.c | 1 +
2683 drivers/md/raid1.c | 1 +
2684 drivers/md/raid10.c | 1 +
2685 drivers/md/raid5.c | 1 +
2686 drivers/media/common/saa7146_core.c | 1 +
2687 drivers/media/common/saa7146_fops.c | 1 +
2688 drivers/media/common/saa7146_hlp.c | 1 +
2689 drivers/media/common/saa7146_video.c | 1 +
2690 drivers/media/common/tuners/tuner-types.c | 1 +
2691 drivers/media/dvb/frontends/dibx000_common.c | 1 +
2692 drivers/media/dvb/siano/sms-cards.c | 1 +
2693 drivers/media/dvb/siano/smsendian.c | 1 +
2694 drivers/media/dvb/siano/smssdio.c | 1 +
2695 drivers/media/dvb/siano/smsusb.c | 1 +
2696 drivers/media/media-device.c | 1 +
2697 drivers/media/radio/radio-timb.c | 1 +
2698 drivers/media/radio/radio-wl1273.c | 1 +
2699 drivers/media/radio/si4713-i2c.c | 1 +
2700 drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +
2701 drivers/media/rc/ir-jvc-decoder.c | 1 +
2702 drivers/media/rc/ir-lirc-codec.c | 1 +
2703 drivers/media/rc/ir-nec-decoder.c | 1 +
2704 drivers/media/rc/ir-raw.c | 2 +
2705 drivers/media/rc/ir-rc5-decoder.c | 1 +
2706 drivers/media/rc/ir-rc5-sz-decoder.c | 1 +
2707 drivers/media/rc/ir-rc6-decoder.c | 1 +
2708 drivers/media/rc/ir-sony-decoder.c | 1 +
2709 drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 1 +
2710 drivers/media/rc/keymaps/rc-alink-dtu-m.c | 1 +
2711 drivers/media/rc/keymaps/rc-anysee.c | 1 +
2712 drivers/media/rc/keymaps/rc-apac-viewcomp.c | 1 +
2713 drivers/media/rc/keymaps/rc-asus-pc39.c | 1 +
2714 drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 1 +
2715 drivers/media/rc/keymaps/rc-avermedia-a16d.c | 1 +
2716 drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 1 +
2717 drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 1 +
2718 drivers/media/rc/keymaps/rc-avermedia-m135a.c | 1 +
2719 .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 1 +
2720 drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 1 +
2721 drivers/media/rc/keymaps/rc-avermedia.c | 1 +
2722 drivers/media/rc/keymaps/rc-avertv-303.c | 1 +
2723 drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | 1 +
2724 drivers/media/rc/keymaps/rc-behold-columbus.c | 1 +
2725 drivers/media/rc/keymaps/rc-behold.c | 1 +
2726 drivers/media/rc/keymaps/rc-budget-ci-old.c | 1 +
2727 drivers/media/rc/keymaps/rc-cinergy-1400.c | 1 +
2728 drivers/media/rc/keymaps/rc-cinergy.c | 1 +
2729 drivers/media/rc/keymaps/rc-dib0700-nec.c | 1 +
2730 drivers/media/rc/keymaps/rc-dib0700-rc5.c | 1 +
2731 drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | 1 +
2732 drivers/media/rc/keymaps/rc-digittrade.c | 1 +
2733 drivers/media/rc/keymaps/rc-dm1105-nec.c | 1 +
2734 drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 1 +
2735 drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 1 +
2736 drivers/media/rc/keymaps/rc-em-terratec.c | 1 +
2737 drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 1 +
2738 drivers/media/rc/keymaps/rc-encore-enltv.c | 1 +
2739 drivers/media/rc/keymaps/rc-encore-enltv2.c | 1 +
2740 drivers/media/rc/keymaps/rc-evga-indtube.c | 1 +
2741 drivers/media/rc/keymaps/rc-eztv.c | 1 +
2742 drivers/media/rc/keymaps/rc-flydvb.c | 1 +
2743 drivers/media/rc/keymaps/rc-flyvideo.c | 1 +
2744 drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 1 +
2745 drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 1 +
2746 drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 1 +
2747 drivers/media/rc/keymaps/rc-gotview7135.c | 1 +
2748 drivers/media/rc/keymaps/rc-hauppauge.c | 1 +
2749 drivers/media/rc/keymaps/rc-imon-mce.c | 1 +
2750 drivers/media/rc/keymaps/rc-imon-pad.c | 1 +
2751 drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 1 +
2752 drivers/media/rc/keymaps/rc-kaiomy.c | 1 +
2753 drivers/media/rc/keymaps/rc-kworld-315u.c | 1 +
2754 .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 1 +
2755 drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | 1 +
2756 drivers/media/rc/keymaps/rc-lirc.c | 1 +
2757 drivers/media/rc/keymaps/rc-lme2510.c | 1 +
2758 drivers/media/rc/keymaps/rc-manli.c | 1 +
2759 drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 1 +
2760 drivers/media/rc/keymaps/rc-msi-digivox-iii.c | 1 +
2761 drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 1 +
2762 drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 1 +
2763 drivers/media/rc/keymaps/rc-nebula.c | 1 +
2764 .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 1 +
2765 drivers/media/rc/keymaps/rc-norwood.c | 1 +
2766 drivers/media/rc/keymaps/rc-npgtech.c | 1 +
2767 drivers/media/rc/keymaps/rc-pctv-sedna.c | 1 +
2768 drivers/media/rc/keymaps/rc-pinnacle-color.c | 1 +
2769 drivers/media/rc/keymaps/rc-pinnacle-grey.c | 1 +
2770 drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 +
2771 drivers/media/rc/keymaps/rc-pixelview-002t.c | 1 +
2772 drivers/media/rc/keymaps/rc-pixelview-mk12.c | 1 +
2773 drivers/media/rc/keymaps/rc-pixelview-new.c | 1 +
2774 drivers/media/rc/keymaps/rc-pixelview.c | 1 +
2775 .../media/rc/keymaps/rc-powercolor-real-angel.c | 1 +
2776 drivers/media/rc/keymaps/rc-proteus-2309.c | 1 +
2777 drivers/media/rc/keymaps/rc-purpletv.c | 1 +
2778 drivers/media/rc/keymaps/rc-pv951.c | 1 +
2779 drivers/media/rc/keymaps/rc-rc6-mce.c | 1 +
2780 .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 1 +
2781 drivers/media/rc/keymaps/rc-streamzap.c | 1 +
2782 drivers/media/rc/keymaps/rc-tbs-nec.c | 1 +
2783 drivers/media/rc/keymaps/rc-technisat-usb2.c | 1 +
2784 drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 1 +
2785 drivers/media/rc/keymaps/rc-terratec-slim-2.c | 1 +
2786 drivers/media/rc/keymaps/rc-terratec-slim.c | 1 +
2787 drivers/media/rc/keymaps/rc-tevii-nec.c | 1 +
2788 drivers/media/rc/keymaps/rc-tivo.c | 1 +
2789 drivers/media/rc/keymaps/rc-total-media-in-hand.c | 1 +
2790 drivers/media/rc/keymaps/rc-trekstor.c | 1 +
2791 drivers/media/rc/keymaps/rc-tt-1500.c | 1 +
2792 drivers/media/rc/keymaps/rc-twinhan1027.c | 1 +
2793 drivers/media/rc/keymaps/rc-videomate-m1f.c | 1 +
2794 drivers/media/rc/keymaps/rc-videomate-s350.c | 1 +
2795 drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 1 +
2796 drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 1 +
2797 drivers/media/rc/keymaps/rc-winfast.c | 1 +
2798 drivers/media/rc/rc-main.c | 1 +
2799 drivers/media/video/adp1653.c | 1 +
2800 drivers/media/video/ak881x.c | 1 +
2801 drivers/media/video/cpia2/cpia2_usb.c | 1 +
2802 drivers/media/video/cx25840/cx25840-ir.c | 1 +
2803 drivers/media/video/davinci/dm355_ccdc.c | 1 +
2804 drivers/media/video/davinci/dm644x_ccdc.c | 1 +
2805 drivers/media/video/hdpvr/hdpvr-i2c.c | 1 +
2806 drivers/media/video/hexium_gemini.c | 1 +
2807 drivers/media/video/hexium_orion.c | 1 +
2808 drivers/media/video/imx074.c | 1 +
2809 drivers/media/video/m5mols/m5mols_core.c | 1 +
2810 drivers/media/video/mt9m001.c | 1 +
2811 drivers/media/video/mt9m111.c | 1 +
2812 drivers/media/video/mt9t031.c | 1 +
2813 drivers/media/video/mt9v011.c | 1 +
2814 drivers/media/video/mt9v022.c | 1 +
2815 drivers/media/video/mt9v032.c | 1 +
2816 drivers/media/video/mxb.c | 1 +
2817 drivers/media/video/noon010pc30.c | 1 +
2818 drivers/media/video/omap24xxcam.c | 1 +
2819 drivers/media/video/ov6650.c | 1 +
2820 drivers/media/video/pvrusb2/pvrusb2-devattr.c | 1 +
2821 drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 +
2822 drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 +
2823 drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 +
2824 drivers/media/video/rj54n1cb0c.c | 1 +
2825 drivers/media/video/sh_mobile_csi2.c | 1 +
2826 drivers/media/video/sh_vou.c | 1 +
2827 drivers/media/video/sr030pc30.c | 1 +
2828 drivers/media/video/tcm825x.c | 1 +
2829 drivers/media/video/timblogiw.c | 1 +
2830 drivers/media/video/tvp514x.c | 1 +
2831 drivers/media/video/tvp5150.c | 1 +
2832 drivers/media/video/tvp7002.c | 1 +
2833 drivers/media/video/usbvision/usbvision-cards.c | 1 +
2834 drivers/media/video/v4l2-ctrls.c | 1 +
2835 drivers/media/video/v4l2-device.c | 1 +
2836 drivers/media/video/v4l2-event.c | 1 +
2837 drivers/media/video/v4l2-fh.c | 1 +
2838 drivers/media/video/v4l2-int-device.c | 1 +
2839 drivers/media/video/v4l2-subdev.c | 1 +
2840 drivers/memstick/core/memstick.c | 1 +
2841 drivers/memstick/core/mspro_block.c | 1 +
2842 drivers/memstick/host/jmb38x_ms.c | 1 +
2843 drivers/memstick/host/tifm_ms.c | 1 +
2844 drivers/message/i2o/pci.c | 1 +
2845 drivers/mfd/ab3100-core.c | 1 +
2846 drivers/mfd/ab3550-core.c | 1 +
2847 drivers/mfd/ab8500-debugfs.c | 1 +
2848 drivers/mfd/ab8500-sysctrl.c | 1 +
2849 drivers/mfd/abx500-core.c | 1 +
2850 drivers/mfd/asic3.c | 1 +
2851 drivers/mfd/dm355evm_msp.c | 1 +
2852 drivers/mfd/max8997.c | 1 +
2853 drivers/mfd/mfd-core.c | 1 +
2854 drivers/mfd/pcf50633-irq.c | 1 +
2855 drivers/mfd/tmio_core.c | 1 +
2856 drivers/mfd/twl-core.c | 1 +
2857 drivers/mfd/twl6030-irq.c | 1 +
2858 drivers/mfd/wl1273-core.c | 1 +
2859 drivers/mfd/wm8400-core.c | 1 +
2860 drivers/misc/ab8500-pwm.c | 1 +
2861 drivers/misc/atmel-ssc.c | 1 +
2862 drivers/misc/atmel_tclib.c | 1 +
2863 drivers/misc/bh1780gli.c | 1 +
2864 drivers/misc/kgdbts.c | 1 +
2865 drivers/misc/ti-st/st_kim.c | 1 +
2866 drivers/misc/tifm_7xx1.c | 1 +
2867 drivers/misc/tifm_core.c | 1 +
2868 drivers/mmc/card/mmc_test.c | 1 +
2869 drivers/mmc/core/bus.c | 2 +
2870 drivers/mmc/core/debugfs.c | 1 +
2871 drivers/mmc/core/host.c | 1 +
2872 drivers/mmc/core/mmc.c | 1 +
2873 drivers/mmc/core/mmc_ops.c | 1 +
2874 drivers/mmc/core/quirks.c | 1 +
2875 drivers/mmc/core/sd.c | 1 +
2876 drivers/mmc/core/sd_ops.c | 1 +
2877 drivers/mmc/core/sdio_bus.c | 1 +
2878 drivers/mmc/core/sdio_io.c | 1 +
2879 drivers/mmc/core/sdio_irq.c | 1 +
2880 drivers/mmc/host/mmc_spi.c | 1 +
2881 drivers/mmc/host/mxs-mmc.c | 1 +
2882 drivers/mmc/host/sdhci-of-esdhc.c | 1 +
2883 drivers/mmc/host/sdhci-of-hlwd.c | 1 +
2884 drivers/mmc/host/sdhci-pci.c | 1 +
2885 drivers/mmc/host/sdhci-pltfm.c | 1 +
2886 drivers/mmc/host/sdhci-pxav2.c | 1 +
2887 drivers/mmc/host/sdhci-pxav3.c | 1 +
2888 drivers/mmc/host/sdhci-spear.c | 1 +
2889 drivers/mmc/host/sdhci-tegra.c | 1 +
2890 drivers/mmc/host/sdhci.c | 1 +
2891 drivers/mmc/host/sdricoh_cs.c | 1 +
2892 drivers/mmc/host/sh_mmcif.c | 1 +
2893 drivers/mmc/host/sh_mobile_sdhi.c | 1 +
2894 drivers/mmc/host/tifm_sd.c | 1 +
2895 drivers/mmc/host/via-sdmmc.c | 1 +
2896 drivers/mtd/ar7part.c | 1 +
2897 drivers/mtd/cmdlinepart.c | 1 +
2898 drivers/mtd/lpddr/lpddr_cmds.c | 1 +
2899 drivers/mtd/mtdblock_ro.c | 1 +
2900 drivers/mtd/mtdsuper.c | 1 +
2901 drivers/mtd/nand/cafe_nand.c | 1 +
2902 drivers/mtd/nand/cmx270_nand.c | 1 +
2903 drivers/mtd/nand/diskonchip.c | 1 +
2904 drivers/mtd/nand/nand_bbt.c | 1 +
2905 drivers/mtd/nand/omap2.c | 1 +
2906 drivers/mtd/nand/sm_common.c | 1 +
2907 drivers/mtd/onenand/onenand_bbt.c | 1 +
2908 drivers/mtd/redboot.c | 1 +
2909 drivers/mtd/rfd_ftl.c | 1 +
2910 drivers/mtd/ubi/vmt.c | 1 +
2911 drivers/net/mlx4/alloc.c | 1 +
2912 drivers/net/mlx4/catas.c | 1 +
2913 drivers/net/mlx4/cmd.c | 1 +
2914 drivers/net/mlx4/cq.c | 1 +
2915 drivers/net/mlx4/eq.c | 1 +
2916 drivers/net/mlx4/fw.c | 1 +
2917 drivers/net/mlx4/intf.c | 1 +
2918 drivers/net/mlx4/mr.c | 1 +
2919 drivers/net/mlx4/pd.c | 1 +
2920 drivers/net/mlx4/port.c | 1 +
2921 drivers/net/mlx4/qp.c | 1 +
2922 drivers/net/mlx4/srq.c | 1 +
2923 drivers/net/phy/realtek.c | 1 +
2924 drivers/net/wireless/b43/pcmcia.c | 1 +
2925 drivers/of/of_pci.c | 1 +
2926 drivers/of/of_pci_irq.c | 1 +
2927 drivers/of/of_spi.c | 1 +
2928 drivers/parisc/ccio-dma.c | 1 +
2929 drivers/parisc/sba_iommu.c | 1 +
2930 drivers/pci/hotplug-pci.c | 1 +
2931 drivers/pci/hotplug/pciehp_acpi.c | 1 +
2932 drivers/pci/hotplug/pcihp_slot.c | 1 +
2933 drivers/pci/hotplug/rpadlpar_core.c | 1 +
2934 drivers/pci/htirq.c | 1 +
2935 drivers/pci/iov.c | 1 +
2936 drivers/pci/irq.c | 1 +
2937 drivers/pci/msi.c | 1 +
2938 drivers/pci/pci-sysfs.c | 1 +
2939 drivers/pci/quirks.c | 1 +
2940 drivers/pci/rom.c | 1 +
2941 drivers/pci/setup-res.c | 1 +
2942 drivers/pci/slot.c | 1 +
2943 drivers/pci/vpd.c | 1 +
2944 drivers/pcmcia/db1xxx_ss.c | 1 +
2945 drivers/pcmcia/pxa2xx_cm_x255.c | 1 +
2946 drivers/pcmcia/pxa2xx_cm_x270.c | 1 +
2947 drivers/platform/x86/intel_scu_ipc.c | 1 +
2948 drivers/platform/x86/msi-wmi.c | 1 +
2949 drivers/platform/x86/wmi.c | 1 +
2950 drivers/power/max17042_battery.c | 1 +
2951 drivers/power/max8903_charger.c | 1 +
2952 drivers/power/power_supply_sysfs.c | 1 +
2953 drivers/ps3/ps3stor_lib.c | 1 +
2954 drivers/ps3/sys-manager-core.c | 1 +
2955 drivers/rapidio/switches/idt_gen2.c | 1 +
2956 drivers/regulator/88pm8607.c | 1 +
2957 drivers/regulator/ab8500.c | 1 +
2958 drivers/regulator/bq24022.c | 1 +
2959 drivers/regulator/da903x.c | 1 +
2960 drivers/regulator/db8500-prcmu.c | 1 +
2961 drivers/regulator/dummy.c | 1 +
2962 drivers/regulator/fixed.c | 1 +
2963 drivers/regulator/lp3971.c | 1 +
2964 drivers/regulator/lp3972.c | 1 +
2965 drivers/regulator/max8925-regulator.c | 1 +
2966 drivers/regulator/max8997.c | 1 +
2967 drivers/regulator/mc13783-regulator.c | 1 +
2968 drivers/regulator/mc13892-regulator.c | 1 +
2969 drivers/regulator/mc13xxx-regulator-core.c | 1 +
2970 drivers/regulator/tps6586x-regulator.c | 1 +
2971 drivers/regulator/userspace-consumer.c | 1 +
2972 drivers/regulator/virtual.c | 1 +
2973 drivers/regulator/wm8400-regulator.c | 1 +
2974 drivers/rtc/interface.c | 1 +
2975 drivers/rtc/rtc-dm355evm.c | 1 +
2976 drivers/rtc/rtc-ds1305.c | 1 +
2977 drivers/rtc/rtc-ds1511.c | 1 +
2978 drivers/rtc/rtc-ds1553.c | 1 +
2979 drivers/rtc/rtc-ds1672.c | 1 +
2980 drivers/rtc/rtc-ds1742.c | 1 +
2981 drivers/rtc/rtc-em3027.c | 1 +
2982 drivers/rtc/rtc-isl12022.c | 1 +
2983 drivers/rtc/rtc-mv.c | 1 +
2984 drivers/rtc/rtc-pcf2123.c | 1 +
2985 drivers/rtc/rtc-pcf8563.c | 1 +
2986 drivers/rtc/rtc-rs5c348.c | 1 +
2987 drivers/rtc/rtc-rs5c372.c | 1 +
2988 drivers/rtc/rtc-stk17ta8.c | 1 +
2989 drivers/rtc/rtc-tx4939.c | 1 +
2990 drivers/rtc/rtc-x1205.c | 1 +
2991 drivers/s390/char/fs3270.c | 1 +
2992 drivers/s390/char/sclp_cpi_sys.c | 1 +
2993 drivers/s390/char/vmur.c | 1 +
2994 drivers/s390/cio/chp.c | 2 +
2995 drivers/s390/cio/qdio_debug.c | 2 +
2996 drivers/s390/kvm/kvm_virtio.c | 1 +
2997 drivers/s390/scsi/zfcp_ccw.c | 1 +
2998 drivers/s390/scsi/zfcp_dbf.c | 1 +
2999 drivers/s390/scsi/zfcp_scsi.c | 1 +
3000 drivers/scsi/a2091.c | 1 +
3001 drivers/scsi/a3000.c | 1 +
3002 drivers/scsi/aacraid/aachba.c | 1 +
3003 drivers/scsi/bfa/bfad_debugfs.c | 1 +
3004 drivers/scsi/bfa/bfad_im.c | 2 +
3005 drivers/scsi/device_handler/scsi_dh.c | 1 +
3006 drivers/scsi/device_handler/scsi_dh_alua.c | 1 +
3007 drivers/scsi/device_handler/scsi_dh_emc.c | 1 +
3008 drivers/scsi/device_handler/scsi_dh_hp_sw.c | 1 +
3009 drivers/scsi/device_handler/scsi_dh_rdac.c | 1 +
3010 drivers/scsi/gvp11.c | 1 +
3011 drivers/scsi/libfc/fc_disc.c | 1 +
3012 drivers/scsi/libfc/fc_elsct.c | 1 +
3013 drivers/scsi/libfc/fc_exch.c | 1 +
3014 drivers/scsi/libfc/fc_libfc.c | 1 +
3015 drivers/scsi/libfc/fc_lport.c | 1 +
3016 drivers/scsi/libfc/fc_npiv.c | 1 +
3017 drivers/scsi/libfc/fc_rport.c | 1 +
3018 drivers/scsi/libsas/sas_scsi_host.c | 1 +
3019 drivers/scsi/libsas/sas_task.c | 1 +
3020 drivers/scsi/libsrp.c | 1 +
3021 drivers/scsi/lpfc/lpfc_attr.c | 1 +
3022 drivers/scsi/lpfc/lpfc_debugfs.c | 1 +
3023 drivers/scsi/lpfc/lpfc_init.c | 1 +
3024 drivers/scsi/lpfc/lpfc_scsi.c | 1 +
3025 drivers/scsi/mac53c94.c | 1 +
3026 drivers/scsi/megaraid/megaraid_mbox.c | 1 +
3027 drivers/scsi/osd/osd_initiator.c | 1 +
3028 drivers/scsi/ps3rom.c | 1 +
3029 drivers/scsi/scsi_lib.c | 1 +
3030 drivers/scsi/scsi_lib_dma.c | 1 +
3031 drivers/scsi/scsi_pm.c | 1 +
3032 drivers/scsi/sr_ioctl.c | 1 +
3033 drivers/sfi/sfi_core.h | 3 +
3034 drivers/sh/intc/core.c | 1 +
3035 drivers/sh/intc/virq.c | 1 +
3036 drivers/sh/maple/maple.c | 1 +
3037 drivers/spi/spi-altera.c | 1 +
3038 drivers/spi/spi-au1550.c | 1 +
3039 drivers/spi/spi-bitbang.c | 1 +
3040 drivers/spi/spi-butterfly.c | 1 +
3041 drivers/spi/spi-dw-mmio.c | 1 +
3042 drivers/spi/spi-dw-pci.c | 1 +
3043 drivers/spi/spi-dw.c | 1 +
3044 drivers/spi/spi-gpio.c | 1 +
3045 drivers/spi/spi-oc-tiny.c | 1 +
3046 drivers/spi/spi-omap-uwire.c | 1 +
3047 drivers/spi/spi-orion.c | 1 +
3048 drivers/spi/spi-pxa2xx-pci.c | 1 +
3049 drivers/spi/spi-s3c24xx.c | 1 +
3050 drivers/spi/spi-sh-msiof.c | 1 +
3051 drivers/spi/spi-sh-sci.c | 1 +
3052 drivers/spi/spi-ti-ssp.c | 1 +
3053 drivers/spi/spi-tle62x0.c | 1 +
3054 drivers/spi/spi-txx9.c | 1 +
3055 drivers/spi/spi.c | 1 +
3056 drivers/ssb/b43_pci_bridge.c | 1 +
3057 drivers/ssb/driver_chipcommon.c | 1 +
3058 drivers/ssb/driver_chipcommon_pmu.c | 1 +
3059 drivers/ssb/driver_gige.c | 1 +
3060 drivers/ssb/driver_pcicore.c | 1 +
3061 drivers/ssb/embedded.c | 1 +
3062 drivers/ssb/main.c | 1 +
3063 drivers/ssb/pcihost_wrapper.c | 1 +
3064 drivers/staging/altera-stapl/altera.c | 1 +
3065 drivers/staging/brcm80211/brcmutil/wifi.c | 1 +
3066 drivers/staging/dt3155v4l/dt3155v4l.c | 1 +
3067 drivers/staging/iio/accel/adis16201_core.c | 1 +
3068 drivers/staging/iio/accel/adis16203_core.c | 1 +
3069 drivers/staging/iio/accel/adis16204_core.c | 1 +
3070 drivers/staging/iio/accel/adis16209_core.c | 1 +
3071 drivers/staging/iio/accel/adis16220_core.c | 1 +
3072 drivers/staging/iio/accel/adis16240_core.c | 1 +
3073 drivers/staging/iio/accel/kxsd9.c | 1 +
3074 drivers/staging/iio/accel/lis3l02dq_core.c | 1 +
3075 drivers/staging/iio/accel/sca3000_core.c | 1 +
3076 drivers/staging/iio/adc/ad7150.c | 1 +
3077 drivers/staging/iio/adc/ad7152.c | 1 +
3078 drivers/staging/iio/adc/ad7291.c | 1 +
3079 drivers/staging/iio/adc/ad7298_core.c | 1 +
3080 drivers/staging/iio/adc/ad7314.c | 1 +
3081 drivers/staging/iio/adc/ad7476_core.c | 1 +
3082 drivers/staging/iio/adc/ad7606_core.c | 1 +
3083 drivers/staging/iio/adc/ad7745.c | 1 +
3084 drivers/staging/iio/adc/ad7780.c | 1 +
3085 drivers/staging/iio/adc/ad7816.c | 1 +
3086 drivers/staging/iio/adc/ad7887_core.c | 1 +
3087 drivers/staging/iio/adc/ad799x_core.c | 1 +
3088 drivers/staging/iio/adc/adt7310.c | 1 +
3089 drivers/staging/iio/adc/adt7410.c | 1 +
3090 drivers/staging/iio/adc/adt75.c | 1 +
3091 drivers/staging/iio/adc/max1363_core.c | 1 +
3092 drivers/staging/iio/addac/adt7316-i2c.c | 1 +
3093 drivers/staging/iio/addac/adt7316.c | 1 +
3094 drivers/staging/iio/dac/ad5446.c | 1 +
3095 drivers/staging/iio/dac/ad5504.c | 1 +
3096 drivers/staging/iio/dac/ad5624r_spi.c | 1 +
3097 drivers/staging/iio/dac/ad5686.c | 1 +
3098 drivers/staging/iio/dac/ad5791.c | 1 +
3099 drivers/staging/iio/dds/ad5930.c | 1 +
3100 drivers/staging/iio/dds/ad9832.c | 1 +
3101 drivers/staging/iio/dds/ad9834.c | 1 +
3102 drivers/staging/iio/dds/ad9850.c | 1 +
3103 drivers/staging/iio/dds/ad9852.c | 1 +
3104 drivers/staging/iio/dds/ad9910.c | 1 +
3105 drivers/staging/iio/dds/ad9951.c | 1 +
3106 drivers/staging/iio/gyro/adis16060_core.c | 1 +
3107 drivers/staging/iio/gyro/adis16080_core.c | 1 +
3108 drivers/staging/iio/gyro/adis16130_core.c | 1 +
3109 drivers/staging/iio/gyro/adis16260_core.c | 1 +
3110 drivers/staging/iio/gyro/adxrs450_core.c | 1 +
3111 drivers/staging/iio/imu/adis16400_core.c | 1 +
3112 drivers/staging/iio/industrialio-ring.c | 1 +
3113 drivers/staging/iio/light/tsl2583.c | 1 +
3114 drivers/staging/iio/meter/ade7753.c | 1 +
3115 drivers/staging/iio/meter/ade7754.c | 1 +
3116 drivers/staging/iio/meter/ade7758_core.c | 1 +
3117 drivers/staging/iio/meter/ade7759.c | 1 +
3118 drivers/staging/iio/meter/ade7854-i2c.c | 1 +
3119 drivers/staging/iio/meter/ade7854-spi.c | 1 +
3120 drivers/staging/iio/meter/ade7854.c | 1 +
3121 drivers/staging/iio/resolver/ad2s120x.c | 1 +
3122 drivers/staging/iio/resolver/ad2s1210.c | 1 +
3123 drivers/staging/iio/resolver/ad2s90.c | 1 +
3124 drivers/staging/iio/trigger.h | 1 +
3125 .../staging/intel_sst/intel_sst_drv_interface.c | 1 +
3126 drivers/staging/line6/audio.c | 1 +
3127 drivers/staging/olpc_dcon/olpc_dcon.c | 1 +
3128 drivers/staging/sm7xx/smtcfb.c | 2 +
3129 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 +
3130 drivers/staging/usbip/stub_dev.c | 1 +
3131 drivers/staging/usbip/stub_main.c | 1 +
3132 drivers/staging/usbip/usbip_event.c | 1 +
3133 drivers/tty/hvc/hvc_iseries.c | 1 +
3134 drivers/tty/hvc/hvc_vio.c | 1 +
3135 drivers/tty/serial/jsm/jsm_driver.c | 2 +-
3136 drivers/tty/serial/kgdboc.c | 1 +
3137 drivers/tty/serial/max3100.c | 1 +
3138 drivers/tty/serial/max3107-aava.c | 1 +
3139 drivers/tty/serial/max3107.c | 1 +
3140 drivers/tty/serial/nwpserial.c | 1 +
3141 drivers/tty/serial/timbuart.c | 1 +
3142 drivers/tty/serial/xilinx_uartps.c | 1 +
3143 drivers/tty/vt/vc_screen.c | 1 +
3144 drivers/uio/uio_pdrv.c | 1 +
3145 drivers/uio/uio_pdrv_genirq.c | 1 +
3146 drivers/usb/c67x00/c67x00-drv.c | 1 +
3147 drivers/usb/core/driver.c | 1 +
3148 drivers/usb/core/notify.c | 1 +
3149 drivers/usb/gadget/cdc2.c | 1 +
3150 drivers/usb/gadget/composite.c | 1 +
3151 drivers/usb/gadget/dbgp.c | 1 +
3152 drivers/usb/gadget/f_fs.c | 1 +
3153 drivers/usb/gadget/f_obex.c | 1 +
3154 drivers/usb/gadget/f_sourcesink.c | 1 +
3155 drivers/usb/gadget/file_storage.c | 1 +
3156 drivers/usb/gadget/fusb300_udc.c | 1 +
3157 drivers/usb/gadget/gmidi.c | 1 +
3158 drivers/usb/gadget/u_serial.c | 1 +
3159 drivers/usb/host/fsl-mph-dr-of.c | 1 +
3160 drivers/usb/host/isp1760-if.c | 1 +
3161 drivers/usb/host/pci-quirks.c | 1 +
3162 drivers/usb/host/whci/debug.c | 1 +
3163 drivers/usb/host/whci/hcd.c | 1 +
3164 drivers/usb/host/xhci-hub.c | 1 +
3165 drivers/usb/host/xhci-pci.c | 1 +
3166 drivers/usb/mon/mon_bin.c | 1 +
3167 drivers/usb/mon/mon_stat.c | 1 +
3168 drivers/usb/mon/mon_text.c | 1 +
3169 drivers/usb/otg/gpio_vbus.c | 1 +
3170 drivers/usb/otg/otg.c | 1 +
3171 drivers/usb/otg/ulpi.c | 1 +
3172 drivers/usb/serial/aircable.c | 1 +
3173 drivers/usb/serial/qcserial.c | 1 +
3174 drivers/usb/storage/option_ms.c | 1 +
3175 drivers/usb/storage/protocol.c | 1 +
3176 drivers/usb/storage/sierra_ms.c | 1 +
3177 drivers/usb/storage/transport.c | 1 +
3178 drivers/usb/storage/uas.c | 1 +
3179 drivers/usb/wusbcore/devconnect.c | 1 +
3180 drivers/usb/wusbcore/mmc.c | 1 +
3181 drivers/usb/wusbcore/rh.c | 1 +
3182 drivers/usb/wusbcore/security.c | 1 +
3183 drivers/usb/wusbcore/wa-hc.c | 1 +
3184 drivers/usb/wusbcore/wa-rpipe.c | 1 +
3185 drivers/usb/wusbcore/wa-xfer.c | 1 +
3186 drivers/uwb/est.c | 1 +
3187 drivers/uwb/i1480/dfu/dfu.c | 1 +
3188 drivers/uwb/ie.c | 1 +
3189 drivers/uwb/lc-dev.c | 2 +
3190 drivers/uwb/neh.c | 1 +
3191 drivers/uwb/pal.c | 1 +
3192 drivers/uwb/radio.c | 1 +
3193 drivers/uwb/reset.c | 1 +
3194 drivers/uwb/rsv.c | 1 +
3195 drivers/uwb/scan.c | 1 +
3196 drivers/uwb/umc-bus.c | 1 +
3197 drivers/uwb/umc-dev.c | 1 +
3198 drivers/uwb/umc-drv.c | 1 +
3199 drivers/uwb/whci.c | 1 +
3200 drivers/video/atmel_lcdfb.c | 1 +
3201 drivers/video/backlight/88pm860x_bl.c | 1 +
3202 drivers/video/backlight/adp5520_bl.c | 1 +
3203 drivers/video/backlight/ams369fg06.c | 1 +
3204 drivers/video/backlight/da903x_bl.c | 1 +
3205 drivers/video/backlight/l4f00242t03.c | 1 +
3206 drivers/video/backlight/ld9040.c | 1 +
3207 drivers/video/backlight/lms283gf05.c | 1 +
3208 drivers/video/backlight/max8925_bl.c | 1 +
3209 drivers/video/backlight/s6e63m0.c | 1 +
3210 drivers/video/backlight/wm831x_bl.c | 1 +
3211 drivers/video/carminefb.c | 1 +
3212 drivers/video/cobalt_lcdfb.c | 1 +
3213 drivers/video/fb_ddc.c | 3 +-
3214 drivers/video/fb_notify.c | 1 +
3215 drivers/video/mb862xx/mb862xx-i2c.c | 1 +
3216 drivers/video/mb862xx/mb862xxfbdrv.c | 1 +
3217 drivers/video/msm/mdp.c | 1 +
3218 drivers/video/omap/lcd_mipid.c | 1 +
3219 drivers/video/omap/omapfb_main.c | 1 +
3220 drivers/video/omap2/dss/dispc.c | 1 +
3221 drivers/video/omap2/dss/dpi.c | 1 +
3222 drivers/video/omap2/dss/dsi.c | 1 +
3223 drivers/video/omap2/dss/dss.c | 1 +
3224 drivers/video/omap2/dss/rfbi.c | 1 +
3225 drivers/video/omap2/dss/sdi.c | 1 +
3226 drivers/video/omap2/omapfb/omapfb-ioctl.c | 1 +
3227 drivers/video/savage/savagefb_accel.c | 1 +
3228 drivers/video/sh_mipi_dsi.c | 1 +
3229 drivers/video/sh_mobile_lcdcfb.c | 1 +
3230 drivers/video/via/via-gpio.c | 1 +
3231 drivers/video/w100fb.c | 1 +
3232 drivers/virtio/virtio.c | 1 +
3233 drivers/virtio/virtio_balloon.c | 1 +
3234 drivers/virtio/virtio_ring.c | 1 +
3235 drivers/w1/w1_family.c | 1 +
3236 drivers/xen/balloon.c | 1 +
3237 drivers/xen/manage.c | 1 +
3238 drivers/xen/swiotlb-xen.c | 1 +
3239 drivers/xen/xen-pciback/conf_space.c | 1 +
3240 drivers/xen/xen-selfballoon.c | 2 +
3241 drivers/xen/xenbus/xenbus_client.c | 1 +
3242 drivers/xen/xenbus/xenbus_probe.c | 1 +
3243 drivers/xen/xenbus/xenbus_probe_backend.c | 1 +
3244 drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
3245 drivers/zorro/proc.c | 1 +
3246 fs/bio-integrity.c | 1 +
3247 fs/exofs/super.c | 1 +
3248 fs/gfs2/ops_fstype.c | 1 +
3250 fs/jfs/jfs_logmgr.c | 1 +
3251 fs/logfs/super.c | 1 +
3252 fs/nfsd/nfssvc.c | 1 +
3253 fs/proc/vmcore.c | 1 +
3254 include/acpi/platform/aclinux.h | 2 +-
3255 include/drm/drmP.h | 3 +-
3256 include/linux/bcma/bcma.h | 7 +-
3257 include/linux/blkdev.h | 2 +-
3258 include/linux/cpuidle.h | 3 +-
3259 include/linux/crypto.h | 6 --
3260 include/linux/device.h | 15 ++-
3261 include/linux/device_cgroup.h | 1 -
3262 include/linux/dmaengine.h | 2 +
3263 include/linux/export.h | 89 ++++++++++++++++++++
3264 include/linux/firmware.h | 2 +-
3265 include/linux/ftrace.h | 2 +-
3266 include/linux/gameport.h | 17 ++--
3267 include/linux/hid.h | 9 +-
3268 include/linux/i2c.h | 10 +-
3269 include/linux/ipmi.h | 3 +-
3270 include/linux/ipmi_smi.h | 1 -
3271 include/linux/mdio-bitbang.h | 3 +-
3272 include/linux/module.h | 68 +---------------
3273 include/linux/mtd/mtd.h | 3 +-
3274 include/linux/of_platform.h | 1 -
3275 include/linux/pci_hotplug.h | 10 +--
3276 include/linux/pm_runtime.h | 1 +
3277 include/linux/regulator/driver.h | 1 +
3278 include/linux/serio.h | 20 +++--
3279 include/linux/ssb/ssb.h | 7 +-
3280 include/linux/stop_machine.h | 1 +
3281 include/linux/sunrpc/svc_xprt.h | 3 +-
3282 include/linux/sysdev.h | 1 -
3283 include/linux/textsearch.h | 3 +-
3284 include/linux/uio_driver.h | 12 ++--
3285 include/linux/usb.h | 9 +-
3286 include/linux/uwb.h | 1 +
3287 include/linux/uwb/umc.h | 7 +-
3288 include/linux/vermagic.h | 1 -
3289 include/linux/vlynq.h | 3 +-
3290 include/media/saa7146.h | 3 +-
3291 include/media/v4l2-int-device.h | 3 +-
3292 include/net/inet_timewait_sock.h | 1 -
3293 include/net/lib80211.h | 3 +-
3294 include/net/sch_generic.h | 1 -
3295 include/net/sock.h | 2 +-
3296 include/sound/core.h | 2 +-
3297 include/trace/define_trace.h | 2 +-
3298 include/trace/events/module.h | 2 +-
3299 include/xen/xenbus.h | 1 +
3300 kernel/async.c | 2 +-
3301 kernel/audit.c | 2 +-
3302 kernel/auditsc.c | 2 +-
3303 kernel/capability.c | 2 +-
3304 kernel/cgroup_freezer.c | 2 +-
3305 kernel/compat.c | 1 +
3307 kernel/cpuset.c | 2 +-
3308 kernel/crash_dump.c | 2 +-
3309 kernel/cred.c | 2 +-
3310 kernel/debug/kdb/kdb_debugger.c | 1 +
3312 kernel/events/core.c | 1 +
3313 kernel/exit.c | 3 +-
3314 kernel/fork.c | 3 +-
3315 kernel/freezer.c | 2 +-
3316 kernel/futex.c | 2 +-
3317 kernel/groups.c | 2 +-
3318 kernel/hrtimer.c | 2 +-
3319 kernel/hung_task.c | 2 +-
3320 kernel/irq_work.c | 4 +-
3321 kernel/kfifo.c | 2 +-
3322 kernel/kprobes.c | 2 +-
3323 kernel/ksysfs.c | 3 +-
3324 kernel/kthread.c | 2 +-
3325 kernel/latencytop.c | 2 +-
3326 kernel/lockdep.c | 2 +-
3327 kernel/lockdep_proc.c | 2 +-
3328 kernel/module.c | 2 +-
3329 kernel/mutex-debug.c | 2 +-
3330 kernel/mutex.c | 2 +-
3331 kernel/notifier.c | 2 +-
3332 kernel/nsproxy.c | 2 +-
3333 kernel/padata.c | 2 +-
3334 kernel/params.c | 4 +-
3336 kernel/posix-timers.c | 2 +-
3337 kernel/power/hibernate.c | 1 +
3338 kernel/power/main.c | 1 +
3339 kernel/power/suspend.c | 2 +
3340 kernel/printk.c | 2 +-
3341 kernel/profile.c | 2 +-
3342 kernel/ptrace.c | 2 +-
3343 kernel/range.c | 2 +-
3344 kernel/rcupdate.c | 2 +-
3345 kernel/rcutiny.c | 4 +-
3346 kernel/rcutorture.c | 3 +-
3347 kernel/rcutree.c | 2 +-
3348 kernel/rcutree_trace.c | 3 +-
3349 kernel/relay.c | 2 +-
3350 kernel/resource.c | 2 +-
3351 kernel/rtmutex-debug.c | 2 +-
3352 kernel/rtmutex-tester.c | 2 +-
3353 kernel/rtmutex.c | 2 +-
3354 kernel/rwsem.c | 2 +-
3355 kernel/sched.c | 2 +-
3356 kernel/sched_clock.c | 2 +-
3357 kernel/semaphore.c | 2 +-
3358 kernel/signal.c | 2 +-
3360 kernel/softirq.c | 2 +-
3361 kernel/spinlock.c | 2 +-
3362 kernel/srcu.c | 2 +-
3363 kernel/stacktrace.c | 2 +-
3364 kernel/stop_machine.c | 2 +-
3366 kernel/sysctl.c | 2 +-
3367 kernel/time.c | 2 +-
3368 kernel/time/posix-clock.c | 1 +
3369 kernel/timer.c | 2 +-
3370 kernel/trace/blktrace.c | 1 +
3371 kernel/trace/ftrace.c | 1 +
3372 kernel/trace/trace_syscalls.c | 1 +
3374 kernel/user-return-notifier.c | 2 +-
3375 kernel/user.c | 2 +-
3376 kernel/user_namespace.c | 2 +-
3377 kernel/utsname.c | 2 +-
3378 kernel/utsname_sysctl.c | 2 +-
3379 kernel/wait.c | 2 +-
3380 kernel/watchdog.c | 3 +-
3381 kernel/workqueue.c | 2 +-
3382 lib/dma-debug.c | 1 +
3383 lib/raid6/algos.c | 1 +
3384 lib/raid6/mktables.c | 1 +
3385 lib/raid6/recov.c | 1 +
3387 mm/memcontrol.c | 1 +
3388 mm/memory-failure.c | 1 +
3390 mm/quicklist.c | 1 -
3391 mm/sparse-vmemmap.c | 1 -
3392 mm/swap_state.c | 1 -
3394 net/caif/cfpkt_skbuff.c | 1 +
3395 net/netfilter/ipset/pfxlen.c | 1 +
3396 net/rfkill/input.c | 1 +
3397 security/selinux/netlink.c | 1 +
3398 sound/core/control.c | 1 +
3399 sound/core/device.c | 1 +
3400 sound/core/hwdep.c | 1 +
3401 sound/core/info.c | 1 +
3402 sound/core/info_oss.c | 1 +
3403 sound/core/init.c | 1 +
3404 sound/core/isadma.c | 1 +
3405 sound/core/jack.c | 1 +
3406 sound/core/memory.c | 1 +
3407 sound/core/misc.c | 1 +
3408 sound/core/oss/mixer_oss.c | 1 +
3409 sound/core/rawmidi.c | 1 +
3410 sound/core/seq/oss/seq_oss.c | 2 +-
3411 sound/core/seq/oss/seq_oss_init.c | 2 +-
3412 sound/core/seq/oss/seq_oss_synth.c | 1 +
3413 sound/core/seq/seq.c | 2 +-
3414 sound/core/seq/seq_clientmgr.c | 1 +
3415 sound/core/seq/seq_device.c | 1 +
3416 sound/core/seq/seq_dummy.c | 2 +-
3417 sound/core/seq/seq_info.c | 1 +
3418 sound/core/seq/seq_lock.c | 1 +
3419 sound/core/seq/seq_memory.c | 1 +
3420 sound/core/seq/seq_midi.c | 2 +-
3421 sound/core/seq/seq_midi_emul.c | 1 +
3422 sound/core/seq/seq_midi_event.c | 1 +
3423 sound/core/seq/seq_ports.c | 1 +
3424 sound/core/seq/seq_system.c | 1 +
3425 sound/core/seq/seq_virmidi.c | 1 +
3426 sound/core/sound.c | 2 +-
3427 sound/core/sound_oss.c | 1 +
3428 sound/core/timer.c | 2 +-
3429 sound/core/vmaster.c | 1 +
3430 sound/drivers/mpu401/mpu401.c | 2 +-
3431 sound/drivers/mpu401/mpu401_uart.c | 1 +
3432 sound/drivers/mtpav.c | 1 +
3433 sound/drivers/mts64.c | 1 +
3434 sound/drivers/opl3/opl3_lib.c | 1 +
3435 sound/drivers/opl3/opl3_oss.c | 1 +
3436 sound/drivers/opl3/opl3_seq.c | 1 +
3437 sound/drivers/opl3/opl3_synth.c | 1 +
3438 sound/drivers/opl4/opl4_lib.c | 1 +
3439 sound/drivers/opl4/opl4_proc.c | 1 +
3440 sound/drivers/opl4/opl4_seq.c | 1 +
3441 sound/drivers/portman2x4.c | 1 +
3442 sound/drivers/serial-u16550.c | 2 +-
3443 sound/drivers/virmidi.c | 2 +-
3444 sound/firewire/iso-resources.c | 1 +
3445 sound/firewire/packets-buffer.c | 1 +
3446 sound/i2c/i2c.c | 1 +
3447 sound/i2c/other/ak4xxx-adda.c | 1 +
3448 sound/i2c/other/pt2258.c | 1 +
3449 sound/i2c/other/tea575x-tuner.c | 1 +
3450 sound/i2c/tea6330t.c | 1 +
3451 sound/isa/sb/emu8000.c | 1 +
3452 sound/isa/sb/emu8000_callback.c | 1 +
3453 sound/isa/sb/emu8000_patch.c | 1 +
3454 sound/isa/sb/emu8000_synth.c | 1 +
3455 sound/isa/wavefront/wavefront_fx.c | 1 +
3456 sound/isa/wavefront/wavefront_synth.c | 1 +
3457 sound/pci/als4000.c | 2 +-
3458 sound/pci/asihpi/hpioctl.c | 1 +
3459 sound/pci/ctxfi/xfi.c | 1 +
3460 sound/pci/oxygen/oxygen_io.c | 1 +
3461 sound/soc/tegra/tegra_asoc_utils.c | 1 +
3462 sound/synth/emux/emux.c | 1 +
3463 sound/synth/emux/emux_oss.c | 1 +
3464 sound/synth/emux/emux_seq.c | 2 +-
3465 sound/synth/emux/emux_synth.c | 1 +
3466 sound/synth/emux/soundfont.c | 1 +
3467 sound/synth/util_mem.c | 1 +
3468 sound/usb/6fire/firmware.c | 1 +
3469 sound/usb/midi.c | 1 +
3470 virt/kvm/iommu.c | 2 +
3471 1375 files changed, 1507 insertions(+), 426 deletions(-)
3472 create mode 100644 include/linux/export.h
3473 $ git am -3 ../patches/0001-dm-use-export.h-instead-of-module.h-where-possible.patch
3474 Applying: dm: use export.h instead of module.h where possible
3476 Unstaged changes after reset:
3477 M drivers/md/persistent-data/dm-btree-remove.c
3478 M drivers/md/persistent-data/dm-btree.c
3479 M drivers/md/persistent-data/dm-space-map-disk.c
3480 M drivers/md/persistent-data/dm-transaction-manager.c
3482 $ git commit -v -a --amend
3483 [master 346a625] Merge remote-tracking branch 'moduleh/module.h-split'
3484 $ git am -3 ../patches/0001-block-bsg-lib.c-needs-export.h-not-module.h.patch
3485 Applying: block: bsg-lib.c needs export.h not module.h
3487 Unstaged changes after reset:
3490 $ git commit -v -a --amend
3491 [master 46cc7c4] Merge remote-tracking branch 'moduleh/module.h-split'
3492 $ git am -3 ../patches/power__max8998_charger.c_needs_module.h.patch
3493 Applying: power: max8998_charger.c needs module.h
3495 Unstaged changes after reset:
3496 M drivers/power/max8998_charger.c
3498 $ git commit -v -a --amend
3499 [master d1b73a3] Merge remote-tracking branch 'moduleh/module.h-split'
3500 $ git am -3 ../patches/0001-power_supply-max8997_charger.c-need-to-include-modul.patch
3501 Applying: power_supply: max8997_charger.c need to include module.h
3503 Unstaged changes after reset:
3504 M drivers/power/max8997_charger.c
3506 $ git commit -v -a --amend
3507 [master 9b1d78b] Merge remote-tracking branch 'moduleh/module.h-split'
3508 $ git clone -s -l -n -q . ../rebase-tmp
3510 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
3512 * [new branch] quilt/akpm -> akpm
3513 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
3515 * [new branch] quilt/akpm-base -> akpm-base
3517 Switched to branch 'akpm'
3518 $ git rebase --onto master akpm-base
3519 First, rewinding head to replay your work on top of it...
3520 Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
3521 Applying: This patch makes two changes:
3522 Applying: On thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex. It
3523 Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
3524 Applying: When no floppy is found the module code can be released while a timer
3525 Applying: The parameter's origin type is long. On an i386 architecture, it can
3526 Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
3527 Applying: This makes the iris driver use the platform API, so it is properly exposed
3528 Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
3529 Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
3530 Applying: Cc: Ed Wildgoose <git@wildgooses.com>
3531 Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
3532 Applying: The x86 timer interrupt handler is the only handler not traced in the
3533 Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
3534 Applying: Don't allow everybody to use a modem.
3535 Applying: The address limit is already set in flush_old_exec() so this
3536 Applying: A call to va_copy() should always be followed by a call to va_end() in the
3537 Applying: Don't dereference em if it's NULL or an error pointer.
3538 Applying: Some messing with error codes to return 0 on out id's and match
3539 Applying: fb_set_suspend() must be called with the console semaphore held, which
3540 Applying: hwmon was using an idr with a NULL pointer, so convert to an
3541 Applying: A straightforward looking use of idr for a device id.
3542 Applying: Unless I'm very much missing something these tests are intended to check
3543 Applying: The address limit is already set in flush_old_exec() so this
3544 Applying: The address limit is already set in flush_old_exec() so this
3545 Applying: Add new check (assert_init) to make sure objects are initialized and
3546 Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
3547 Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
3548 Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
3549 Applying: The address limit is already set in flush_old_exec() so those calls to
3550 Applying: When do pci remove/rescan on system that have more iommus, got
3551 Applying: The current implementation of dmi_name_in_vendors() is an invitation to
3552 Applying: For headers that get exported to userland and make use of u32 style
3553 Applying: Fix sparse warnings of right shift bigger than source value size:
3554 Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
3555 Applying: Some mangling of errors was necessary to maintain current interface.
3556 Applying: This does involve additional use of the spin lock in idr.c. Is this an
3557 Applying: Instead of open coding this function use kstrtoul_from_user() directly.
3558 Applying: brd_make_request() always returns 0, which doesn't make much sense.
3559 Applying: The address limit is already set in flush_old_exec() so this assignment of
3560 Applying: The basic idea behind cross memory attach is to allow MPI programs doing
3561 Applying: - Add x86_64 specific wire up
3562 Applying: acct_isolated of compaction uses page_lru_base_type which returns only
3563 Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally,
3564 Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So,
3565 Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless,
3566 Applying: unmap_and_move() is one a big messy function. Clean it up.
3567 Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
3568 Applying: per-task block plug can reduce block queue lock contention and increase
3569 Applying: The tracing ring-buffer used this function briefly, but not anymore.
3570 Applying: After selecting a task to kill, the oom killer iterates all processes and
3571 Applying: Remove PageSwapBacked (!page_is_file_cache) cases from
3572 Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
3573 Applying: The current implementation of the /dev/hpet driver couples opening the
3574 Applying: smp_call_function() only lets all other CPUs execute a specific function,
3575 Applying: auto_demotion_disable is called only for online CPUs. For hotplugged
3576 Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
3577 Applying: Strict user copy checks are only really supported on x86_32 even though
3578 Applying: The help text for this config is duplicated across the x86, parisc, and
3579 Applying: s/lib-/obj-/ for usercopy.o
3580 Applying: After an "unexpected" reboot, I found this Oops in my logs:
3581 Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
3582 Applying: Add axis correction for HP EliteBook 2730p.
3583 Applying: Add axis correction for HP EliteBook 8540w.
3584 Applying: Add axis correction for HP ProBook 6555b.
3585 Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
3586 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
3587 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
3588 Applying: Change exported functions to use the device given as parameter
3589 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
3590 Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
3591 Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify
3592 Applying: don't include asm/msr.h
3593 Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
3594 Applying: One can get this information from minix/inode.c, but adding the
3595 Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
3596 Applying: Force this on for -next/mm testing purposes.
3597 Applying: Add a proc_dointvec_bool() sysctl handler for cases where the input value
3598 Applying: Use the new proc_do_intvec_bool() handler for various boolean inputs.
3599 Applying: Add a proc_dointvec_unsigned() sysctl handler for positive value cases.
3600 Applying: Cc: Alexey Dobriyan <adobriyan@gmail.com>
3601 Applying: Use the new proc_do_intvec_unsigned() handler for various unsigned inputs.
3602 Applying: A default echo function has been provided so it is no longer an error when
3603 Applying: This client driver allows you to use a GPIO pin as a source for PPS
3604 Applying: remove unneeded cast of void*
3605 Applying: Straightforward. As an aside, the ida_init calls are not needed as far as
3607 $ git fetch -f ../rebase-tmp akpm:akpm
3609 + c126084...086406e akpm -> akpm (forced update)
3610 $ rm -rf ../rebase-tmp
3612 $ git merge --no-ff akpm
3613 Removing arch/sparc/lib/usercopy.c
3614 Removing drivers/leds/leds-alix2.c
3615 Merge made by recursive.
3616 Documentation/DocBook/debugobjects.tmpl | 50 ++
3617 .../trace/postprocess/trace-vmscan-postprocess.pl | 8 +-
3619 arch/arm/include/asm/processor.h | 1 -
3620 arch/arm/mach-ux500/mbox-db5500.c | 2 +-
3621 arch/ia64/include/asm/processor.h | 1 -
3622 arch/parisc/Kconfig | 1 +
3623 arch/parisc/Kconfig.debug | 14 -
3624 arch/parisc/include/asm/processor.h | 2 -
3625 arch/parisc/kernel/process.c | 1 -
3626 arch/powerpc/include/asm/systbl.h | 2 +
3627 arch/powerpc/include/asm/unistd.h | 4 +-
3628 arch/s390/Kconfig | 1 +
3629 arch/s390/Kconfig.debug | 14 -
3630 arch/s390/lib/Makefile | 1 -
3631 arch/sparc/kernel/process_32.c | 3 +-
3632 arch/sparc/kernel/process_64.c | 3 -
3633 arch/sparc/lib/Makefile | 1 -
3634 arch/sparc/lib/usercopy.c | 8 -
3635 arch/tile/Kconfig | 8 +-
3636 arch/tile/include/asm/uaccess.h | 7 +-
3637 arch/tile/lib/uaccess.c | 8 -
3638 arch/unicore32/include/asm/processor.h | 1 -
3639 arch/x86/Kconfig | 15 +
3640 arch/x86/Kconfig.debug | 14 -
3641 arch/x86/ia32/ia32entry.S | 2 +
3642 arch/x86/include/asm/irq_vectors.h | 50 ++
3643 arch/x86/include/asm/uaccess_64.h | 12 +-
3644 arch/x86/include/asm/unistd_32.h | 4 +-
3645 arch/x86/include/asm/unistd_64.h | 4 +
3646 arch/x86/kernel/apic/apic.c | 7 +
3647 arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 +
3648 arch/x86/kernel/cpu/mcheck/threshold.c | 3 +
3649 arch/x86/kernel/e820.c | 59 +--
3650 arch/x86/kernel/irq.c | 6 +-
3651 arch/x86/kernel/irq_work.c | 3 +
3652 arch/x86/kernel/smp.c | 7 +
3653 arch/x86/kernel/syscall_table_32.S | 2 +
3654 arch/x86/kernel/time.c | 15 +-
3655 arch/x86/kernel/traps.c | 3 +
3656 arch/x86/lib/usercopy_32.c | 6 -
3657 arch/x86/mm/mmap.c | 4 +-
3658 arch/x86/mm/tlb.c | 3 +
3659 arch/x86/platform/Makefile | 1 +
3660 arch/x86/platform/geode/Makefile | 1 +
3661 arch/x86/platform/geode/alix.c | 142 ++++++
3662 arch/x86/platform/iris/iris.c | 67 +++-
3663 drivers/block/brd.c | 2 +-
3664 drivers/block/floppy.c | 8 +-
3665 drivers/char/hpet.c | 56 ++-
3666 drivers/firmware/dmi_scan.c | 6 +-
3667 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 34 +-
3668 drivers/hwmon/hwmon.c | 32 +-
3669 drivers/hwmon/ibmaem.c | 47 +--
3670 drivers/idle/intel_idle.c | 59 ++-
3671 drivers/iommu/dmar.c | 7 +-
3672 drivers/iommu/intel-iommu.c | 177 +++++++-
3673 drivers/leds/Kconfig | 20 +-
3674 drivers/leds/Makefile | 2 +-
3675 drivers/leds/leds-alix2.c | 239 ----------
3676 drivers/leds/leds-renesas-tpu.c | 343 ++++++++++++++
3677 drivers/misc/lis3lv02d/lis3lv02d.c | 389 +++++++++-------
3678 drivers/misc/lis3lv02d/lis3lv02d.h | 9 +-
3679 drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 11 +-
3680 drivers/misc/lis3lv02d/lis3lv02d_spi.c | 2 +-
3681 drivers/platform/x86/Kconfig | 2 +-
3682 drivers/platform/x86/acerhdf.c | 1 +
3683 drivers/platform/x86/hp_accel.c | 10 +-
3684 drivers/pps/clients/Kconfig | 9 +
3685 drivers/pps/clients/Makefile | 1 +
3686 drivers/pps/clients/pps-gpio.c | 227 +++++++++
3687 drivers/pps/clients/pps-ktimer.c | 12 -
3688 drivers/pps/clients/pps_parport.c | 9 -
3689 drivers/pps/kapi.c | 20 +-
3690 drivers/rtc/class.c | 32 +-
3691 drivers/scsi/aacraid/commctrl.c | 1 +
3692 drivers/scsi/megaraid.c | 8 +-
3693 drivers/scsi/osd/osd_uld.c | 22 +-
3694 drivers/scsi/sd.c | 32 +-
3695 drivers/scsi/sg.c | 25 +-
3696 drivers/video/fbmem.c | 24 +-
3697 drivers/w1/slaves/w1_ds2760.c | 48 +--
3698 drivers/w1/slaves/w1_ds2780.c | 48 +--
3700 fs/btrfs/inode.c | 3 +-
3702 fs/ext4/ext4.h | 7 +-
3703 fs/ext4/ialloc.c | 4 +-
3704 fs/ocfs2/ocfs2.h | 47 ++
3705 fs/ocfs2/quota_local.c | 10 +-
3706 fs/read_write.c | 8 +-
3707 include/linux/compat.h | 3 +-
3708 include/linux/debugobjects.h | 6 +
3709 include/linux/dmar.h | 5 +
3710 include/linux/fs.h | 7 +-
3711 include/linux/hpet.h | 1 +
3712 include/linux/jiffies.h | 2 +-
3713 include/linux/leds-renesas-tpu.h | 14 +
3714 include/linux/magic.h | 10 +-
3715 include/linux/memcontrol.h | 3 +-
3716 include/linux/mmzone.h | 12 +
3717 include/linux/pps-gpio.h | 32 ++
3718 include/linux/swap.h | 7 +-
3719 include/linux/syscalls.h | 13 +
3720 include/linux/sysctl.h | 4 +
3721 include/linux/writeback.h | 2 -
3722 include/scsi/scsi_netlink.h | 2 +-
3723 include/trace/events/irq_vectors.h | 56 +++
3724 include/trace/events/vmscan.h | 8 +-
3725 init/do_mounts.c | 46 ++-
3730 kernel/audit.c | 5 +-
3731 kernel/irq/generic-chip.c | 4 +-
3732 kernel/kprobes.c | 2 +-
3733 kernel/sys_ni.c | 4 +
3734 kernel/sysctl.c | 103 +++--
3735 kernel/time.c | 2 +-
3736 kernel/timer.c | 54 ++-
3737 lib/Kconfig.debug | 18 +
3739 lib/crc32.c | 370 +++++++++++-----
3740 lib/crc32defs.h | 16 +-
3741 lib/debugobjects.c | 33 ++
3742 lib/gen_crc32table.c | 59 ++-
3743 lib/radix-tree.c | 10 +-
3744 {arch/s390/lib => lib}/usercopy.c | 0
3746 mm/compaction.c | 24 +-
3747 mm/memcontrol.c | 5 +-
3748 mm/mempolicy.c | 4 +-
3749 mm/migrate.c | 75 ++--
3751 mm/oom_kill.c | 5 +-
3752 mm/page-writeback.c | 122 +++---
3753 mm/process_vm_access.c | 487 ++++++++++++++++++++
3754 mm/vmscan.c | 63 ++-
3755 security/keys/compat.c | 2 +-
3756 security/keys/keyctl.c | 2 +-
3757 security/selinux/selinuxfs.c | 14 +-
3758 142 files changed, 3102 insertions(+), 1313 deletions(-)
3759 delete mode 100644 arch/sparc/lib/usercopy.c
3760 create mode 100644 arch/x86/platform/geode/Makefile
3761 create mode 100644 arch/x86/platform/geode/alix.c
3762 delete mode 100644 drivers/leds/leds-alix2.c
3763 create mode 100644 drivers/leds/leds-renesas-tpu.c
3764 create mode 100644 drivers/pps/clients/pps-gpio.c
3765 create mode 100644 include/linux/leds-renesas-tpu.h
3766 create mode 100644 include/linux/pps-gpio.h
3767 create mode 100644 include/trace/events/irq_vectors.h
3768 rename {arch/s390/lib => lib}/usercopy.c (100%)
3769 create mode 100644 mm/process_vm_access.c
projects / karo-tx-linux.git / blob