3 $ git reset --hard stable
4 HEAD is now at adadfe4 Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6
6 $ git merge origin/master
7 Updating adadfe4..609cfda
10 arch/powerpc/include/asm/8xx_immap.h | 4 +-
11 arch/x86/kernel/cpu/amd.c | 2 +-
12 arch/x86/kernel/reboot_32.S | 12 ++--
13 arch/x86/mm/numa_64.c | 2 +-
14 arch/x86/xen/mmu.c | 125 +++++++++++++++++++++++++-
15 drivers/input/touchscreen/wm831x-ts.c | 75 +++++++++++++---
16 drivers/mmc/core/bus.c | 1 +
17 drivers/mmc/core/host.c | 9 +-
18 drivers/mmc/host/omap.c | 2 +-
19 drivers/mmc/host/sdhci-pci.c | 1 +
20 drivers/mmc/host/sdhci.c | 9 ++-
21 drivers/mmc/host/tmio_mmc_pio.c | 10 +-
22 drivers/net/amd8111e.c | 2 +-
23 drivers/net/atl1c/atl1c.h | 6 +-
24 drivers/net/atl1c/atl1c_main.c | 14 +--
25 drivers/net/benet/be_main.c | 1 +
26 drivers/net/bnx2.c | 2 +
27 drivers/net/bnx2x/bnx2x_cmn.c | 34 +++++--
28 drivers/net/bonding/bond_3ad.c | 7 +-
29 drivers/net/ehea/ehea_main.c | 9 ++-
30 drivers/net/fs_enet/mac-fec.c | 8 +-
31 drivers/net/ftmac100.c | 8 +-
32 drivers/net/mii.c | 4 +
33 drivers/net/netconsole.c | 8 ++
34 drivers/net/r8169.c | 99 +++++++++++++++------
35 drivers/net/tg3.c | 8 ++-
36 drivers/net/usb/cdc_ether.c | 14 +++-
37 drivers/net/usb/cdc_ncm.c | 4 +-
38 drivers/net/usb/smsc95xx.c | 2 +-
39 drivers/net/usb/usbnet.c | 8 ++
40 drivers/net/veth.c | 12 +++
41 drivers/net/wireless/ath/ath9k/recv.c | 2 +-
42 drivers/net/wireless/b43/main.c | 1 +
43 drivers/net/wireless/iwlegacy/iwl-4965-tx.c | 28 ++++--
44 drivers/net/wireless/iwlegacy/iwl-led.c | 20 ++++-
45 drivers/net/wireless/iwlegacy/iwl4965-base.c | 8 +-
46 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 7 +--
47 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 27 ++++--
48 include/linux/mfd/wm831x/pdata.h | 2 +
49 include/linux/mmc/host.h | 1 -
50 include/linux/usb/usbnet.h | 1 +
51 kernel/irq/proc.c | 2 +-
52 net/bluetooth/hci_core.c | 5 +-
53 net/bluetooth/hci_event.c | 2 -
54 net/bluetooth/l2cap_core.c | 1 +
55 net/bluetooth/sco.c | 9 ++
56 net/bridge/br_input.c | 2 +-
60 net/dsa/Kconfig | 4 +-
61 net/dsa/mv88e6131.c | 26 +++++-
62 net/ipv4/devinet.c | 2 +-
63 net/ipv4/fib_trie.c | 3 -
64 net/ipv4/route.c | 7 ++
65 net/ipv6/addrconf.c | 2 +-
66 net/ipv6/esp6.c | 2 +-
67 net/ipv6/route.c | 8 ++-
69 net/mac80211/cfg.c | 2 +
70 net/mac80211/debugfs_netdev.c | 4 +-
71 net/unix/af_unix.c | 16 +++-
72 net/xfrm/xfrm_replay.c | 2 +-
73 net/xfrm/xfrm_user.c | 3 +
74 65 files changed, 557 insertions(+), 168 deletions(-)
76 $ git merge fixes/fixes
78 Merging kbuild-current/rc-fixes
79 $ git merge kbuild-current/rc-fixes
81 Merging arm-current/master
82 $ git merge arm-current/master
84 Merging m68k-current/for-linus
85 $ git merge m68k-current/for-linus
87 Merging powerpc-merge/merge
88 $ git merge powerpc-merge/merge
90 Merging 52xx-and-virtex-current/powerpc/merge
91 $ git merge 52xx-and-virtex-current/powerpc/merge
93 Merging sparc-current/master
94 $ git merge sparc-current/master
95 Merge made by recursive.
96 arch/sparc/kernel/apc.c | 2 +-
97 arch/sparc/kernel/pmc.c | 2 +-
98 arch/sparc/kernel/smp_32.c | 10 +++++++---
99 arch/sparc/kernel/time_32.c | 2 +-
100 4 files changed, 10 insertions(+), 6 deletions(-)
101 Merging scsi-rc-fixes/master
102 $ git merge scsi-rc-fixes/master
103 Merge made by recursive.
104 drivers/scsi/scsi_lib.c | 7 ++++++-
105 1 files changed, 6 insertions(+), 1 deletions(-)
106 Merging net-current/master
107 $ git merge net-current/master
109 Merging sound-current/for-linus
110 $ git merge sound-current/for-linus
112 Merging pci-current/for-linus
113 $ git merge pci-current/for-linus
115 Merging wireless-current/master
116 $ git merge wireless-current/master
118 Merging driver-core.current/driver-core-linus
119 $ git merge driver-core.current/driver-core-linus
121 Merging tty.current/tty-linus
122 $ git merge tty.current/tty-linus
124 Merging usb.current/usb-linus
125 $ git merge usb.current/usb-linus
126 Merge made by recursive.
127 drivers/mfd/omap-usb-host.c | 9 +++------
128 drivers/staging/usbip/vhci_hcd.c | 2 +-
129 drivers/usb/host/ehci-omap.c | 20 ++++++++++++++++++++
130 drivers/usb/host/isp1760-hcd.c | 1 +
131 drivers/usb/host/xhci-hub.c | 19 +++++++++++++++++--
132 drivers/usb/musb/musb_gadget.c | 6 ++----
133 drivers/usb/musb/omap2430.c | 2 +-
134 7 files changed, 45 insertions(+), 14 deletions(-)
135 Merging staging.current/staging-linus
136 $ git merge staging.current/staging-linus
137 Auto-merging drivers/staging/usbip/vhci_hcd.c
138 Merge made by recursive.
139 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 ----
140 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 3 ---
141 drivers/staging/gma500/Kconfig | 2 +-
142 drivers/staging/intel_sst/intelmid_v1_control.c | 1 +
143 drivers/staging/intel_sst/intelmid_v2_control.c | 1 +
144 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 1 +
145 drivers/staging/rts_pstor/debug.h | 2 +-
146 drivers/staging/rts_pstor/ms.c | 1 +
147 drivers/staging/rts_pstor/rtsx_chip.c | 5 +++--
148 drivers/staging/rts_pstor/rtsx_scsi.c | 1 +
149 drivers/staging/rts_pstor/sd.c | 4 ++--
150 drivers/staging/rts_pstor/trace.h | 2 +-
151 drivers/staging/rts_pstor/xd.c | 1 +
152 drivers/staging/solo6x10/Kconfig | 1 +
153 drivers/staging/usbip/vhci_hcd.c | 9 ++++-----
154 drivers/staging/usbip/vhci_sysfs.c | 7 ++++---
155 16 files changed, 23 insertions(+), 22 deletions(-)
156 Merging cpufreq-current/fixes
157 $ git merge cpufreq-current/fixes
159 Merging input-current/for-linus
160 $ git merge input-current/for-linus
162 Merging md-current/for-linus
163 $ git merge md-current/for-linus
164 Merge made by recursive.
165 Merging audit-current/for-linus
166 $ git merge audit-current/for-linus
168 Merging crypto-current/master
169 $ git merge crypto-current/master
171 Merging ide-curent/master
172 $ git merge ide-curent/master
175 $ git merge dwmw2/master
177 Merging sh-current/sh-fixes-for-linus
178 $ git merge sh-current/sh-fixes-for-linus
179 Merge made by recursive.
180 arch/sh/boards/mach-ecovec24/setup.c | 18 +++++++++---------
181 arch/sh/configs/ecovec24_defconfig | 2 +-
182 arch/sh/configs/sh7757lcr_defconfig | 2 +-
183 arch/sh/kernel/cpu/Makefile | 4 +---
184 drivers/i2c/busses/i2c-sh_mobile.c | 1 +
185 drivers/sh/clk/cpg.c | 2 +-
186 6 files changed, 14 insertions(+), 15 deletions(-)
187 Merging rmobile-current/rmobile-fixes-for-linus
188 $ git merge rmobile-current/rmobile-fixes-for-linus
189 Merge made by recursive.
190 arch/arm/mach-shmobile/clock-sh7372.c | 3 ---
191 1 files changed, 0 insertions(+), 3 deletions(-)
192 Merging fbdev-current/fbdev-fixes-for-linus
193 $ git merge fbdev-current/fbdev-fixes-for-linus
194 Merge made by recursive.
195 drivers/video/efifb.c | 4 ++--
196 drivers/video/omap2/displays/Kconfig | 9 +++++----
197 drivers/video/omap2/dss/dsi.c | 14 +++++++++-----
198 drivers/video/omap2/dss/dss.c | 10 ++++++++--
199 drivers/video/omap2/dss/dss_features.c | 2 +-
200 drivers/video/omap2/dss/dss_features.h | 2 ++
201 drivers/video/s3c-fb.c | 11 +++++++++--
202 drivers/video/via/hw.c | 8 ++++++--
203 drivers/video/via/viamode.c | 2 +-
204 9 files changed, 43 insertions(+), 19 deletions(-)
205 Merging devicetree-current/devicetree/merge
206 $ git merge devicetree-current/devicetree/merge
208 Merging spi-current/spi/merge
209 $ git merge spi-current/spi/merge
212 $ git merge arm/for-next
213 Removing arch/arm/configs/ns9xxx_defconfig
214 Removing arch/arm/configs/stmp378x_defconfig
215 Removing arch/arm/configs/stmp37xx_defconfig
216 Removing arch/arm/mach-exynos4/include/mach/smp.h
217 Removing arch/arm/mach-msm/include/mach/smp.h
218 Removing arch/arm/mach-ns9xxx/Kconfig
219 Removing arch/arm/mach-ns9xxx/Makefile
220 Removing arch/arm/mach-ns9xxx/Makefile.boot
221 Removing arch/arm/mach-ns9xxx/board-a9m9750dev.c
222 Removing arch/arm/mach-ns9xxx/board-a9m9750dev.h
223 Removing arch/arm/mach-ns9xxx/board-jscc9p9360.c
224 Removing arch/arm/mach-ns9xxx/board-jscc9p9360.h
225 Removing arch/arm/mach-ns9xxx/clock.c
226 Removing arch/arm/mach-ns9xxx/clock.h
227 Removing arch/arm/mach-ns9xxx/generic.c
228 Removing arch/arm/mach-ns9xxx/generic.h
229 Removing arch/arm/mach-ns9xxx/gpio-ns9360.c
230 Removing arch/arm/mach-ns9xxx/gpio-ns9360.h
231 Removing arch/arm/mach-ns9xxx/gpio.c
232 Removing arch/arm/mach-ns9xxx/include/mach/board.h
233 Removing arch/arm/mach-ns9xxx/include/mach/debug-macro.S
234 Removing arch/arm/mach-ns9xxx/include/mach/entry-macro.S
235 Removing arch/arm/mach-ns9xxx/include/mach/gpio.h
236 Removing arch/arm/mach-ns9xxx/include/mach/hardware.h
237 Removing arch/arm/mach-ns9xxx/include/mach/io.h
238 Removing arch/arm/mach-ns9xxx/include/mach/irqs.h
239 Removing arch/arm/mach-ns9xxx/include/mach/memory.h
240 Removing arch/arm/mach-ns9xxx/include/mach/module.h
241 Removing arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h
242 Removing arch/arm/mach-ns9xxx/include/mach/processor.h
243 Removing arch/arm/mach-ns9xxx/include/mach/regs-bbu.h
244 Removing arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h
245 Removing arch/arm/mach-ns9xxx/include/mach/regs-mem.h
246 Removing arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h
247 Removing arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h
248 Removing arch/arm/mach-ns9xxx/include/mach/system.h
249 Removing arch/arm/mach-ns9xxx/include/mach/timex.h
250 Removing arch/arm/mach-ns9xxx/include/mach/uncompress.h
251 Removing arch/arm/mach-ns9xxx/include/mach/vmalloc.h
252 Removing arch/arm/mach-ns9xxx/irq.c
253 Removing arch/arm/mach-ns9xxx/mach-cc9p9360dev.c
254 Removing arch/arm/mach-ns9xxx/mach-cc9p9360js.c
255 Removing arch/arm/mach-ns9xxx/plat-serial8250.c
256 Removing arch/arm/mach-ns9xxx/processor-ns9360.c
257 Removing arch/arm/mach-ns9xxx/time-ns9360.c
258 Removing arch/arm/mach-realview/include/mach/smp.h
259 Removing arch/arm/mach-shmobile/include/mach/smp.h
260 Removing arch/arm/mach-stmp378x/Makefile
261 Removing arch/arm/mach-stmp378x/Makefile.boot
262 Removing arch/arm/mach-stmp378x/include/mach/entry-macro.S
263 Removing arch/arm/mach-stmp378x/include/mach/irqs.h
264 Removing arch/arm/mach-stmp378x/include/mach/pins.h
265 Removing arch/arm/mach-stmp378x/include/mach/regs-apbh.h
266 Removing arch/arm/mach-stmp378x/include/mach/regs-apbx.h
267 Removing arch/arm/mach-stmp378x/include/mach/regs-audioin.h
268 Removing arch/arm/mach-stmp378x/include/mach/regs-audioout.h
269 Removing arch/arm/mach-stmp378x/include/mach/regs-bch.h
270 Removing arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h
271 Removing arch/arm/mach-stmp378x/include/mach/regs-dcp.h
272 Removing arch/arm/mach-stmp378x/include/mach/regs-digctl.h
273 Removing arch/arm/mach-stmp378x/include/mach/regs-dram.h
274 Removing arch/arm/mach-stmp378x/include/mach/regs-dri.h
275 Removing arch/arm/mach-stmp378x/include/mach/regs-ecc8.h
276 Removing arch/arm/mach-stmp378x/include/mach/regs-emi.h
277 Removing arch/arm/mach-stmp378x/include/mach/regs-gpmi.h
278 Removing arch/arm/mach-stmp378x/include/mach/regs-i2c.h
279 Removing arch/arm/mach-stmp378x/include/mach/regs-icoll.h
280 Removing arch/arm/mach-stmp378x/include/mach/regs-ir.h
281 Removing arch/arm/mach-stmp378x/include/mach/regs-lcdif.h
282 Removing arch/arm/mach-stmp378x/include/mach/regs-lradc.h
283 Removing arch/arm/mach-stmp378x/include/mach/regs-ocotp.h
284 Removing arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h
285 Removing arch/arm/mach-stmp378x/include/mach/regs-power.h
286 Removing arch/arm/mach-stmp378x/include/mach/regs-pwm.h
287 Removing arch/arm/mach-stmp378x/include/mach/regs-pxp.h
288 Removing arch/arm/mach-stmp378x/include/mach/regs-rtc.h
289 Removing arch/arm/mach-stmp378x/include/mach/regs-saif.h
290 Removing arch/arm/mach-stmp378x/include/mach/regs-spdif.h
291 Removing arch/arm/mach-stmp378x/include/mach/regs-ssp.h
292 Removing arch/arm/mach-stmp378x/include/mach/regs-sydma.h
293 Removing arch/arm/mach-stmp378x/include/mach/regs-timrot.h
294 Removing arch/arm/mach-stmp378x/include/mach/regs-tvenc.h
295 Removing arch/arm/mach-stmp378x/include/mach/regs-uartapp.h
296 Removing arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h
297 Removing arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h
298 Removing arch/arm/mach-stmp378x/include/mach/regs-usbphy.h
299 Removing arch/arm/mach-stmp378x/stmp378x.c
300 Removing arch/arm/mach-stmp378x/stmp378x.h
301 Removing arch/arm/mach-stmp378x/stmp378x_devb.c
302 Removing arch/arm/mach-stmp37xx/Makefile
303 Removing arch/arm/mach-stmp37xx/Makefile.boot
304 Removing arch/arm/mach-stmp37xx/include/mach/entry-macro.S
305 Removing arch/arm/mach-stmp37xx/include/mach/irqs.h
306 Removing arch/arm/mach-stmp37xx/include/mach/pins.h
307 Removing arch/arm/mach-stmp37xx/include/mach/regs-apbh.h
308 Removing arch/arm/mach-stmp37xx/include/mach/regs-apbx.h
309 Removing arch/arm/mach-stmp37xx/include/mach/regs-audioin.h
310 Removing arch/arm/mach-stmp37xx/include/mach/regs-audioout.h
311 Removing arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h
312 Removing arch/arm/mach-stmp37xx/include/mach/regs-digctl.h
313 Removing arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h
314 Removing arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h
315 Removing arch/arm/mach-stmp37xx/include/mach/regs-i2c.h
316 Removing arch/arm/mach-stmp37xx/include/mach/regs-icoll.h
317 Removing arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h
318 Removing arch/arm/mach-stmp37xx/include/mach/regs-lradc.h
319 Removing arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h
320 Removing arch/arm/mach-stmp37xx/include/mach/regs-power.h
321 Removing arch/arm/mach-stmp37xx/include/mach/regs-pwm.h
322 Removing arch/arm/mach-stmp37xx/include/mach/regs-rtc.h
323 Removing arch/arm/mach-stmp37xx/include/mach/regs-ssp.h
324 Removing arch/arm/mach-stmp37xx/include/mach/regs-timrot.h
325 Removing arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h
326 Removing arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h
327 Removing arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h
328 Removing arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h
329 Removing arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h
330 Removing arch/arm/mach-stmp37xx/stmp37xx.c
331 Removing arch/arm/mach-stmp37xx/stmp37xx.h
332 Removing arch/arm/mach-stmp37xx/stmp37xx_devb.c
333 Removing arch/arm/mach-tegra/include/mach/smp.h
334 Removing arch/arm/mach-ux500/include/mach/smp.h
335 Removing arch/arm/mach-vexpress/include/mach/smp.h
336 Removing arch/arm/plat-omap/include/plat/smp.h
337 Removing arch/arm/plat-stmp3xxx/Kconfig
338 Removing arch/arm/plat-stmp3xxx/Makefile
339 Removing arch/arm/plat-stmp3xxx/clock.c
340 Removing arch/arm/plat-stmp3xxx/clock.h
341 Removing arch/arm/plat-stmp3xxx/core.c
342 Removing arch/arm/plat-stmp3xxx/devices.c
343 Removing arch/arm/plat-stmp3xxx/dma.c
344 Removing arch/arm/plat-stmp3xxx/include/mach/clkdev.h
345 Removing arch/arm/plat-stmp3xxx/include/mach/cputype.h
346 Removing arch/arm/plat-stmp3xxx/include/mach/debug-macro.S
347 Removing arch/arm/plat-stmp3xxx/include/mach/dma.h
348 Removing arch/arm/plat-stmp3xxx/include/mach/gpio.h
349 Removing arch/arm/plat-stmp3xxx/include/mach/gpmi.h
350 Removing arch/arm/plat-stmp3xxx/include/mach/hardware.h
351 Removing arch/arm/plat-stmp3xxx/include/mach/io.h
352 Removing arch/arm/plat-stmp3xxx/include/mach/memory.h
353 Removing arch/arm/plat-stmp3xxx/include/mach/mmc.h
354 Removing arch/arm/plat-stmp3xxx/include/mach/pinmux.h
355 Removing arch/arm/plat-stmp3xxx/include/mach/pins.h
356 Removing arch/arm/plat-stmp3xxx/include/mach/platform.h
357 Removing arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h
358 Removing arch/arm/plat-stmp3xxx/include/mach/system.h
359 Removing arch/arm/plat-stmp3xxx/include/mach/timex.h
360 Removing arch/arm/plat-stmp3xxx/include/mach/uncompress.h
361 Removing arch/arm/plat-stmp3xxx/include/mach/vmalloc.h
362 Removing arch/arm/plat-stmp3xxx/irq.c
363 Removing arch/arm/plat-stmp3xxx/pinmux.c
364 Removing arch/arm/plat-stmp3xxx/timer.c
365 Merge made by recursive.
366 Documentation/DocBook/genericirq.tmpl | 82 +-
367 arch/arm/Kconfig | 28 +-
368 arch/arm/Makefile | 4 -
369 arch/arm/boot/compressed/head.S | 6 -
370 arch/arm/configs/dove_defconfig | 12 +-
371 arch/arm/configs/mxs_defconfig | 129 +++
372 arch/arm/configs/ns9xxx_defconfig | 56 -
373 arch/arm/configs/stmp378x_defconfig | 128 ---
374 arch/arm/configs/stmp37xx_defconfig | 108 --
375 arch/arm/include/asm/pgalloc.h | 2 +-
376 arch/arm/include/asm/pgtable.h | 23 +-
377 arch/arm/include/asm/sizes.h | 42 +-
378 arch/arm/include/asm/smp.h | 6 +-
379 arch/arm/include/asm/tlb.h | 1 +
380 arch/arm/kernel/smp.c | 7 +
381 arch/arm/mach-exynos4/include/mach/smp.h | 19 -
382 arch/arm/mach-exynos4/platsmp.c | 5 +-
383 arch/arm/mach-msm/include/mach/smp.h | 23 -
384 arch/arm/mach-msm/platsmp.c | 4 +-
385 arch/arm/mach-mxs/Kconfig | 10 +
386 arch/arm/mach-mxs/Makefile | 1 +
387 arch/arm/mach-mxs/mach-stmp378x_devb.c | 120 ++
388 arch/arm/mach-ns9xxx/Kconfig | 40 -
389 arch/arm/mach-ns9xxx/Makefile | 12 -
390 arch/arm/mach-ns9xxx/Makefile.boot | 2 -
391 arch/arm/mach-ns9xxx/board-a9m9750dev.c | 156 ---
392 arch/arm/mach-ns9xxx/board-a9m9750dev.h | 15 -
393 arch/arm/mach-ns9xxx/board-jscc9p9360.c | 17 -
394 arch/arm/mach-ns9xxx/board-jscc9p9360.h | 13 -
395 arch/arm/mach-ns9xxx/clock.c | 215 ----
396 arch/arm/mach-ns9xxx/clock.h | 35 -
397 arch/arm/mach-ns9xxx/generic.c | 19 -
398 arch/arm/mach-ns9xxx/generic.h | 16 -
399 arch/arm/mach-ns9xxx/gpio-ns9360.c | 118 --
400 arch/arm/mach-ns9xxx/gpio-ns9360.h | 13 -
401 arch/arm/mach-ns9xxx/gpio.c | 147 ---
402 arch/arm/mach-ns9xxx/include/mach/board.h | 40 -
403 arch/arm/mach-ns9xxx/include/mach/debug-macro.S | 21 -
404 arch/arm/mach-ns9xxx/include/mach/entry-macro.S | 28 -
405 arch/arm/mach-ns9xxx/include/mach/gpio.h | 47 -
406 arch/arm/mach-ns9xxx/include/mach/hardware.h | 77 --
407 arch/arm/mach-ns9xxx/include/mach/io.h | 20 -
408 arch/arm/mach-ns9xxx/include/mach/irqs.h | 86 --
409 arch/arm/mach-ns9xxx/include/mach/memory.h | 24 -
410 arch/arm/mach-ns9xxx/include/mach/module.h | 55 -
411 .../mach-ns9xxx/include/mach/processor-ns9360.h | 32 -
412 arch/arm/mach-ns9xxx/include/mach/processor.h | 42 -
413 arch/arm/mach-ns9xxx/include/mach/regs-bbu.h | 45 -
414 .../include/mach/regs-board-a9m9750dev.h | 24 -
415 arch/arm/mach-ns9xxx/include/mach/regs-mem.h | 135 ---
416 .../arm/mach-ns9xxx/include/mach/regs-sys-common.h | 31 -
417 .../arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h | 148 ---
418 arch/arm/mach-ns9xxx/include/mach/system.h | 35 -
419 arch/arm/mach-ns9xxx/include/mach/timex.h | 20 -
420 arch/arm/mach-ns9xxx/include/mach/uncompress.h | 164 ---
421 arch/arm/mach-ns9xxx/include/mach/vmalloc.h | 16 -
422 arch/arm/mach-ns9xxx/irq.c | 74 --
423 arch/arm/mach-ns9xxx/mach-cc9p9360dev.c | 43 -
424 arch/arm/mach-ns9xxx/mach-cc9p9360js.c | 31 -
425 arch/arm/mach-ns9xxx/plat-serial8250.c | 70 --
426 arch/arm/mach-ns9xxx/processor-ns9360.c | 53 -
427 arch/arm/mach-ns9xxx/time-ns9360.c | 181 ----
428 arch/arm/mach-omap2/include/mach/omap4-common.h | 7 +
429 arch/arm/mach-omap2/omap-smp.c | 5 +-
430 arch/arm/mach-realview/include/mach/smp.h | 14 -
431 arch/arm/mach-realview/platsmp.c | 3 +
432 arch/arm/mach-shmobile/include/mach/smp.h | 16 -
433 arch/arm/mach-shmobile/platsmp.c | 3 +
434 arch/arm/mach-stmp378x/Makefile | 2 -
435 arch/arm/mach-stmp378x/Makefile.boot | 3 -
436 arch/arm/mach-stmp378x/include/mach/entry-macro.S | 35 -
437 arch/arm/mach-stmp378x/include/mach/irqs.h | 95 --
438 arch/arm/mach-stmp378x/include/mach/pins.h | 151 ---
439 arch/arm/mach-stmp378x/include/mach/regs-apbh.h | 101 --
440 arch/arm/mach-stmp378x/include/mach/regs-apbx.h | 119 --
441 arch/arm/mach-stmp378x/include/mach/regs-audioin.h | 63 --
442 .../arm/mach-stmp378x/include/mach/regs-audioout.h | 104 --
443 arch/arm/mach-stmp378x/include/mach/regs-bch.h | 56 -
444 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h | 88 --
445 arch/arm/mach-stmp378x/include/mach/regs-dcp.h | 87 --
446 arch/arm/mach-stmp378x/include/mach/regs-digctl.h | 38 -
447 arch/arm/mach-stmp378x/include/mach/regs-dram.h | 27 -
448 arch/arm/mach-stmp378x/include/mach/regs-dri.h | 45 -
449 arch/arm/mach-stmp378x/include/mach/regs-ecc8.h | 39 -
450 arch/arm/mach-stmp378x/include/mach/regs-emi.h | 25 -
451 arch/arm/mach-stmp378x/include/mach/regs-gpmi.h | 78 --
452 arch/arm/mach-stmp378x/include/mach/regs-i2c.h | 55 -
453 arch/arm/mach-stmp378x/include/mach/regs-icoll.h | 45 -
454 arch/arm/mach-stmp378x/include/mach/regs-ir.h | 23 -
455 arch/arm/mach-stmp378x/include/mach/regs-lcdif.h | 195 ----
456 arch/arm/mach-stmp378x/include/mach/regs-lradc.h | 99 --
457 arch/arm/mach-stmp378x/include/mach/regs-ocotp.h | 40 -
458 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h | 90 --
459 arch/arm/mach-stmp378x/include/mach/regs-power.h | 63 --
460 arch/arm/mach-stmp378x/include/mach/regs-pwm.h | 53 -
461 arch/arm/mach-stmp378x/include/mach/regs-pxp.h | 140 ---
462 arch/arm/mach-stmp378x/include/mach/regs-rtc.h | 59 -
463 arch/arm/mach-stmp378x/include/mach/regs-saif.h | 21 -
464 arch/arm/mach-stmp378x/include/mach/regs-spdif.h | 49 -
465 arch/arm/mach-stmp378x/include/mach/regs-ssp.h | 102 --
466 arch/arm/mach-stmp378x/include/mach/regs-sydma.h | 23 -
467 arch/arm/mach-stmp378x/include/mach/regs-timrot.h | 68 --
468 arch/arm/mach-stmp378x/include/mach/regs-tvenc.h | 67 --
469 arch/arm/mach-stmp378x/include/mach/regs-uartapp.h | 87 --
470 arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h | 268 -----
471 arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h | 40 -
472 arch/arm/mach-stmp378x/include/mach/regs-usbphy.h | 37 -
473 arch/arm/mach-stmp378x/stmp378x.c | 299 -----
474 arch/arm/mach-stmp378x/stmp378x.h | 25 -
475 arch/arm/mach-stmp378x/stmp378x_devb.c | 332 ------
476 arch/arm/mach-stmp37xx/Makefile | 2 -
477 arch/arm/mach-stmp37xx/Makefile.boot | 3 -
478 arch/arm/mach-stmp37xx/include/mach/entry-macro.S | 37 -
479 arch/arm/mach-stmp37xx/include/mach/irqs.h | 99 --
480 arch/arm/mach-stmp37xx/include/mach/pins.h | 147 ---
481 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h | 97 --
482 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h | 113 --
483 arch/arm/mach-stmp37xx/include/mach/regs-audioin.h | 61 --
484 .../arm/mach-stmp37xx/include/mach/regs-audioout.h | 111 --
485 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h | 72 --
486 arch/arm/mach-stmp37xx/include/mach/regs-digctl.h | 24 -
487 arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h | 37 -
488 arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h | 63 --
489 arch/arm/mach-stmp37xx/include/mach/regs-i2c.h | 55 -
490 arch/arm/mach-stmp37xx/include/mach/regs-icoll.h | 43 -
491 arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h | 89 --
492 arch/arm/mach-stmp37xx/include/mach/regs-lradc.h | 97 --
493 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h | 88 --
494 arch/arm/mach-stmp37xx/include/mach/regs-power.h | 56 -
495 arch/arm/mach-stmp37xx/include/mach/regs-pwm.h | 51 -
496 arch/arm/mach-stmp37xx/include/mach/regs-rtc.h | 57 -
497 arch/arm/mach-stmp37xx/include/mach/regs-ssp.h | 101 --
498 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h | 49 -
499 arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h | 85 --
500 arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h | 268 -----
501 arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h | 22 -
502 arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h | 22 -
503 arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h | 37 -
504 arch/arm/mach-stmp37xx/stmp37xx.c | 219 ----
505 arch/arm/mach-stmp37xx/stmp37xx.h | 24 -
506 arch/arm/mach-stmp37xx/stmp37xx_devb.c | 99 --
507 arch/arm/mach-tegra/include/mach/smp.h | 14 -
508 arch/arm/mach-tegra/platsmp.c | 3 +
509 arch/arm/mach-ux500/include/mach/smp.h | 24 -
510 arch/arm/mach-ux500/platsmp.c | 5 +-
511 arch/arm/mach-vexpress/ct-ca9x4.c | 2 +
512 arch/arm/mach-vexpress/include/mach/smp.h | 13 -
513 arch/arm/mm/proc-v6.S | 34 -
514 arch/arm/plat-omap/include/plat/smp.h | 36 -
515 arch/arm/plat-stmp3xxx/Kconfig | 37 -
516 arch/arm/plat-stmp3xxx/Makefile | 5 -
517 arch/arm/plat-stmp3xxx/clock.c | 1134 --------------------
518 arch/arm/plat-stmp3xxx/clock.h | 61 --
519 arch/arm/plat-stmp3xxx/core.c | 128 ---
520 arch/arm/plat-stmp3xxx/devices.c | 389 -------
521 arch/arm/plat-stmp3xxx/dma.c | 464 --------
522 arch/arm/plat-stmp3xxx/include/mach/clkdev.h | 18 -
523 arch/arm/plat-stmp3xxx/include/mach/cputype.h | 33 -
524 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | 39 -
525 arch/arm/plat-stmp3xxx/include/mach/dma.h | 153 ---
526 arch/arm/plat-stmp3xxx/include/mach/gpio.h | 28 -
527 arch/arm/plat-stmp3xxx/include/mach/gpmi.h | 12 -
528 arch/arm/plat-stmp3xxx/include/mach/hardware.h | 32 -
529 arch/arm/plat-stmp3xxx/include/mach/io.h | 25 -
530 arch/arm/plat-stmp3xxx/include/mach/memory.h | 22 -
531 arch/arm/plat-stmp3xxx/include/mach/mmc.h | 14 -
532 arch/arm/plat-stmp3xxx/include/mach/pinmux.h | 157 ---
533 arch/arm/plat-stmp3xxx/include/mach/pins.h | 30 -
534 arch/arm/plat-stmp3xxx/include/mach/platform.h | 68 --
535 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h | 54 -
536 arch/arm/plat-stmp3xxx/include/mach/system.h | 49 -
537 arch/arm/plat-stmp3xxx/include/mach/timex.h | 20 -
538 arch/arm/plat-stmp3xxx/include/mach/uncompress.h | 53 -
539 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h | 12 -
540 arch/arm/plat-stmp3xxx/irq.c | 50 -
541 arch/arm/plat-stmp3xxx/pinmux.c | 550 ----------
542 arch/arm/plat-stmp3xxx/timer.c | 186 ----
543 arch/arm/plat-versatile/platsmp.c | 3 +-
544 include/linux/irq.h | 179 +++-
545 include/linux/irqdesc.h | 6 +-
546 kernel/irq/Makefile | 1 +
547 kernel/irq/chip.c | 1 +
548 kernel/irq/debug.h | 1 +
549 kernel/irq/generic-chip.c | 354 ++++++
550 kernel/irq/manage.c | 3 +-
551 kernel/irq/settings.h | 17 +
552 186 files changed, 910 insertions(+), 12597 deletions(-)
553 create mode 100644 arch/arm/configs/mxs_defconfig
554 delete mode 100644 arch/arm/configs/ns9xxx_defconfig
555 delete mode 100644 arch/arm/configs/stmp378x_defconfig
556 delete mode 100644 arch/arm/configs/stmp37xx_defconfig
557 delete mode 100644 arch/arm/mach-exynos4/include/mach/smp.h
558 delete mode 100644 arch/arm/mach-msm/include/mach/smp.h
559 create mode 100644 arch/arm/mach-mxs/mach-stmp378x_devb.c
560 delete mode 100644 arch/arm/mach-ns9xxx/Kconfig
561 delete mode 100644 arch/arm/mach-ns9xxx/Makefile
562 delete mode 100644 arch/arm/mach-ns9xxx/Makefile.boot
563 delete mode 100644 arch/arm/mach-ns9xxx/board-a9m9750dev.c
564 delete mode 100644 arch/arm/mach-ns9xxx/board-a9m9750dev.h
565 delete mode 100644 arch/arm/mach-ns9xxx/board-jscc9p9360.c
566 delete mode 100644 arch/arm/mach-ns9xxx/board-jscc9p9360.h
567 delete mode 100644 arch/arm/mach-ns9xxx/clock.c
568 delete mode 100644 arch/arm/mach-ns9xxx/clock.h
569 delete mode 100644 arch/arm/mach-ns9xxx/generic.c
570 delete mode 100644 arch/arm/mach-ns9xxx/generic.h
571 delete mode 100644 arch/arm/mach-ns9xxx/gpio-ns9360.c
572 delete mode 100644 arch/arm/mach-ns9xxx/gpio-ns9360.h
573 delete mode 100644 arch/arm/mach-ns9xxx/gpio.c
574 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/board.h
575 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/debug-macro.S
576 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/entry-macro.S
577 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/gpio.h
578 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/hardware.h
579 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/io.h
580 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/irqs.h
581 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/memory.h
582 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/module.h
583 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h
584 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/processor.h
585 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-bbu.h
586 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h
587 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-mem.h
588 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h
589 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h
590 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/system.h
591 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/timex.h
592 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/uncompress.h
593 delete mode 100644 arch/arm/mach-ns9xxx/include/mach/vmalloc.h
594 delete mode 100644 arch/arm/mach-ns9xxx/irq.c
595 delete mode 100644 arch/arm/mach-ns9xxx/mach-cc9p9360dev.c
596 delete mode 100644 arch/arm/mach-ns9xxx/mach-cc9p9360js.c
597 delete mode 100644 arch/arm/mach-ns9xxx/plat-serial8250.c
598 delete mode 100644 arch/arm/mach-ns9xxx/processor-ns9360.c
599 delete mode 100644 arch/arm/mach-ns9xxx/time-ns9360.c
600 delete mode 100644 arch/arm/mach-realview/include/mach/smp.h
601 delete mode 100644 arch/arm/mach-shmobile/include/mach/smp.h
602 delete mode 100644 arch/arm/mach-stmp378x/Makefile
603 delete mode 100644 arch/arm/mach-stmp378x/Makefile.boot
604 delete mode 100644 arch/arm/mach-stmp378x/include/mach/entry-macro.S
605 delete mode 100644 arch/arm/mach-stmp378x/include/mach/irqs.h
606 delete mode 100644 arch/arm/mach-stmp378x/include/mach/pins.h
607 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbh.h
608 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbx.h
609 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioin.h
610 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioout.h
611 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-bch.h
612 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h
613 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dcp.h
614 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-digctl.h
615 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dram.h
616 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dri.h
617 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ecc8.h
618 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-emi.h
619 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-gpmi.h
620 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-i2c.h
621 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-icoll.h
622 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ir.h
623 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lcdif.h
624 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lradc.h
625 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ocotp.h
626 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h
627 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-power.h
628 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pwm.h
629 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pxp.h
630 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-rtc.h
631 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-saif.h
632 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-spdif.h
633 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ssp.h
634 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-sydma.h
635 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-timrot.h
636 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-tvenc.h
637 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartapp.h
638 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h
639 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h
640 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbphy.h
641 delete mode 100644 arch/arm/mach-stmp378x/stmp378x.c
642 delete mode 100644 arch/arm/mach-stmp378x/stmp378x.h
643 delete mode 100644 arch/arm/mach-stmp378x/stmp378x_devb.c
644 delete mode 100644 arch/arm/mach-stmp37xx/Makefile
645 delete mode 100644 arch/arm/mach-stmp37xx/Makefile.boot
646 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/entry-macro.S
647 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/irqs.h
648 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/pins.h
649 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h
650 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h
651 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioin.h
652 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioout.h
653 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h
654 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-digctl.h
655 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h
656 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h
657 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-i2c.h
658 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-icoll.h
659 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h
660 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lradc.h
661 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h
662 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-power.h
663 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pwm.h
664 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-rtc.h
665 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ssp.h
666 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h
667 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h
668 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h
669 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h
670 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h
671 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h
672 delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx.c
673 delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx.h
674 delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx_devb.c
675 delete mode 100644 arch/arm/mach-tegra/include/mach/smp.h
676 delete mode 100644 arch/arm/mach-ux500/include/mach/smp.h
677 delete mode 100644 arch/arm/mach-vexpress/include/mach/smp.h
678 delete mode 100644 arch/arm/plat-omap/include/plat/smp.h
679 delete mode 100644 arch/arm/plat-stmp3xxx/Kconfig
680 delete mode 100644 arch/arm/plat-stmp3xxx/Makefile
681 delete mode 100644 arch/arm/plat-stmp3xxx/clock.c
682 delete mode 100644 arch/arm/plat-stmp3xxx/clock.h
683 delete mode 100644 arch/arm/plat-stmp3xxx/core.c
684 delete mode 100644 arch/arm/plat-stmp3xxx/devices.c
685 delete mode 100644 arch/arm/plat-stmp3xxx/dma.c
686 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/clkdev.h
687 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/cputype.h
688 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S
689 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/dma.h
690 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpio.h
691 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpmi.h
692 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/hardware.h
693 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/io.h
694 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/memory.h
695 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/mmc.h
696 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/pinmux.h
697 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/pins.h
698 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/platform.h
699 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h
700 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/system.h
701 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/timex.h
702 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/uncompress.h
703 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h
704 delete mode 100644 arch/arm/plat-stmp3xxx/irq.c
705 delete mode 100644 arch/arm/plat-stmp3xxx/pinmux.c
706 delete mode 100644 arch/arm/plat-stmp3xxx/timer.c
707 create mode 100644 kernel/irq/generic-chip.c
708 Merging at91/at91-next
709 $ git merge at91/at91-next
710 Auto-merging arch/arm/Kconfig
711 Auto-merging arch/arm/configs/at91sam9261_defconfig
712 Auto-merging arch/arm/configs/at91sam9263_defconfig
713 Removing arch/arm/configs/neocore926_defconfig
714 Removing arch/arm/configs/usb-a9263_defconfig
715 Merge made by recursive.
716 arch/arm/Kconfig | 2 +
717 ...91sam9261ek_defconfig => at91sam9261_defconfig} | 85 ++++++++++++++--
718 ...91sam9263ek_defconfig => at91sam9263_defconfig} | 84 ++++++++++++++--
719 arch/arm/configs/at91x40_defconfig | 48 +++++++++
720 arch/arm/configs/neocore926_defconfig | 104 -------------------
721 arch/arm/configs/usb-a9263_defconfig | 106 --------------------
722 arch/arm/mach-at91/Kconfig | 20 +----
723 arch/arm/mach-at91/at572d940hf.c | 69 +++++++++++++-
724 arch/arm/mach-at91/at572d940hf_devices.c | 26 +++--
725 arch/arm/mach-at91/at91cap9.c | 63 ++++++++++++-
726 arch/arm/mach-at91/at91cap9_devices.c | 32 +++---
727 arch/arm/mach-at91/at91rm9200.c | 55 ++++++++++-
728 arch/arm/mach-at91/at91rm9200_devices.c | 32 +++---
729 arch/arm/mach-at91/at91sam9260.c | 60 +++++++++++-
730 arch/arm/mach-at91/at91sam9260_devices.c | 35 +++----
731 arch/arm/mach-at91/at91sam9261.c | 61 +++++++++++-
732 arch/arm/mach-at91/at91sam9261_devices.c | 30 +++---
733 arch/arm/mach-at91/at91sam9263.c | 59 +++++++++++-
734 arch/arm/mach-at91/at91sam9263_devices.c | 28 +++---
735 arch/arm/mach-at91/at91sam9g45.c | 89 +++++++++++++----
736 arch/arm/mach-at91/at91sam9g45_devices.c | 35 +++----
737 arch/arm/mach-at91/at91sam9rl.c | 56 ++++++++++-
738 arch/arm/mach-at91/at91sam9rl_devices.c | 31 +++---
739 arch/arm/mach-at91/at91x40.c | 5 -
740 arch/arm/mach-at91/board-1arm.c | 6 +-
741 arch/arm/mach-at91/board-afeb-9260v1.c | 6 +-
742 arch/arm/mach-at91/board-at572d940hf_ek.c | 13 +--
743 arch/arm/mach-at91/board-cam60.c | 6 +-
744 arch/arm/mach-at91/board-cap9adk.c | 13 +--
745 arch/arm/mach-at91/board-carmeva.c | 6 +-
746 arch/arm/mach-at91/board-cpu9krea.c | 6 +-
747 arch/arm/mach-at91/board-cpuat91.c | 6 +-
748 arch/arm/mach-at91/board-csb337.c | 6 +-
749 arch/arm/mach-at91/board-csb637.c | 6 +-
750 arch/arm/mach-at91/board-eb01.c | 11 ++-
751 arch/arm/mach-at91/board-eb9200.c | 6 +-
752 arch/arm/mach-at91/board-ecbat91.c | 6 +-
753 arch/arm/mach-at91/board-eco920.c | 25 +----
754 arch/arm/mach-at91/board-flexibity.c | 6 +-
755 arch/arm/mach-at91/board-foxg20.c | 6 +-
756 arch/arm/mach-at91/board-gsia18s.c | 8 +-
757 arch/arm/mach-at91/board-kafa.c | 6 +-
758 arch/arm/mach-at91/board-kb9202.c | 6 +-
759 arch/arm/mach-at91/board-neocore926.c | 6 +-
760 arch/arm/mach-at91/board-pcontrol-g20.c | 8 +-
761 arch/arm/mach-at91/board-picotux200.c | 6 +-
762 arch/arm/mach-at91/board-qil-a9260.c | 6 +-
763 arch/arm/mach-at91/board-rm9200dk.c | 6 +-
764 arch/arm/mach-at91/board-rm9200ek.c | 6 +-
765 arch/arm/mach-at91/board-sam9-l9260.c | 6 +-
766 arch/arm/mach-at91/board-sam9260ek.c | 13 +--
767 arch/arm/mach-at91/board-sam9261ek.c | 13 +--
768 arch/arm/mach-at91/board-sam9263ek.c | 13 +--
769 arch/arm/mach-at91/board-sam9g20ek.c | 17 ++--
770 arch/arm/mach-at91/board-sam9m10g45ek.c | 13 +--
771 arch/arm/mach-at91/board-sam9rlek.c | 6 +-
772 arch/arm/mach-at91/board-snapper9260.c | 6 +-
773 arch/arm/mach-at91/board-stamp9g20.c | 18 ++--
774 arch/arm/mach-at91/board-usb-a9260.c | 6 +-
775 arch/arm/mach-at91/board-usb-a9263.c | 6 +-
776 arch/arm/mach-at91/board-yl-9200.c | 6 +-
777 arch/arm/mach-at91/clock.c | 54 +++-------
778 arch/arm/mach-at91/clock.h | 19 +++-
779 arch/arm/mach-at91/generic.h | 23 ++++-
780 arch/arm/mach-at91/include/mach/at572d940hf.h | 2 -
781 arch/arm/mach-at91/include/mach/at91cap9.h | 4 -
782 arch/arm/mach-at91/include/mach/at91rm9200.h | 2 -
783 arch/arm/mach-at91/include/mach/at91sam9260.h | 2 -
784 arch/arm/mach-at91/include/mach/at91sam9261.h | 2 -
785 arch/arm/mach-at91/include/mach/at91sam9263.h | 2 -
786 arch/arm/mach-at91/include/mach/at91sam9g45.h | 4 -
787 arch/arm/mach-at91/include/mach/at91sam9rl.h | 2 -
788 arch/arm/mach-at91/include/mach/at91x40.h | 2 -
789 arch/arm/mach-at91/include/mach/board.h | 1 +
790 arch/arm/mach-at91/include/mach/clkdev.h | 7 ++
791 arch/arm/mach-at91/include/mach/cpu.h | 28 +++++
792 arch/arm/mach-at91/include/mach/hardware.h | 13 +--
793 arch/arm/mach-at91/include/mach/memory.h | 2 -
794 arch/arm/mach-at91/include/mach/stamp9g20.h | 2 +-
795 arch/arm/mach-at91/include/mach/system_rev.h | 25 +++++
796 arch/avr32/mach-at32ap/at32ap700x.c | 4 +-
797 arch/avr32/mach-at32ap/include/mach/board.h | 1 +
798 drivers/tty/serial/atmel_serial.c | 2 +-
799 83 files changed, 1067 insertions(+), 666 deletions(-)
800 rename arch/arm/configs/{at91sam9261ek_defconfig => at91sam9261_defconfig} (53%)
801 rename arch/arm/configs/{at91sam9263ek_defconfig => at91sam9263_defconfig} (57%)
802 create mode 100644 arch/arm/configs/at91x40_defconfig
803 delete mode 100644 arch/arm/configs/neocore926_defconfig
804 delete mode 100644 arch/arm/configs/usb-a9263_defconfig
805 create mode 100644 arch/arm/mach-at91/include/mach/clkdev.h
806 create mode 100644 arch/arm/mach-at91/include/mach/system_rev.h
807 Merging davinci/davinci-next
808 $ git merge davinci/davinci-next
810 Merging i.MX/for-next
811 $ git merge i.MX/for-next
812 Auto-merging arch/arm/Makefile
813 Auto-merging arch/arm/mach-imx/clock-imx31.c
814 Auto-merging arch/arm/mach-imx/clock-imx35.c
815 Auto-merging arch/arm/mach-imx/cpu-imx31.c
816 Auto-merging arch/arm/mach-imx/devices-imx31.h
817 Auto-merging arch/arm/mach-imx/devices-imx35.h
818 Auto-merging arch/arm/mach-imx/ehci-imx31.c
819 Auto-merging arch/arm/mach-imx/ehci-imx35.c
820 Auto-merging arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
821 Auto-merging arch/arm/mach-imx/mach-armadillo5x0.c
822 Auto-merging arch/arm/mach-imx/mach-bug.c
823 Auto-merging arch/arm/mach-imx/mach-cpuimx35.c
824 Auto-merging arch/arm/mach-imx/mach-kzm_arm11_01.c
825 Auto-merging arch/arm/mach-imx/mach-mx31_3ds.c
826 Auto-merging arch/arm/mach-imx/mach-mx31ads.c
827 Auto-merging arch/arm/mach-imx/mach-mx31lilly.c
828 Auto-merging arch/arm/mach-imx/mach-mx31lite.c
829 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
830 Auto-merging arch/arm/mach-imx/mach-mx35_3ds.c
831 Auto-merging arch/arm/mach-imx/mach-pcm037.c
832 Auto-merging arch/arm/mach-imx/mach-pcm037_eet.c
833 Auto-merging arch/arm/mach-imx/mach-pcm043.c
834 Auto-merging arch/arm/mach-imx/mach-qong.c
835 Auto-merging arch/arm/mach-imx/mach-vpr200.c
836 Auto-merging arch/arm/mach-imx/mx31lilly-db.c
837 Auto-merging arch/arm/mach-imx/mx31lite-db.c
838 Auto-merging arch/arm/mach-imx/mx31moboard-devboard.c
839 Auto-merging arch/arm/mach-imx/mx31moboard-marxbot.c
840 Auto-merging arch/arm/mach-imx/mx31moboard-smartbot.c
841 Removing arch/arm/mach-mx3/Kconfig
842 Removing arch/arm/mach-mx3/Makefile
843 Removing arch/arm/mach-mx3/Makefile.boot
844 Removing arch/arm/mach-mx3/devices.c
845 Removing arch/arm/mach-mx3/devices.h
846 Removing arch/arm/mach-mx3/mm.c
847 Auto-merging arch/arm/mach-mx5/board-mx53_loco.c
848 Removing arch/arm/mach-mxc91231/Kconfig
849 Removing arch/arm/mach-mxc91231/Makefile
850 Removing arch/arm/mach-mxc91231/Makefile.boot
851 Removing arch/arm/mach-mxc91231/clock.c
852 Removing arch/arm/mach-mxc91231/crm_regs.h
853 Removing arch/arm/mach-mxc91231/devices.c
854 Removing arch/arm/mach-mxc91231/devices.h
855 Removing arch/arm/mach-mxc91231/iomux.c
856 Removing arch/arm/mach-mxc91231/magx-zn5.c
857 Removing arch/arm/mach-mxc91231/mm.c
858 Removing arch/arm/mach-mxc91231/system.c
859 Removing arch/arm/plat-mxc/include/mach/iomux-mxc91231.h
860 Removing arch/arm/plat-mxc/include/mach/mxc91231.h
861 Merge made by recursive.
862 arch/arm/Makefile | 3 +-
863 arch/arm/configs/mx1_defconfig | 11 +-
864 arch/arm/configs/mx21_defconfig | 10 +-
865 arch/arm/configs/mx27_defconfig | 46 ++-
866 arch/arm/configs/mx3_defconfig | 43 +-
867 arch/arm/configs/mx51_defconfig | 57 ++-
868 arch/arm/mach-imx/Kconfig | 305 +++++++++-
869 arch/arm/mach-imx/Makefile | 37 +-
870 arch/arm/mach-imx/Makefile.boot | 4 +
871 arch/arm/mach-imx/cache-l2x0.c | 56 ++
872 arch/arm/{mach-mx3 => mach-imx}/clock-imx31.c | 3 +-
873 arch/arm/{mach-mx3 => mach-imx}/clock-imx35.c | 1 -
874 arch/arm/{mach-mx3/cpu.c => mach-imx/cpu-imx31.c} | 38 +--
875 arch/arm/mach-imx/cpu-imx35.c | 44 ++
876 .../crm_regs.h => mach-imx/crmregs-imx31.h} | 0
877 arch/arm/mach-imx/devices-imx1.h | 8 +-
878 arch/arm/mach-imx/devices-imx21.h | 22 +-
879 arch/arm/mach-imx/devices-imx25.h | 35 +-
880 arch/arm/mach-imx/devices-imx27.h | 30 +-
881 arch/arm/{mach-mx3 => mach-imx}/devices-imx31.h | 36 +-
882 arch/arm/{mach-mx3 => mach-imx}/devices-imx35.h | 37 +-
883 arch/arm/{mach-mx3 => mach-imx}/ehci-imx31.c | 1 -
884 arch/arm/{mach-mx3 => mach-imx}/ehci-imx35.c | 1 -
885 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 1 -
886 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 17 +-
887 .../eukrea_mbimxsd35-baseboard.c} | 29 +-
888 arch/arm/{mach-mx3 => mach-imx}/iomux-imx31.c | 0
889 .../arm/{mach-mx3 => mach-imx}/mach-armadillo5x0.c | 29 +-
890 arch/arm/{mach-mx3 => mach-imx}/mach-bug.c | 1 -
891 arch/arm/mach-imx/mach-cpuimx27.c | 1 -
892 arch/arm/{mach-mx3 => mach-imx}/mach-cpuimx35.c | 2 -
893 arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 -
894 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 14 +-
895 .../arm/{mach-mx3 => mach-imx}/mach-kzm_arm11_01.c | 1 -
896 arch/arm/mach-imx/mach-mx1ads.c | 1 -
897 arch/arm/mach-imx/mach-mx21ads.c | 1 -
898 arch/arm/mach-imx/mach-mx25_3ds.c | 13 +-
899 arch/arm/mach-imx/mach-mx27ads.c | 1 -
900 arch/arm/{mach-mx3 => mach-imx}/mach-mx31_3ds.c | 50 +-
901 arch/arm/{mach-mx3 => mach-imx}/mach-mx31ads.c | 1 -
902 arch/arm/{mach-mx3 => mach-imx}/mach-mx31lilly.c | 1 -
903 arch/arm/{mach-mx3 => mach-imx}/mach-mx31lite.c | 1 -
904 arch/arm/{mach-mx3 => mach-imx}/mach-mx31moboard.c | 75 ++-
905 arch/arm/{mach-mx3 => mach-imx}/mach-mx35_3ds.c | 1 -
906 arch/arm/mach-imx/mach-mxt_td60.c | 1 -
907 arch/arm/mach-imx/mach-pca100.c | 1 -
908 arch/arm/{mach-mx3 => mach-imx}/mach-pcm037.c | 65 ++-
909 arch/arm/{mach-mx3 => mach-imx}/mach-pcm037_eet.c | 17 +-
910 arch/arm/mach-imx/mach-pcm038.c | 1 -
911 arch/arm/{mach-mx3 => mach-imx}/mach-pcm043.c | 17 +-
912 arch/arm/{mach-mx3 => mach-imx}/mach-qong.c | 15 +-
913 arch/arm/{mach-mx3 => mach-imx}/mach-vpr200.c | 25 +-
914 arch/arm/mach-imx/mm-imx31.c | 66 ++
915 arch/arm/mach-imx/mm-imx35.c | 63 ++
916 arch/arm/{mach-mx3 => mach-imx}/mx31lilly-db.c | 13 +-
917 arch/arm/{mach-mx3 => mach-imx}/mx31lite-db.c | 3 +-
918 .../{mach-mx3 => mach-imx}/mx31moboard-devboard.c | 1 -
919 .../{mach-mx3 => mach-imx}/mx31moboard-marxbot.c | 2 -
920 .../{mach-mx3 => mach-imx}/mx31moboard-smartbot.c | 1 -
921 arch/arm/{mach-mx3 => mach-imx}/pcm037.h | 0
922 arch/arm/mach-mx3/Kconfig | 257 --------
923 arch/arm/mach-mx3/Makefile | 26 -
924 arch/arm/mach-mx3/Makefile.boot | 3 -
925 arch/arm/mach-mx3/devices.c | 115 ----
926 arch/arm/mach-mx3/devices.h | 4 -
927 arch/arm/mach-mx3/mm.c | 141 -----
928 arch/arm/mach-mx5/Kconfig | 58 ++-
929 arch/arm/mach-mx5/board-cpuimx51.c | 2 -
930 arch/arm/mach-mx5/board-cpuimx51sd.c | 2 -
931 arch/arm/mach-mx5/board-mx50_rdp.c | 1 -
932 arch/arm/mach-mx5/board-mx51_babbage.c | 18 +-
933 arch/arm/mach-mx5/board-mx51_efikamx.c | 5 +-
934 arch/arm/mach-mx5/board-mx51_efikasb.c | 5 +-
935 arch/arm/mach-mx5/board-mx53_evk.c | 2 -
936 arch/arm/mach-mx5/board-mx53_loco.c | 2 -
937 arch/arm/mach-mx5/board-mx53_smd.c | 30 +-
938 arch/arm/mach-mx5/clock-mx51-mx53.c | 1 +
939 arch/arm/mach-mx5/cpu.c | 23 +
940 arch/arm/mach-mx5/devices-imx50.h | 6 +-
941 arch/arm/mach-mx5/devices-imx51.h | 25 +-
942 arch/arm/mach-mx5/devices-imx53.h | 13 +-
943 arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 2 -
944 arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 16 +-
945 arch/arm/mach-mx5/mx51_efika.c | 3 -
946 arch/arm/mach-mxc91231/Kconfig | 11 -
947 arch/arm/mach-mxc91231/Makefile | 2 -
948 arch/arm/mach-mxc91231/Makefile.boot | 3 -
949 arch/arm/mach-mxc91231/clock.c | 640 --------------------
950 arch/arm/mach-mxc91231/crm_regs.h | 394 ------------
951 arch/arm/mach-mxc91231/devices.c | 251 --------
952 arch/arm/mach-mxc91231/devices.h | 13 -
953 arch/arm/mach-mxc91231/iomux.c | 177 ------
954 arch/arm/mach-mxc91231/magx-zn5.c | 62 --
955 arch/arm/mach-mxc91231/mm.c | 62 --
956 arch/arm/mach-mxc91231/system.c | 51 --
957 arch/arm/mach-mxs/devices-mx28.h | 2 +-
958 arch/arm/mach-mxs/devices/platform-mxs-i2c.c | 5 +-
959 arch/arm/mach-mxs/include/mach/devices-common.h | 5 +-
960 arch/arm/mach-mxs/include/mach/mx23.h | 2 +-
961 arch/arm/mach-mxs/mach-mx23evk.c | 2 +-
962 arch/arm/mach-mxs/mach-mx28evk.c | 4 +-
963 arch/arm/plat-mxc/Kconfig | 54 +-
964 arch/arm/plat-mxc/devices/Kconfig | 7 +-
965 arch/arm/plat-mxc/devices/Makefile | 2 +
966 arch/arm/plat-mxc/devices/platform-ipu-core.c | 129 ++++
967 arch/arm/plat-mxc/devices/platform-mxc_rtc.c | 40 ++
968 arch/arm/plat-mxc/devices/platform-spi_imx.c | 2 +-
969 arch/arm/plat-mxc/include/mach/common.h | 8 +-
970 arch/arm/plat-mxc/include/mach/debug-macro.S | 7 -
971 arch/arm/plat-mxc/include/mach/devices-common.h | 27 +
972 arch/arm/plat-mxc/include/mach/hardware.h | 17 +-
973 arch/arm/plat-mxc/include/mach/io.h | 23 +-
974 arch/arm/plat-mxc/include/mach/iomux-mx25.h | 3 +
975 arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | 283 ---------
976 arch/arm/plat-mxc/include/mach/irqs.h | 2 -
977 arch/arm/plat-mxc/include/mach/memory.h | 3 -
978 arch/arm/plat-mxc/include/mach/mx27.h | 4 +-
979 arch/arm/plat-mxc/include/mach/mx53.h | 13 -
980 arch/arm/plat-mxc/include/mach/mxc.h | 22 +-
981 arch/arm/plat-mxc/include/mach/mxc91231.h | 256 --------
982 arch/arm/plat-mxc/include/mach/system.h | 6 -
983 arch/arm/plat-mxc/include/mach/timex.h | 2 -
984 arch/arm/plat-mxc/system.c | 6 -
985 arch/arm/plat-mxc/time.c | 2 +-
986 drivers/video/Kconfig | 5 +-
987 drivers/video/imxfb.c | 28 +-
988 126 files changed, 1336 insertions(+), 3422 deletions(-)
989 create mode 100644 arch/arm/mach-imx/cache-l2x0.c
990 rename arch/arm/{mach-mx3 => mach-imx}/clock-imx31.c (99%)
991 rename arch/arm/{mach-mx3 => mach-imx}/clock-imx35.c (99%)
992 rename arch/arm/{mach-mx3/cpu.c => mach-imx/cpu-imx31.c} (72%)
993 create mode 100644 arch/arm/mach-imx/cpu-imx35.c
994 rename arch/arm/{mach-mx3/crm_regs.h => mach-imx/crmregs-imx31.h} (100%)
995 rename arch/arm/{mach-mx3 => mach-imx}/devices-imx31.h (67%)
996 rename arch/arm/{mach-mx3 => mach-imx}/devices-imx35.h (69%)
997 rename arch/arm/{mach-mx3 => mach-imx}/ehci-imx31.c (99%)
998 rename arch/arm/{mach-mx3 => mach-imx}/ehci-imx35.c (99%)
999 rename arch/arm/{mach-mx3/eukrea_mbimxsd-baseboard.c => mach-imx/eukrea_mbimxsd35-baseboard.c} (92%)
1000 rename arch/arm/{mach-mx3 => mach-imx}/iomux-imx31.c (100%)
1001 rename arch/arm/{mach-mx3 => mach-imx}/mach-armadillo5x0.c (95%)
1002 rename arch/arm/{mach-mx3 => mach-imx}/mach-bug.c (98%)
1003 rename arch/arm/{mach-mx3 => mach-imx}/mach-cpuimx35.c (99%)
1004 rename arch/arm/{mach-mx3 => mach-imx}/mach-kzm_arm11_01.c (99%)
1005 rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31_3ds.c (96%)
1006 rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31ads.c (99%)
1007 rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31lilly.c (99%)
1008 rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31lite.c (99%)
1009 rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31moboard.c (92%)
1010 rename arch/arm/{mach-mx3 => mach-imx}/mach-mx35_3ds.c (99%)
1011 rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm037.c (94%)
1012 rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm037_eet.c (92%)
1013 rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm043.c (97%)
1014 rename arch/arm/{mach-mx3 => mach-imx}/mach-qong.c (95%)
1015 rename arch/arm/{mach-mx3 => mach-imx}/mach-vpr200.c (94%)
1016 create mode 100644 arch/arm/mach-imx/mm-imx31.c
1017 create mode 100644 arch/arm/mach-imx/mm-imx35.c
1018 rename arch/arm/{mach-mx3 => mach-imx}/mx31lilly-db.c (95%)
1019 rename arch/arm/{mach-mx3 => mach-imx}/mx31lite-db.c (98%)
1020 rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-devboard.c (99%)
1021 rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-marxbot.c (99%)
1022 rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-smartbot.c (99%)
1023 rename arch/arm/{mach-mx3 => mach-imx}/pcm037.h (100%)
1024 delete mode 100644 arch/arm/mach-mx3/Kconfig
1025 delete mode 100644 arch/arm/mach-mx3/Makefile
1026 delete mode 100644 arch/arm/mach-mx3/Makefile.boot
1027 delete mode 100644 arch/arm/mach-mx3/devices.c
1028 delete mode 100644 arch/arm/mach-mx3/devices.h
1029 delete mode 100644 arch/arm/mach-mx3/mm.c
1030 delete mode 100644 arch/arm/mach-mxc91231/Kconfig
1031 delete mode 100644 arch/arm/mach-mxc91231/Makefile
1032 delete mode 100644 arch/arm/mach-mxc91231/Makefile.boot
1033 delete mode 100644 arch/arm/mach-mxc91231/clock.c
1034 delete mode 100644 arch/arm/mach-mxc91231/crm_regs.h
1035 delete mode 100644 arch/arm/mach-mxc91231/devices.c
1036 delete mode 100644 arch/arm/mach-mxc91231/devices.h
1037 delete mode 100644 arch/arm/mach-mxc91231/iomux.c
1038 delete mode 100644 arch/arm/mach-mxc91231/magx-zn5.c
1039 delete mode 100644 arch/arm/mach-mxc91231/mm.c
1040 delete mode 100644 arch/arm/mach-mxc91231/system.c
1041 create mode 100644 arch/arm/plat-mxc/devices/platform-ipu-core.c
1042 create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_rtc.c
1043 delete mode 100644 arch/arm/plat-mxc/include/mach/iomux-mxc91231.h
1044 delete mode 100644 arch/arm/plat-mxc/include/mach/mxc91231.h
1045 Merging linux-spec/for-next
1046 $ git merge linux-spec/for-next
1048 Merging msm/for-next
1049 $ git merge msm/for-next
1050 Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
1051 Merge made by recursive.
1052 arch/arm/mach-msm/Makefile | 5 +-
1053 arch/arm/mach-msm/acpuclock-arm11.c | 2 +-
1054 arch/arm/mach-msm/board-halibut.c | 1 +
1055 arch/arm/mach-msm/board-mahimahi.c | 1 +
1056 arch/arm/mach-msm/board-msm7x30.c | 1 +
1057 arch/arm/mach-msm/board-msm8960.c | 18 +
1058 arch/arm/mach-msm/board-msm8x60.c | 9 +-
1059 arch/arm/mach-msm/board-qsd8x50.c | 1 +
1060 arch/arm/mach-msm/board-trout.c | 1 +
1061 arch/arm/mach-msm/clock-dummy.c | 81 +++++
1062 arch/arm/mach-msm/clock.h | 11 +
1063 arch/arm/mach-msm/devices-msm7x00.c | 21 ++-
1064 arch/arm/mach-msm/devices-msm7x30.c | 21 ++-
1065 arch/arm/mach-msm/devices-msm8960.c | 181 +++++++++++
1066 arch/arm/mach-msm/devices-msm8x60.c | 56 ++++
1067 arch/arm/mach-msm/devices-qsd8x50.c | 21 ++-
1068 arch/arm/mach-msm/devices.h | 8 +
1069 arch/arm/mach-msm/dma.c | 391 ++++++++++++++++++-----
1070 arch/arm/mach-msm/include/mach/dma.h | 84 +++---
1071 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 5 +-
1072 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 5 +-
1073 arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 3 +
1074 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 5 +-
1075 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 6 +
1076 arch/arm/mach-msm/io.c | 3 -
1077 25 files changed, 808 insertions(+), 133 deletions(-)
1078 create mode 100644 arch/arm/mach-msm/clock-dummy.c
1079 create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
1080 Merging omap/for-next
1081 $ git merge omap/for-next
1082 Merge made by recursive.
1083 arch/arm/configs/omap2plus_defconfig | 83 +--------
1084 arch/arm/mach-omap2/Makefile | 2 +
1085 arch/arm/mach-omap2/board-2430sdp.c | 20 +--
1086 arch/arm/mach-omap2/board-3430sdp.c | 85 +--------
1087 arch/arm/mach-omap2/board-4430sdp.c | 16 +--
1088 arch/arm/mach-omap2/board-cm-t35.c | 162 ++---------------
1089 arch/arm/mach-omap2/board-devkit8000.c | 119 +------------
1090 arch/arm/mach-omap2/board-igep0020.c | 76 +-------
1091 arch/arm/mach-omap2/board-igep0030.c | 21 +--
1092 arch/arm/mach-omap2/board-ldp.c | 138 ++--------------
1093 arch/arm/mach-omap2/board-omap3beagle.c | 66 +-------
1094 arch/arm/mach-omap2/board-omap3evm.c | 143 ++--------------
1095 arch/arm/mach-omap2/board-omap3logic.c | 14 +--
1096 arch/arm/mach-omap2/board-omap3pandora.c | 69 +-------
1097 arch/arm/mach-omap2/board-omap3stalker.c | 126 ++------------
1098 arch/arm/mach-omap2/board-omap3touchbook.c | 101 +----------
1099 arch/arm/mach-omap2/board-omap4panda.c | 17 +--
1100 arch/arm/mach-omap2/board-overo.c | 214 ++--------------------
1101 arch/arm/mach-omap2/board-rm680.c | 21 +--
1102 arch/arm/mach-omap2/board-rx51-peripherals.c | 13 +--
1103 arch/arm/mach-omap2/board-zoom-debugboard.c | 56 +------
1104 arch/arm/mach-omap2/board-zoom-peripherals.c | 21 +--
1105 arch/arm/mach-omap2/common-board-devices.c | 148 ++++++++++++++++
1106 arch/arm/mach-omap2/common-board-devices.h | 52 ++++++
1107 arch/arm/mach-omap2/gpmc-smsc911x.c | 37 ++---
1108 arch/arm/mach-omap2/omap_l3_noc.c | 51 +++---
1109 arch/arm/mach-omap2/omap_l3_smx.c | 42 ++---
1110 arch/arm/mach-omap2/pm44xx.c | 2 -
1111 arch/arm/mach-omap2/smartreflex.c | 23 ++-
1112 arch/arm/mach-omap2/usb-musb.c | 14 ++-
1113 arch/arm/mach-omap2/voltage.c | 1 -
1114 arch/arm/plat-omap/include/plat/gpmc-smsc911x.h | 4 +-
1115 32 files changed, 439 insertions(+), 1518 deletions(-)
1116 create mode 100644 arch/arm/mach-omap2/common-board-devices.c
1117 create mode 100644 arch/arm/mach-omap2/common-board-devices.h
1118 Merging pxa/for-next
1119 $ git merge pxa/for-next
1121 Merging samsung/next-samsung
1122 $ git merge samsung/next-samsung
1124 Merging s5p/for-next
1125 $ git merge s5p/for-next
1126 Merge made by recursive.
1127 arch/arm/configs/exynos4_defconfig | 2 +
1128 arch/arm/mach-exynos4/Kconfig | 2 +
1129 arch/arm/mach-exynos4/Makefile | 1 +
1130 arch/arm/mach-exynos4/cpuidle.c | 86 ++++++++++++++++++++++++++++++++++
1131 arch/arm/mach-exynos4/mach-nuri.c | 89 ++++++++++++++++++++++++++++++++++++
1132 5 files changed, 180 insertions(+), 0 deletions(-)
1133 create mode 100644 arch/arm/mach-exynos4/cpuidle.c
1134 Merging tegra/for-next
1135 $ git merge tegra/for-next
1137 Merging ux500-core/ux500-core
1138 $ git merge ux500-core/ux500-core
1139 Auto-merging arch/arm/Kconfig
1140 Removing arch/arm/mach-u300/gpio.c
1141 Removing arch/arm/mach-ux500/cpufreq.c
1142 Removing arch/arm/mach-ux500/include/mach/prcmu-defs.h
1143 Removing arch/arm/mach-ux500/include/mach/prcmu.h
1144 Removing arch/arm/mach-ux500/prcmu.c
1145 Removing arch/arm/plat-nomadik/include/plat/gpio.h
1146 Removing arch/arm/plat-nomadik/include/plat/pincfg.h
1147 Auto-merging drivers/gpio/nomadik-gpio.c
1148 Merge made by recursive.
1149 arch/arm/Kconfig | 2 +-
1150 arch/arm/configs/u8500_defconfig | 29 +-
1151 arch/arm/mach-nomadik/Kconfig | 2 +-
1152 arch/arm/mach-nomadik/board-nhk8815.c | 3 +-
1153 arch/arm/mach-nomadik/cpu-8815.c | 1 +
1154 arch/arm/mach-nomadik/i2c-8815nhk.c | 14 +-
1155 arch/arm/mach-nomadik/include/mach/gpio.h | 8 +-
1156 arch/arm/mach-u300/Kconfig | 1 +
1157 arch/arm/mach-u300/Makefile | 6 +-
1158 arch/arm/mach-u300/core.c | 31 +-
1159 arch/arm/mach-u300/gpio.c | 700 -------
1160 arch/arm/mach-u300/include/mach/gpio.h | 163 +--
1161 arch/arm/mach-u300/include/mach/irqs.h | 25 +-
1162 arch/arm/mach-ux500/Kconfig | 18 +-
1163 arch/arm/mach-ux500/Makefile | 11 +-
1164 arch/arm/mach-ux500/board-mop500-pins.c | 3 +-
1165 arch/arm/mach-ux500/board-mop500-regulators.c | 9 +-
1166 arch/arm/mach-ux500/board-mop500-sdi.c | 63 +-
1167 arch/arm/mach-ux500/board-mop500.c | 3 +
1168 arch/arm/mach-ux500/board-mop500.h | 5 +
1169 arch/arm/mach-ux500/board-snowball-pins.c | 131 ++
1170 arch/arm/mach-ux500/board-snowball.c | 359 ++++
1171 arch/arm/mach-ux500/board-snowball.h | 12 +
1172 arch/arm/mach-ux500/board-u5500-sdi.c | 3 +-
1173 arch/arm/mach-ux500/clock-db8500.c | 1287 +++++++++++++
1174 arch/arm/mach-ux500/clock.c | 904 +++-------
1175 arch/arm/mach-ux500/clock.h | 225 +--
1176 arch/arm/mach-ux500/cpu-db5500.c | 5 +-
1177 arch/arm/mach-ux500/cpu-db8500.c | 195 ++-
1178 arch/arm/mach-ux500/cpu.c | 7 +-
1179 arch/arm/mach-ux500/cpufreq.c | 211 --
1180 arch/arm/mach-ux500/devices-common.c | 3 +-
1181 arch/arm/mach-ux500/include/mach/db5500-regs.h | 20 +-
1182 arch/arm/mach-ux500/include/mach/db8500-regs.h | 37 +-
1183 arch/arm/mach-ux500/include/mach/gpio.h | 8 +-
1184 arch/arm/mach-ux500/include/mach/hardware.h | 1 +
1185 arch/arm/mach-ux500/include/mach/id.h | 20 +
1186 .../mach-ux500/include/mach/irqs-board-mop500.h | 5 +
1187 .../arm/mach-ux500/include/mach/irqs-board-u5500.h | 21 +
1188 arch/arm/mach-ux500/include/mach/irqs-db5500.h | 27 +
1189 arch/arm/mach-ux500/include/mach/irqs-db8500.h | 54 +
1190 arch/arm/mach-ux500/include/mach/irqs.h | 46 +-
1191 arch/arm/mach-ux500/include/mach/prcmu-db5500.h | 45 +
1192 arch/arm/mach-ux500/include/mach/prcmu-defs.h | 30 -
1193 arch/arm/mach-ux500/include/mach/prcmu-fw-api.h | 523 +++++
1194 .../arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h | 467 +++++
1195 arch/arm/mach-ux500/include/mach/prcmu-regs.h | 27 +-
1196 arch/arm/mach-ux500/include/mach/prcmu.h | 28 -
1197 arch/arm/mach-ux500/include/mach/uncompress.h | 3 +-
1198 arch/arm/mach-ux500/pins-db5500.h | 2 +
1199 arch/arm/mach-ux500/pins-db8500.h | 144 +-
1200 arch/arm/mach-ux500/pm/Kconfig | 6 +
1201 arch/arm/mach-ux500/pm/Makefile | 4 +
1202 arch/arm/mach-ux500/pm/cpufreq.c | 171 ++
1203 arch/arm/mach-ux500/prcmu-db5500.c | 449 +++++
1204 arch/arm/mach-ux500/prcmu-db8500.c | 2018 ++++++++++++++++++++
1205 arch/arm/mach-ux500/prcmu-regs-db8500.h | 162 ++
1206 arch/arm/mach-ux500/prcmu.c | 394 ----
1207 arch/arm/mach-ux500/regulator-db8500.c | 562 ++++++
1208 arch/arm/mach-ux500/regulator-db8500.h | 45 +
1209 arch/arm/plat-nomadik/Kconfig | 5 -
1210 arch/arm/plat-nomadik/Makefile | 1 -
1211 arch/arm/plat-nomadik/include/plat/gpio.h | 93 -
1212 arch/arm/plat-nomadik/include/plat/pincfg.h | 144 --
1213 drivers/gpio/Kconfig | 25 +-
1214 drivers/gpio/Makefile | 8 +-
1215 drivers/gpio/gpiolib.c | 28 +
1216 .../gpio.c => drivers/gpio/nomadik-gpio.c | 857 +++++----
1217 drivers/gpio/u300-gpio.c | 836 ++++++++
1218 drivers/mfd/ab8500-i2c.c | 2 +-
1219 drivers/video/via/via-gpio.c | 49 +-
1220 include/asm-generic/gpio.h | 8 +-
1221 include/linux/gpio.h | 61 +
1222 include/linux/gpio/nomadik.h | 291 +++
1223 include/linux/gpio/u300.h | 32 +
1224 75 files changed, 9077 insertions(+), 3121 deletions(-)
1225 delete mode 100644 arch/arm/mach-u300/gpio.c
1226 create mode 100644 arch/arm/mach-ux500/board-snowball-pins.c
1227 create mode 100644 arch/arm/mach-ux500/board-snowball.c
1228 create mode 100644 arch/arm/mach-ux500/board-snowball.h
1229 create mode 100644 arch/arm/mach-ux500/clock-db8500.c
1230 delete mode 100644 arch/arm/mach-ux500/cpufreq.c
1231 create mode 100644 arch/arm/mach-ux500/include/mach/irqs-board-u5500.h
1232 create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-db5500.h
1233 delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h
1234 create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-api.h
1235 create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h
1236 delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h
1237 create mode 100644 arch/arm/mach-ux500/pm/Kconfig
1238 create mode 100644 arch/arm/mach-ux500/pm/Makefile
1239 create mode 100644 arch/arm/mach-ux500/pm/cpufreq.c
1240 create mode 100644 arch/arm/mach-ux500/prcmu-db5500.c
1241 create mode 100644 arch/arm/mach-ux500/prcmu-db8500.c
1242 create mode 100644 arch/arm/mach-ux500/prcmu-regs-db8500.h
1243 delete mode 100644 arch/arm/mach-ux500/prcmu.c
1244 create mode 100644 arch/arm/mach-ux500/regulator-db8500.c
1245 create mode 100644 arch/arm/mach-ux500/regulator-db8500.h
1246 delete mode 100644 arch/arm/plat-nomadik/include/plat/gpio.h
1247 delete mode 100644 arch/arm/plat-nomadik/include/plat/pincfg.h
1248 rename arch/arm/plat-nomadik/gpio.c => drivers/gpio/nomadik-gpio.c (57%)
1249 create mode 100644 drivers/gpio/u300-gpio.c
1250 create mode 100644 include/linux/gpio/nomadik.h
1251 create mode 100644 include/linux/gpio/u300.h
1252 Merging xilinx/arm-next
1253 $ git merge xilinx/arm-next
1254 Auto-merging arch/arm/Kconfig
1255 Auto-merging arch/arm/Makefile
1256 Merge made by recursive.
1257 arch/arm/Kconfig | 14 ++
1258 arch/arm/Makefile | 1 +
1259 arch/arm/mach-zynq/Kconfig | 14 ++
1260 arch/arm/mach-zynq/Makefile | 7 +
1261 arch/arm/mach-zynq/Makefile.boot | 3 +
1262 arch/arm/mach-zynq/board_ep107.c | 85 +++++++
1263 arch/arm/mach-zynq/common.c | 114 ++++++++++
1264 arch/arm/mach-zynq/common.h | 30 +++
1265 arch/arm/mach-zynq/include/mach/clkdev.h | 33 +++
1266 arch/arm/mach-zynq/include/mach/debug-macro.S | 36 +++
1267 arch/arm/mach-zynq/include/mach/entry-macro.S | 30 +++
1268 arch/arm/mach-zynq/include/mach/hardware.h | 18 ++
1269 arch/arm/mach-zynq/include/mach/io.h | 33 +++
1270 arch/arm/mach-zynq/include/mach/irqs.h | 29 +++
1271 arch/arm/mach-zynq/include/mach/memory.h | 23 ++
1272 arch/arm/mach-zynq/include/mach/system.h | 28 +++
1273 arch/arm/mach-zynq/include/mach/timex.h | 23 ++
1274 arch/arm/mach-zynq/include/mach/uart.h | 25 ++
1275 arch/arm/mach-zynq/include/mach/uncompress.h | 51 +++++
1276 arch/arm/mach-zynq/include/mach/vmalloc.h | 20 ++
1277 arch/arm/mach-zynq/include/mach/zynq_soc.h | 48 ++++
1278 arch/arm/mach-zynq/timer.c | 297 +++++++++++++++++++++++++
1279 arch/arm/mm/Kconfig | 2 +-
1280 23 files changed, 963 insertions(+), 1 deletions(-)
1281 create mode 100644 arch/arm/mach-zynq/Kconfig
1282 create mode 100644 arch/arm/mach-zynq/Makefile
1283 create mode 100644 arch/arm/mach-zynq/Makefile.boot
1284 create mode 100644 arch/arm/mach-zynq/board_ep107.c
1285 create mode 100644 arch/arm/mach-zynq/common.c
1286 create mode 100644 arch/arm/mach-zynq/common.h
1287 create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h
1288 create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S
1289 create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S
1290 create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h
1291 create mode 100644 arch/arm/mach-zynq/include/mach/io.h
1292 create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h
1293 create mode 100644 arch/arm/mach-zynq/include/mach/memory.h
1294 create mode 100644 arch/arm/mach-zynq/include/mach/system.h
1295 create mode 100644 arch/arm/mach-zynq/include/mach/timex.h
1296 create mode 100644 arch/arm/mach-zynq/include/mach/uart.h
1297 create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h
1298 create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h
1299 create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h
1300 create mode 100644 arch/arm/mach-zynq/timer.c
1301 Merging avr32/avr32-arch
1302 $ git merge avr32/avr32-arch
1304 Merging blackfin/for-linus
1305 $ git merge blackfin/for-linus
1306 Merge made by recursive.
1307 arch/blackfin/Kconfig.debug | 2 +-
1308 arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 12 +-
1309 arch/blackfin/configs/BF527-EZKIT_defconfig | 14 +-
1310 arch/blackfin/include/asm/bfin-global.h | 10 -
1311 arch/blackfin/include/asm/cacheflush.h | 23 +-
1312 arch/blackfin/include/asm/cpu.h | 3 -
1313 arch/blackfin/include/asm/irq_handler.h | 25 +
1314 arch/blackfin/include/asm/kgdb.h | 6 +-
1315 arch/blackfin/include/asm/ptrace.h | 2 -
1316 arch/blackfin/include/mach-common/irq.h | 57 +
1317 arch/blackfin/kernel/Makefile | 2 +
1318 arch/blackfin/kernel/bfin_gpio.c | 3 +-
1319 arch/blackfin/kernel/bfin_ksyms.c | 1 +
1320 arch/blackfin/kernel/debug-mmrs.c | 1860 +++++++++++++++++++++
1321 arch/blackfin/kernel/ipipe.c | 1 +
1322 arch/blackfin/kernel/irqchip.c | 1 +
1323 arch/blackfin/kernel/setup.c | 50 +-
1324 arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 16 +-
1325 arch/blackfin/mach-bf518/include/mach/defBF512.h | 8 +-
1326 arch/blackfin/mach-bf518/include/mach/irq.h | 262 ++--
1327 arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 16 +-
1328 arch/blackfin/mach-bf527/include/mach/defBF522.h | 8 +-
1329 arch/blackfin/mach-bf527/include/mach/irq.h | 266 ++--
1330 arch/blackfin/mach-bf533/include/mach/irq.h | 168 +--
1331 arch/blackfin/mach-bf537/include/mach/irq.h | 365 ++---
1332 arch/blackfin/mach-bf537/ints-priority.c | 163 ++
1333 arch/blackfin/mach-bf538/include/mach/irq.h | 89 +-
1334 arch/blackfin/mach-bf548/include/mach/irq.h | 89 +-
1335 arch/blackfin/mach-bf561/include/mach/irq.h | 505 ++----
1336 arch/blackfin/mach-bf561/smp.c | 3 -
1337 arch/blackfin/mach-common/ints-priority.c | 476 ++----
1338 arch/blackfin/mach-common/smp.c | 1 +
1339 32 files changed, 2989 insertions(+), 1518 deletions(-)
1340 create mode 100644 arch/blackfin/include/mach-common/irq.h
1341 create mode 100644 arch/blackfin/kernel/debug-mmrs.c
1342 Merging cris/for-next
1343 $ git merge cris/for-next
1344 Auto-merging drivers/net/cris/eth_v10.c
1345 Merge made by recursive.
1346 Documentation/cris/README | 62 +++++++++++++++---------------
1347 arch/cris/arch-v32/drivers/cryptocop.c | 6 +--
1348 arch/cris/arch-v32/kernel/ptrace.c | 2 -
1349 arch/cris/include/arch-v32/arch/cache.h | 2 +-
1350 drivers/net/cris/eth_v10.c | 1 -
1351 5 files changed, 34 insertions(+), 39 deletions(-)
1353 $ git merge ia64/test
1354 Merge made by recursive.
1355 arch/ia64/oprofile/backtrace.c | 2 +-
1356 1 files changed, 1 insertions(+), 1 deletions(-)
1357 Merging m68k/for-next
1358 $ git merge m68k/for-next
1360 Merging m68knommu/for-next
1361 $ git merge m68knommu/for-next
1362 Removing arch/m68k/kernel/asm-offsets_mm.c
1363 Removing arch/m68k/kernel/asm-offsets_no.c
1364 Removing arch/m68k/kernel/m68k_ksyms_mm.c
1365 Removing arch/m68k/kernel/m68k_ksyms_no.c
1366 Removing arch/m68k/lib/Makefile_mm
1367 Removing arch/m68k/lib/Makefile_no
1368 Removing arch/m68k/lib/checksum.c
1369 Removing arch/m68k/lib/muldi3_mm.c
1370 Removing arch/m68k/lib/muldi3_no.c
1371 Removing arch/m68k/mm/Makefile_mm
1372 Removing arch/m68k/mm/Makefile_no
1373 Removing arch/m68k/mm/kmap_mm.c
1374 Removing arch/m68k/mm/kmap_no.c
1375 Merge made by recursive.
1376 arch/m68k/Kconfig | 1 +
1377 arch/m68k/include/asm/bitops_no.h | 18 +--
1378 arch/m68k/include/asm/io_no.h | 8 +-
1379 arch/m68k/kernel/asm-offsets.c | 106 ++++++++++-
1380 arch/m68k/kernel/asm-offsets_mm.c | 100 ----------
1381 arch/m68k/kernel/asm-offsets_no.c | 76 -------
1382 arch/m68k/kernel/entry_no.S | 1 -
1383 arch/m68k/kernel/irq.c | 28 ---
1384 arch/m68k/kernel/m68k_ksyms.c | 35 +++-
1385 arch/m68k/kernel/m68k_ksyms_mm.c | 16 --
1386 arch/m68k/kernel/m68k_ksyms_no.c | 78 --------
1387 arch/m68k/kernel/process_no.c | 2 +
1388 arch/m68k/kernel/syscalltable.S | 1 -
1389 arch/m68k/lib/Makefile | 13 +-
1390 arch/m68k/lib/Makefile_mm | 6 -
1391 arch/m68k/lib/Makefile_no | 7 -
1392 arch/m68k/lib/checksum.c | 5 -
1393 arch/m68k/lib/checksum_no.c | 3 +
1394 arch/m68k/lib/memcpy.c | 128 +++++++------
1395 arch/m68k/lib/memmove.c | 2 -
1396 arch/m68k/lib/memset.c | 114 +++++++----
1397 arch/m68k/lib/muldi3.c | 99 +++++++++-
1398 arch/m68k/lib/muldi3_mm.c | 63 ------
1399 arch/m68k/lib/muldi3_no.c | 86 --------
1400 arch/m68k/lib/string.c | 223 ---------------------
1401 arch/m68k/mm/Makefile | 14 +-
1402 arch/m68k/mm/Makefile_mm | 8 -
1403 arch/m68k/mm/Makefile_no | 5 -
1404 arch/m68k/mm/init_no.c | 51 +-----
1405 arch/m68k/mm/kmap.c | 368 ++++++++++++++++++++++++++++++++++-
1406 arch/m68k/mm/kmap_mm.c | 367 ----------------------------------
1407 arch/m68k/mm/kmap_no.c | 45 -----
1408 arch/m68k/platform/68328/entry.S | 7 +-
1409 arch/m68k/platform/68360/entry.S | 7 +-
1410 arch/m68k/platform/coldfire/dma.c | 3 +
1411 arch/m68k/platform/coldfire/entry.S | 11 +-
1412 arch/m68k/platform/coldfire/head.S | 1 -
1413 drivers/spi/coldfire_qspi.c | 1 +
1414 38 files changed, 790 insertions(+), 1317 deletions(-)
1415 delete mode 100644 arch/m68k/kernel/asm-offsets_mm.c
1416 delete mode 100644 arch/m68k/kernel/asm-offsets_no.c
1417 delete mode 100644 arch/m68k/kernel/m68k_ksyms_mm.c
1418 delete mode 100644 arch/m68k/kernel/m68k_ksyms_no.c
1419 delete mode 100644 arch/m68k/lib/Makefile_mm
1420 delete mode 100644 arch/m68k/lib/Makefile_no
1421 delete mode 100644 arch/m68k/lib/checksum.c
1422 delete mode 100644 arch/m68k/lib/muldi3_mm.c
1423 delete mode 100644 arch/m68k/lib/muldi3_no.c
1424 delete mode 100644 arch/m68k/mm/Makefile_mm
1425 delete mode 100644 arch/m68k/mm/Makefile_no
1426 delete mode 100644 arch/m68k/mm/kmap_mm.c
1427 delete mode 100644 arch/m68k/mm/kmap_no.c
1428 Merging microblaze/next
1429 $ git merge microblaze/next
1431 Merging mips/mips-for-linux-next
1432 $ git merge mips/mips-for-linux-next
1433 Merge made by recursive.
1434 arch/mips/Kbuild.platforms | 1 +
1435 arch/mips/Kconfig | 19 +
1436 arch/mips/include/asm/mach-lantiq/lantiq.h | 59 ++
1437 .../mips/include/asm/mach-lantiq/lantiq_platform.h | 46 ++
1438 arch/mips/include/asm/mach-lantiq/war.h | 24 +
1439 arch/mips/include/asm/mach-lantiq/xway/irq.h | 18 +
1440 .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 62 ++
1441 .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 139 ++++
1442 arch/mips/include/asm/thread_info.h | 3 +
1443 arch/mips/kernel/entry.S | 2 +-
1444 arch/mips/kernel/vmlinux.lds.S | 1 +
1445 arch/mips/lantiq/Kconfig | 23 +
1446 arch/mips/lantiq/Makefile | 11 +
1447 arch/mips/lantiq/Platform | 8 +
1448 arch/mips/lantiq/clk.c | 140 ++++
1449 arch/mips/lantiq/clk.h | 18 +
1450 arch/mips/lantiq/devices.c | 125 ++++
1451 arch/mips/lantiq/devices.h | 20 +
1452 arch/mips/lantiq/early_printk.c | 33 +
1453 arch/mips/lantiq/irq.c | 326 +++++++++
1454 arch/mips/lantiq/machtypes.h | 20 +
1455 arch/mips/lantiq/prom.c | 71 ++
1456 arch/mips/lantiq/prom.h | 24 +
1457 arch/mips/lantiq/setup.c | 65 ++
1458 arch/mips/lantiq/xway/Kconfig | 23 +
1459 arch/mips/lantiq/xway/Makefile | 7 +
1460 arch/mips/lantiq/xway/clk-ase.c | 48 ++
1461 arch/mips/lantiq/xway/clk-xway.c | 223 ++++++
1462 arch/mips/lantiq/xway/devices.c | 77 ++
1463 arch/mips/lantiq/xway/devices.h | 17 +
1464 arch/mips/lantiq/xway/ebu.c | 53 ++
1465 arch/mips/lantiq/xway/gpio.c | 195 +++++
1466 arch/mips/lantiq/xway/gpio_ebu.c | 126 ++++
1467 arch/mips/lantiq/xway/gpio_stp.c | 157 ++++
1468 arch/mips/lantiq/xway/mach-easy50601.c | 69 ++
1469 arch/mips/lantiq/xway/mach-easy50712.c | 74 ++
1470 arch/mips/lantiq/xway/pmu.c | 70 ++
1471 arch/mips/lantiq/xway/prom-ase.c | 39 +
1472 arch/mips/lantiq/xway/prom-xway.c | 54 ++
1473 arch/mips/lantiq/xway/reset.c | 79 ++
1474 arch/mips/pci/Makefile | 1 +
1475 arch/mips/pci/ops-lantiq.c | 116 +++
1476 arch/mips/pci/pci-lantiq.c | 297 ++++++++
1477 arch/mips/pci/pci-lantiq.h | 18 +
1478 arch/mips/sgi-ip27/ip27-timer.c | 13 +-
1479 drivers/mtd/maps/Kconfig | 9 +
1480 drivers/mtd/maps/Makefile | 1 +
1481 drivers/mtd/maps/lantiq-flash.c | 251 +++++++
1482 drivers/tty/serial/Kconfig | 8 +
1483 drivers/tty/serial/Makefile | 1 +
1484 drivers/tty/serial/lantiq.c | 756 ++++++++++++++++++++
1485 lib/Kconfig.debug | 2 +-
1486 52 files changed, 4028 insertions(+), 14 deletions(-)
1487 create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq.h
1488 create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_platform.h
1489 create mode 100644 arch/mips/include/asm/mach-lantiq/war.h
1490 create mode 100644 arch/mips/include/asm/mach-lantiq/xway/irq.h
1491 create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h
1492 create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
1493 create mode 100644 arch/mips/lantiq/Kconfig
1494 create mode 100644 arch/mips/lantiq/Makefile
1495 create mode 100644 arch/mips/lantiq/Platform
1496 create mode 100644 arch/mips/lantiq/clk.c
1497 create mode 100644 arch/mips/lantiq/clk.h
1498 create mode 100644 arch/mips/lantiq/devices.c
1499 create mode 100644 arch/mips/lantiq/devices.h
1500 create mode 100644 arch/mips/lantiq/early_printk.c
1501 create mode 100644 arch/mips/lantiq/irq.c
1502 create mode 100644 arch/mips/lantiq/machtypes.h
1503 create mode 100644 arch/mips/lantiq/prom.c
1504 create mode 100644 arch/mips/lantiq/prom.h
1505 create mode 100644 arch/mips/lantiq/setup.c
1506 create mode 100644 arch/mips/lantiq/xway/Kconfig
1507 create mode 100644 arch/mips/lantiq/xway/Makefile
1508 create mode 100644 arch/mips/lantiq/xway/clk-ase.c
1509 create mode 100644 arch/mips/lantiq/xway/clk-xway.c
1510 create mode 100644 arch/mips/lantiq/xway/devices.c
1511 create mode 100644 arch/mips/lantiq/xway/devices.h
1512 create mode 100644 arch/mips/lantiq/xway/ebu.c
1513 create mode 100644 arch/mips/lantiq/xway/gpio.c
1514 create mode 100644 arch/mips/lantiq/xway/gpio_ebu.c
1515 create mode 100644 arch/mips/lantiq/xway/gpio_stp.c
1516 create mode 100644 arch/mips/lantiq/xway/mach-easy50601.c
1517 create mode 100644 arch/mips/lantiq/xway/mach-easy50712.c
1518 create mode 100644 arch/mips/lantiq/xway/pmu.c
1519 create mode 100644 arch/mips/lantiq/xway/prom-ase.c
1520 create mode 100644 arch/mips/lantiq/xway/prom-xway.c
1521 create mode 100644 arch/mips/lantiq/xway/reset.c
1522 create mode 100644 arch/mips/pci/ops-lantiq.c
1523 create mode 100644 arch/mips/pci/pci-lantiq.c
1524 create mode 100644 arch/mips/pci/pci-lantiq.h
1525 create mode 100644 drivers/mtd/maps/lantiq-flash.c
1526 create mode 100644 drivers/tty/serial/lantiq.c
1527 Merging parisc/for-next
1528 $ git merge parisc/for-next
1529 Merge made by recursive.
1530 arch/parisc/include/asm/cacheflush.h | 5 +-
1531 arch/parisc/include/asm/pgtable.h | 9 +-
1532 arch/parisc/include/asm/unistd.h | 8 +-
1533 arch/parisc/kernel/cache.c | 13 ++-
1534 arch/parisc/kernel/entry.S | 3 +
1535 arch/parisc/kernel/head.S | 5 +-
1536 arch/parisc/kernel/module.c | 10 ++-
1537 arch/parisc/kernel/pacache.S | 6 +-
1538 arch/parisc/kernel/sys_parisc32.c | 8 +
1539 arch/parisc/kernel/syscall_table.S | 6 +
1540 arch/parisc/kernel/vmlinux.lds.S | 1 +
1541 arch/parisc/mm/init.c | 260 +++++++++++++++++++---------------
1542 12 files changed, 205 insertions(+), 129 deletions(-)
1543 Merging powerpc/next
1544 $ git merge powerpc/next
1545 Auto-merging arch/powerpc/include/asm/io-workarounds.h
1546 Auto-merging arch/powerpc/kernel/io-workarounds.c
1547 Removing arch/powerpc/platforms/pseries/xics.c
1548 Removing arch/powerpc/platforms/pseries/xics.h
1549 Merge made by recursive.
1550 arch/powerpc/Kconfig | 6 +
1551 arch/powerpc/boot/Makefile | 4 +-
1552 arch/powerpc/boot/crt0.S | 116 ++-
1553 arch/powerpc/boot/epapr.c | 66 ++
1554 arch/powerpc/boot/wrapper | 13 +-
1555 arch/powerpc/boot/zImage.coff.lds.S | 6 +-
1556 arch/powerpc/boot/zImage.lds.S | 57 +-
1557 arch/powerpc/configs/c2k_defconfig | 4 +-
1558 arch/powerpc/configs/pmac32_defconfig | 4 +-
1559 arch/powerpc/configs/ppc6xx_defconfig | 4 +-
1560 arch/powerpc/configs/ps3_defconfig | 4 +-
1561 arch/powerpc/include/asm/cputable.h | 44 +-
1562 arch/powerpc/include/asm/emulated_ops.h | 4 +
1563 arch/powerpc/include/asm/exception-64s.h | 97 ++-
1564 arch/powerpc/include/asm/feature-fixups.h | 2 +-
1565 .../cell => include/asm}/io-workarounds.h | 1 -
1566 arch/powerpc/include/asm/io.h | 16 +-
1567 arch/powerpc/include/asm/irq.h | 6 +
1568 arch/powerpc/include/asm/kvm_asm.h | 1 +
1569 arch/powerpc/include/asm/kvm_book3s_asm.h | 1 +
1570 arch/powerpc/include/asm/machdep.h | 3 +-
1571 arch/powerpc/include/asm/mmu-book3e.h | 16 +
1572 arch/powerpc/include/asm/mmu.h | 48 +
1573 arch/powerpc/include/asm/mmu_context.h | 2 +-
1574 arch/powerpc/include/asm/paca.h | 5 +-
1575 arch/powerpc/include/asm/page_64.h | 2 +-
1576 arch/powerpc/include/asm/ppc-opcode.h | 35 +
1577 arch/powerpc/include/asm/ppc_asm.h | 1 +
1578 arch/powerpc/include/asm/processor.h | 4 +
1579 arch/powerpc/include/asm/reg.h | 97 ++-
1580 arch/powerpc/include/asm/reg_a2.h | 156 ++++
1581 arch/powerpc/include/asm/reg_booke.h | 6 +-
1582 arch/powerpc/include/asm/scom.h | 156 ++++
1583 arch/powerpc/include/asm/smp.h | 3 +-
1584 arch/powerpc/include/asm/tlbflush.h | 2 +
1585 arch/powerpc/include/asm/xics.h | 142 +++
1586 arch/powerpc/kernel/Makefile | 5 +
1587 arch/powerpc/kernel/asm-offsets.c | 1 +
1588 arch/powerpc/kernel/cpu_setup_a2.S | 114 +++
1589 arch/powerpc/kernel/cpu_setup_power7.S | 91 ++
1590 arch/powerpc/kernel/cputable.c | 66 +-
1591 arch/powerpc/kernel/entry_64.S | 27 +-
1592 arch/powerpc/kernel/exceptions-64e.S | 50 +-
1593 arch/powerpc/kernel/exceptions-64s.S | 184 +++-
1594 arch/powerpc/kernel/head_64.S | 42 +-
1595 arch/powerpc/kernel/idle_power7.S | 97 ++
1596 .../{platforms/cell => kernel}/io-workarounds.c | 31 +-
1597 arch/powerpc/kernel/irq.c | 34 +-
1598 arch/powerpc/kernel/paca.c | 13 +-
1599 arch/powerpc/kernel/process.c | 20 +-
1600 arch/powerpc/kernel/prom.c | 44 +-
1601 arch/powerpc/kernel/prom_init.c | 26 +-
1602 arch/powerpc/kernel/rtas.c | 2 +-
1603 arch/powerpc/kernel/setup_32.c | 1 +
1604 arch/powerpc/kernel/setup_64.c | 15 +-
1605 arch/powerpc/kernel/signal_64.c | 4 +-
1606 arch/powerpc/kernel/smp.c | 10 +-
1607 arch/powerpc/kernel/sysfs.c | 38 +
1608 arch/powerpc/kernel/traps.c | 26 +-
1609 arch/powerpc/kvm/book3s_rmhandlers.S | 11 +-
1610 arch/powerpc/kvm/book3s_segment.S | 12 +-
1611 arch/powerpc/lib/sstep.c | 61 +-
1612 arch/powerpc/mm/hash_low_64.S | 8 +-
1613 arch/powerpc/mm/hash_native_64.c | 8 +-
1614 arch/powerpc/mm/hash_utils_64.c | 62 +-
1615 arch/powerpc/mm/hugetlbpage.c | 2 +-
1616 arch/powerpc/mm/mmu_context_hash64.c | 3 +-
1617 arch/powerpc/mm/mmu_context_nohash.c | 18 +-
1618 arch/powerpc/mm/numa.c | 15 +-
1619 arch/powerpc/mm/slb.c | 10 +-
1620 arch/powerpc/mm/slb_low.S | 8 +-
1621 arch/powerpc/mm/stab.c | 2 +-
1622 arch/powerpc/platforms/44x/iss4xx.c | 6 +-
1623 arch/powerpc/platforms/85xx/smp.c | 6 +-
1624 arch/powerpc/platforms/86xx/mpc86xx_smp.c | 6 +-
1625 arch/powerpc/platforms/Kconfig | 17 +-
1626 arch/powerpc/platforms/Kconfig.cputype | 4 +
1627 arch/powerpc/platforms/cell/Kconfig | 4 +-
1628 arch/powerpc/platforms/cell/Makefile | 8 +-
1629 arch/powerpc/platforms/cell/beat_smp.c | 5 +-
1630 arch/powerpc/platforms/cell/celleb_pci.c | 19 +-
1631 arch/powerpc/platforms/cell/celleb_pci.h | 3 +-
1632 arch/powerpc/platforms/cell/qpace_setup.c | 1 -
1633 arch/powerpc/platforms/cell/setup.c | 4 +-
1634 arch/powerpc/platforms/cell/smp.c | 6 +-
1635 arch/powerpc/platforms/cell/spider-pci.c | 3 +-
1636 arch/powerpc/platforms/chrp/smp.c | 4 +-
1637 arch/powerpc/platforms/iseries/Kconfig | 3 +-
1638 arch/powerpc/platforms/iseries/exception.S | 3 +-
1639 arch/powerpc/platforms/iseries/setup.c | 4 +-
1640 arch/powerpc/platforms/iseries/smp.c | 6 +-
1641 arch/powerpc/platforms/powermac/smp.c | 10 +-
1642 arch/powerpc/platforms/ps3/interrupt.c | 2 +-
1643 arch/powerpc/platforms/pseries/Kconfig | 5 +-
1644 arch/powerpc/platforms/pseries/Makefile | 1 -
1645 arch/powerpc/platforms/pseries/eeh.c | 13 +-
1646 arch/powerpc/platforms/pseries/hotplug-cpu.c | 3 +-
1647 arch/powerpc/platforms/pseries/kexec.c | 5 +-
1648 arch/powerpc/platforms/pseries/lpar.c | 2 +-
1649 arch/powerpc/platforms/pseries/plpar_wrappers.h | 27 -
1650 arch/powerpc/platforms/pseries/setup.c | 8 +-
1651 arch/powerpc/platforms/pseries/smp.c | 23 +-
1652 arch/powerpc/platforms/pseries/xics.c | 949 --------------------
1653 arch/powerpc/platforms/pseries/xics.h | 23 -
1654 arch/powerpc/sysdev/Kconfig | 10 +
1655 arch/powerpc/sysdev/Makefile | 6 +
1656 arch/powerpc/sysdev/mmio_nvram.c | 2 +
1657 arch/powerpc/sysdev/scom.c | 192 ++++
1658 arch/powerpc/sysdev/xics/Kconfig | 12 +
1659 arch/powerpc/sysdev/xics/Makefile | 6 +
1660 arch/powerpc/sysdev/xics/icp-hv.c | 184 ++++
1661 arch/powerpc/sysdev/xics/icp-native.c | 312 +++++++
1662 arch/powerpc/sysdev/xics/ics-rtas.c | 240 +++++
1663 arch/powerpc/sysdev/xics/xics-common.c | 469 ++++++++++
1664 arch/powerpc/xmon/xmon.c | 16 +-
1665 drivers/infiniband/hw/cxgb4/t4.h | 5 +-
1666 drivers/of/irq.c | 2 +-
1667 include/linux/of_irq.h | 1 +
1668 118 files changed, 3427 insertions(+), 1508 deletions(-)
1669 create mode 100644 arch/powerpc/boot/epapr.c
1670 rename arch/powerpc/{platforms/cell => include/asm}/io-workarounds.h (97%)
1671 create mode 100644 arch/powerpc/include/asm/reg_a2.h
1672 create mode 100644 arch/powerpc/include/asm/scom.h
1673 create mode 100644 arch/powerpc/include/asm/xics.h
1674 create mode 100644 arch/powerpc/kernel/cpu_setup_a2.S
1675 create mode 100644 arch/powerpc/kernel/cpu_setup_power7.S
1676 create mode 100644 arch/powerpc/kernel/idle_power7.S
1677 rename arch/powerpc/{platforms/cell => kernel}/io-workarounds.c (95%)
1678 delete mode 100644 arch/powerpc/platforms/pseries/xics.c
1679 delete mode 100644 arch/powerpc/platforms/pseries/xics.h
1680 create mode 100644 arch/powerpc/sysdev/scom.c
1681 create mode 100644 arch/powerpc/sysdev/xics/Kconfig
1682 create mode 100644 arch/powerpc/sysdev/xics/Makefile
1683 create mode 100644 arch/powerpc/sysdev/xics/icp-hv.c
1684 create mode 100644 arch/powerpc/sysdev/xics/icp-native.c
1685 create mode 100644 arch/powerpc/sysdev/xics/ics-rtas.c
1686 create mode 100644 arch/powerpc/sysdev/xics/xics-common.c
1688 $ git merge 4xx/next
1690 Merging 52xx-and-virtex/powerpc/next
1691 $ git merge 52xx-and-virtex/powerpc/next
1692 Merge made by recursive.
1693 arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++
1694 arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++-
1695 arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
1696 3 files changed, 249 insertions(+), 8 deletions(-)
1697 create mode 100644 arch/powerpc/boot/dts/charon.dts
1699 $ git merge galak/next
1701 Merging s390/features
1702 $ git merge s390/features
1703 Removing drivers/s390/char/tape_block.c
1704 Merge made by recursive.
1705 arch/s390/Kconfig | 11 -
1706 arch/s390/appldata/appldata_base.c | 2 -
1707 arch/s390/include/asm/cmpxchg.h | 1 -
1708 arch/s390/include/asm/elf.h | 12 -
1709 arch/s390/include/asm/hugetlb.h | 17 +-
1710 arch/s390/include/asm/lowcore.h | 4 +-
1711 arch/s390/include/asm/mmu.h | 3 -
1712 arch/s390/include/asm/mmu_context.h | 6 +-
1713 arch/s390/include/asm/percpu.h | 68 ++++++
1714 arch/s390/include/asm/pgalloc.h | 28 +--
1715 arch/s390/include/asm/pgtable.h | 38 ---
1716 arch/s390/include/asm/processor.h | 1 +
1717 arch/s390/include/asm/tlbflush.h | 13 +-
1718 arch/s390/kernel/asm-offsets.c | 4 +-
1719 arch/s390/kernel/entry.S | 1 +
1720 arch/s390/kernel/entry64.S | 1 +
1721 arch/s390/kernel/setup.c | 31 +---
1722 arch/s390/kernel/smp.c | 26 +-
1723 arch/s390/kernel/time.c | 4 +-
1724 arch/s390/kernel/topology.c | 16 +-
1725 arch/s390/kernel/vdso32/Makefile | 3 +
1726 arch/s390/kernel/vdso64/Makefile | 3 +
1727 arch/s390/mm/extmem.c | 6 +-
1728 arch/s390/mm/fault.c | 187 ++++++++-------
1729 arch/s390/mm/hugetlbpage.c | 10 -
1730 arch/s390/mm/pgtable.c | 68 +-----
1731 arch/s390/oprofile/init.c | 12 +-
1732 drivers/crypto/Kconfig | 2 +
1733 drivers/s390/block/dasd_alias.c | 4 -
1734 drivers/s390/block/dasd_eckd.c | 11 +-
1735 drivers/s390/char/Kconfig | 12 -
1736 drivers/s390/char/Makefile | 1 -
1737 drivers/s390/char/monwriter.c | 4 +-
1738 drivers/s390/char/raw3270.c | 2 -
1739 drivers/s390/char/sclp_cmd.c | 2 +
1740 drivers/s390/char/sclp_config.c | 14 +-
1741 drivers/s390/char/sclp_sdias.c | 3 -
1742 drivers/s390/char/tape_3590.c | 11 +-
1743 drivers/s390/char/tape_block.c | 445 -----------------------------------
1744 drivers/s390/char/tape_std.c | 3 +-
1745 drivers/s390/cio/device_fsm.c | 3 -
1746 drivers/s390/cio/device_ops.c | 3 -
1747 drivers/s390/crypto/ap_bus.c | 8 +-
1748 43 files changed, 250 insertions(+), 854 deletions(-)
1749 delete mode 100644 drivers/s390/char/tape_block.c
1750 Merging sh/sh-latest
1751 $ git merge sh/sh-latest
1753 Merging rmobile/rmobile-latest
1754 $ git merge rmobile/rmobile-latest
1756 Merging sparc/master
1757 $ git merge sparc/master
1758 Auto-merging arch/sparc/kernel/smp_32.c
1759 Auto-merging arch/sparc/kernel/time_32.c
1760 Removing arch/sparc/lib/rwsem_32.S
1761 Merge made by recursive.
1762 arch/sparc/Kconfig | 6 +-
1763 arch/sparc/include/asm/floppy_32.h | 40 ++-
1764 arch/sparc/include/asm/irq_32.h | 6 +-
1765 arch/sparc/include/asm/leon.h | 37 +--
1766 arch/sparc/include/asm/pcic.h | 12 +-
1767 arch/sparc/include/asm/pgtable_32.h | 6 +-
1768 arch/sparc/include/asm/pgtable_64.h | 3 +
1769 arch/sparc/include/asm/setup.h | 12 +
1770 arch/sparc/include/asm/smp_64.h | 4 +
1771 arch/sparc/include/asm/system_32.h | 5 -
1772 arch/sparc/include/asm/system_64.h | 4 -
1773 arch/sparc/kernel/Makefile | 4 -
1774 arch/sparc/kernel/cpu.c | 139 +++++++++-
1775 arch/sparc/kernel/devices.c | 4 +-
1776 arch/sparc/kernel/entry.S | 16 --
1777 arch/sparc/kernel/head_32.S | 51 ++--
1778 arch/sparc/kernel/irq.h | 45 ++--
1779 arch/sparc/kernel/irq_32.c | 503 ++++++++---------------------------
1780 arch/sparc/kernel/kernel.h | 5 +-
1781 arch/sparc/kernel/leon_kernel.c | 365 +++++++++++++++++---------
1782 arch/sparc/kernel/leon_smp.c | 19 +-
1783 arch/sparc/kernel/pcic.c | 83 ++++--
1784 arch/sparc/kernel/perf_event.c | 1 +
1785 arch/sparc/kernel/prom_32.c | 1 -
1786 arch/sparc/kernel/setup_32.c | 87 +------
1787 arch/sparc/kernel/setup_64.c | 78 ------
1788 arch/sparc/kernel/smp_32.c | 2 -
1789 arch/sparc/kernel/sun4c_irq.c | 150 +++++++----
1790 arch/sparc/kernel/sun4d_irq.c | 485 ++++++++++++----------------------
1791 arch/sparc/kernel/sun4d_smp.c | 2 -
1792 arch/sparc/kernel/sun4m_irq.c | 179 +++++++------
1793 arch/sparc/kernel/sun4m_smp.c | 18 +--
1794 arch/sparc/kernel/time_32.c | 10 +-
1795 arch/sparc/lib/Makefile | 1 -
1796 arch/sparc/lib/rwsem_32.S | 204 --------------
1797 35 files changed, 1055 insertions(+), 1532 deletions(-)
1798 delete mode 100644 arch/sparc/lib/rwsem_32.S
1800 $ git merge tile/master
1802 Merging unicore32/unicore32
1803 $ git merge unicore32/unicore32
1805 Merging xtensa/master
1806 $ git merge xtensa/master
1807 Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution.
1808 Auto-merging arch/xtensa/Kconfig
1809 Auto-merging arch/xtensa/Makefile
1810 Auto-merging arch/xtensa/boot/Makefile
1811 Auto-merging arch/xtensa/configs/iss_defconfig
1812 CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
1813 Auto-merging arch/xtensa/include/asm/coprocessor.h
1814 Auto-merging arch/xtensa/kernel/Makefile
1815 Auto-merging arch/xtensa/kernel/time.c
1816 Automatic merge failed; fix conflicts and then commit the result.
1818 [master 8a17522] Merge remote-tracking branch 'xtensa/master'
1819 $ git diff -M --stat --summary HEAD^..
1820 arch/xtensa/Kconfig | 17 +-
1821 arch/xtensa/Makefile | 5 +-
1822 arch/xtensa/boot/Makefile | 1 +
1823 arch/xtensa/include/asm/coprocessor.h | 9 +-
1824 arch/xtensa/include/asm/io.h | 40 ++--
1825 arch/xtensa/include/asm/irq.h | 7 +-
1826 arch/xtensa/include/asm/serial.h | 12 +-
1827 arch/xtensa/kernel/Makefile | 4 +-
1828 arch/xtensa/kernel/time.c | 2 +-
1829 arch/xtensa/platforms/xtavnet/Makefile | 10 +
1830 .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++
1831 .../platforms/xtavnet/include/platform/lcd.h | 22 ++
1832 .../platforms/xtavnet/include/platform/serial.h | 1 +
1833 arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++
1834 arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++
1835 15 files changed, 526 insertions(+), 37 deletions(-)
1836 create mode 100644 arch/xtensa/platforms/xtavnet/Makefile
1837 create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h
1838 create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h
1839 create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h
1840 create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c
1841 create mode 100644 arch/xtensa/platforms/xtavnet/setup.c
1842 Merging ceph/for-next
1843 $ git merge ceph/for-next
1846 $ git merge cifs/master
1847 Merge made by recursive.
1848 fs/cifs/connect.c | 120 +++++++++++++++++++++++++++++-----------------------
1849 fs/cifs/sess.c | 19 ++-------
1850 2 files changed, 71 insertions(+), 68 deletions(-)
1851 Merging configfs/linux-next
1852 $ git merge configfs/linux-next
1854 Merging ecryptfs/next
1855 $ git merge ecryptfs/next
1856 Merge made by recursive.
1857 fs/ecryptfs/inode.c | 2 ++
1858 1 files changed, 2 insertions(+), 0 deletions(-)
1859 Merging ext3/for_next
1860 $ git merge ext3/for_next
1861 Merge made by recursive.
1862 fs/ext3/namei.c | 81 +++++++++++++++++++++++++++++++++++++++++++++--------
1863 fs/jbd/journal.c | 16 ++++++++--
1864 2 files changed, 81 insertions(+), 16 deletions(-)
1866 $ git merge ext4/next
1867 Merge made by recursive.
1868 Documentation/filesystems/ext4.txt | 4 -
1869 fs/ext4/balloc.c | 5 -
1870 fs/ext4/ext4.h | 15 +
1871 fs/ext4/extents.c | 732 +++++++++++++++---------------------
1872 fs/ext4/mballoc.c | 36 +--
1873 fs/ext4/migrate.c | 2 +-
1874 fs/ext4/namei.c | 80 ++++-
1875 fs/ext4/page-io.c | 39 +--
1876 fs/ext4/super.c | 74 ++++-
1877 fs/jbd2/journal.c | 16 +-
1878 10 files changed, 478 insertions(+), 525 deletions(-)
1879 Merging fatfs/master
1880 $ git merge fatfs/master
1881 Merge made by recursive.
1882 fs/fat/cache.c | 7 +++++
1883 fs/fat/dir.c | 32 +++++++++++----------
1884 fs/fat/fat.h | 15 +++++-----
1885 fs/fat/fatent.c | 4 +-
1886 fs/fat/inode.c | 74 ++++++++++++++++++++++++-------------------------
1887 fs/fat/misc.c | 44 ++++++++++++++++++++---------
1888 fs/fat/namei_msdos.c | 4 +-
1889 fs/fat/namei_vfat.c | 4 +-
1890 8 files changed, 104 insertions(+), 80 deletions(-)
1891 Merging fuse/for-next
1892 $ git merge fuse/for-next
1895 $ git merge gfs2/master
1896 Auto-merging fs/gfs2/glock.c
1897 Merge made by recursive.
1898 fs/gfs2/aops.c | 8 ++-
1899 fs/gfs2/dir.c | 186 +++++++++++++++++++++----------------------------
1900 fs/gfs2/export.c | 2 +-
1901 fs/gfs2/file.c | 46 ++++++-------
1902 fs/gfs2/glock.c | 89 +++++++++++++-----------
1903 fs/gfs2/glock.h | 3 +-
1904 fs/gfs2/glops.c | 59 +++++++++++-----
1905 fs/gfs2/glops.h | 2 +
1906 fs/gfs2/incore.h | 7 +-
1907 fs/gfs2/inode.c | 63 +----------------
1908 fs/gfs2/inode.h | 3 +-
1909 fs/gfs2/log.c | 179 +++++++++++++++++++++++++-----------------------
1911 fs/gfs2/lops.c | 39 +++++++---
1912 fs/gfs2/main.c | 1 +
1913 fs/gfs2/meta_io.c | 2 +
1914 fs/gfs2/meta_io.h | 2 -
1915 fs/gfs2/rgrp.c | 20 ++++-
1916 fs/gfs2/super.c | 103 +++++++++++++++++++++++++---
1917 fs/gfs2/trace_gfs2.h | 38 +++++++++-
1918 20 files changed, 475 insertions(+), 379 deletions(-)
1919 Merging hfsplus/for-next
1920 $ git merge hfsplus/for-next
1921 Merge made by recursive.
1922 fs/hfsplus/extents.c | 9 ++++++---
1923 fs/hfsplus/super.c | 9 +++++++++
1924 fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++--------
1925 fs/hfsplus/wrapper.c | 9 +++------
1926 4 files changed, 45 insertions(+), 17 deletions(-)
1928 $ git merge jfs/next
1930 Merging logfs/master
1931 $ git merge logfs/master
1932 Resolved 'fs/logfs/logfs.h' using previous resolution.
1933 Auto-merging fs/logfs/logfs.h
1934 CONFLICT (content): Merge conflict in fs/logfs/logfs.h
1935 Automatic merge failed; fix conflicts and then commit the result.
1937 [master 4ddd304] Merge remote-tracking branch 'logfs/master'
1938 $ git diff -M --stat --summary HEAD^..
1939 Merging nfs/linux-next
1940 $ git merge nfs/linux-next
1942 Merging nfsd/nfsd-next
1943 $ git merge nfsd/nfsd-next
1944 Merge made by recursive.
1945 include/linux/sunrpc/svcsock.h | 1 +
1946 net/sunrpc/svcsock.c | 336 ++++++++++++++++++++++------------------
1947 2 files changed, 189 insertions(+), 148 deletions(-)
1948 Merging nilfs2/for-next
1949 $ git merge nilfs2/for-next
1950 Merge made by recursive.
1951 fs/nilfs2/file.c | 1 -
1952 fs/nilfs2/inode.c | 13 +++-
1953 fs/nilfs2/page.c | 53 +--------------
1954 fs/nilfs2/page.h | 4 -
1955 fs/nilfs2/segbuf.c | 17 +----
1956 fs/nilfs2/segment.c | 166 +++++++--------------------------------------
1957 fs/nilfs2/segment.h | 2 -
1958 include/linux/nilfs2_fs.h | 2 +-
1959 8 files changed, 41 insertions(+), 217 deletions(-)
1960 Merging ocfs2/linux-next
1961 $ git merge ocfs2/linux-next
1963 Merging omfs/for-next
1964 $ git merge omfs/for-next
1966 Merging squashfs/master
1967 $ git merge squashfs/master
1969 Merging udf/for_next
1970 $ git merge udf/for_next
1972 Merging v9fs/for-next
1973 $ git merge v9fs/for-next
1974 Merge made by recursive.
1975 net/9p/client.c | 2 +-
1976 net/9p/mod.c | 4 ++--
1977 net/9p/trans_common.c | 11 +++--------
1978 3 files changed, 6 insertions(+), 11 deletions(-)
1979 Merging ubifs/linux-next
1980 $ git merge ubifs/linux-next
1983 $ git merge xfs/master
1984 Merge made by recursive.
1985 fs/xfs/linux-2.6/xfs_buf.c | 1 -
1986 fs/xfs/linux-2.6/xfs_ioctl32.c | 3 +-
1987 fs/xfs/linux-2.6/xfs_ioctl32.h | 1 +
1988 fs/xfs/linux-2.6/xfs_linux.h | 1 +
1989 fs/xfs/linux-2.6/xfs_trace.h | 76 ++---
1990 fs/xfs/xfs_ag.h | 1 -
1991 fs/xfs/xfs_alloc.c | 843 ++++++++++++++++++++++++++++------------
1992 fs/xfs/xfs_alloc.h | 15 +-
1993 fs/xfs/xfs_alloc_btree.c | 13 +-
1994 fs/xfs/xfs_dfrag.c | 6 +-
1995 fs/xfs/xfs_inode_item.c | 1 -
1996 fs/xfs/xfs_log.c | 7 -
1997 fs/xfs/xfs_log.h | 2 -
1998 fs/xfs/xfs_log_cil.c | 5 +-
1999 fs/xfs/xfs_log_priv.h | 2 +
2000 fs/xfs/xfs_mount.c | 4 +-
2001 fs/xfs/xfs_trans.c | 6 +-
2002 fs/xfs/xfs_types.h | 2 -
2003 18 files changed, 639 insertions(+), 350 deletions(-)
2004 Merging vfs/for-next
2005 $ git merge vfs/for-next
2007 Merging vfs-scale/vfs-scale-working
2008 $ git merge vfs-scale/vfs-scale-working
2010 Merging pci/linux-next
2011 $ git merge pci/linux-next
2012 Resolved 'include/linux/pci_ids.h' using previous resolution.
2013 Auto-merging include/linux/pci_ids.h
2014 CONFLICT (content): Merge conflict in include/linux/pci_ids.h
2015 Automatic merge failed; fix conflicts and then commit the result.
2017 [master ce75cd9] Merge remote-tracking branch 'pci/linux-next'
2018 $ git diff -M --stat --summary HEAD^..
2019 arch/x86/include/asm/pci.h | 2 -
2020 arch/x86/kernel/pci-dma.c | 64 -------------------------------------
2021 arch/x86/kernel/setup.c | 1 -
2022 arch/x86/pci/direct.c | 17 +++------
2023 arch/x86/pci/irq.c | 4 ++-
2024 drivers/pci/access.c | 18 +++++++++--
2025 drivers/pci/pci.c | 15 +++++++++
2026 drivers/pci/pcie/aer/aer_inject.c | 2 +-
2027 drivers/pci/pcie/aspm.c | 2 +-
2028 drivers/pci/quirks.c | 14 +++++++-
2029 include/linux/pci_ids.h | 3 ++
2030 11 files changed, 56 insertions(+), 86 deletions(-)
2031 Merging hid/for-next
2032 $ git merge hid/for-next
2033 Auto-merging drivers/hid/Kconfig
2034 Removing drivers/hid/hid-3m-pct.c
2035 Removing drivers/hid/hid-cando.c
2036 Auto-merging drivers/hid/hid-core.c
2037 Auto-merging drivers/hid/hid-ids.h
2038 Auto-merging drivers/hid/hid-lgff.c
2039 Removing drivers/hid/hid-mosart.c
2040 Removing drivers/hid/hid-stantum.c
2041 Auto-merging drivers/hid/usbhid/hid-quirks.c
2042 Auto-merging samples/Kconfig
2043 Merge made by recursive.
2044 Documentation/{usb => hid}/hiddev.txt | 0
2045 Documentation/hid/hidraw.txt | 119 +++++++++++++
2046 drivers/hid/Kconfig | 29 +---
2047 drivers/hid/Makefile | 4 -
2048 drivers/hid/hid-3m-pct.c | 305 ---------------------------------
2049 drivers/hid/hid-cando.c | 276 -----------------------------
2050 drivers/hid/hid-core.c | 3 +
2051 drivers/hid/hid-ids.h | 9 +
2052 drivers/hid/hid-lg.c | 2 +
2053 drivers/hid/hid-lgff.c | 3 +
2054 drivers/hid/hid-mosart.c | 296 --------------------------------
2055 drivers/hid/hid-multitouch.c | 166 +++++++++++++++---
2056 drivers/hid/hid-sony.c | 2 +
2057 drivers/hid/hid-stantum.c | 286 -------------------------------
2058 drivers/hid/hidraw.c | 16 +-
2059 drivers/hid/usbhid/hid-quirks.c | 2 +
2060 drivers/hid/usbhid/hiddev.c | 6 +-
2061 net/bluetooth/hidp/hidp.h | 2 +-
2062 samples/Kconfig | 6 +
2063 samples/Makefile | 2 +-
2064 samples/hidraw/Makefile | 10 +
2065 samples/hidraw/hid-example.c | 178 +++++++++++++++++++
2066 22 files changed, 495 insertions(+), 1227 deletions(-)
2067 rename Documentation/{usb => hid}/hiddev.txt (100%)
2068 create mode 100644 Documentation/hid/hidraw.txt
2069 delete mode 100644 drivers/hid/hid-3m-pct.c
2070 delete mode 100644 drivers/hid/hid-cando.c
2071 delete mode 100644 drivers/hid/hid-mosart.c
2072 delete mode 100644 drivers/hid/hid-stantum.c
2073 create mode 100644 samples/hidraw/Makefile
2074 create mode 100644 samples/hidraw/hid-example.c
2076 $ git merge quilt/i2c
2077 Merge made by recursive.
2078 Documentation/i2c/busses/i2c-i801 | 1 +
2079 drivers/i2c/busses/Kconfig | 1 +
2080 drivers/i2c/busses/i2c-i801.c | 3 +
2081 drivers/i2c/busses/i2c-parport-light.c | 10 ++--
2082 drivers/i2c/busses/i2c-parport.c | 20 ++++----
2083 drivers/i2c/busses/i2c-parport.h | 74 +++++++++++++++-----------------
2084 6 files changed, 55 insertions(+), 54 deletions(-)
2085 Merging bjdooks-i2c/next-i2c
2086 $ git merge bjdooks-i2c/next-i2c
2087 Resolved 'arch/arm/mach-pxa/tosa.c' using previous resolution.
2088 Resolved 'drivers/i2c/busses/i2c-designware-core.c' using previous resolution.
2089 Resolved 'drivers/i2c/busses/i2c-pxa.c' using previous resolution.
2090 Auto-merging MAINTAINERS
2091 Auto-merging arch/arm/mach-pxa/tosa.c
2092 CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
2093 Auto-merging drivers/i2c/busses/Kconfig
2094 Auto-merging drivers/i2c/busses/Makefile
2095 Auto-merging drivers/i2c/busses/i2c-designware-core.c
2096 CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-core.c
2097 CONFLICT (delete/modify): drivers/i2c/busses/i2c-intel-mid.c deleted in bjdooks-i2c/next-i2c and modified in HEAD. Version HEAD of drivers/i2c/busses/i2c-intel-mid.c left in tree.
2098 Auto-merging drivers/i2c/busses/i2c-pxa.c
2099 CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c
2100 Automatic merge failed; fix conflicts and then commit the result.
2101 $ git rm -f drivers/i2c/busses/i2c-intel-mid.c
2102 arch/arm/mach-pxa/tosa.c: needs merge
2103 drivers/i2c/busses/i2c-designware-core.c: needs merge
2104 drivers/i2c/busses/i2c-intel-mid.c: needs merge
2105 drivers/i2c/busses/i2c-pxa.c: needs merge
2106 rm 'drivers/i2c/busses/i2c-intel-mid.c'
2108 [master 9803dc3] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
2109 $ git diff -M --stat --summary HEAD^..
2111 drivers/i2c/busses/Kconfig | 25 +-
2112 drivers/i2c/busses/Makefile | 6 +-
2113 .../{i2c-designware.c => i2c-designware-core.c} | 383 ++-----
2114 drivers/i2c/busses/i2c-designware-core.h | 106 ++
2115 drivers/i2c/busses/i2c-designware-pcidrv.c | 405 +++++++
2116 drivers/i2c/busses/i2c-designware-platdrv.c | 215 ++++
2117 drivers/i2c/busses/i2c-intel-mid.c | 1135 --------------------
2118 8 files changed, 868 insertions(+), 1413 deletions(-)
2119 rename drivers/i2c/busses/{i2c-designware.c => i2c-designware-core.c} (65%)
2120 create mode 100644 drivers/i2c/busses/i2c-designware-core.h
2121 create mode 100644 drivers/i2c/busses/i2c-designware-pcidrv.c
2122 create mode 100644 drivers/i2c/busses/i2c-designware-platdrv.c
2123 delete mode 100644 drivers/i2c/busses/i2c-intel-mid.c
2124 $ git am -3 ../patches/0001-i2c-designware-mdelay-use-needs-linux-delay.h-inclus.patch
2125 Applying: i2c-designware: mdelay use needs linux/delay.h inclusion
2127 Unstaged changes after reset:
2128 M drivers/i2c/busses/i2c-designware-core.c
2130 $ git commit -v -a --amend
2131 [master c3d8373] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
2132 $ git am -3 ../patches/i2c__designware-pcidrv_depends_on_PCI.patch
2133 Applying: i2c: designware-pcidrv depends on PCI
2135 Unstaged changes after reset:
2136 M drivers/i2c/busses/Kconfig
2138 $ git commit -v -a --amend
2139 [master a0ad90c] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
2140 Merging quilt/jdelvare-hwmon
2141 $ git merge quilt/jdelvare-hwmon
2142 Auto-merging MAINTAINERS
2143 Merge made by recursive.
2144 Documentation/hwmon/f71882fg | 4 +
2145 Documentation/hwmon/fam15h_power | 37 ++++
2146 Documentation/hwmon/k10temp | 3 +-
2148 drivers/acpi/Kconfig | 11 -
2149 drivers/acpi/Makefile | 1 -
2150 drivers/hwmon/Kconfig | 28 ++-
2151 drivers/hwmon/Makefile | 2 +
2152 .../power_meter.c => hwmon/acpi_power_meter.c} | 0
2153 drivers/hwmon/adcxx.c | 16 +-
2154 drivers/hwmon/f71882fg.c | 115 +++++++++-
2155 drivers/hwmon/fam15h_power.c | 229 ++++++++++++++++++++
2156 drivers/hwmon/ibmaem.c | 10 +-
2157 drivers/hwmon/jc42.c | 2 +-
2158 drivers/hwmon/k10temp.c | 11 +-
2159 drivers/hwmon/k8temp.c | 8 +-
2160 drivers/hwmon/lm70.c | 10 +-
2161 drivers/hwmon/ultra45_env.c | 4 +-
2162 include/linux/i2c.h | 2 +-
2163 19 files changed, 442 insertions(+), 58 deletions(-)
2164 create mode 100644 Documentation/hwmon/fam15h_power
2165 rename drivers/{acpi/power_meter.c => hwmon/acpi_power_meter.c} (100%)
2166 create mode 100644 drivers/hwmon/fam15h_power.c
2167 Merging hwmon-staging/hwmon-next
2168 $ git merge hwmon-staging/hwmon-next
2169 Auto-merging drivers/hwmon/Kconfig
2170 Auto-merging drivers/hwmon/Makefile
2171 Merge made by recursive.
2172 Documentation/hwmon/adm1275 | 60 +++
2173 Documentation/hwmon/max16065 | 98 +++++
2174 Documentation/hwmon/max6642 | 21 +
2175 Documentation/hwmon/sht15 | 74 ++++
2176 Documentation/hwmon/ucd9000 | 110 +++++
2177 Documentation/hwmon/ucd9200 | 112 +++++
2178 drivers/hwmon/Kconfig | 59 +++
2179 drivers/hwmon/Makefile | 5 +
2180 drivers/hwmon/adm1275.c | 121 ++++++
2181 drivers/hwmon/max16065.c | 717 +++++++++++++++++++++++++++++++
2182 drivers/hwmon/max34440.c | 6 +-
2183 drivers/hwmon/max6642.c | 356 ++++++++++++++++
2184 drivers/hwmon/max8688.c | 4 +-
2185 drivers/hwmon/pmbus.h | 10 +-
2186 drivers/hwmon/pmbus_core.c | 970 +++++++++++++++++++-----------------------
2187 drivers/hwmon/sht15.c | 747 +++++++++++++++++++++++++--------
2188 drivers/hwmon/ucd9000.c | 278 ++++++++++++
2189 drivers/hwmon/ucd9200.c | 210 +++++++++
2190 include/linux/sht15.h | 18 +-
2191 19 files changed, 3264 insertions(+), 712 deletions(-)
2192 create mode 100644 Documentation/hwmon/adm1275
2193 create mode 100644 Documentation/hwmon/max16065
2194 create mode 100644 Documentation/hwmon/max6642
2195 create mode 100644 Documentation/hwmon/sht15
2196 create mode 100644 Documentation/hwmon/ucd9000
2197 create mode 100644 Documentation/hwmon/ucd9200
2198 create mode 100644 drivers/hwmon/adm1275.c
2199 create mode 100644 drivers/hwmon/max16065.c
2200 create mode 100644 drivers/hwmon/max6642.c
2201 create mode 100644 drivers/hwmon/ucd9000.c
2202 create mode 100644 drivers/hwmon/ucd9200.c
2203 Merging quilt/kernel-doc
2204 $ git merge quilt/kernel-doc
2205 Merge made by recursive.
2206 Documentation/dontdiff | 58 ++++++++++++++++++++++++++++++++++---------
2207 Documentation/sysctl/fs.txt | 7 -----
2208 2 files changed, 46 insertions(+), 19 deletions(-)
2209 Merging docs/docs-move
2210 $ git merge docs/docs-move
2211 Auto-merging Documentation/virtual/kvm/review-checklist.txt
2212 Auto-merging Documentation/virtual/lguest/lguest.txt
2213 Auto-merging MAINTAINERS
2214 Merge made by recursive.
2215 Documentation/00-INDEX | 2 --
2216 Documentation/virtual/00-INDEX | 10 ++++++++++
2217 Documentation/{ => virtual}/kvm/api.txt | 0
2218 Documentation/{ => virtual}/kvm/cpuid.txt | 0
2219 Documentation/{ => virtual}/kvm/locking.txt | 0
2220 Documentation/{ => virtual}/kvm/mmu.txt | 0
2221 Documentation/{ => virtual}/kvm/msr.txt | 0
2222 Documentation/{ => virtual}/kvm/ppc-pv.txt | 0
2223 .../{ => virtual}/kvm/review-checklist.txt | 2 +-
2224 Documentation/{ => virtual}/kvm/timekeeping.txt | 0
2225 Documentation/{ => virtual}/lguest/.gitignore | 0
2226 Documentation/{ => virtual}/lguest/Makefile | 0
2227 Documentation/{ => virtual}/lguest/extract | 0
2228 Documentation/{ => virtual}/lguest/lguest.c | 0
2229 Documentation/{ => virtual}/lguest/lguest.txt | 3 ++-
2230 .../{ => virtual}/uml/UserModeLinux-HOWTO.txt | 0
2231 MAINTAINERS | 4 ++--
2232 arch/x86/lguest/boot.c | 2 +-
2233 drivers/lguest/Kconfig | 6 ++++--
2234 drivers/lguest/Makefile | 2 +-
2235 drivers/vhost/vhost.c | 2 +-
2236 21 files changed, 22 insertions(+), 11 deletions(-)
2237 create mode 100644 Documentation/virtual/00-INDEX
2238 rename Documentation/{ => virtual}/kvm/api.txt (100%)
2239 rename Documentation/{ => virtual}/kvm/cpuid.txt (100%)
2240 rename Documentation/{ => virtual}/kvm/locking.txt (100%)
2241 rename Documentation/{ => virtual}/kvm/mmu.txt (100%)
2242 rename Documentation/{ => virtual}/kvm/msr.txt (100%)
2243 rename Documentation/{ => virtual}/kvm/ppc-pv.txt (100%)
2244 rename Documentation/{ => virtual}/kvm/review-checklist.txt (95%)
2245 rename Documentation/{ => virtual}/kvm/timekeeping.txt (100%)
2246 rename Documentation/{ => virtual}/lguest/.gitignore (100%)
2247 rename Documentation/{ => virtual}/lguest/Makefile (100%)
2248 rename Documentation/{ => virtual}/lguest/extract (100%)
2249 rename Documentation/{ => virtual}/lguest/lguest.c (100%)
2250 rename Documentation/{ => virtual}/lguest/lguest.txt (97%)
2251 rename Documentation/{ => virtual}/uml/UserModeLinux-HOWTO.txt (100%)
2252 Merging v4l-dvb/master
2253 $ git merge v4l-dvb/master
2254 Resolved 'drivers/media/video/omap3isp/isp.c' using previous resolution.
2255 Removing drivers/media/dvb/frontends/drx397xD.c
2256 Removing drivers/media/dvb/frontends/drx397xD.h
2257 Removing drivers/media/dvb/frontends/drx397xD_fw.h
2258 Auto-merging drivers/media/video/omap3isp/isp.c
2259 CONFLICT (content): Merge conflict in drivers/media/video/omap3isp/isp.c
2260 Automatic merge failed; fix conflicts and then commit the result.
2262 [master 70f9dbc] Merge remote-tracking branch 'v4l-dvb/master'
2263 $ git diff -M --stat --summary HEAD^..
2264 Documentation/DocBook/media-entities.tmpl | 1 +
2265 Documentation/DocBook/v4l/pixfmt-y10b.xml | 43 +
2266 Documentation/DocBook/v4l/pixfmt.xml | 1 +
2267 Documentation/DocBook/v4l/videodev2.h.xml | 3 +
2268 Documentation/video4linux/CARDLIST.em28xx | 2 +-
2269 Documentation/video4linux/gspca.txt | 1 +
2270 drivers/media/common/saa7146_core.c | 7 +-
2271 drivers/media/common/tuners/Kconfig | 8 +
2272 drivers/media/common/tuners/Makefile | 1 +
2273 drivers/media/common/tuners/tda18212.c | 265 ++
2274 drivers/media/common/tuners/tda18212.h | 48 +
2275 drivers/media/common/tuners/tda18212_priv.h | 44 +
2276 drivers/media/common/tuners/xc5000.c | 32 +-
2277 drivers/media/dvb/b2c2/flexcop-pci.c | 4 +-
2278 drivers/media/dvb/bt8xx/bt878.c | 2 +-
2279 drivers/media/dvb/dvb-usb/Kconfig | 3 +
2280 drivers/media/dvb/dvb-usb/anysee.c | 519 +++-
2281 drivers/media/dvb/dvb-usb/anysee.h | 22 +-
2282 drivers/media/dvb/dvb-usb/dibusb-common.c | 2 +-
2283 drivers/media/dvb/dvb-usb/lmedm04.c | 12 +-
2284 drivers/media/dvb/dvb-usb/m920x.c | 16 +-
2285 drivers/media/dvb/dvb-usb/nova-t-usb2.c | 2 +-
2286 drivers/media/dvb/frontends/Kconfig | 12 +-
2287 drivers/media/dvb/frontends/Makefile | 3 +-
2288 drivers/media/dvb/frontends/drx397xD.c | 1511 ----------
2289 drivers/media/dvb/frontends/drx397xD.h | 130 -
2290 drivers/media/dvb/frontends/drx397xD_fw.h | 40 -
2291 drivers/media/dvb/frontends/drxd.h | 61 +
2292 drivers/media/dvb/frontends/drxd_firm.c | 929 ++++++
2293 drivers/media/dvb/frontends/drxd_firm.h | 115 +
2294 drivers/media/dvb/frontends/drxd_hard.c | 3000 ++++++++++++++++++++
2295 drivers/media/dvb/frontends/drxd_map_firm.h | 1013 +++++++
2296 drivers/media/dvb/mantis/hopper_cards.c | 2 +-
2297 drivers/media/dvb/mantis/mantis_cards.c | 2 +-
2298 drivers/media/dvb/mantis/mantis_pci.c | 5 +-
2299 drivers/media/dvb/ngene/ngene-core.c | 1 +
2300 drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 60 +-
2301 drivers/media/radio/saa7706h.c | 2 +-
2302 drivers/media/radio/tef6862.c | 2 +-
2303 drivers/media/rc/imon.c | 31 +-
2304 drivers/media/rc/ite-cir.c | 1 +
2305 drivers/media/rc/keymaps/Makefile | 1 +
2306 drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 2 +-
2307 drivers/media/rc/keymaps/rc-imon-mce.c | 2 +-
2308 drivers/media/rc/keymaps/rc-imon-pad.c | 6 +-
2309 .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 2 +-
2310 drivers/media/rc/keymaps/rc-rc6-mce.c | 4 +-
2311 drivers/media/rc/keymaps/rc-tivo.c | 98 +
2312 drivers/media/rc/mceusb.c | 18 +-
2313 drivers/media/rc/nuvoton-cir.c | 62 +-
2314 drivers/media/rc/nuvoton-cir.h | 17 +-
2315 drivers/media/rc/rc-main.c | 4 +-
2316 drivers/media/video/bt8xx/bttv-driver.c | 2 +-
2317 drivers/media/video/cx18/Kconfig | 3 +
2318 drivers/media/video/cx18/cx18-cards.c | 18 +-
2319 drivers/media/video/cx18/cx18-cards.h | 2 +-
2320 drivers/media/video/cx18/cx18-driver.c | 27 +-
2321 drivers/media/video/cx18/cx18-version.h | 2 +-
2322 drivers/media/video/cx23885/cx23885-core.c | 2 +-
2323 drivers/media/video/cx88/cx88-mpeg.c | 2 +-
2324 drivers/media/video/cx88/cx88-video.c | 2 +-
2325 drivers/media/video/em28xx/Kconfig | 1 +
2326 drivers/media/video/em28xx/em28xx-cards.c | 21 +-
2327 drivers/media/video/em28xx/em28xx-dvb.c | 22 +-
2328 drivers/media/video/em28xx/em28xx.h | 2 +-
2329 drivers/media/video/gspca/Kconfig | 9 +
2330 drivers/media/video/gspca/Makefile | 2 +
2331 drivers/media/video/gspca/jeilinj.c | 581 +++--
2332 drivers/media/video/gspca/kinect.c | 429 +++
2333 drivers/media/video/gspca/zc3xx.c | 42 +-
2334 drivers/media/video/ivtv/ivtv-driver.c | 4 +-
2335 drivers/media/video/m52790.c | 2 +-
2336 drivers/media/video/saa7134/saa7134-core.c | 2 +-
2337 drivers/media/video/saa7164/saa7164-core.c | 2 +-
2338 drivers/media/video/tda9840.c | 2 +-
2339 drivers/media/video/tea6415c.c | 2 +-
2340 drivers/media/video/tea6420.c | 2 +-
2341 drivers/media/video/tveeprom.c | 32 +-
2342 drivers/media/video/upd64031a.c | 2 +-
2343 drivers/media/video/upd64083.c | 2 +-
2344 drivers/media/video/zoran/zoran_card.c | 2 +-
2345 drivers/staging/easycap/easycap_ioctl.c | 3 +-
2346 drivers/staging/lirc/lirc_sasem.c | 13 +-
2347 drivers/staging/tm6000/tm6000-video.c | 4 +-
2348 include/linux/videodev2.h | 3 +
2349 include/media/rc-map.h | 1 +
2350 include/media/soc_camera_platform.h | 50 +
2351 87 files changed, 7303 insertions(+), 2168 deletions(-)
2352 create mode 100644 Documentation/DocBook/v4l/pixfmt-y10b.xml
2353 create mode 100644 drivers/media/common/tuners/tda18212.c
2354 create mode 100644 drivers/media/common/tuners/tda18212.h
2355 create mode 100644 drivers/media/common/tuners/tda18212_priv.h
2356 delete mode 100644 drivers/media/dvb/frontends/drx397xD.c
2357 delete mode 100644 drivers/media/dvb/frontends/drx397xD.h
2358 delete mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h
2359 create mode 100644 drivers/media/dvb/frontends/drxd.h
2360 create mode 100644 drivers/media/dvb/frontends/drxd_firm.c
2361 create mode 100644 drivers/media/dvb/frontends/drxd_firm.h
2362 create mode 100644 drivers/media/dvb/frontends/drxd_hard.c
2363 create mode 100644 drivers/media/dvb/frontends/drxd_map_firm.h
2364 create mode 100644 drivers/media/rc/keymaps/rc-tivo.c
2365 create mode 100644 drivers/media/video/gspca/kinect.c
2366 Merging kbuild/for-next
2367 $ git merge kbuild/for-next
2368 Auto-merging Documentation/kbuild/kbuild.txt
2369 Auto-merging Makefile
2370 Auto-merging drivers/edac/cpc925_edac.c
2371 Auto-merging drivers/edac/i5000_edac.c
2372 Auto-merging drivers/edac/i5400_edac.c
2373 Auto-merging drivers/edac/i7300_edac.c
2374 Auto-merging drivers/edac/i7core_edac.c
2375 Auto-merging drivers/edac/r82600_edac.c
2376 Auto-merging drivers/media/video/cx231xx/cx231xx-avcore.c
2377 Auto-merging drivers/scsi/pmcraid.c
2378 Auto-merging drivers/scsi/pmcraid.h
2379 Auto-merging drivers/scsi/wd33c93.c
2380 Auto-merging drivers/tty/nozomi.c
2381 Auto-merging init/Kconfig
2382 Auto-merging scripts/gen_initramfs_list.sh
2383 Merge made by recursive.
2385 Documentation/DocBook/Makefile | 2 +-
2386 Documentation/kbuild/kbuild.txt | 13 +++++
2387 Documentation/kbuild/kconfig-language.txt | 32 +++++++++++-
2388 Documentation/kbuild/makefiles.txt | 53 ++++++++++++++++++
2389 Makefile | 48 ++++++++++++----
2390 drivers/edac/amd76x_edac.c | 2 +-
2391 drivers/edac/amd8111_edac.c | 2 +-
2392 drivers/edac/amd8131_edac.c | 2 +-
2393 drivers/edac/cpc925_edac.c | 2 +-
2394 drivers/edac/e752x_edac.c | 2 +-
2395 drivers/edac/e7xxx_edac.c | 2 +-
2396 drivers/edac/edac_module.c | 2 +-
2397 drivers/edac/i5000_edac.c | 2 +-
2398 drivers/edac/i5400_edac.c | 2 +-
2399 drivers/edac/i7300_edac.c | 2 +-
2400 drivers/edac/i7core_edac.c | 2 +-
2401 drivers/edac/i82860_edac.c | 2 +-
2402 drivers/edac/i82875p_edac.c | 2 +-
2403 drivers/edac/i82975x_edac.c | 2 +-
2404 drivers/edac/mpc85xx_edac.h | 2 +-
2405 drivers/edac/mv64x60_edac.h | 2 +-
2406 drivers/edac/ppc4xx_edac.c | 2 +-
2407 drivers/edac/r82600_edac.c | 2 +-
2408 drivers/media/radio/radio-maxiradio.c | 3 +-
2409 drivers/media/video/cx231xx/cx231xx-avcore.c | 2 +-
2410 drivers/scsi/aacraid/linit.c | 3 +-
2411 drivers/scsi/in2000.c | 2 +-
2412 drivers/scsi/pmcraid.c | 9 ++--
2413 drivers/scsi/pmcraid.h | 1 -
2414 drivers/scsi/wd33c93.c | 7 +--
2415 drivers/staging/generic_serial/rio/rioinit.c | 2 +-
2416 drivers/tty/cyclades.c | 3 +-
2417 drivers/tty/nozomi.c | 3 +-
2418 init/Kconfig | 30 ++++------
2419 scripts/.gitignore | 1 +
2420 scripts/Kbuild.include | 10 ++++
2421 scripts/Makefile | 7 ++-
2422 scripts/Makefile.asm-generic | 23 ++++++++
2423 scripts/Makefile.build | 74 ++++++++++++++++----------
2424 scripts/Makefile.headersinst | 10 +++-
2425 scripts/Makefile.lib | 2 +-
2426 scripts/basic/.gitignore | 2 -
2427 scripts/basic/Makefile | 3 +-
2428 scripts/checkversion.pl | 1 +
2429 scripts/{basic => }/docproc.c | 0
2430 scripts/gen_initramfs_list.sh | 13 ++++-
2431 scripts/kconfig/Makefile | 38 ++++++++-----
2432 scripts/kconfig/confdata.c | 8 +--
2433 scripts/kconfig/expr.h | 4 --
2434 scripts/kconfig/lex.zconf.c_shipped | 33 +++++++-----
2435 scripts/kconfig/nconf.c | 14 +++---
2436 scripts/kconfig/zconf.l | 33 +++++++-----
2437 scripts/mkcompile_h | 30 +++++------
2438 scripts/patch-kernel | 2 +-
2439 usr/gen_init_cpio.c | 53 ++++++++++++++-----
2440 56 files changed, 410 insertions(+), 201 deletions(-)
2441 create mode 100644 scripts/Makefile.asm-generic
2442 rename scripts/{basic => }/docproc.c (100%)
2443 Merging kconfig/for-next
2444 $ git merge kconfig/for-next
2446 Merge made by recursive.
2448 $ git merge ide/master
2451 $ git merge libata/NEXT
2453 Merging infiniband/for-next
2454 $ git merge infiniband/for-next
2455 Auto-merging drivers/infiniband/hw/qib/qib_iba7322.c
2456 Merge made by recursive.
2457 drivers/infiniband/hw/cxgb4/cm.c | 16 +++++++---------
2458 drivers/infiniband/hw/cxgb4/device.c | 6 +++---
2459 drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 4 ++--
2460 drivers/infiniband/hw/cxgb4/qp.c | 3 +--
2461 drivers/infiniband/hw/qib/qib_iba7322.c | 3 ++-
2462 5 files changed, 15 insertions(+), 17 deletions(-)
2464 $ git merge acpi/test
2466 Merging idle-test/idle-test
2467 $ git merge idle-test/idle-test
2469 Merging powertools/tools-test
2470 $ git merge powertools/tools-test
2472 Merging cpupowerutils/master
2473 $ git merge cpupowerutils/master
2474 Auto-merging MAINTAINERS
2475 Merge made by recursive.
2478 tools/power/cpupower/.gitignore | 22 +
2479 tools/power/cpupower/Makefile | 279 ++++++
2480 tools/power/cpupower/README | 49 +
2481 tools/power/cpupower/ToDo | 11 +
2482 tools/power/cpupower/bench/Makefile | 29 +
2483 tools/power/cpupower/bench/README-BENCH | 124 +++
2484 tools/power/cpupower/bench/benchmark.c | 194 ++++
2485 tools/power/cpupower/bench/benchmark.h | 29 +
2486 tools/power/cpupower/bench/config.h | 36 +
2487 tools/power/cpupower/bench/cpufreq-bench_plot.sh | 104 +++
2488 tools/power/cpupower/bench/cpufreq-bench_script.sh | 101 ++
2489 tools/power/cpupower/bench/example.cfg | 11 +
2490 tools/power/cpupower/bench/main.c | 202 ++++
2491 tools/power/cpupower/bench/parse.c | 225 +++++
2492 tools/power/cpupower/bench/parse.h | 53 ++
2493 tools/power/cpupower/bench/system.c | 191 ++++
2494 tools/power/cpupower/bench/system.h | 29 +
2495 tools/power/cpupower/debug/i386/Makefile | 20 +
2496 tools/power/cpupower/debug/i386/centrino-decode.c | 113 +++
2497 tools/power/cpupower/debug/i386/dump_psb.c | 196 ++++
2498 tools/power/cpupower/debug/i386/intel_gsic.c | 78 ++
2499 .../power/cpupower/debug/i386/powernow-k8-decode.c | 96 ++
2500 tools/power/cpupower/debug/kernel/Makefile | 23 +
2501 .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 113 +++
2502 tools/power/cpupower/debug/x86_64/Makefile | 14 +
2503 .../power/cpupower/debug/x86_64/centrino-decode.c | 1 +
2504 .../cpupower/debug/x86_64/powernow-k8-decode.c | 1 +
2505 tools/power/cpupower/lib/cpufreq.c | 208 +++++
2506 tools/power/cpupower/lib/cpufreq.h | 223 +++++
2507 tools/power/cpupower/lib/sysfs.c | 672 ++++++++++++++
2508 tools/power/cpupower/lib/sysfs.h | 31 +
2509 tools/power/cpupower/man/cpupower-frequency-info.1 | 76 ++
2510 tools/power/cpupower/man/cpupower-frequency-set.1 | 54 ++
2511 tools/power/cpupower/man/cpupower-info.1 | 19 +
2512 tools/power/cpupower/man/cpupower-monitor.1 | 179 ++++
2513 tools/power/cpupower/man/cpupower-set.1 | 103 +++
2514 tools/power/cpupower/man/cpupower.1 | 72 ++
2515 tools/power/cpupower/po/cs.po | 944 +++++++++++++++++++
2516 tools/power/cpupower/po/de.po | 961 ++++++++++++++++++++
2517 tools/power/cpupower/po/fr.po | 947 +++++++++++++++++++
2518 tools/power/cpupower/po/it.po | 961 ++++++++++++++++++++
2519 tools/power/cpupower/po/pt.po | 957 +++++++++++++++++++
2520 tools/power/cpupower/utils/builtin.h | 18 +
2521 tools/power/cpupower/utils/cpufreq-info.c | 678 ++++++++++++++
2522 tools/power/cpupower/utils/cpufreq-set.c | 358 ++++++++
2523 tools/power/cpupower/utils/cpuidle-info.c | 244 +++++
2524 tools/power/cpupower/utils/cpupower-info.c | 153 ++++
2525 tools/power/cpupower/utils/cpupower-set.c | 153 ++++
2526 tools/power/cpupower/utils/cpupower.c | 203 ++++
2527 tools/power/cpupower/utils/helpers/amd.c | 137 +++
2528 tools/power/cpupower/utils/helpers/bitmask.c | 292 ++++++
2529 tools/power/cpupower/utils/helpers/bitmask.h | 33 +
2530 tools/power/cpupower/utils/helpers/cpuid.c | 143 +++
2531 tools/power/cpupower/utils/helpers/helpers.h | 180 ++++
2532 tools/power/cpupower/utils/helpers/misc.c | 35 +
2533 tools/power/cpupower/utils/helpers/msr.c | 122 +++
2534 tools/power/cpupower/utils/helpers/pci.c | 44 +
2535 tools/power/cpupower/utils/helpers/sysfs.c | 358 ++++++++
2536 tools/power/cpupower/utils/helpers/sysfs.h | 28 +
2537 tools/power/cpupower/utils/helpers/topology.c | 108 +++
2538 .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 338 +++++++
2539 .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 196 ++++
2540 .../cpupower/utils/idle_monitor/cpupower-monitor.c | 448 +++++++++
2541 .../cpupower/utils/idle_monitor/cpupower-monitor.h | 68 ++
2542 .../cpupower/utils/idle_monitor/idle_monitors.def | 7 +
2543 .../cpupower/utils/idle_monitor/idle_monitors.h | 18 +
2544 .../cpupower/utils/idle_monitor/mperf_monitor.c | 255 ++++++
2545 tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 216 +++++
2546 tools/power/cpupower/utils/idle_monitor/snb_idle.c | 190 ++++
2547 tools/power/cpupower/utils/version-gen.sh | 35 +
2548 72 files changed, 13831 insertions(+), 1 deletions(-)
2549 create mode 100644 tools/power/cpupower/.gitignore
2550 create mode 100644 tools/power/cpupower/Makefile
2551 create mode 100644 tools/power/cpupower/README
2552 create mode 100644 tools/power/cpupower/ToDo
2553 create mode 100644 tools/power/cpupower/bench/Makefile
2554 create mode 100644 tools/power/cpupower/bench/README-BENCH
2555 create mode 100644 tools/power/cpupower/bench/benchmark.c
2556 create mode 100644 tools/power/cpupower/bench/benchmark.h
2557 create mode 100644 tools/power/cpupower/bench/config.h
2558 create mode 100644 tools/power/cpupower/bench/cpufreq-bench_plot.sh
2559 create mode 100644 tools/power/cpupower/bench/cpufreq-bench_script.sh
2560 create mode 100644 tools/power/cpupower/bench/example.cfg
2561 create mode 100644 tools/power/cpupower/bench/main.c
2562 create mode 100644 tools/power/cpupower/bench/parse.c
2563 create mode 100644 tools/power/cpupower/bench/parse.h
2564 create mode 100644 tools/power/cpupower/bench/system.c
2565 create mode 100644 tools/power/cpupower/bench/system.h
2566 create mode 100644 tools/power/cpupower/debug/i386/Makefile
2567 create mode 100644 tools/power/cpupower/debug/i386/centrino-decode.c
2568 create mode 100644 tools/power/cpupower/debug/i386/dump_psb.c
2569 create mode 100644 tools/power/cpupower/debug/i386/intel_gsic.c
2570 create mode 100644 tools/power/cpupower/debug/i386/powernow-k8-decode.c
2571 create mode 100644 tools/power/cpupower/debug/kernel/Makefile
2572 create mode 100644 tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
2573 create mode 100644 tools/power/cpupower/debug/x86_64/Makefile
2574 create mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c
2575 create mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
2576 create mode 100644 tools/power/cpupower/lib/cpufreq.c
2577 create mode 100644 tools/power/cpupower/lib/cpufreq.h
2578 create mode 100644 tools/power/cpupower/lib/sysfs.c
2579 create mode 100644 tools/power/cpupower/lib/sysfs.h
2580 create mode 100644 tools/power/cpupower/man/cpupower-frequency-info.1
2581 create mode 100644 tools/power/cpupower/man/cpupower-frequency-set.1
2582 create mode 100644 tools/power/cpupower/man/cpupower-info.1
2583 create mode 100644 tools/power/cpupower/man/cpupower-monitor.1
2584 create mode 100644 tools/power/cpupower/man/cpupower-set.1
2585 create mode 100644 tools/power/cpupower/man/cpupower.1
2586 create mode 100644 tools/power/cpupower/po/cs.po
2587 create mode 100644 tools/power/cpupower/po/de.po
2588 create mode 100644 tools/power/cpupower/po/fr.po
2589 create mode 100644 tools/power/cpupower/po/it.po
2590 create mode 100644 tools/power/cpupower/po/pt.po
2591 create mode 100644 tools/power/cpupower/utils/builtin.h
2592 create mode 100644 tools/power/cpupower/utils/cpufreq-info.c
2593 create mode 100644 tools/power/cpupower/utils/cpufreq-set.c
2594 create mode 100644 tools/power/cpupower/utils/cpuidle-info.c
2595 create mode 100644 tools/power/cpupower/utils/cpupower-info.c
2596 create mode 100644 tools/power/cpupower/utils/cpupower-set.c
2597 create mode 100644 tools/power/cpupower/utils/cpupower.c
2598 create mode 100644 tools/power/cpupower/utils/helpers/amd.c
2599 create mode 100644 tools/power/cpupower/utils/helpers/bitmask.c
2600 create mode 100644 tools/power/cpupower/utils/helpers/bitmask.h
2601 create mode 100644 tools/power/cpupower/utils/helpers/cpuid.c
2602 create mode 100644 tools/power/cpupower/utils/helpers/helpers.h
2603 create mode 100644 tools/power/cpupower/utils/helpers/misc.c
2604 create mode 100644 tools/power/cpupower/utils/helpers/msr.c
2605 create mode 100644 tools/power/cpupower/utils/helpers/pci.c
2606 create mode 100644 tools/power/cpupower/utils/helpers/sysfs.c
2607 create mode 100644 tools/power/cpupower/utils/helpers/sysfs.h
2608 create mode 100644 tools/power/cpupower/utils/helpers/topology.c
2609 create mode 100644 tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
2610 create mode 100644 tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
2611 create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
2612 create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
2613 create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.def
2614 create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.h
2615 create mode 100644 tools/power/cpupower/utils/idle_monitor/mperf_monitor.c
2616 create mode 100644 tools/power/cpupower/utils/idle_monitor/nhm_idle.c
2617 create mode 100644 tools/power/cpupower/utils/idle_monitor/snb_idle.c
2618 create mode 100755 tools/power/cpupower/utils/version-gen.sh
2619 Merging ieee1394/for-next
2620 $ git merge ieee1394/for-next
2621 Merge made by recursive.
2622 drivers/firewire/ohci.c | 84 +++++++++++++++++++++++++++++------------------
2623 1 files changed, 52 insertions(+), 32 deletions(-)
2624 Merging ubi/linux-next
2625 $ git merge ubi/linux-next
2626 Merge made by recursive.
2627 drivers/mtd/ubi/cdev.c | 14 +++++++-------
2628 drivers/mtd/ubi/debug.c | 18 +++++++++---------
2629 drivers/mtd/ubi/io.c | 6 +++---
2630 drivers/mtd/ubi/scan.c | 2 +-
2631 drivers/mtd/ubi/ubi-media.h | 6 +++---
2632 drivers/mtd/ubi/ubi.h | 4 ++--
2633 drivers/mtd/ubi/wl.c | 3 ++-
2634 include/linux/mtd/ubi.h | 4 ++--
2635 include/mtd/ubi-user.h | 40 +++++++++++++++++++++-------------------
2636 9 files changed, 50 insertions(+), 47 deletions(-)
2637 Merging kvm/linux-next
2638 $ git merge kvm/linux-next
2639 Auto-merging Documentation/virtual/kvm/api.txt
2640 Auto-merging arch/x86/include/asm/msr-index.h
2641 Merge made by recursive.
2642 Documentation/virtual/kvm/api.txt | 23 +
2643 arch/ia64/kvm/vti.h | 26 +-
2644 arch/powerpc/include/asm/kvm_host.h | 1 +
2645 arch/powerpc/kvm/powerpc.c | 4 +
2646 arch/powerpc/kvm/timing.c | 10 +-
2647 arch/x86/include/asm/kvm_emulate.h | 198 ++++-
2648 arch/x86/include/asm/kvm_host.h | 54 +-
2649 arch/x86/include/asm/msr-index.h | 1 +
2650 arch/x86/kvm/emulate.c | 1659 ++++++++++++++++++++++++-----------
2651 arch/x86/kvm/i8254.h | 2 -
2652 arch/x86/kvm/irq.h | 2 -
2653 arch/x86/kvm/mmu.c | 16 +-
2654 arch/x86/kvm/paging_tmpl.h | 93 ++-
2655 arch/x86/kvm/svm.c | 585 +++++++++----
2656 arch/x86/kvm/vmx.c | 124 +++-
2657 arch/x86/kvm/x86.c | 569 +++++++++----
2658 arch/x86/kvm/x86.h | 2 +-
2659 include/linux/kvm.h | 5 +
2660 include/linux/kvm_host.h | 21 +-
2661 virt/kvm/ioapic.c | 2 +-
2662 virt/kvm/kvm_main.c | 17 -
2663 21 files changed, 2410 insertions(+), 1004 deletions(-)
2665 $ git merge dlm/next
2666 Merge made by recursive.
2668 1 files changed, 0 insertions(+), 1 deletions(-)
2669 Merging swiotlb/master
2670 $ git merge swiotlb/master
2673 $ git merge ibft/master
2674 Merge made by recursive.
2675 drivers/firmware/iscsi_ibft_find.c | 51 ++++++++++++++++++++++-------------
2676 1 files changed, 32 insertions(+), 19 deletions(-)
2678 $ git merge scsi/master
2679 Auto-merging MAINTAINERS
2680 Auto-merging drivers/scsi/in2000.c
2681 Auto-merging drivers/scsi/mpt2sas/mpt2sas_ctl.c
2682 Auto-merging drivers/scsi/scsi_transport_fc.c
2683 Auto-merging drivers/scsi/wd33c93.c
2684 Merge made by recursive.
2685 Documentation/scsi/LICENSE.qla2xxx | 292 +++++++++-
2687 drivers/message/fusion/mptbase.h | 4 +-
2688 drivers/message/fusion/mptscsih.c | 13 +-
2689 drivers/message/fusion/mptspi.c | 22 +
2690 drivers/message/i2o/i2o_scsi.c | 4 +-
2691 drivers/scsi/arcmsr/arcmsr_hba.c | 138 ++---
2692 drivers/scsi/be2iscsi/be.h | 10 +-
2693 drivers/scsi/be2iscsi/be_cmds.c | 11 +-
2694 drivers/scsi/be2iscsi/be_cmds.h | 10 +-
2695 drivers/scsi/be2iscsi/be_iscsi.c | 13 +-
2696 drivers/scsi/be2iscsi/be_iscsi.h | 13 +-
2697 drivers/scsi/be2iscsi/be_main.c | 51 +-
2698 drivers/scsi/be2iscsi/be_main.h | 15 +-
2699 drivers/scsi/be2iscsi/be_mgmt.c | 17 +-
2700 drivers/scsi/be2iscsi/be_mgmt.h | 13 +-
2701 drivers/scsi/bfa/bfad.c | 61 ++-
2702 drivers/scsi/bfa/bfad_debugfs.c | 33 +-
2703 drivers/scsi/bfa/bfad_im.h | 25 -
2704 drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
2705 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 35 +-
2706 drivers/scsi/bnx2fc/bnx2fc_hwi.c | 3 +
2707 drivers/scsi/bnx2fc/bnx2fc_io.c | 6 +
2708 drivers/scsi/constants.c | 1 +
2709 drivers/scsi/dc395x.c | 193 +++---
2710 drivers/scsi/device_handler/scsi_dh_alua.c | 2 +-
2711 drivers/scsi/device_handler/scsi_dh_rdac.c | 72 ++-
2712 drivers/scsi/dpt_i2o.c | 6 +-
2713 drivers/scsi/eata.c | 66 +-
2714 drivers/scsi/eata_pio.c | 19 +-
2715 drivers/scsi/esp_scsi.c | 6 +-
2716 drivers/scsi/fcoe/fcoe.c | 202 ++----
2717 drivers/scsi/fcoe/fcoe_ctlr.c | 6 +-
2718 drivers/scsi/fcoe/fcoe_transport.c | 56 +-
2719 drivers/scsi/ibmvscsi/ibmvscsi.c | 3 +-
2720 drivers/scsi/in2000.c | 29 +-
2721 drivers/scsi/ipr.c | 155 ++++--
2722 drivers/scsi/ipr.h | 22 +-
2723 drivers/scsi/libfc/fc_fcp.c | 57 +-
2724 drivers/scsi/libfc/fc_lport.c | 1 -
2725 drivers/scsi/lpfc/lpfc.h | 2 +
2726 drivers/scsi/lpfc/lpfc_bsg.c | 59 +-
2727 drivers/scsi/lpfc/lpfc_bsg.h | 130 ++++
2728 drivers/scsi/lpfc/lpfc_debugfs.c | 931 +++++++++++++++++++++-------
2729 drivers/scsi/lpfc/lpfc_debugfs.h | 48 ++-
2730 drivers/scsi/lpfc/lpfc_els.c | 44 +-
2731 drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +-
2732 drivers/scsi/lpfc/lpfc_hw4.h | 18 +-
2733 drivers/scsi/lpfc/lpfc_init.c | 19 +-
2734 drivers/scsi/lpfc/lpfc_mbox.c | 2 +-
2735 drivers/scsi/lpfc/lpfc_scsi.c | 14 +-
2736 drivers/scsi/lpfc/lpfc_sli.c | 32 +-
2737 drivers/scsi/lpfc/lpfc_version.h | 2 +-
2738 drivers/scsi/megaraid.c | 20 +-
2739 drivers/scsi/megaraid/megaraid_mbox.c | 37 +-
2740 drivers/scsi/megaraid/megaraid_sas_base.c | 13 +-
2741 drivers/scsi/mesh.c | 3 +-
2742 drivers/scsi/mpt2sas/mpt2sas_base.c | 42 +-
2743 drivers/scsi/mpt2sas/mpt2sas_base.h | 49 ++-
2744 drivers/scsi/mpt2sas/mpt2sas_ctl.c | 5 +-
2745 drivers/scsi/mpt2sas/mpt2sas_ctl.h | 1 +
2746 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 617 +++++++++++++++++--
2747 drivers/scsi/mvsas/Kconfig | 1 +
2748 drivers/scsi/mvsas/Makefile | 1 +
2749 drivers/scsi/mvsas/mv_64xx.c | 1 +
2750 drivers/scsi/mvsas/mv_64xx.h | 1 +
2751 drivers/scsi/mvsas/mv_94xx.c | 1 +
2752 drivers/scsi/mvsas/mv_94xx.h | 1 +
2753 drivers/scsi/mvsas/mv_chips.h | 1 +
2754 drivers/scsi/mvsas/mv_defs.h | 3 +
2755 drivers/scsi/mvsas/mv_init.c | 67 ++-
2756 drivers/scsi/mvsas/mv_sas.c | 385 ++++++++----
2757 drivers/scsi/mvsas/mv_sas.h | 8 +
2758 drivers/scsi/ncr53c8xx.c | 2 +-
2759 drivers/scsi/qla1280.c | 2 +-
2760 drivers/scsi/qla2xxx/qla_attr.c | 4 +-
2761 drivers/scsi/qla2xxx/qla_bsg.c | 2 +-
2762 drivers/scsi/qla2xxx/qla_bsg.h | 2 +-
2763 drivers/scsi/qla2xxx/qla_dbg.c | 2 +-
2764 drivers/scsi/qla2xxx/qla_dbg.h | 2 +-
2765 drivers/scsi/qla2xxx/qla_def.h | 10 +-
2766 drivers/scsi/qla2xxx/qla_dfs.c | 2 +-
2767 drivers/scsi/qla2xxx/qla_fw.h | 2 +-
2768 drivers/scsi/qla2xxx/qla_gbl.h | 5 +-
2769 drivers/scsi/qla2xxx/qla_gs.c | 2 +-
2770 drivers/scsi/qla2xxx/qla_init.c | 45 +-
2771 drivers/scsi/qla2xxx/qla_inline.h | 21 +-
2772 drivers/scsi/qla2xxx/qla_iocb.c | 2 +-
2773 drivers/scsi/qla2xxx/qla_isr.c | 43 +-
2774 drivers/scsi/qla2xxx/qla_mbx.c | 24 +-
2775 drivers/scsi/qla2xxx/qla_mid.c | 4 +-
2776 drivers/scsi/qla2xxx/qla_nx.c | 59 ++-
2777 drivers/scsi/qla2xxx/qla_nx.h | 2 +-
2778 drivers/scsi/qla2xxx/qla_os.c | 43 ++-
2779 drivers/scsi/qla2xxx/qla_settings.h | 2 +-
2780 drivers/scsi/qla2xxx/qla_sup.c | 2 +-
2781 drivers/scsi/qla2xxx/qla_version.h | 6 +-
2782 drivers/scsi/qla4xxx/ql4_os.c | 5 +-
2783 drivers/scsi/scsi_error.c | 6 +
2784 drivers/scsi/scsi_proc.c | 58 ++-
2785 drivers/scsi/scsi_tgt_lib.c | 6 +-
2786 drivers/scsi/scsi_transport_fc.c | 11 +-
2787 drivers/scsi/tmscsim.c | 22 +-
2788 drivers/scsi/u14-34f.c | 61 +-
2789 drivers/scsi/wd33c93.c | 45 +-
2790 drivers/usb/storage/isd200.c | 1 -
2791 106 files changed, 3333 insertions(+), 1427 deletions(-)
2792 Merging async_tx/next
2793 $ git merge async_tx/next
2796 $ git merge net/master
2797 Resolved 'drivers/net/tg3.c' using previous resolution.
2798 Auto-merging Documentation/feature-removal-schedule.txt
2799 Auto-merging MAINTAINERS
2800 Removing drivers/isdn/capi/capifs.c
2801 Removing drivers/isdn/capi/capifs.h
2802 Auto-merging drivers/net/bnx2.c
2803 Auto-merging drivers/net/cris/eth_v10.c
2804 Auto-merging drivers/net/mii.c
2805 Auto-merging drivers/net/tg3.c
2806 CONFLICT (content): Merge conflict in drivers/net/tg3.c
2807 Auto-merging drivers/net/usb/smsc95xx.c
2808 Auto-merging drivers/net/usb/usbnet.c
2809 Auto-merging drivers/net/veth.c
2810 Removing drivers/net/wireless/ath/ar9170/Kconfig
2811 Removing drivers/net/wireless/ath/ar9170/Makefile
2812 Removing drivers/net/wireless/ath/ar9170/ar9170.h
2813 Removing drivers/net/wireless/ath/ar9170/cmd.c
2814 Removing drivers/net/wireless/ath/ar9170/cmd.h
2815 Removing drivers/net/wireless/ath/ar9170/eeprom.h
2816 Removing drivers/net/wireless/ath/ar9170/hw.h
2817 Removing drivers/net/wireless/ath/ar9170/led.c
2818 Removing drivers/net/wireless/ath/ar9170/mac.c
2819 Removing drivers/net/wireless/ath/ar9170/main.c
2820 Removing drivers/net/wireless/ath/ar9170/phy.c
2821 Removing drivers/net/wireless/ath/ar9170/usb.c
2822 Removing drivers/net/wireless/ath/ar9170/usb.h
2823 Auto-merging drivers/net/wireless/iwlegacy/iwl4965-base.c
2824 Removing drivers/net/wireless/iwlwifi/iwl-agn-led.c
2825 Removing drivers/net/wireless/iwlwifi/iwl-agn-led.h
2826 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-tx.c
2827 Removing drivers/net/wireless/rt2x00/rt2x00ht.c
2828 Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c
2829 Auto-merging drivers/scsi/fcoe/fcoe.c
2830 Removing firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex
2831 Removing firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex
2832 Removing firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex
2833 Auto-merging net/9p/client.c
2834 Auto-merging net/bluetooth/hidp/hidp.h
2835 Auto-merging net/core/dev.c
2836 Auto-merging net/ipv4/fib_trie.c
2837 Auto-merging net/ipv6/addrconf.c
2838 Auto-merging net/ipv6/esp6.c
2839 Auto-merging net/l2tp/l2tp_ip.c
2840 Auto-merging net/sctp/ulpevent.c
2841 Automatic merge failed; fix conflicts and then commit the result.
2843 [master de69ed6] Merge remote-tracking branch 'net/master'
2844 $ git diff -M --stat --summary HEAD^..
2845 Documentation/feature-removal-schedule.txt | 21 -
2846 Documentation/networking/bonding.txt | 34 +-
2847 Documentation/networking/igb.txt | 13 +
2848 Documentation/sysctl/net.txt | 11 +
2850 arch/mips/txx9/generic/setup_tx4939.c | 21 +-
2851 arch/x86/Kbuild | 1 +
2852 arch/x86/Kconfig | 1 +
2853 arch/x86/net/Makefile | 4 +
2854 arch/x86/net/bpf_jit.S | 140 +
2855 arch/x86/net/bpf_jit_comp.c | 654 +
2856 drivers/atm/eni.c | 5 -
2857 drivers/atm/he.c | 4 +-
2858 drivers/atm/idt77252.c | 52 +-
2859 drivers/atm/iphase.c | 14 +-
2860 drivers/atm/solos-pci.c | 3 +-
2861 drivers/bluetooth/Kconfig | 4 +-
2862 drivers/bluetooth/ath3k.c | 3 -
2863 drivers/bluetooth/btmrvl_sdio.c | 124 +-
2864 drivers/bluetooth/btmrvl_sdio.h | 68 +-
2865 drivers/bluetooth/hci_ath.c | 7 +-
2866 drivers/bluetooth/hci_h4.c | 7 +-
2867 drivers/bluetooth/hci_ldisc.c | 6 +-
2868 drivers/infiniband/hw/nes/nes_hw.c | 5 +-
2869 drivers/infiniband/hw/nes/nes_hw.h | 1 -
2870 drivers/infiniband/hw/nes/nes_nic.c | 59 +-
2871 drivers/infiniband/ulp/ipoib/ipoib.h | 1 -
2872 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 11 +-
2873 drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 28 -
2874 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +-
2875 drivers/infiniband/ulp/ipoib/ipoib_main.c | 24 +-
2876 drivers/isdn/capi/Kconfig | 15 -
2877 drivers/isdn/capi/Makefile | 1 -
2878 drivers/isdn/capi/capi.c | 24 +-
2879 drivers/isdn/capi/capifs.c | 239 -
2880 drivers/isdn/capi/capifs.h | 28 -
2881 drivers/isdn/gigaset/bas-gigaset.c | 5 -
2882 drivers/isdn/gigaset/ev-layer.c | 26 +-
2883 drivers/isdn/hardware/eicon/debug.c | 3 +-
2884 drivers/isdn/hardware/eicon/message.c | 23 +-
2885 drivers/isdn/hardware/mISDN/hfcpci.c | 6 +-
2886 drivers/isdn/hardware/mISDN/hfcsusb.c | 5 +-
2887 drivers/isdn/hisax/arcofi.c | 4 +-
2888 drivers/isdn/hisax/elsa_cs.c | 2 -
2889 drivers/isdn/hisax/elsa_ser.c | 3 +-
2890 drivers/isdn/hisax/hfc_usb.c | 6 +-
2891 drivers/isdn/hisax/ipacx.c | 4 +-
2892 drivers/isdn/hisax/jade.c | 3 +-
2893 drivers/isdn/hisax/l3dss1.c | 4 +-
2894 drivers/isdn/hisax/l3ni1.c | 4 +-
2895 drivers/isdn/hisax/teles_cs.c | 2 -
2896 drivers/isdn/hysdn/hysdn_proclog.c | 11 +-
2897 drivers/isdn/i4l/isdn_common.c | 11 +-
2898 drivers/isdn/i4l/isdn_net.c | 2 -
2899 drivers/isdn/i4l/isdn_tty.c | 2 -
2900 drivers/isdn/mISDN/layer2.c | 20 +-
2901 drivers/isdn/mISDN/socket.c | 3 +
2902 drivers/net/3c509.c | 16 +-
2903 drivers/net/3c59x.c | 4 +-
2904 drivers/net/8139cp.c | 46 +-
2905 drivers/net/acenic.c | 12 +-
2906 drivers/net/arm/etherh.c | 5 +-
2907 drivers/net/arm/ks8695net.c | 7 +-
2908 drivers/net/atl1c/atl1c_ethtool.c | 17 +-
2909 drivers/net/atl1c/atl1c_main.c | 25 +-
2910 drivers/net/atl1e/atl1e_ethtool.c | 7 +-
2911 drivers/net/atl1e/atl1e_main.c | 14 +-
2912 drivers/net/atlx/atl1.c | 29 +-
2913 drivers/net/atlx/atl2.c | 18 +-
2914 drivers/net/b44.c | 13 +-
2915 drivers/net/bcm63xx_enet.c | 7 +-
2916 drivers/net/benet/be.h | 31 +-
2917 drivers/net/benet/be_cmds.c | 116 +-
2918 drivers/net/benet/be_cmds.h | 23 +-
2919 drivers/net/benet/be_ethtool.c | 119 +-
2920 drivers/net/benet/be_hw.h | 4 +
2921 drivers/net/benet/be_main.c | 202 +-
2922 drivers/net/bna/bfa_ioc.c | 13 +-
2923 drivers/net/bna/bna_ctrl.c | 21 -
2924 drivers/net/bna/bna_txrx.c | 7 +-
2925 drivers/net/bna/bnad.c | 22 +-
2926 drivers/net/bna/bnad.h | 2 -
2927 drivers/net/bna/bnad_ethtool.c | 70 +-
2928 drivers/net/bnx2.c | 184 +-
2929 drivers/net/bnx2.h | 3 +-
2930 drivers/net/bnx2x/bnx2x.h | 1 -
2931 drivers/net/bnx2x/bnx2x_cmn.c | 49 +-
2932 drivers/net/bnx2x/bnx2x_cmn.h | 16 +-
2933 drivers/net/bnx2x/bnx2x_dcb.c | 22 +
2934 drivers/net/bnx2x/bnx2x_dcb.h | 8 +-
2935 drivers/net/bnx2x/bnx2x_ethtool.c | 162 +-
2936 drivers/net/bnx2x/bnx2x_hsi.h | 2 +-
2937 drivers/net/bnx2x/bnx2x_main.c | 41 +-
2938 drivers/net/bonding/Makefile | 3 -
2939 drivers/net/bonding/bond_3ad.c | 33 +-
2940 drivers/net/bonding/bond_3ad.h | 4 +-
2941 drivers/net/bonding/bond_alb.c | 46 +-
2942 drivers/net/bonding/bond_alb.h | 1 -
2943 drivers/net/bonding/bond_main.c | 280 +-
2944 drivers/net/bonding/bond_procfs.c | 2 -
2945 drivers/net/bonding/bond_sysfs.c | 84 +-
2946 drivers/net/bonding/bonding.h | 46 +-
2947 drivers/net/cassini.c | 37 +-
2948 drivers/net/chelsio/common.h | 5 -
2949 drivers/net/chelsio/cxgb2.c | 59 +-
2950 drivers/net/chelsio/sge.c | 13 +-
2951 drivers/net/chelsio/tp.c | 5 -
2952 drivers/net/chelsio/tp.h | 1 -
2953 drivers/net/cnic.c | 62 +-
2954 drivers/net/cnic.h | 1 +
2955 drivers/net/cnic_if.h | 6 +-
2956 drivers/net/cris/eth_v10.c | 4 +-
2957 drivers/net/cxgb3/adapter.h | 7 -
2958 drivers/net/cxgb3/common.h | 1 -
2959 drivers/net/cxgb3/cxgb3_main.c | 117 +-
2960 drivers/net/cxgb3/sge.c | 7 +-
2961 drivers/net/cxgb4/cxgb4.h | 6 -
2962 drivers/net/cxgb4/cxgb4_main.c | 103 +-
2963 drivers/net/cxgb4/sge.c | 4 +-
2964 drivers/net/cxgb4vf/adapter.h | 6 -
2965 drivers/net/cxgb4vf/cxgb4vf_main.c | 73 +-
2966 drivers/net/cxgb4vf/sge.c | 4 +-
2967 drivers/net/depca.c | 35 +-
2968 drivers/net/dl2k.c | 29 +-
2969 drivers/net/dm9000.c | 57 +-
2970 drivers/net/e100.c | 10 +-
2971 drivers/net/e1000/e1000.h | 2 +-
2972 drivers/net/e1000/e1000_ethtool.c | 10 +-
2973 drivers/net/e1000/e1000_main.c | 42 +-
2974 drivers/net/e1000e/82571.c | 22 +-
2975 drivers/net/e1000e/e1000.h | 12 +-
2976 drivers/net/e1000e/es2lan.c | 5 +-
2977 drivers/net/e1000e/ethtool.c | 154 +-
2978 drivers/net/e1000e/hw.h | 1 +
2979 drivers/net/e1000e/ich8lan.c | 16 +-
2980 drivers/net/e1000e/lib.c | 14 +-
2981 drivers/net/e1000e/netdev.c | 213 +-
2982 drivers/net/e1000e/phy.c | 4 +-
2983 drivers/net/eepro.c | 2 +-
2984 drivers/net/ehea/ehea_ethtool.c | 46 +-
2985 drivers/net/ehea/ehea_main.c | 4 +-
2986 drivers/net/enc28j60.c | 5 +-
2987 drivers/net/enic/Makefile | 2 +-
2988 drivers/net/enic/enic.h | 5 +-
2989 drivers/net/enic/enic_dev.c | 62 +-
2990 drivers/net/enic/enic_dev.h | 7 +-
2991 drivers/net/enic/enic_main.c | 274 +-
2992 drivers/net/enic/enic_pp.c | 264 +
2993 drivers/net/enic/enic_pp.h | 27 +
2994 drivers/net/enic/enic_res.c | 4 +-
2995 drivers/net/enic/vnic_dev.c | 97 +-
2996 drivers/net/enic/vnic_dev.h | 6 +-
2997 drivers/net/enic/vnic_devcmd.h | 57 +-
2998 drivers/net/enic/vnic_vic.c | 5 +-
2999 drivers/net/enic/vnic_vic.h | 13 +-
3000 drivers/net/ewrk3.c | 58 +-
3001 drivers/net/forcedeth.c | 113 +-
3002 drivers/net/fs_enet/fs_enet-main.c | 2 -
3003 drivers/net/gianfar.c | 16 +-
3004 drivers/net/gianfar.h | 20 +-
3005 drivers/net/gianfar_ethtool.c | 110 +-
3006 drivers/net/greth.c | 46 +-
3007 drivers/net/greth.h | 4 -
3008 drivers/net/hp100.c | 12 +-
3009 drivers/net/ibm_newemac/core.c | 17 +-
3010 drivers/net/ibmlana.c | 7 +-
3011 drivers/net/ibmveth.c | 98 +-
3012 drivers/net/igb/e1000_82575.c | 3 +-
3013 drivers/net/igb/igb.h | 2 +-
3014 drivers/net/igb/igb_ethtool.c | 11 +-
3015 drivers/net/igb/igb_main.c | 90 +-
3016 drivers/net/igbvf/ethtool.c | 8 +-
3017 drivers/net/ioc3-eth.c | 30 +-
3018 drivers/net/irda/smsc-ircc2.c | 44 +-
3019 drivers/net/ixgb/ixgb_ethtool.c | 7 +-
3020 drivers/net/ixgbe/ixgbe.h | 1 +
3021 drivers/net/ixgbe/ixgbe_82598.c | 60 +-
3022 drivers/net/ixgbe/ixgbe_82599.c | 137 +-
3023 drivers/net/ixgbe/ixgbe_common.c | 112 +-
3024 drivers/net/ixgbe/ixgbe_common.h | 4 +-
3025 drivers/net/ixgbe/ixgbe_dcb_82598.c | 2 +-
3026 drivers/net/ixgbe/ixgbe_dcb_82599.c | 77 +-
3027 drivers/net/ixgbe/ixgbe_dcb_82599.h | 2 +
3028 drivers/net/ixgbe/ixgbe_dcb_nl.c | 109 +-
3029 drivers/net/ixgbe/ixgbe_ethtool.c | 64 +-
3030 drivers/net/ixgbe/ixgbe_fcoe.c | 4 +-
3031 drivers/net/ixgbe/ixgbe_main.c | 37 +-
3032 drivers/net/ixgbe/ixgbe_mbx.h | 3 -
3033 drivers/net/ixgbe/ixgbe_phy.c | 10 +-
3034 drivers/net/ixgbe/ixgbe_sriov.c | 2 +-
3035 drivers/net/ixgbe/ixgbe_type.h | 201 +-
3036 drivers/net/ixgbe/ixgbe_x540.c | 256 +-
3037 drivers/net/ixgbevf/ethtool.c | 8 +-
3038 drivers/net/jme.c | 80 +-
3039 drivers/net/jme.h | 2 -
3040 drivers/net/ksz884x.c | 82 +-
3041 drivers/net/macb.c | 11 +-
3042 drivers/net/macvlan.c | 16 +-
3043 drivers/net/mdio.c | 23 +-
3044 drivers/net/mii.c | 31 +-
3045 drivers/net/mlx4/en_ethtool.c | 49 +-
3046 drivers/net/mlx4/en_netdev.c | 26 +-
3047 drivers/net/mlx4/en_rx.c | 2 +-
3048 drivers/net/mlx4/mlx4_en.h | 1 -
3049 drivers/net/mv643xx_eth.c | 34 +-
3050 drivers/net/myri10ge/myri10ge.c | 68 +-
3051 drivers/net/natsemi.c | 11 +-
3052 drivers/net/ne3210.c | 15 +-
3053 drivers/net/netxen/netxen_nic.h | 2 +-
3054 drivers/net/netxen/netxen_nic_ethtool.c | 117 +-
3055 drivers/net/netxen/netxen_nic_init.c | 3 +-
3056 drivers/net/netxen/netxen_nic_main.c | 55 +-
3057 drivers/net/niu.c | 63 +-
3058 drivers/net/niu.h | 1 +
3059 drivers/net/ns83820.c | 8 +-
3060 drivers/net/pch_gbe/pch_gbe.h | 4 -
3061 drivers/net/pch_gbe/pch_gbe_ethtool.c | 65 +-
3062 drivers/net/pch_gbe/pch_gbe_main.c | 48 +-
3063 drivers/net/pch_gbe/pch_gbe_param.c | 16 +-
3064 drivers/net/pch_gbe/pch_gbe_phy.c | 4 +-
3065 drivers/net/pcmcia/smc91c92_cs.c | 6 +-
3066 drivers/net/pcnet32.c | 90 +-
3067 drivers/net/phy/phy.c | 12 +-
3068 drivers/net/ps3_gelic_net.c | 34 +-
3069 drivers/net/ps3_gelic_net.h | 3 -
3070 drivers/net/ps3_gelic_wireless.c | 4 -
3071 drivers/net/qla3xxx.c | 4 +-
3072 drivers/net/qlcnic/qlcnic.h | 240 +-
3073 drivers/net/qlcnic/qlcnic_ctx.c | 159 +-
3074 drivers/net/qlcnic/qlcnic_ethtool.c | 348 +-
3075 drivers/net/qlcnic/qlcnic_hw.c | 119 +-
3076 drivers/net/qlcnic/qlcnic_init.c | 62 +-
3077 drivers/net/qlcnic/qlcnic_main.c | 621 +-
3078 drivers/net/qlge/qlge.h | 2 +-
3079 drivers/net/qlge/qlge_ethtool.c | 74 +-
3080 drivers/net/qlge/qlge_main.c | 25 +-
3081 drivers/net/r8169.c | 590 +-
3082 drivers/net/s2io.c | 197 +-
3083 drivers/net/s2io.h | 13 +-
3084 drivers/net/sc92031.c | 8 +-
3085 drivers/net/sfc/efx.c | 26 +-
3086 drivers/net/sfc/ethtool.c | 111 +-
3087 drivers/net/sfc/falcon.c | 4 +-
3088 drivers/net/sfc/falcon_xmac.c | 2 +-
3089 drivers/net/sfc/mac.h | 4 +-
3090 drivers/net/sfc/mcdi_mac.c | 2 +-
3091 drivers/net/sfc/mcdi_phy.c | 8 +-
3092 drivers/net/sfc/mdio_10g.c | 4 +-
3093 drivers/net/sfc/net_driver.h | 8 +-
3094 drivers/net/sfc/nic.c | 6 +-
3095 drivers/net/sfc/nic.h | 6 +-
3096 drivers/net/sfc/phy.h | 8 +-
3097 drivers/net/sfc/qt202x_phy.c | 2 +-
3098 drivers/net/sfc/rx.c | 3 +
3099 drivers/net/sfc/siena.c | 2 +-
3100 drivers/net/sfc/tenxpress.c | 4 +-
3101 drivers/net/sfc/txc43128_phy.c | 2 +-
3102 drivers/net/skge.c | 93 +-
3103 drivers/net/skge.h | 1 -
3104 drivers/net/sky2.c | 195 +-
3105 drivers/net/sky2.h | 1 -
3106 drivers/net/smc-mca.c | 6 +-
3107 drivers/net/smc911x.c | 4 +-
3108 drivers/net/smc91x.c | 4 +-
3109 drivers/net/smsc911x.c | 448 +-
3110 drivers/net/smsc911x.h | 22 +-
3111 drivers/net/spider_net.c | 15 +-
3112 drivers/net/spider_net.h | 7 -
3113 drivers/net/spider_net_ethtool.c | 23 +-
3114 drivers/net/stmmac/dwmac1000_core.c | 5 +-
3115 drivers/net/stmmac/stmmac_ethtool.c | 23 +-
3116 drivers/net/stmmac/stmmac_main.c | 83 +-
3117 drivers/net/sungem.c | 18 +-
3118 drivers/net/sunhme.c | 25 +-
3119 drivers/net/tehuti.c | 28 +-
3120 drivers/net/tg3.c | 2824 +++--
3121 drivers/net/tg3.h | 267 +-
3122 drivers/net/tile/tilepro.c | 2 +-
3123 drivers/net/tokenring/madgemc.c | 2 +-
3124 drivers/net/tulip/de2104x.c | 9 +-
3125 drivers/net/tulip/de4x5.c | 4 +-
3126 drivers/net/tulip/uli526x.c | 6 +-
3127 drivers/net/tun.c | 65 +-
3128 drivers/net/typhoon.c | 58 +-
3129 drivers/net/ucc_geth_ethtool.c | 1 -
3130 drivers/net/usb/Kconfig | 2 +-
3131 drivers/net/usb/asix.c | 28 +-
3132 drivers/net/usb/catc.c | 2 +-
3133 drivers/net/usb/dm9601.c | 6 +-
3134 drivers/net/usb/plusb.c | 32 +-
3135 drivers/net/usb/rndis_host.c | 39 +-
3136 drivers/net/usb/rtl8150.c | 11 +-
3137 drivers/net/usb/smsc75xx.c | 131 +-
3138 drivers/net/usb/smsc95xx.c | 90 +-
3139 drivers/net/usb/usbnet.c | 6 +-
3140 drivers/net/veth.c | 47 +-
3141 drivers/net/via-rhine.c | 242 +-
3142 drivers/net/via-velocity.c | 28 +-
3143 drivers/net/virtio_net.c | 46 +-
3144 drivers/net/vmxnet3/vmxnet3_drv.c | 40 +-
3145 drivers/net/vmxnet3/vmxnet3_ethtool.c | 71 +-
3146 drivers/net/vmxnet3/vmxnet3_int.h | 7 +-
3147 drivers/net/vxge/vxge-config.c | 48 +-
3148 drivers/net/vxge/vxge-config.h | 70 +-
3149 drivers/net/vxge/vxge-ethtool.c | 104 +-
3150 drivers/net/vxge/vxge-main.c | 143 +-
3151 drivers/net/vxge/vxge-main.h | 14 +-
3152 drivers/net/vxge/vxge-traffic.h | 2 +-
3153 drivers/net/vxge/vxge-version.h | 4 +-
3154 drivers/net/wireless/Kconfig | 1 +
3155 drivers/net/wireless/Makefile | 2 +
3156 drivers/net/wireless/ath/Kconfig | 1 -
3157 drivers/net/wireless/ath/Makefile | 1 -
3158 drivers/net/wireless/ath/ar9170/Kconfig | 20 -
3159 drivers/net/wireless/ath/ar9170/Makefile | 3 -
3160 drivers/net/wireless/ath/ar9170/ar9170.h | 258 -
3161 drivers/net/wireless/ath/ar9170/cmd.c | 127 -
3162 drivers/net/wireless/ath/ar9170/cmd.h | 92 -
3163 drivers/net/wireless/ath/ar9170/eeprom.h | 179 -
3164 drivers/net/wireless/ath/ar9170/hw.h | 430 -
3165 drivers/net/wireless/ath/ar9170/led.c | 181 -
3166 drivers/net/wireless/ath/ar9170/mac.c | 519 -
3167 drivers/net/wireless/ath/ar9170/main.c | 2190 ---
3168 drivers/net/wireless/ath/ar9170/phy.c | 1719 ---
3169 drivers/net/wireless/ath/ar9170/usb.c | 1008 --
3170 drivers/net/wireless/ath/ar9170/usb.h | 82 -
3171 drivers/net/wireless/ath/ath.h | 10 +-
3172 drivers/net/wireless/ath/ath5k/ahb.c | 28 +
3173 drivers/net/wireless/ath/ath5k/ath5k.h | 31 +-
3174 drivers/net/wireless/ath/ath5k/attach.c | 7 +-
3175 drivers/net/wireless/ath/ath5k/base.c | 71 +-
3176 drivers/net/wireless/ath/ath5k/base.h | 7 +-
3177 drivers/net/wireless/ath/ath5k/caps.c | 3 +
3178 drivers/net/wireless/ath/ath5k/debug.c | 65 +-
3179 drivers/net/wireless/ath/ath5k/debug.h | 17 -
3180 drivers/net/wireless/ath/ath5k/desc.c | 158 +-
3181 drivers/net/wireless/ath/ath5k/eeprom.c | 158 +-
3182 drivers/net/wireless/ath/ath5k/mac80211-ops.c | 9 +
3183 drivers/net/wireless/ath/ath5k/pci.c | 32 +
3184 drivers/net/wireless/ath/ath5k/pcu.c | 35 +-
3185 drivers/net/wireless/ath/ath5k/qcu.c | 4 +-
3186 drivers/net/wireless/ath/ath9k/Kconfig | 21 +-
3187 drivers/net/wireless/ath/ath9k/Makefile | 6 +-
3188 drivers/net/wireless/ath/ath9k/ahb.c | 14 +-
3189 drivers/net/wireless/ath/ath9k/ar5008_phy.c | 45 +-
3190 drivers/net/wireless/ath/ath9k/ar9002_calib.c | 43 +-
3191 drivers/net/wireless/ath/ath9k/ar9002_mac.c | 24 +-
3192 drivers/net/wireless/ath/ath9k/ar9002_phy.h | 6 +
3193 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 178 +-
3194 drivers/net/wireless/ath/ath9k/ar9003_hw.c | 98 +-
3195 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 24 +-
3196 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 17 +-
3197 drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 935 +--
3198 drivers/net/wireless/ath/ath9k/ath9k.h | 26 +-
3199 drivers/net/wireless/ath/ath9k/beacon.c | 229 +-
3200 drivers/net/wireless/ath/ath9k/common.c | 2 +-
3201 drivers/net/wireless/ath/ath9k/debug.c | 134 +-
3202 drivers/net/wireless/ath/ath9k/debug.h | 7 +
3203 drivers/net/wireless/ath/ath9k/eeprom.h | 6 +-
3204 drivers/net/wireless/ath/ath9k/eeprom_4k.c | 26 +
3205 drivers/net/wireless/ath/ath9k/eeprom_9287.c | 31 +-
3206 drivers/net/wireless/ath/ath9k/eeprom_def.c | 7 +
3207 drivers/net/wireless/ath/ath9k/gpio.c | 14 +-
3208 drivers/net/wireless/ath/ath9k/hif_usb.c | 334 +-
3209 drivers/net/wireless/ath/ath9k/hif_usb.h | 7 +-
3210 drivers/net/wireless/ath/ath9k/htc.h | 213 +-
3211 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 327 +-
3212 drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 505 +
3213 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 12 +-
3214 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 124 +-
3215 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 322 +-
3216 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 790 +-
3217 drivers/net/wireless/ath/ath9k/htc_hst.c | 50 +-
3218 drivers/net/wireless/ath/ath9k/htc_hst.h | 14 +-
3219 drivers/net/wireless/ath/ath9k/hw-ops.h | 5 +-
3220 drivers/net/wireless/ath/ath9k/hw.c | 251 +-
3221 drivers/net/wireless/ath/ath9k/hw.h | 75 +-
3222 drivers/net/wireless/ath/ath9k/init.c | 53 +-
3223 drivers/net/wireless/ath/ath9k/mac.c | 113 +-
3224 drivers/net/wireless/ath/ath9k/mac.h | 1 -
3225 drivers/net/wireless/ath/ath9k/main.c | 232 +-
3226 drivers/net/wireless/ath/ath9k/phy.h | 15 -
3227 drivers/net/wireless/ath/ath9k/rc.c | 3 +-
3228 drivers/net/wireless/ath/ath9k/recv.c | 8 +-
3229 drivers/net/wireless/ath/ath9k/reg.h | 36 +-
3230 drivers/net/wireless/ath/ath9k/wmi.c | 122 +-
3231 drivers/net/wireless/ath/ath9k/wmi.h | 80 +-
3232 drivers/net/wireless/ath/ath9k/xmit.c | 140 +-
3233 drivers/net/wireless/ath/key.c | 38 +-
3234 drivers/net/wireless/ath/regd.c | 8 +-
3235 drivers/net/wireless/ath/regd_common.h | 2 +
3236 drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 1 -
3237 drivers/net/wireless/iwlegacy/iwl4965-base.c | 2 +-
3238 drivers/net/wireless/iwlwifi/Makefile | 4 +-
3239 drivers/net/wireless/iwlwifi/iwl-1000.c | 40 +-
3240 drivers/net/wireless/iwlwifi/iwl-2000.c | 91 +-
3241 drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 4 +-
3242 drivers/net/wireless/iwlwifi/iwl-5000.c | 63 +-
3243 drivers/net/wireless/iwlwifi/iwl-6000-hw.h | 4 +-
3244 drivers/net/wireless/iwlwifi/iwl-6000.c | 98 +-
3245 drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 47 +-
3246 drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 8 +-
3247 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 186 +-
3248 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 2 +-
3249 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 6 +-
3250 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 2 +-
3251 drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +-
3252 drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 4 +-
3253 drivers/net/wireless/iwlwifi/iwl-agn-led.c | 73 -
3254 drivers/net/wireless/iwlwifi/iwl-agn-led.h | 33 -
3255 drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 45 +-
3256 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 29 +-
3257 drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 31 +-
3258 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 15 +-
3259 drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 4 +-
3260 drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 2 +-
3261 drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 2 +-
3262 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 142 +-
3263 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 125 +-
3264 drivers/net/wireless/iwlwifi/iwl-agn.c | 587 +-
3265 drivers/net/wireless/iwlwifi/iwl-agn.h | 48 +-
3266 drivers/net/wireless/iwlwifi/iwl-commands.h | 711 +-
3267 drivers/net/wireless/iwlwifi/iwl-core.c | 185 +-
3268 drivers/net/wireless/iwlwifi/iwl-core.h | 92 +-
3269 drivers/net/wireless/iwlwifi/iwl-csr.h | 43 +-
3270 drivers/net/wireless/iwlwifi/iwl-debug.h | 4 +-
3271 drivers/net/wireless/iwlwifi/iwl-debugfs.c | 62 +-
3272 drivers/net/wireless/iwlwifi/iwl-dev.h | 284 +-
3273 drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +-
3274 drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +-
3275 drivers/net/wireless/iwlwifi/iwl-eeprom.c | 56 +-
3276 drivers/net/wireless/iwlwifi/iwl-eeprom.h | 192 +-
3277 drivers/net/wireless/iwlwifi/iwl-fh.h | 42 +-
3278 drivers/net/wireless/iwlwifi/iwl-hcmd.c | 25 +-
3279 drivers/net/wireless/iwlwifi/iwl-helpers.h | 15 +-
3280 drivers/net/wireless/iwlwifi/iwl-io.c | 274 +
3281 drivers/net/wireless/iwlwifi/iwl-io.h | 491 +-
3282 drivers/net/wireless/iwlwifi/iwl-led.c | 32 +-
3283 drivers/net/wireless/iwlwifi/iwl-led.h | 3 +-
3284 drivers/net/wireless/iwlwifi/iwl-power.c | 19 +-
3285 drivers/net/wireless/iwlwifi/iwl-power.h | 2 +-
3286 drivers/net/wireless/iwlwifi/iwl-prph.h | 358 +-
3287 drivers/net/wireless/iwlwifi/iwl-rx.c | 332 +-
3288 drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +-
3289 drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +-
3290 drivers/net/wireless/iwlwifi/iwl-sta.c | 18 +-
3291 drivers/net/wireless/iwlwifi/iwl-sta.h | 2 +-
3292 drivers/net/wireless/iwlwifi/iwl-tx.c | 107 +-
3293 drivers/net/wireless/libertas/if_spi.c | 65 +
3294 drivers/net/wireless/mwifiex/11n.c | 797 +
3295 drivers/net/wireless/mwifiex/11n.h | 161 +
3296 drivers/net/wireless/mwifiex/11n_aggr.c | 422 +
3297 drivers/net/wireless/mwifiex/11n_aggr.h | 32 +
3298 drivers/net/wireless/mwifiex/11n_rxreorder.c | 617 +
3299 drivers/net/wireless/mwifiex/11n_rxreorder.h | 65 +
3300 drivers/net/wireless/mwifiex/Kconfig | 21 +
3301 drivers/net/wireless/mwifiex/Makefile | 41 +
3302 drivers/net/wireless/mwifiex/README | 204 +
3303 drivers/net/wireless/mwifiex/cfg80211.c | 1390 ++
3304 drivers/net/wireless/mwifiex/cfg80211.h | 31 +
3305 drivers/net/wireless/mwifiex/cfp.c | 360 +
3306 drivers/net/wireless/mwifiex/cmdevt.c | 1415 ++
3307 drivers/net/wireless/mwifiex/debugfs.c | 770 +
3308 drivers/net/wireless/mwifiex/decl.h | 129 +
3309 drivers/net/wireless/mwifiex/fw.h | 1206 ++
3310 drivers/net/wireless/mwifiex/init.c | 652 +
3311 drivers/net/wireless/mwifiex/ioctl.h | 410 +
3312 drivers/net/wireless/mwifiex/join.c | 1422 ++
3313 drivers/net/wireless/mwifiex/main.c | 1060 ++
3314 drivers/net/wireless/mwifiex/main.h | 1008 ++
3315 drivers/net/wireless/mwifiex/scan.c | 3027 ++++
3316 drivers/net/wireless/mwifiex/sdio.c | 1753 +++
3317 drivers/net/wireless/mwifiex/sdio.h | 305 +
3318 drivers/net/wireless/mwifiex/sta_cmd.c | 1219 ++
3319 drivers/net/wireless/mwifiex/sta_cmdresp.c | 972 ++
3320 drivers/net/wireless/mwifiex/sta_event.c | 406 +
3321 drivers/net/wireless/mwifiex/sta_ioctl.c | 1605 ++
3322 drivers/net/wireless/mwifiex/sta_rx.c | 182 +
3323 drivers/net/wireless/mwifiex/sta_tx.c | 198 +
3324 drivers/net/wireless/mwifiex/txrx.c | 200 +
3325 drivers/net/wireless/mwifiex/util.c | 227 +
3326 drivers/net/wireless/mwifiex/util.h | 32 +
3327 drivers/net/wireless/mwifiex/wmm.c | 1231 ++
3328 drivers/net/wireless/mwifiex/wmm.h | 110 +
3329 drivers/net/wireless/mwl8k.c | 818 +-
3330 drivers/net/wireless/rt2x00/Kconfig | 26 +-
3331 drivers/net/wireless/rt2x00/Makefile | 1 -
3332 drivers/net/wireless/rt2x00/rt2400pci.c | 35 +-
3333 drivers/net/wireless/rt2x00/rt2500pci.c | 34 +-
3334 drivers/net/wireless/rt2x00/rt2500usb.c | 90 +-
3335 drivers/net/wireless/rt2x00/rt2800.h | 106 +
3336 drivers/net/wireless/rt2x00/rt2800lib.c | 333 +-
3337 drivers/net/wireless/rt2x00/rt2800lib.h | 1 +
3338 drivers/net/wireless/rt2x00/rt2800pci.c | 263 +-
3339 drivers/net/wireless/rt2x00/rt2800usb.c | 622 +-
3340 drivers/net/wireless/rt2x00/rt2x00.h | 104 +-
3341 drivers/net/wireless/rt2x00/rt2x00config.c | 77 +-
3342 drivers/net/wireless/rt2x00/rt2x00crypto.c | 4 +-
3343 drivers/net/wireless/rt2x00/rt2x00debug.c | 43 +-
3344 drivers/net/wireless/rt2x00/rt2x00dev.c | 51 +-
3345 drivers/net/wireless/rt2x00/rt2x00firmware.c | 2 +-
3346 drivers/net/wireless/rt2x00/rt2x00ht.c | 133 -
3347 drivers/net/wireless/rt2x00/rt2x00lib.h | 57 +-
3348 drivers/net/wireless/rt2x00/rt2x00link.c | 61 +-
3349 drivers/net/wireless/rt2x00/rt2x00mac.c | 95 +-
3350 drivers/net/wireless/rt2x00/rt2x00pci.c | 19 +-
3351 drivers/net/wireless/rt2x00/rt2x00pci.h | 17 +-
3352 drivers/net/wireless/rt2x00/rt2x00queue.c | 177 +-
3353 drivers/net/wireless/rt2x00/rt2x00queue.h | 34 +-
3354 drivers/net/wireless/rt2x00/rt2x00usb.c | 126 +-
3355 drivers/net/wireless/rt2x00/rt2x00usb.h | 31 +-
3356 drivers/net/wireless/rt2x00/rt61pci.c | 70 +-
3357 drivers/net/wireless/rt2x00/rt73usb.c | 191 +-
3358 drivers/net/wireless/rtlwifi/base.c | 17 +-
3359 drivers/net/wireless/rtlwifi/core.c | 8 +-
3360 drivers/net/wireless/rtlwifi/efuse.c | 106 +-
3361 drivers/net/wireless/rtlwifi/pci.c | 56 +-
3362 drivers/net/wireless/rtlwifi/pci.h | 4 +-
3363 drivers/net/wireless/rtlwifi/ps.c | 3 +-
3364 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 2 +-
3365 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 40 +-
3366 drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 14 +-
3367 drivers/net/wireless/rtlwifi/rtl8192ce/led.h | 1 -
3368 drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 4 +-
3369 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 -
3370 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 4 +-
3371 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
3372 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +-
3373 drivers/net/wireless/rtlwifi/wifi.h | 18 +-
3374 drivers/net/wireless/wl1251/cmd.h | 4 +-
3375 drivers/net/wireless/wl1251/event.c | 6 +-
3376 drivers/net/wireless/wl1251/main.c | 22 +-
3377 drivers/net/wireless/wl1251/ps.c | 23 +-
3378 drivers/net/wireless/wl1251/ps.h | 2 +-
3379 drivers/net/wireless/wl1251/wl1251.h | 9 +-
3380 drivers/net/wireless/zd1211rw/zd_chip.c | 262 +-
3381 drivers/net/wireless/zd1211rw/zd_chip.h | 529 +-
3382 drivers/net/wireless/zd1211rw/zd_rf.h | 2 +-
3383 drivers/net/wireless/zd1211rw/zd_rf_al2230.c | 198 +-
3384 drivers/net/wireless/zd1211rw/zd_rf_al7230b.c | 240 +-
3385 drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | 78 +-
3386 drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | 86 +-
3387 drivers/net/wireless/zd1211rw/zd_usb.c | 4 +-
3388 drivers/net/wireless/zd1211rw/zd_usb.h | 2 +-
3389 drivers/net/xen-netback/common.h | 3 -
3390 drivers/net/xen-netback/interface.c | 84 +-
3391 drivers/net/xen-netback/xenbus.c | 2 +-
3392 drivers/net/xen-netfront.c | 106 +-
3393 drivers/s390/net/qeth_core.h | 7 -
3394 drivers/s390/net/qeth_l3_main.c | 117 +-
3395 drivers/s390/net/qeth_l3_sys.c | 35 +-
3396 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 11 +-
3397 drivers/scsi/fcoe/fcoe.c | 11 +-
3398 drivers/ssb/driver_pcicore.c | 104 +-
3399 drivers/ssb/scan.c | 2 +-
3400 drivers/staging/hv/netvsc_drv.c | 3 +-
3401 firmware/Makefile | 6 +-
3402 firmware/WHENCE | 9 +-
3403 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex | 9483 ------------
3404 firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex | 9484 ++++++++++++
3405 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex |13181 -----------------
3406 firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex |13192 +++++++++++++++++
3407 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex |15456 -------------------
3408 firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex |15473 ++++++++++++++++++++
3409 include/linux/ath9k_platform.h | 5 +
3410 include/linux/ethtool.h | 287 +-
3411 include/linux/filter.h | 76 +
3412 include/linux/ieee80211.h | 9 +
3413 include/linux/if_vlan.h | 10 +-
3414 include/linux/netdevice.h | 26 +-
3415 include/linux/netfilter/ipset/ip_set_getport.h | 2 +
3416 include/linux/netfilter/x_tables.h | 96 +-
3417 include/linux/nl80211.h | 69 +-
3418 include/linux/pkt_sched.h | 15 +
3419 include/linux/rfkill-regulator.h | 48 +
3420 include/linux/skbuff.h | 2 +-
3421 include/linux/smsc911x.h | 1 +
3422 include/linux/ssb/ssb.h | 2 +-
3423 include/linux/usb/rndis_host.h | 2 +
3424 include/net/addrconf.h | 25 +-
3425 include/net/af_rxrpc.h | 3 -
3426 include/net/af_unix.h | 2 -
3427 include/net/atmclip.h | 2 -
3428 include/net/bluetooth/hci.h | 42 +-
3429 include/net/bluetooth/hci_core.h | 25 +-
3430 include/net/bluetooth/l2cap.h | 132 +-
3431 include/net/bluetooth/mgmt.h | 47 +
3432 include/net/caif/caif_dev.h | 27 +-
3433 include/net/caif/cfctrl.h | 12 +-
3434 include/net/caif/cfmuxl.h | 2 -
3435 include/net/caif/cfpkt.h | 75 -
3436 include/net/caif/cfsrvl.h | 3 +-
3437 include/net/cfg80211.h | 76 +-
3438 include/net/dst.h | 6 +-
3439 include/net/flow.h | 25 +-
3440 include/net/if_inet6.h | 7 +-
3441 include/net/inet_sock.h | 14 +-
3442 include/net/inetpeer.h | 2 +-
3443 include/net/ip.h | 11 +-
3444 include/net/ip6_fib.h | 13 +-
3445 include/net/ip6_route.h | 26 +-
3446 include/net/ip_fib.h | 9 +-
3447 include/net/ip_vs.h | 5 -
3448 include/net/ipv6.h | 11 +-
3449 include/net/ipx.h | 2 -
3450 include/net/mac80211.h | 16 +
3451 include/net/ndisc.h | 9 +-
3452 include/net/netevent.h | 2 -
3453 include/net/netfilter/nf_conntrack.h | 2 -
3454 include/net/netfilter/nf_conntrack_tuple.h | 4 -
3455 include/net/netfilter/nf_nat.h | 4 -
3456 include/net/phonet/pn_dev.h | 2 +-
3457 include/net/rawv6.h | 4 -
3458 include/net/route.h | 129 +-
3459 include/net/sctp/command.h | 1 -
3460 include/net/sctp/constants.h | 18 +-
3461 include/net/sctp/sctp.h | 2 -
3462 include/net/sctp/sm.h | 5 +-
3463 include/net/sctp/structs.h | 20 +-
3464 include/net/sctp/ulpevent.h | 3 +
3465 include/net/sctp/user.h | 33 +-
3466 include/net/sock.h | 54 +
3467 include/net/transp_v6.h | 4 -
3468 include/net/wimax.h | 5 -
3469 include/net/xfrm.h | 15 +-
3470 include/rdma/ib_addr.h | 13 +-
3471 net/8021q/vlan.c | 28 +-
3472 net/8021q/vlan.h | 2 -
3473 net/8021q/vlan_core.c | 85 +-
3474 net/8021q/vlan_dev.c | 223 +-
3475 net/9p/client.c | 9 +-
3478 net/ax25/af_ax25.c | 16 +-
3479 net/ax25/ax25_iface.c | 3 +-
3480 net/batman-adv/aggregation.c | 1 -
3481 net/batman-adv/gateway_client.c | 296 +-
3482 net/batman-adv/gateway_client.h | 2 +-
3483 net/batman-adv/hard-interface.c | 83 +-
3484 net/batman-adv/hard-interface.h | 18 +
3485 net/batman-adv/icmp_socket.c | 37 +-
3486 net/batman-adv/main.h | 2 +
3487 net/batman-adv/originator.c | 72 +-
3488 net/batman-adv/originator.h | 1 +
3489 net/batman-adv/routing.c | 412 +-
3490 net/batman-adv/send.c | 37 +-
3491 net/batman-adv/soft-interface.c | 190 +-
3492 net/batman-adv/translation-table.c | 57 +-
3493 net/batman-adv/types.h | 9 +-
3494 net/batman-adv/unicast.c | 18 +-
3495 net/batman-adv/vis.c | 128 +-
3496 net/bluetooth/bnep/bnep.h | 148 +-
3497 net/bluetooth/bnep/core.c | 71 +-
3498 net/bluetooth/bnep/sock.c | 2 +-
3499 net/bluetooth/cmtp/capi.c | 6 +-
3500 net/bluetooth/cmtp/cmtp.h | 11 +-
3501 net/bluetooth/cmtp/core.c | 25 +-
3502 net/bluetooth/cmtp/sock.c | 2 +-
3503 net/bluetooth/hci_core.c | 79 +-
3504 net/bluetooth/hci_event.c | 99 +-
3505 net/bluetooth/hci_sysfs.c | 40 +-
3506 net/bluetooth/hidp/core.c | 90 +-
3507 net/bluetooth/hidp/hidp.h | 6 +-
3508 net/bluetooth/hidp/sock.c | 7 +-
3509 net/bluetooth/l2cap_core.c | 1359 +-
3510 net/bluetooth/l2cap_sock.c | 72 +-
3511 net/bluetooth/mgmt.c | 518 +-
3512 net/bridge/br.c | 1 +
3513 net/bridge/br_device.c | 100 +-
3514 net/bridge/br_fdb.c | 311 +-
3515 net/bridge/br_if.c | 104 +-
3516 net/bridge/br_input.c | 5 +-
3517 net/bridge/br_ioctl.c | 40 +-
3518 net/bridge/br_multicast.c | 12 +-
3519 net/bridge/br_netfilter.c | 4 +-
3520 net/bridge/br_netlink.c | 60 +-
3521 net/bridge/br_notify.c | 11 +-
3522 net/bridge/br_private.h | 22 +-
3523 net/bridge/br_private_stp.h | 13 +
3524 net/bridge/br_stp.c | 48 +
3525 net/bridge/br_stp_if.c | 21 +-
3526 net/bridge/br_sysfs_br.c | 39 +-
3527 net/bridge/br_sysfs_if.c | 26 +-
3528 net/caif/caif_config_util.c | 6 +-
3529 net/caif/caif_dev.c | 56 +-
3530 net/caif/caif_socket.c | 35 +-
3531 net/caif/cfcnfg.c | 2 +-
3532 net/caif/cfctrl.c | 75 +-
3533 net/caif/cfdgml.c | 7 +-
3534 net/caif/cffrml.c | 8 +-
3535 net/caif/cfmuxl.c | 45 +-
3536 net/caif/cfpkt_skbuff.c | 178 +-
3537 net/caif/cfserl.c | 7 +-
3538 net/caif/cfsrvl.c | 7 +-
3539 net/caif/cfutill.c | 7 +-
3540 net/caif/cfveil.c | 5 +-
3541 net/caif/cfvidl.c | 5 +-
3542 net/can/af_can.c | 52 +-
3543 net/core/dev.c | 128 +-
3544 net/core/dst.c | 34 +-
3545 net/core/ethtool.c | 106 +-
3546 net/core/fib_rules.c | 3 +-
3547 net/core/filter.c | 65 +-
3548 net/core/net-sysfs.c | 24 +-
3549 net/core/net_namespace.c | 12 +-
3550 net/core/netpoll.c | 2 +-
3551 net/core/pktgen.c | 37 +-
3552 net/core/rtnetlink.c | 12 +-
3553 net/core/sysctl_net_core.c | 9 +
3554 net/dccp/ipv4.c | 28 +-
3555 net/dccp/ipv6.c | 10 +-
3556 net/decnet/dn_dev.c | 10 +-
3557 net/decnet/dn_route.c | 15 +-
3558 net/decnet/dn_table.c | 4 +-
3559 net/dsa/slave.c | 1 -
3560 net/econet/af_econet.c | 8 -
3561 net/ipv4/af_inet.c | 26 +-
3562 net/ipv4/ah4.c | 7 +-
3563 net/ipv4/cipso_ipv4.c | 113 +-
3564 net/ipv4/datagram.c | 9 +-
3565 net/ipv4/esp4.c | 7 +-
3566 net/ipv4/fib_frontend.c | 16 +-
3567 net/ipv4/fib_trie.c | 110 +-
3568 net/ipv4/icmp.c | 35 +-
3569 net/ipv4/igmp.c | 10 -
3570 net/ipv4/inet_connection_sock.c | 22 +-
3571 net/ipv4/inet_diag.c | 2 +-
3572 net/ipv4/inet_lro.c | 4 +-
3573 net/ipv4/ip_gre.c | 28 +-
3574 net/ipv4/ip_input.c | 4 +-
3575 net/ipv4/ip_options.c | 38 +-
3576 net/ipv4/ip_output.c | 62 +-
3577 net/ipv4/ip_sockglue.c | 37 +-
3578 net/ipv4/ipcomp.c | 4 +-
3579 net/ipv4/ipip.c | 8 +-
3580 net/ipv4/ipmr.c | 2 +-
3581 net/ipv4/netfilter/arp_tables.c | 18 +-
3582 net/ipv4/netfilter/ip_tables.c | 28 +-
3583 net/ipv4/netfilter/nf_nat_helper.c | 2 +-
3584 net/ipv4/raw.c | 47 +-
3585 net/ipv4/route.c | 301 +-
3586 net/ipv4/syncookies.c | 22 +-
3587 net/ipv4/tcp.c | 7 +-
3588 net/ipv4/tcp_ipv4.c | 58 +-
3589 net/ipv4/udp.c | 41 +-
3590 net/ipv4/xfrm4_policy.c | 2 +-
3591 net/ipv4/xfrm4_state.c | 2 +-
3592 net/ipv6/addrconf.c | 18 +-
3593 net/ipv6/af_inet6.c | 2 +-
3594 net/ipv6/anycast.c | 16 +-
3595 net/ipv6/esp6.c | 5 +-
3596 net/ipv6/icmp.c | 8 +-
3597 net/ipv6/ip6_fib.c | 20 +-
3598 net/ipv6/ip6_input.c | 6 +-
3599 net/ipv6/ip6_output.c | 16 +-
3600 net/ipv6/ip6_tunnel.c | 36 +-
3601 net/ipv6/ip6mr.c | 4 +-
3602 net/ipv6/ipcomp6.c | 5 +-
3603 net/ipv6/mcast.c | 36 +-
3604 net/ipv6/mip6.c | 8 +-
3605 net/ipv6/ndisc.c | 51 +-
3606 net/ipv6/netfilter.c | 10 +-
3607 net/ipv6/netfilter/ip6_tables.c | 21 +-
3608 net/ipv6/netfilter/ip6table_mangle.c | 3 +-
3609 net/ipv6/raw.c | 14 +-
3610 net/ipv6/reassembly.c | 4 +-
3611 net/ipv6/route.c | 157 +-
3612 net/ipv6/sit.c | 25 +-
3613 net/ipv6/syncookies.c | 13 +-
3614 net/ipv6/tcp_ipv6.c | 50 +-
3615 net/ipv6/udp.c | 22 +-
3616 net/ipv6/xfrm6_mode_beet.c | 2 -
3617 net/ipv6/xfrm6_mode_tunnel.c | 6 +-
3618 net/ipv6/xfrm6_policy.c | 2 +-
3619 net/ipv6/xfrm6_tunnel.c | 10 +-
3620 net/irda/irlap_event.c | 3 -
3621 net/irda/irproc.c | 5 +-
3622 net/key/af_key.c | 2 +-
3623 net/l2tp/l2tp_ip.c | 26 +-
3624 net/l2tp/l2tp_netlink.c | 3 +-
3625 net/mac80211/Kconfig | 1 -
3626 net/mac80211/cfg.c | 40 +-
3627 net/mac80211/debugfs.c | 89 +-
3628 net/mac80211/debugfs_sta.c | 26 +
3629 net/mac80211/driver-ops.h | 13 +
3630 net/mac80211/driver-trace.h | 20 +
3631 net/mac80211/ibss.c | 3 +-
3632 net/mac80211/ieee80211_i.h | 9 +-
3633 net/mac80211/main.c | 14 +-
3634 net/mac80211/mesh.c | 14 +-
3635 net/mac80211/mesh.h | 3 +-
3636 net/mac80211/mesh_pathtbl.c | 49 +-
3637 net/mac80211/mesh_plink.c | 35 +-
3638 net/mac80211/mlme.c | 26 +-
3639 net/mac80211/rx.c | 28 +-
3640 net/mac80211/sta_info.c | 31 +-
3641 net/mac80211/sta_info.h | 6 +-
3642 net/mac80211/status.c | 11 +-
3643 net/mac80211/tkip.c | 4 +-
3644 net/mac80211/tkip.h | 4 +-
3645 net/mac80211/tx.c | 2 +-
3646 net/mac80211/util.c | 2 +-
3647 net/mac80211/wep.c | 34 +-
3648 net/mac80211/wep.h | 4 +-
3649 net/netfilter/ipset/ip_set_getport.c | 16 +-
3650 net/netfilter/ipset/ip_set_hash_ipport.c | 2 +-
3651 net/netfilter/ipset/ip_set_hash_ipportip.c | 2 +-
3652 net/netfilter/ipset/ip_set_hash_ipportnet.c | 2 +-
3653 net/netfilter/ipset/ip_set_hash_netport.c | 2 +-
3654 net/netfilter/ipvs/ip_vs_ctl.c | 3 -
3655 net/netfilter/nf_conntrack_standalone.c | 2 +-
3656 net/netfilter/nfnetlink_log.c | 2 -
3657 net/netfilter/x_tables.c | 9 +-
3658 net/netlabel/netlabel_cipso_v4.c | 4 -
3659 net/netrom/af_netrom.c | 12 +-
3660 net/packet/af_packet.c | 2 +-
3661 net/phonet/pn_dev.c | 6 +-
3662 net/phonet/pn_netlink.c | 4 +-
3663 net/phonet/socket.c | 45 +-
3664 net/rfkill/Kconfig | 11 +
3665 net/rfkill/Makefile | 1 +
3666 net/rfkill/rfkill-regulator.c | 164 +
3667 net/rose/af_rose.c | 16 +-
3668 net/sched/Kconfig | 11 +
3669 net/sched/Makefile | 1 +
3670 net/sched/sch_qfq.c | 1137 ++
3671 net/sched/sch_sfq.c | 2 +-
3672 net/sctp/debug.c | 1 -
3673 net/sctp/endpointola.c | 20 +-
3674 net/sctp/input.c | 19 +-
3675 net/sctp/ipv6.c | 185 +-
3676 net/sctp/outqueue.c | 19 +-
3677 net/sctp/protocol.c | 54 +-
3678 net/sctp/sm_make_chunk.c | 62 +-
3679 net/sctp/sm_sideeffect.c | 9 +-
3680 net/sctp/sm_statefuns.c | 89 +-
3681 net/sctp/sm_statetable.c | 78 +-
3682 net/sctp/socket.c | 82 +-
3683 net/sctp/transport.c | 28 +-
3684 net/sctp/ulpevent.c | 30 +-
3685 net/socket.c | 14 +-
3686 net/wireless/mesh.c | 23 +-
3687 net/wireless/mlme.c | 9 +
3688 net/wireless/nl80211.c | 122 +-
3689 net/wireless/nl80211.h | 7 +
3690 net/wireless/reg.c | 71 +-
3691 net/xfrm/xfrm_policy.c | 3 +-
3692 net/xfrm/xfrm_state.c | 12 +-
3693 848 files changed, 86749 insertions(+), 66209 deletions(-)
3694 create mode 100644 arch/x86/net/Makefile
3695 create mode 100644 arch/x86/net/bpf_jit.S
3696 create mode 100644 arch/x86/net/bpf_jit_comp.c
3697 delete mode 100644 drivers/isdn/capi/capifs.c
3698 delete mode 100644 drivers/isdn/capi/capifs.h
3699 create mode 100644 drivers/net/enic/enic_pp.c
3700 create mode 100644 drivers/net/enic/enic_pp.h
3701 delete mode 100644 drivers/net/wireless/ath/ar9170/Kconfig
3702 delete mode 100644 drivers/net/wireless/ath/ar9170/Makefile
3703 delete mode 100644 drivers/net/wireless/ath/ar9170/ar9170.h
3704 delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.c
3705 delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.h
3706 delete mode 100644 drivers/net/wireless/ath/ar9170/eeprom.h
3707 delete mode 100644 drivers/net/wireless/ath/ar9170/hw.h
3708 delete mode 100644 drivers/net/wireless/ath/ar9170/led.c
3709 delete mode 100644 drivers/net/wireless/ath/ar9170/mac.c
3710 delete mode 100644 drivers/net/wireless/ath/ar9170/main.c
3711 delete mode 100644 drivers/net/wireless/ath/ar9170/phy.c
3712 delete mode 100644 drivers/net/wireless/ath/ar9170/usb.c
3713 delete mode 100644 drivers/net/wireless/ath/ar9170/usb.h
3714 create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_debug.c
3715 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.c
3716 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.h
3717 create mode 100644 drivers/net/wireless/iwlwifi/iwl-io.c
3718 create mode 100644 drivers/net/wireless/mwifiex/11n.c
3719 create mode 100644 drivers/net/wireless/mwifiex/11n.h
3720 create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.c
3721 create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.h
3722 create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.c
3723 create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.h
3724 create mode 100644 drivers/net/wireless/mwifiex/Kconfig
3725 create mode 100644 drivers/net/wireless/mwifiex/Makefile
3726 create mode 100644 drivers/net/wireless/mwifiex/README
3727 create mode 100644 drivers/net/wireless/mwifiex/cfg80211.c
3728 create mode 100644 drivers/net/wireless/mwifiex/cfg80211.h
3729 create mode 100644 drivers/net/wireless/mwifiex/cfp.c
3730 create mode 100644 drivers/net/wireless/mwifiex/cmdevt.c
3731 create mode 100644 drivers/net/wireless/mwifiex/debugfs.c
3732 create mode 100644 drivers/net/wireless/mwifiex/decl.h
3733 create mode 100644 drivers/net/wireless/mwifiex/fw.h
3734 create mode 100644 drivers/net/wireless/mwifiex/init.c
3735 create mode 100644 drivers/net/wireless/mwifiex/ioctl.h
3736 create mode 100644 drivers/net/wireless/mwifiex/join.c
3737 create mode 100644 drivers/net/wireless/mwifiex/main.c
3738 create mode 100644 drivers/net/wireless/mwifiex/main.h
3739 create mode 100644 drivers/net/wireless/mwifiex/scan.c
3740 create mode 100644 drivers/net/wireless/mwifiex/sdio.c
3741 create mode 100644 drivers/net/wireless/mwifiex/sdio.h
3742 create mode 100644 drivers/net/wireless/mwifiex/sta_cmd.c
3743 create mode 100644 drivers/net/wireless/mwifiex/sta_cmdresp.c
3744 create mode 100644 drivers/net/wireless/mwifiex/sta_event.c
3745 create mode 100644 drivers/net/wireless/mwifiex/sta_ioctl.c
3746 create mode 100644 drivers/net/wireless/mwifiex/sta_rx.c
3747 create mode 100644 drivers/net/wireless/mwifiex/sta_tx.c
3748 create mode 100644 drivers/net/wireless/mwifiex/txrx.c
3749 create mode 100644 drivers/net/wireless/mwifiex/util.c
3750 create mode 100644 drivers/net/wireless/mwifiex/util.h
3751 create mode 100644 drivers/net/wireless/mwifiex/wmm.c
3752 create mode 100644 drivers/net/wireless/mwifiex/wmm.h
3753 delete mode 100644 drivers/net/wireless/rt2x00/rt2x00ht.c
3754 delete mode 100644 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex
3755 create mode 100644 firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex
3756 delete mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex
3757 create mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex
3758 delete mode 100644 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex
3759 create mode 100644 firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex
3760 create mode 100644 include/linux/rfkill-regulator.h
3761 create mode 100644 net/rfkill/rfkill-regulator.c
3762 create mode 100644 net/sched/sch_qfq.c
3763 Merging wireless/master
3764 $ git merge wireless/master
3765 Resolved 'drivers/net/wireless/libertas/if_cs.c' using previous resolution.
3766 Resolved 'drivers/net/wireless/rtlwifi/pci.c' using previous resolution.
3767 Resolved 'net/bluetooth/l2cap_sock.c' using previous resolution.
3768 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
3769 Auto-merging drivers/net/wireless/ath/ath9k/rc.c
3770 Auto-merging drivers/net/wireless/ath/ath9k/xmit.c
3771 Auto-merging drivers/net/wireless/ath/carl9170/carl9170.h
3772 Auto-merging drivers/net/wireless/iwlegacy/iwl-core.c
3773 Auto-merging drivers/net/wireless/iwlegacy/iwl4965-base.c
3774 Removing drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c
3775 Removing drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h
3776 Removing drivers/net/wireless/iwlwifi/iwl-spectrum.h
3777 Auto-merging drivers/net/wireless/libertas/cfg.c
3778 Auto-merging drivers/net/wireless/libertas/if_cs.c
3779 CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_cs.c
3780 Auto-merging drivers/net/wireless/libertas/if_spi.h
3781 Auto-merging drivers/net/wireless/p54/main.c
3782 Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c
3783 Auto-merging drivers/net/wireless/rt2x00/rt2x00.h
3784 Auto-merging drivers/net/wireless/rt2x00/rt2x00config.c
3785 Auto-merging drivers/net/wireless/rt2x00/rt2x00usb.c
3786 Auto-merging drivers/net/wireless/rt2x00/rt2x00usb.h
3787 Auto-merging drivers/net/wireless/rtlwifi/base.c
3788 Auto-merging drivers/net/wireless/rtlwifi/pci.c
3789 CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c
3790 Auto-merging drivers/net/wireless/rtlwifi/regd.c
3791 Auto-merging drivers/net/wireless/rtlwifi/wifi.h
3792 Auto-merging drivers/net/wireless/wl12xx/cmd.c
3793 Auto-merging drivers/net/wireless/wl12xx/conf.h
3794 Auto-merging drivers/net/wireless/wl12xx/io.h
3795 Auto-merging include/net/bluetooth/hci.h
3796 Auto-merging include/net/mac80211.h
3797 Auto-merging net/bluetooth/hci_core.c
3798 Auto-merging net/bluetooth/l2cap_core.c
3799 Auto-merging net/bluetooth/l2cap_sock.c
3800 CONFLICT (content): Merge conflict in net/bluetooth/l2cap_sock.c
3801 Auto-merging net/mac80211/ieee80211_i.h
3802 Auto-merging net/mac80211/rx.c
3803 Auto-merging net/mac80211/sta_info.c
3804 Auto-merging net/wireless/reg.c
3805 Automatic merge failed; fix conflicts and then commit the result.
3807 [master 09c38994] Merge remote-tracking branch 'wireless/master'
3808 $ git diff -M --stat --summary HEAD^..
3809 drivers/net/wireless/ath/ath5k/reset.c | 5 +
3810 drivers/net/wireless/ath/ath9k/ahb.c | 6 +-
3811 drivers/net/wireless/ath/ath9k/ani.c | 6 -
3812 drivers/net/wireless/ath/ath9k/ar9003_calib.c | 387 ++---
3813 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 61 +-
3814 drivers/net/wireless/ath/ath9k/ar9003_hw.c | 101 ++-
3815 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 36 +-
3816 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 25 +-
3817 drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 1525 ++++++++++++++++++++
3818 drivers/net/wireless/ath/ath9k/ath9k.h | 2 +
3819 drivers/net/wireless/ath/ath9k/beacon.c | 6 -
3820 drivers/net/wireless/ath/ath9k/btcoex.c | 100 ++-
3821 drivers/net/wireless/ath/ath9k/btcoex.h | 20 +-
3822 drivers/net/wireless/ath/ath9k/common.c | 31 -
3823 drivers/net/wireless/ath/ath9k/common.h | 8 -
3824 drivers/net/wireless/ath/ath9k/debug.c | 5 +
3825 drivers/net/wireless/ath/ath9k/debug.h | 4 +
3826 drivers/net/wireless/ath/ath9k/eeprom_9287.c | 3 +-
3827 drivers/net/wireless/ath/ath9k/eeprom_def.c | 4 +
3828 drivers/net/wireless/ath/ath9k/gpio.c | 19 +-
3829 drivers/net/wireless/ath/ath9k/hif_usb.h | 3 +
3830 drivers/net/wireless/ath/ath9k/htc.h | 89 +-
3831 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 6 +-
3832 drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 477 ++++++-
3833 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 204 +---
3834 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 41 +-
3835 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 95 ++-
3836 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 -
3837 drivers/net/wireless/ath/ath9k/htc_hst.h | 11 -
3838 drivers/net/wireless/ath/ath9k/hw.c | 125 ++-
3839 drivers/net/wireless/ath/ath9k/hw.h | 13 +-
3840 drivers/net/wireless/ath/ath9k/init.c | 2 +
3841 drivers/net/wireless/ath/ath9k/mac.c | 13 +-
3842 drivers/net/wireless/ath/ath9k/main.c | 49 +-
3843 drivers/net/wireless/ath/ath9k/phy.h | 3 +
3844 drivers/net/wireless/ath/ath9k/rc.c | 12 +-
3845 drivers/net/wireless/ath/ath9k/recv.c | 5 +-
3846 drivers/net/wireless/ath/ath9k/reg.h | 99 +-
3847 drivers/net/wireless/ath/ath9k/wmi.c | 4 +-
3848 drivers/net/wireless/ath/ath9k/wmi.h | 2 +-
3849 drivers/net/wireless/ath/ath9k/xmit.c | 23 -
3850 drivers/net/wireless/ath/carl9170/carl9170.h | 2 +
3851 drivers/net/wireless/ath/carl9170/main.c | 92 +--
3852 drivers/net/wireless/ath/carl9170/tx.c | 157 ++-
3853 drivers/net/wireless/b43/phy_n.c | 7 +-
3854 drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 3 -
3855 drivers/net/wireless/iwlegacy/iwl-core.c | 20 +-
3856 drivers/net/wireless/iwlegacy/iwl-core.h | 1 -
3857 drivers/net/wireless/iwlegacy/iwl-dev.h | 4 +-
3858 drivers/net/wireless/iwlegacy/iwl-hcmd.c | 4 +-
3859 drivers/net/wireless/iwlegacy/iwl-helpers.h | 6 +
3860 drivers/net/wireless/iwlegacy/iwl-tx.c | 52 +-
3861 drivers/net/wireless/iwlegacy/iwl3945-base.c | 22 +-
3862 drivers/net/wireless/iwlegacy/iwl4965-base.c | 45 +-
3863 drivers/net/wireless/iwlwifi/Makefile | 1 -
3864 drivers/net/wireless/iwlwifi/iwl-1000.c | 19 +-
3865 drivers/net/wireless/iwlwifi/iwl-2000.c | 79 +-
3866 drivers/net/wireless/iwlwifi/iwl-5000.c | 36 +-
3867 drivers/net/wireless/iwlwifi/iwl-6000.c | 37 +-
3868 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 1025 -------------
3869 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 70 -
3870 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 41 +-
3871 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 50 -
3872 drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 124 ++-
3873 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 259 +++--
3874 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 245 +++-
3875 drivers/net/wireless/iwlwifi/iwl-agn.c | 545 +++-----
3876 drivers/net/wireless/iwlwifi/iwl-agn.h | 45 +-
3877 drivers/net/wireless/iwlwifi/iwl-commands.h | 105 +-
3878 drivers/net/wireless/iwlwifi/iwl-core.c | 87 +-
3879 drivers/net/wireless/iwlwifi/iwl-core.h | 23 +-
3880 drivers/net/wireless/iwlwifi/iwl-debugfs.c | 1012 +++++++++++++-
3881 drivers/net/wireless/iwlwifi/iwl-dev.h | 35 +-
3882 drivers/net/wireless/iwlwifi/iwl-eeprom.c | 50 +-
3883 drivers/net/wireless/iwlwifi/iwl-eeprom.h | 3 -
3884 drivers/net/wireless/iwlwifi/iwl-helpers.h | 24 -
3885 drivers/net/wireless/iwlwifi/iwl-io.c | 36 +-
3886 drivers/net/wireless/iwlwifi/iwl-io.h | 11 +
3887 drivers/net/wireless/iwlwifi/iwl-rx.c | 57 +-
3888 drivers/net/wireless/iwlwifi/iwl-spectrum.h | 92 --
3889 drivers/net/wireless/iwlwifi/iwl-tx.c | 15 +-
3890 drivers/net/wireless/libertas/cfg.c | 45 +-
3891 drivers/net/wireless/libertas/cmd.c | 245 ++--
3892 drivers/net/wireless/libertas/cmdresp.c | 19 +-
3893 drivers/net/wireless/libertas/debugfs.c | 36 +-
3894 drivers/net/wireless/libertas/decl.h | 8 +-
3895 drivers/net/wireless/libertas/defs.h | 113 +-
3896 drivers/net/wireless/libertas/dev.h | 20 +-
3897 drivers/net/wireless/libertas/ethtool.c | 3 +-
3898 drivers/net/wireless/libertas/host.h | 33 +-
3899 drivers/net/wireless/libertas/if_cs.c | 35 +-
3900 drivers/net/wireless/libertas/if_spi.c | 134 ++-
3901 drivers/net/wireless/libertas/if_spi.h | 68 +-
3902 drivers/net/wireless/libertas/if_usb.c | 113 +-
3903 drivers/net/wireless/libertas/if_usb.h | 14 +-
3904 drivers/net/wireless/libertas/main.c | 99 +-
3905 drivers/net/wireless/libertas/mesh.c | 210 ++-
3906 drivers/net/wireless/libertas/mesh.h | 6 +-
3907 drivers/net/wireless/libertas/rx.c | 34 +-
3908 drivers/net/wireless/libertas/tx.c | 34 +-
3909 drivers/net/wireless/libertas/types.h | 18 +-
3910 drivers/net/wireless/mwifiex/11n.c | 102 +-
3911 drivers/net/wireless/mwifiex/11n.h | 2 +-
3912 drivers/net/wireless/mwifiex/cfg80211.c | 61 +-
3913 drivers/net/wireless/mwifiex/join.c | 4 +-
3914 drivers/net/wireless/mwifiex/main.h | 2 +-
3915 drivers/net/wireless/mwifiex/scan.c | 32 +-
3916 drivers/net/wireless/mwl8k.c | 111 +-
3917 drivers/net/wireless/p54/eeprom.c | 2 +-
3918 drivers/net/wireless/p54/fwio.c | 31 +
3919 drivers/net/wireless/p54/lmac.h | 1 +
3920 drivers/net/wireless/p54/main.c | 31 +
3921 drivers/net/wireless/p54/p54.h | 2 +
3922 drivers/net/wireless/rt2x00/rt2500usb.c | 1 +
3923 drivers/net/wireless/rt2x00/rt2800lib.c | 31 +-
3924 drivers/net/wireless/rt2x00/rt2800pci.c | 4 +-
3925 drivers/net/wireless/rt2x00/rt2800usb.c | 14 +-
3926 drivers/net/wireless/rt2x00/rt2x00.h | 18 +
3927 drivers/net/wireless/rt2x00/rt2x00config.c | 31 +
3928 drivers/net/wireless/rt2x00/rt2x00dev.c | 88 ++
3929 drivers/net/wireless/rt2x00/rt2x00usb.c | 11 +-
3930 drivers/net/wireless/rt2x00/rt2x00usb.h | 4 +-
3931 drivers/net/wireless/rt2x00/rt73usb.c | 1 +
3932 drivers/net/wireless/rtlwifi/base.c | 720 ++++++++--
3933 drivers/net/wireless/rtlwifi/base.h | 60 +-
3934 drivers/net/wireless/rtlwifi/cam.c | 106 ++-
3935 drivers/net/wireless/rtlwifi/cam.h | 5 +-
3936 drivers/net/wireless/rtlwifi/core.c | 408 ++++--
3937 drivers/net/wireless/rtlwifi/core.h | 1 +
3938 drivers/net/wireless/rtlwifi/efuse.c | 97 +-
3939 drivers/net/wireless/rtlwifi/efuse.h | 5 +-
3940 drivers/net/wireless/rtlwifi/pci.c | 626 ++++++---
3941 drivers/net/wireless/rtlwifi/pci.h | 15 +-
3942 drivers/net/wireless/rtlwifi/ps.c | 258 +++-
3943 drivers/net/wireless/rtlwifi/ps.h | 9 +
3944 drivers/net/wireless/rtlwifi/rc.c | 212 ++--
3945 drivers/net/wireless/rtlwifi/rc.h | 9 +-
3946 drivers/net/wireless/rtlwifi/regd.c | 97 +-
3947 drivers/net/wireless/rtlwifi/regd.h | 2 +-
3948 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 523 ++++++-
3949 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 2 +
3950 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 81 +-
3951 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 4 +-
3952 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 128 +-
3953 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 76 +-
3954 drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 27 -
3955 drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 2 +
3956 drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 1 +
3957 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 509 +++++---
3958 drivers/net/wireless/rtlwifi/rtl8192ce/hw.h | 34 +-
3959 drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 5 +-
3960 drivers/net/wireless/rtlwifi/rtl8192ce/led.h | 2 -
3961 drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 223 +--
3962 drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 55 +-
3963 drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 58 +-
3964 drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 24 +-
3965 drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 17 +-
3966 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 122 ++-
3967 drivers/net/wireless/rtlwifi/rtl8192ce/sw.h | 14 +-
3968 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 180 +--
3969 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 7 +-
3970 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 11 +-
3971 drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 5 +-
3972 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 14 +-
3973 drivers/net/wireless/rtlwifi/rtl8192cu/phy.h | 14 +
3974 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 4 +-
3975 drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 4 +
3976 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 2 +-
3977 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 48 +-
3978 drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 5 +-
3979 drivers/net/wireless/rtlwifi/usb.c | 19 +-
3980 drivers/net/wireless/rtlwifi/usb.h | 2 +
3981 drivers/net/wireless/rtlwifi/wifi.h | 155 ++-
3982 drivers/net/wireless/wl12xx/Kconfig | 2 +-
3983 drivers/net/wireless/wl12xx/acx.c | 93 +-
3984 drivers/net/wireless/wl12xx/acx.h | 23 +-
3985 drivers/net/wireless/wl12xx/boot.c | 285 +++-
3986 drivers/net/wireless/wl12xx/boot.h | 52 +
3987 drivers/net/wireless/wl12xx/cmd.c | 99 ++-
3988 drivers/net/wireless/wl12xx/cmd.h | 34 +
3989 drivers/net/wireless/wl12xx/conf.h | 29 +-
3990 drivers/net/wireless/wl12xx/debugfs.c | 2 +-
3991 drivers/net/wireless/wl12xx/event.c | 64 +-
3992 drivers/net/wireless/wl12xx/event.h | 17 +-
3993 drivers/net/wireless/wl12xx/ini.h | 98 ++-
3994 drivers/net/wireless/wl12xx/init.c | 51 +-
3995 drivers/net/wireless/wl12xx/init.h | 1 +
3996 drivers/net/wireless/wl12xx/io.c | 11 +
3997 drivers/net/wireless/wl12xx/io.h | 3 +
3998 drivers/net/wireless/wl12xx/main.c | 353 ++++-
3999 drivers/net/wireless/wl12xx/ps.c | 3 -
4000 drivers/net/wireless/wl12xx/reg.h | 15 +-
4001 drivers/net/wireless/wl12xx/rx.c | 44 +-
4002 drivers/net/wireless/wl12xx/scan.c | 17 +-
4003 drivers/net/wireless/wl12xx/sdio.c | 27 +-
4004 drivers/net/wireless/wl12xx/sdio_test.c | 20 +-
4005 drivers/net/wireless/wl12xx/spi.c | 17 +-
4006 drivers/net/wireless/wl12xx/testmode.c | 6 +-
4007 drivers/net/wireless/wl12xx/tx.c | 234 +++-
4008 drivers/net/wireless/wl12xx/tx.h | 60 +-
4009 drivers/net/wireless/wl12xx/wl12xx.h | 66 +-
4010 drivers/ssb/driver_chipcommon.c | 68 +-
4011 drivers/ssb/driver_chipcommon_pmu.c | 2 +
4012 drivers/ssb/driver_pcicore.c | 131 ++-
4013 drivers/ssb/main.c | 23 +-
4014 include/linux/ath9k_platform.h | 2 +
4015 include/linux/ssb/ssb_driver_chipcommon.h | 11 +-
4016 include/linux/ssb/ssb_regs.h | 2 +-
4017 include/linux/wl12xx.h | 29 +-
4018 include/net/bluetooth/hci.h | 9 +
4019 include/net/bluetooth/hci_core.h | 16 +-
4020 include/net/bluetooth/l2cap.h | 69 +-
4021 include/net/bluetooth/mgmt.h | 10 +-
4022 include/net/mac80211.h | 17 +
4023 net/bluetooth/cmtp/core.c | 3 +-
4024 net/bluetooth/hci_conn.c | 78 +-
4025 net/bluetooth/hci_core.c | 75 +-
4026 net/bluetooth/hci_event.c | 163 ++-
4027 net/bluetooth/hci_sysfs.c | 31 +
4028 net/bluetooth/hidp/core.c | 6 +-
4029 net/bluetooth/l2cap_core.c | 588 ++++----
4030 net/bluetooth/l2cap_sock.c | 242 ++--
4031 net/bluetooth/mgmt.c | 95 ++-
4032 net/bluetooth/rfcomm/core.c | 21 +-
4033 net/bluetooth/rfcomm/sock.c | 5 +-
4034 net/mac80211/aes_ccm.c | 6 +-
4035 net/mac80211/cfg.c | 15 +-
4036 net/mac80211/driver-ops.h | 18 +
4037 net/mac80211/driver-trace.h | 27 +
4038 net/mac80211/ibss.c | 7 +-
4039 net/mac80211/ieee80211_i.h | 3 +
4040 net/mac80211/key.c | 19 +-
4041 net/mac80211/main.c | 18 -
4042 net/mac80211/mesh.c | 3 -
4043 net/mac80211/mesh_hwmp.c | 4 -
4044 net/mac80211/pm.c | 16 +-
4045 net/mac80211/rx.c | 49 +-
4046 net/mac80211/sta_info.c | 2 -
4047 net/mac80211/status.c | 8 +
4048 net/mac80211/tx.c | 15 +-
4049 net/mac80211/work.c | 6 +-
4050 net/mac80211/wpa.c | 62 +-
4051 net/wireless/core.c | 17 +
4052 net/wireless/reg.c | 3 +-
4053 244 files changed, 12281 insertions(+), 6490 deletions(-)
4054 create mode 100644 drivers/net/wireless/ath/ath9k/ar9340_initvals.h
4055 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c
4056 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h
4057 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-spectrum.h
4058 Merging bluetooth/master
4059 $ git merge bluetooth/master
4062 $ git merge mtd/master
4064 Merging crypto/master
4065 $ git merge crypto/master
4066 Auto-merging drivers/crypto/Kconfig
4067 Merge made by recursive.
4068 .../devicetree/bindings/crypto/fsl-sec4.txt | 397 +++++
4069 arch/powerpc/boot/dts/p4080ds.dts | 86 +-
4070 drivers/crypto/Kconfig | 13 +
4071 drivers/crypto/Makefile | 2 +
4072 drivers/crypto/caam/Kconfig | 72 +
4073 drivers/crypto/caam/Makefile | 8 +
4074 drivers/crypto/caam/caamalg.c | 1161 ++++++++++++++
4075 drivers/crypto/caam/compat.h | 35 +
4076 drivers/crypto/caam/ctrl.c | 270 ++++
4077 drivers/crypto/caam/desc.h | 1605 ++++++++++++++++++++
4078 drivers/crypto/caam/desc_constr.h | 204 +++
4079 drivers/crypto/caam/error.c | 248 +++
4080 drivers/crypto/caam/error.h | 10 +
4081 drivers/crypto/caam/intern.h | 113 ++
4082 drivers/crypto/caam/jr.c | 517 +++++++
4083 drivers/crypto/caam/jr.h | 21 +
4084 drivers/crypto/caam/regs.h | 663 ++++++++
4085 drivers/crypto/omap-sham.c | 78 +-
4086 drivers/crypto/padlock-sha.c | 269 ++++-
4087 drivers/crypto/picoxcell_crypto.c | 64 +-
4088 drivers/crypto/s5p-sss.c | 701 +++++++++
4089 21 files changed, 6458 insertions(+), 79 deletions(-)
4090 create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt
4091 create mode 100644 drivers/crypto/caam/Kconfig
4092 create mode 100644 drivers/crypto/caam/Makefile
4093 create mode 100644 drivers/crypto/caam/caamalg.c
4094 create mode 100644 drivers/crypto/caam/compat.h
4095 create mode 100644 drivers/crypto/caam/ctrl.c
4096 create mode 100644 drivers/crypto/caam/desc.h
4097 create mode 100644 drivers/crypto/caam/desc_constr.h
4098 create mode 100644 drivers/crypto/caam/error.c
4099 create mode 100644 drivers/crypto/caam/error.h
4100 create mode 100644 drivers/crypto/caam/intern.h
4101 create mode 100644 drivers/crypto/caam/jr.c
4102 create mode 100644 drivers/crypto/caam/jr.h
4103 create mode 100644 drivers/crypto/caam/regs.h
4104 create mode 100644 drivers/crypto/s5p-sss.c
4105 Merging sound/for-next
4106 $ git merge sound/for-next
4107 Auto-merging arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
4108 Removing drivers/media/radio/radio-maestro.c
4109 Removing sound/soc/tegra/harmony.c
4110 Merge made by recursive.
4111 Documentation/sound/alsa/ALSA-Configuration.txt | 7 +
4112 Documentation/sound/alsa/HD-Audio-Models.txt | 2 +-
4113 arch/arm/mach-tegra/Kconfig | 3 +
4114 arch/arm/mach-tegra/board-harmony.c | 7 +-
4115 .../mach/{harmony_audio.h => tegra_wm8903_pdata.h} | 5 +-
4116 drivers/media/radio/Kconfig | 15 -
4117 drivers/media/radio/Makefile | 1 -
4118 drivers/media/radio/radio-maestro.c | 452 ---
4119 .../staging/intel_sst/intel_sst_drv_interface.c | 1 -
4120 drivers/staging/intel_sst/intelmid.c | 4 +
4121 include/linux/mfd/wm8994/pdata.h | 49 +
4122 include/sound/control.h | 1 +
4123 include/sound/max98095.h | 54 +
4124 include/sound/soc-dapm.h | 2 +-
4125 include/sound/soc.h | 30 +-
4126 include/sound/tea575x-tuner.h | 7 +-
4127 include/sound/wm8915.h | 55 +
4128 include/sound/wm8962.h | 22 +
4129 sound/core/control.c | 64 +
4130 sound/core/init.c | 2 +-
4131 sound/i2c/other/Makefile | 2 +-
4132 sound/i2c/other/tea575x-tuner.c | 52 +-
4133 sound/pci/Kconfig | 23 +-
4134 sound/pci/Makefile | 1 +
4135 sound/pci/asihpi/asihpi.c | 328 +-
4136 sound/pci/asihpi/hpi6000.c | 39 +-
4137 sound/pci/asihpi/hpi6205.c | 95 +-
4138 sound/pci/asihpi/hpi_internal.h | 19 +-
4139 sound/pci/asihpi/hpicmn.c | 10 +-
4140 sound/pci/asihpi/hpicmn.h | 2 +
4141 sound/pci/asihpi/hpifunc.c | 27 -
4142 sound/pci/asihpi/hpimsgx.c | 31 +-
4143 sound/pci/asihpi/hpioctl.c | 63 +-
4144 sound/pci/au88x0/au8810.h | 2 +-
4145 sound/pci/au88x0/au8820.h | 2 +-
4146 sound/pci/au88x0/au8830.h | 2 +-
4147 sound/pci/au88x0/au88x0_pcm.c | 13 +-
4148 sound/pci/emu10k1/emumixer.c | 10 +-
4149 sound/pci/es1968.c | 125 +
4150 sound/pci/fm801.c | 1 -
4151 sound/pci/hda/hda_codec.c | 95 +-
4152 sound/pci/hda/hda_codec.h | 4 +-
4153 sound/pci/hda/hda_intel.c | 14 +
4154 sound/pci/hda/hda_local.h | 10 +-
4155 sound/pci/hda/patch_analog.c | 342 +-
4156 sound/pci/hda/patch_ca0110.c | 16 +-
4157 sound/pci/hda/patch_cirrus.c | 38 +-
4158 sound/pci/hda/patch_cmedia.c | 40 +-
4159 sound/pci/hda/patch_conexant.c | 190 +-
4160 sound/pci/hda/patch_hdmi.c | 26 +-
4161 sound/pci/hda/patch_realtek.c | 3626 ++++++++++----------
4162 sound/pci/hda/patch_si3054.c | 11 +-
4163 sound/pci/hda/patch_sigmatel.c | 406 ++--
4164 sound/pci/hda/patch_via.c | 1526 +++++----
4165 sound/pci/lola/Makefile | 3 +
4166 sound/pci/lola/lola.c | 791 +++++
4167 sound/pci/lola/lola.h | 527 +++
4168 sound/pci/lola/lola_clock.c | 323 ++
4169 sound/pci/lola/lola_mixer.c | 839 +++++
4170 sound/pci/lola/lola_pcm.c | 706 ++++
4171 sound/pci/lola/lola_proc.c | 222 ++
4172 sound/ppc/tumbler.c | 2 +-
4173 sound/soc/atmel/sam9g20_wm8731.c | 2 +-
4174 sound/soc/au1x/db1200.c | 2 +-
4175 sound/soc/blackfin/bf5xx-ac97-pcm.c | 13 +-
4176 sound/soc/blackfin/bf5xx-ac97.c | 166 +-
4177 sound/soc/blackfin/bf5xx-ad1836.c | 42 +-
4178 sound/soc/blackfin/bf5xx-ad193x.c | 56 +-
4179 sound/soc/blackfin/bf5xx-ad1980.c | 45 +-
4180 sound/soc/blackfin/bf5xx-ad73311.c | 42 +-
4181 sound/soc/blackfin/bf5xx-i2s-pcm.c | 23 +-
4182 sound/soc/blackfin/bf5xx-i2s.c | 172 +-
4183 sound/soc/blackfin/bf5xx-sport.c | 159 +-
4184 sound/soc/blackfin/bf5xx-sport.h | 16 +-
4185 sound/soc/blackfin/bf5xx-ssm2602.c | 42 +-
4186 sound/soc/blackfin/bf5xx-tdm-pcm.c | 23 +-
4187 sound/soc/blackfin/bf5xx-tdm.c | 110 +-
4188 sound/soc/codecs/Kconfig | 16 +-
4189 sound/soc/codecs/Makefile | 8 +-
4190 sound/soc/codecs/ad193x.c | 23 +-
4191 sound/soc/codecs/ad1980.c | 2 +-
4192 sound/soc/codecs/ad73311.c | 2 +-
4193 sound/soc/codecs/ak4535.c | 19 +-
4194 sound/soc/codecs/ak4671.c | 18 +-
4195 sound/soc/codecs/cx20442.c | 18 +-
4196 sound/soc/codecs/jz4740.c | 18 +-
4197 sound/soc/codecs/max98088.c | 25 +-
4198 sound/soc/codecs/max98095.c | 2400 +++++++++++++
4199 sound/soc/codecs/max98095.h | 299 ++
4200 sound/soc/codecs/sn95031.c | 17 +-
4201 sound/soc/codecs/ssm2602.c | 196 +-
4202 sound/soc/codecs/tlv320aic23.c | 19 +-
4203 sound/soc/codecs/wm1250-ev1.c | 108 +
4204 sound/soc/codecs/wm8711.c | 18 +-
4205 sound/soc/codecs/wm8728.c | 18 +-
4206 sound/soc/codecs/wm8731.c | 22 +-
4207 sound/soc/codecs/wm8903.c | 41 +-
4208 sound/soc/codecs/wm8915.c | 2927 +++++++++++++++
4209 sound/soc/codecs/wm8915.h | 3717 ++++++++++++++++++++
4210 sound/soc/codecs/wm8958-dsp2.c | 1028 ++++++
4211 sound/soc/codecs/wm8962.c | 63 +-
4212 sound/soc/codecs/wm8994.c | 364 +--
4213 sound/soc/codecs/wm8994.h | 97 +
4214 sound/soc/codecs/wm9705.c | 18 +-
4215 sound/soc/codecs/wm9712.c | 18 +-
4216 sound/soc/codecs/wm9713.c | 19 +-
4217 sound/soc/davinci/davinci-mcasp.c | 19 +-
4218 sound/soc/imx/imx-ssi.c | 6 -
4219 sound/soc/jz4740/qi_lb60.c | 46 +-
4220 sound/soc/mid-x86/sst_platform.c | 4 +
4221 sound/soc/pxa/corgi.c | 2 +-
4222 sound/soc/pxa/poodle.c | 2 +-
4223 sound/soc/pxa/spitz.c | 41 +-
4224 sound/soc/samsung/Kconfig | 15 +
4225 sound/soc/samsung/Makefile | 4 +
4226 sound/soc/samsung/goni_wm8994.c | 9 +-
4227 sound/soc/samsung/neo1973_wm8753.c | 1 -
4228 sound/soc/samsung/smdk_wm8580pcm.c | 206 ++
4229 sound/soc/samsung/speyside.c | 332 ++
4230 sound/soc/sh/fsi.c | 188 +-
4231 sound/soc/soc-cache.c | 573 +--
4232 sound/soc/soc-core.c | 147 +-
4233 sound/soc/soc-dapm.c | 250 +-
4234 sound/soc/soc-jack.c | 2 +-
4235 sound/soc/soc-utils.c | 53 +
4236 sound/soc/tegra/Kconfig | 30 +-
4237 sound/soc/tegra/Makefile | 12 +-
4238 sound/soc/tegra/harmony.c | 394 ---
4239 sound/soc/tegra/tegra_asoc_utils.c | 9 +-
4240 sound/soc/tegra/tegra_asoc_utils.h | 2 +-
4241 sound/soc/tegra/tegra_wm8903.c | 475 +++
4242 sound/usb/6fire/control.c | 105 +
4243 sound/usb/6fire/control.h | 17 +
4244 sound/usb/6fire/firmware.c | 73 +-
4245 sound/usb/6fire/pcm.c | 97 +-
4246 sound/usb/Kconfig | 10 +-
4247 sound/usb/mixer.c | 10 +-
4248 sound/usb/mixer_quirks.c | 17 +
4249 sound/usb/quirks-table.h | 6 +
4250 sound/usb/quirks.c | 1 +
4251 140 files changed, 20778 insertions(+), 6218 deletions(-)
4252 rename arch/arm/mach-tegra/include/mach/{harmony_audio.h => tegra_wm8903_pdata.h} (83%)
4253 delete mode 100644 drivers/media/radio/radio-maestro.c
4254 create mode 100644 include/sound/max98095.h
4255 create mode 100644 include/sound/wm8915.h
4256 create mode 100644 sound/pci/lola/Makefile
4257 create mode 100644 sound/pci/lola/lola.c
4258 create mode 100644 sound/pci/lola/lola.h
4259 create mode 100644 sound/pci/lola/lola_clock.c
4260 create mode 100644 sound/pci/lola/lola_mixer.c
4261 create mode 100644 sound/pci/lola/lola_pcm.c
4262 create mode 100644 sound/pci/lola/lola_proc.c
4263 create mode 100644 sound/soc/codecs/max98095.c
4264 create mode 100644 sound/soc/codecs/max98095.h
4265 create mode 100644 sound/soc/codecs/wm1250-ev1.c
4266 create mode 100644 sound/soc/codecs/wm8915.c
4267 create mode 100644 sound/soc/codecs/wm8915.h
4268 create mode 100644 sound/soc/codecs/wm8958-dsp2.c
4269 create mode 100644 sound/soc/samsung/smdk_wm8580pcm.c
4270 create mode 100644 sound/soc/samsung/speyside.c
4271 delete mode 100644 sound/soc/tegra/harmony.c
4272 create mode 100644 sound/soc/tegra/tegra_wm8903.c
4273 Merging sound-asoc/for-next
4274 $ git merge sound-asoc/for-next
4275 Merge made by recursive.
4276 include/sound/soc-dapm.h | 78 +++++----
4277 sound/soc/codecs/88pm860x-codec.c | 2 +-
4278 sound/soc/codecs/wm8915.c | 46 +++--
4279 sound/soc/jz4740/jz4740-i2s.c | 2 +-
4280 sound/soc/mid-x86/sst_platform.c | 6 +
4281 sound/soc/soc-core.c | 31 ++--
4282 sound/soc/soc-dapm.c | 373 ++++++++++++++++++++++++++-----------
4283 sound/soc/tegra/Kconfig | 8 +
4284 sound/soc/tegra/Makefile | 2 +
4285 sound/soc/tegra/trimslice.c | 228 ++++++++++++++++++++++
4286 10 files changed, 593 insertions(+), 183 deletions(-)
4287 create mode 100644 sound/soc/tegra/trimslice.c
4288 Merging cpufreq/next
4289 $ git merge cpufreq/next
4290 Merge made by recursive.
4291 arch/arm/mach-davinci/cpufreq.c | 4 +-
4292 arch/blackfin/mach-common/dpmc.c | 3 -
4293 arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 44 +++---
4294 arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 45 +++---
4295 arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | 6 +-
4296 arch/x86/kernel/cpu/cpufreq/gx-suspmod.c | 21 +--
4297 arch/x86/kernel/cpu/cpufreq/longhaul.c | 11 +-
4298 arch/x86/kernel/cpu/cpufreq/longrun.c | 17 +-
4299 arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 10 +-
4300 arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 51 +++---
4301 arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 33 ++--
4302 arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 100 ++++++------
4303 arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 2 -
4304 arch/x86/kernel/cpu/cpufreq/sc520_freq.c | 6 +-
4305 arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 23 +--
4306 arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 28 ++--
4307 arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 43 +++---
4308 arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | 41 ++---
4309 drivers/acpi/processor_perflib.c | 6 +-
4310 drivers/cpufreq/Kconfig | 13 --
4311 drivers/cpufreq/cpufreq.c | 196 ++++++----------------
4312 drivers/cpufreq/cpufreq_performance.c | 5 +-
4313 drivers/cpufreq/cpufreq_powersave.c | 5 +-
4314 drivers/cpufreq/cpufreq_stats.c | 24 ++-
4315 drivers/cpufreq/cpufreq_userspace.c | 13 +-
4316 drivers/cpufreq/freq_table.c | 19 +--
4317 include/linux/cpufreq.h | 52 ++----
4318 27 files changed, 325 insertions(+), 496 deletions(-)
4319 Merging cpufreq-move/move-drivers
4320 $ git merge cpufreq-move/move-drivers
4321 Resolved 'drivers/cpufreq/cpufreq_stats.c' using previous resolution.
4322 Auto-merging arch/x86/Kconfig
4323 Removing arch/x86/kernel/cpu/cpufreq/Makefile
4324 Auto-merging drivers/cpufreq/Kconfig
4325 Auto-merging drivers/cpufreq/Kconfig.x86
4326 Auto-merging drivers/cpufreq/cpufreq_stats.c
4327 CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_stats.c
4328 Automatic merge failed; fix conflicts and then commit the result.
4330 [master a641c17] Merge remote-tracking branch 'cpufreq-move/move-drivers'
4331 $ git diff -M --stat --summary HEAD^..
4332 arch/x86/Kconfig | 2 +-
4333 arch/x86/kernel/cpu/Makefile | 1 -
4334 arch/x86/kernel/cpu/cpufreq/Makefile | 21 ----------------
4335 drivers/cpufreq/Kconfig | 10 +++++++-
4336 .../cpufreq/Kconfig => drivers/cpufreq/Kconfig.x86 | 13 +---------
4337 drivers/cpufreq/Makefile | 26 ++++++++++++++++++++
4338 .../kernel/cpu => drivers}/cpufreq/acpi-cpufreq.c | 0
4339 .../cpu => drivers}/cpufreq/cpufreq-nforce2.c | 0
4340 .../kernel/cpu => drivers}/cpufreq/e_powersaver.c | 0
4341 .../x86/kernel/cpu => drivers}/cpufreq/elanfreq.c | 0
4342 .../kernel/cpu => drivers}/cpufreq/gx-suspmod.c | 0
4343 .../x86/kernel/cpu => drivers}/cpufreq/longhaul.c | 0
4344 .../x86/kernel/cpu => drivers}/cpufreq/longhaul.h | 0
4345 {arch/x86/kernel/cpu => drivers}/cpufreq/longrun.c | 0
4346 {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.c | 0
4347 {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.h | 0
4348 .../kernel/cpu => drivers}/cpufreq/p4-clockmod.c | 0
4349 .../kernel/cpu => drivers}/cpufreq/pcc-cpufreq.c | 0
4350 .../kernel/cpu => drivers}/cpufreq/powernow-k6.c | 0
4351 .../kernel/cpu => drivers}/cpufreq/powernow-k7.c | 0
4352 .../kernel/cpu => drivers}/cpufreq/powernow-k7.h | 0
4353 .../kernel/cpu => drivers}/cpufreq/powernow-k8.c | 0
4354 .../kernel/cpu => drivers}/cpufreq/powernow-k8.h | 0
4355 .../kernel/cpu => drivers}/cpufreq/sc520_freq.c | 0
4356 .../cpu => drivers}/cpufreq/speedstep-centrino.c | 0
4357 .../kernel/cpu => drivers}/cpufreq/speedstep-ich.c | 0
4358 .../kernel/cpu => drivers}/cpufreq/speedstep-lib.c | 0
4359 .../kernel/cpu => drivers}/cpufreq/speedstep-lib.h | 0
4360 .../kernel/cpu => drivers}/cpufreq/speedstep-smi.c | 0
4361 29 files changed, 37 insertions(+), 36 deletions(-)
4362 delete mode 100644 arch/x86/kernel/cpu/cpufreq/Makefile
4363 rename arch/x86/kernel/cpu/cpufreq/Kconfig => drivers/cpufreq/Kconfig.x86 (97%)
4364 rename {arch/x86/kernel/cpu => drivers}/cpufreq/acpi-cpufreq.c (100%)
4365 rename {arch/x86/kernel/cpu => drivers}/cpufreq/cpufreq-nforce2.c (100%)
4366 rename {arch/x86/kernel/cpu => drivers}/cpufreq/e_powersaver.c (100%)
4367 rename {arch/x86/kernel/cpu => drivers}/cpufreq/elanfreq.c (100%)
4368 rename {arch/x86/kernel/cpu => drivers}/cpufreq/gx-suspmod.c (100%)
4369 rename {arch/x86/kernel/cpu => drivers}/cpufreq/longhaul.c (100%)
4370 rename {arch/x86/kernel/cpu => drivers}/cpufreq/longhaul.h (100%)
4371 rename {arch/x86/kernel/cpu => drivers}/cpufreq/longrun.c (100%)
4372 rename {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.c (100%)
4373 rename {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.h (100%)
4374 rename {arch/x86/kernel/cpu => drivers}/cpufreq/p4-clockmod.c (100%)
4375 rename {arch/x86/kernel/cpu => drivers}/cpufreq/pcc-cpufreq.c (100%)
4376 rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k6.c (100%)
4377 rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k7.c (100%)
4378 rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k7.h (100%)
4379 rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k8.c (100%)
4380 rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k8.h (100%)
4381 rename {arch/x86/kernel/cpu => drivers}/cpufreq/sc520_freq.c (100%)
4382 rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-centrino.c (100%)
4383 rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-ich.c (100%)
4384 rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-lib.c (100%)
4385 rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-lib.h (100%)
4386 rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-smi.c (100%)
4388 $ git merge quilt/rr
4389 Auto-merging arch/x86/lguest/boot.c
4390 Merge made by recursive.
4391 arch/s390/include/asm/cacheflush.h | 1 +
4392 arch/s390/mm/pageattr.c | 5 ++
4393 arch/x86/lguest/boot.c | 1 +
4394 drivers/block/virtio_blk.c | 91 +++++++++++++++++++++++++++++++----
4395 drivers/char/virtio_console.c | 5 --
4396 drivers/virtio/virtio_balloon.c | 21 +++-----
4397 fs/debugfs/file.c | 17 ++-----
4398 include/asm-generic/vmlinux.lds.h | 20 ++++----
4399 include/linux/bsearch.h | 9 ++++
4400 include/linux/module.h | 37 ++++++++-------
4401 include/linux/moduleparam.h | 7 ++-
4402 include/linux/string.h | 1 +
4403 kernel/module.c | 86 ++++++++++++++++++++++------------
4404 kernel/params.c | 23 ++++-----
4406 lib/bsearch.c | 53 +++++++++++++++++++++
4407 lib/string.c | 29 +++++++++++
4408 scripts/mod/modpost.c | 16 ++----
4409 scripts/mod/modpost.h | 27 +++--------
4410 scripts/module-common.lds | 11 ++++
4411 20 files changed, 317 insertions(+), 146 deletions(-)
4412 create mode 100644 include/linux/bsearch.h
4413 create mode 100644 lib/bsearch.c
4415 $ git merge input/next
4416 Merge made by recursive.
4417 arch/arm/mach-tegra/include/mach/kbc.h | 1 +
4418 drivers/input/evdev.c | 17 +-
4419 drivers/input/input-polldev.c | 56 +------
4420 drivers/input/keyboard/gpio_keys.c | 11 +-
4421 drivers/input/keyboard/omap-keypad.c | 6 +-
4422 drivers/input/keyboard/qt1070.c | 1 +
4423 drivers/input/keyboard/sh_keysc.c | 45 ++---
4424 drivers/input/keyboard/tegra-kbc.c | 36 ++++
4425 drivers/input/misc/twl4030-pwrbutton.c | 2 +-
4426 drivers/input/touchscreen/Kconfig | 12 ++
4427 drivers/input/touchscreen/Makefile | 1 +
4428 drivers/input/touchscreen/atmel_mxt_ts.c | 92 +++++++---
4429 drivers/input/touchscreen/h3600_ts_input.c | 8 +-
4430 drivers/input/touchscreen/max11801_ts.c | 272 ++++++++++++++++++++++++++++
4431 include/linux/gpio_keys.h | 8 +-
4432 15 files changed, 438 insertions(+), 130 deletions(-)
4433 create mode 100644 drivers/input/touchscreen/max11801_ts.c
4434 Merging input-mt/next
4435 $ git merge input-mt/next
4437 Merging lsm/for-next
4438 $ git merge lsm/for-next
4440 Merging block/for-next
4441 $ git merge block/for-next
4443 Merging quilt/device-mapper
4444 $ git merge quilt/device-mapper
4446 Merging embedded/master
4447 $ git merge embedded/master
4449 Merging firmware/master
4450 $ git merge firmware/master
4452 Merging pcmcia/master
4453 $ git merge pcmcia/master
4455 Merging battery/master
4456 $ git merge battery/master
4457 Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
4458 Merge made by recursive.
4459 arch/arm/mach-omap2/board-rx51-peripherals.c | 27 ++-
4460 drivers/power/Kconfig | 9 +
4461 drivers/power/Makefile | 1 +
4462 drivers/power/gpio-charger.c | 15 +
4463 drivers/power/isp1704_charger.c | 22 ++
4464 drivers/power/max8903_charger.c | 391 ++++++++++++++++++++++++++
4465 include/linux/power/isp1704_charger.h | 29 ++
4466 include/linux/power/max8903_charger.h | 57 ++++
4467 8 files changed, 549 insertions(+), 2 deletions(-)
4468 create mode 100644 drivers/power/max8903_charger.c
4469 create mode 100644 include/linux/power/isp1704_charger.h
4470 create mode 100644 include/linux/power/max8903_charger.h
4472 $ git merge leds/for-mm
4473 Resolved 'drivers/leds/Kconfig' using previous resolution.
4474 Auto-merging drivers/leds/Kconfig
4475 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
4476 Automatic merge failed; fix conflicts and then commit the result.
4478 [master 5e5a094] Merge remote-tracking branch 'leds/for-mm'
4479 $ git diff -M --stat --summary HEAD^..
4480 Merging backlight/for-mm
4481 $ git merge backlight/for-mm
4483 Merging mmc/mmc-next
4484 $ git merge mmc/mmc-next
4485 Auto-merging drivers/mmc/card/mmc_test.c
4486 Auto-merging drivers/mmc/core/host.c
4487 Auto-merging drivers/mmc/core/mmc.c
4488 Auto-merging drivers/mmc/core/mmc_ops.c
4489 Auto-merging drivers/mmc/host/sdhci-pci.c
4490 Auto-merging drivers/mmc/host/sdhci.c
4491 Auto-merging include/linux/mmc/host.h
4492 Merge made by recursive.
4493 Documentation/ioctl/ioctl-number.txt | 1 +
4494 Documentation/mmc/00-INDEX | 2 +
4495 Documentation/mmc/mmc-dev-attrs.txt | 10 +
4496 Documentation/mmc/mmc-dev-parts.txt | 27 ++
4497 arch/arm/mach-tegra/include/mach/sdhci.h | 1 +
4498 drivers/mmc/card/block.c | 658 +++++++++++++++++++++++++++---
4499 drivers/mmc/card/mmc_test.c | 41 +--
4500 drivers/mmc/card/queue.c | 8 -
4501 drivers/mmc/core/core.c | 53 ++--
4502 drivers/mmc/core/core.h | 2 -
4503 drivers/mmc/core/host.c | 4 +-
4504 drivers/mmc/core/mmc.c | 39 ++-
4505 drivers/mmc/core/mmc_ops.c | 80 ++---
4506 drivers/mmc/core/mmc_ops.h | 1 -
4507 drivers/mmc/core/quirks.c | 89 ++---
4508 drivers/mmc/core/sd_ops.c | 51 +--
4509 drivers/mmc/core/sdio.c | 20 +-
4510 drivers/mmc/core/sdio_ops.c | 18 +-
4511 drivers/mmc/host/Kconfig | 2 +-
4512 drivers/mmc/host/sdhci-pci.c | 49 ++-
4513 drivers/mmc/host/sdhci-tegra.c | 2 +
4514 drivers/mmc/host/sdhci.c | 101 ++++-
4515 drivers/mmc/host/sdhci.h | 8 +
4516 include/linux/Kbuild | 1 +
4517 include/linux/mmc/Kbuild | 1 +
4518 include/linux/mmc/card.h | 109 +++++-
4519 include/linux/mmc/core.h | 4 +-
4520 include/linux/mmc/host.h | 6 +-
4521 include/linux/mmc/ioctl.h | 54 +++
4522 include/linux/mmc/mmc.h | 11 +
4523 include/linux/mmc/sdhci.h | 2 +
4524 31 files changed, 1118 insertions(+), 337 deletions(-)
4525 create mode 100644 Documentation/mmc/mmc-dev-parts.txt
4526 create mode 100644 include/linux/mmc/Kbuild
4527 create mode 100644 include/linux/mmc/ioctl.h
4528 Merging kgdb/kgdb-next
4529 $ git merge kgdb/kgdb-next
4531 Merging slab/for-next
4532 $ git merge slab/for-next
4533 Auto-merging mm/slub.c
4534 Merge made by recursive.
4535 mm/slub.c | 93 ++++++++++++++++++++++++++++++++----------------------------
4536 1 files changed, 50 insertions(+), 43 deletions(-)
4537 Merging uclinux/for-next
4538 $ git merge uclinux/for-next
4541 $ git merge md/for-next
4543 Merging mfd/for-next
4544 $ git merge mfd/for-next
4545 Auto-merging MAINTAINERS
4546 Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
4547 Auto-merging drivers/mfd/omap-usb-host.c
4548 Auto-merging include/linux/mfd/wm831x/pdata.h
4549 Merge made by recursive.
4551 arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
4552 drivers/dma/timb_dma.c | 3 +-
4553 drivers/gpio/janz-ttl.c | 3 +-
4554 drivers/gpio/rdc321x-gpio.c | 3 +-
4555 drivers/gpio/timbgpio.c | 6 +-
4556 drivers/i2c/busses/i2c-ocores.c | 3 +-
4557 drivers/i2c/busses/i2c-xiic.c | 3 +-
4558 drivers/input/misc/twl4030-vibra.c | 3 +-
4559 drivers/leds/leds-88pm860x.c | 7 +-
4560 drivers/leds/leds-mc13783.c | 7 +-
4561 drivers/media/radio/radio-timb.c | 3 +-
4562 drivers/media/radio/radio-wl1273.c | 2 +-
4563 drivers/media/video/timblogiw.c | 3 +-
4564 drivers/mfd/88pm860x-core.c | 46 ++--
4565 drivers/mfd/Kconfig | 84 ++++--
4566 drivers/mfd/Makefile | 2 +
4567 drivers/mfd/ab3100-core.c | 6 +-
4568 drivers/mfd/ab3550-core.c | 6 +-
4569 drivers/mfd/asic3.c | 8 +-
4570 drivers/mfd/davinci_voicecodec.c | 6 +-
4571 drivers/mfd/htc-pasic3.c | 5 +-
4572 drivers/mfd/janz-cmodio.c | 3 +-
4573 drivers/mfd/mc13xxx-core.c | 12 +-
4574 drivers/mfd/mfd-core.c | 7 +
4575 drivers/mfd/omap-usb-host.c | 8 +-
4576 drivers/mfd/pm8921-core.c | 212 +++++++++++++++
4577 drivers/mfd/pm8xxx-irq.c | 371 ++++++++++++++++++++++++++
4578 drivers/mfd/rdc321x-southbridge.c | 6 +-
4579 drivers/mfd/t7l66xb.c | 6 +-
4580 drivers/mfd/tc6387xb.c | 3 +-
4581 drivers/mfd/tc6393xb.c | 10 +-
4582 drivers/mfd/timberdale.c | 81 ++++--
4583 drivers/mfd/tps6105x.c | 3 +-
4584 drivers/mfd/tps6586x.c | 4 +-
4585 drivers/mfd/twl-core.c | 62 +++++
4586 drivers/mfd/twl4030-codec.c | 6 +-
4587 drivers/mfd/twl4030-power.c | 7 +-
4588 drivers/mfd/wl1273-core.c | 7 +-
4589 drivers/mfd/wm831x-core.c | 13 +-
4590 drivers/mfd/wm831x-irq.c | 27 +-
4591 drivers/mfd/wm8400-core.c | 3 +-
4592 drivers/mmc/host/tmio_mmc.c | 2 +-
4593 drivers/mtd/nand/tmio_nand.c | 2 +-
4594 drivers/net/can/janz-ican3.c | 3 +-
4595 drivers/net/ks8842.c | 3 +-
4596 drivers/power/max8925_power.c | 10 +-
4597 drivers/regulator/88pm8607.c | 7 +-
4598 drivers/regulator/ab3100.c | 3 +-
4599 drivers/regulator/max8925-regulator.c | 11 +-
4600 drivers/regulator/mc13783-regulator.c | 7 +-
4601 drivers/regulator/mc13892-regulator.c | 7 +-
4602 drivers/regulator/tps6105x-regulator.c | 4 +-
4603 drivers/spi/xilinx_spi.c | 3 +-
4604 drivers/video/backlight/88pm860x_bl.c | 7 +-
4605 drivers/video/tmiofb.c | 12 +-
4606 drivers/w1/masters/ds1wm.c | 12 +-
4607 drivers/watchdog/rdc321x_wdt.c | 3 +-
4608 include/linux/i2c/twl.h | 19 ++-
4609 include/linux/mfd/abx500.h | 1 +
4610 include/linux/mfd/core.h | 23 +--
4611 include/linux/mfd/pm8xxx/core.h | 81 ++++++
4612 include/linux/mfd/pm8xxx/irq.h | 59 ++++
4613 include/linux/mfd/pm8xxx/pm8921.h | 31 +++
4614 include/linux/mfd/wm831x/core.h | 26 --
4615 include/linux/mfd/wm831x/pdata.h | 4 +
4616 sound/soc/codecs/cq93vc.c | 3 +-
4617 sound/soc/codecs/twl4030.c | 6 +-
4618 sound/soc/codecs/wl1273.c | 3 +-
4619 sound/soc/codecs/wm8400.c | 2 +-
4620 sound/soc/davinci/davinci-vcif.c | 2 +-
4621 71 files changed, 1150 insertions(+), 270 deletions(-)
4622 create mode 100644 drivers/mfd/pm8921-core.c
4623 create mode 100644 drivers/mfd/pm8xxx-irq.c
4624 create mode 100644 include/linux/mfd/pm8xxx/core.h
4625 create mode 100644 include/linux/mfd/pm8xxx/irq.h
4626 create mode 100644 include/linux/mfd/pm8xxx/pm8921.h
4627 Merging hdlc/hdlc-next
4628 $ git merge hdlc/hdlc-next
4630 Merging drm/drm-next
4631 $ git merge drm/drm-next
4632 Merge made by recursive.
4633 drivers/gpu/drm/drm_edid.c | 61 ++++++++-
4634 drivers/gpu/drm/drm_fb_helper.c | 233 ++++++++----------------------
4635 drivers/gpu/drm/drm_irq.c | 9 +-
4636 drivers/gpu/drm/drm_modes.c | 154 ++++++++++++++++++++
4637 drivers/gpu/drm/drm_stub.c | 21 +++
4638 drivers/gpu/drm/i915/intel_bios.c | 6 +-
4639 drivers/gpu/drm/i915/intel_display.c | 8 +-
4640 drivers/gpu/drm/radeon/radeon_display.c | 5 +-
4641 drivers/gpu/drm/radeon/radeon_encoders.c | 4 -
4642 include/drm/drmP.h | 49 +++++--
4643 include/drm/drm_crtc.h | 6 +-
4644 include/drm/drm_edid.h | 25 +++-
4645 include/drm/drm_fb_helper.h | 18 +--
4646 13 files changed, 372 insertions(+), 227 deletions(-)
4647 Merging fbdev/master
4648 $ git merge fbdev/master
4649 Auto-merging drivers/video/Kconfig
4650 Merge made by recursive.
4651 drivers/video/Kconfig | 8 ++
4652 drivers/video/s3fb.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++--
4653 2 files changed, 210 insertions(+), 7 deletions(-)
4654 Merging viafb/viafb-next
4655 $ git merge viafb/viafb-next
4656 Auto-merging drivers/video/Kconfig
4657 Auto-merging drivers/video/via/viafbdev.c
4658 Auto-merging drivers/video/via/viafbdev.h
4659 Merge made by recursive.
4660 drivers/video/Kconfig | 11 +
4661 drivers/video/via/Makefile | 2 +-
4662 drivers/video/via/chip.h | 6 -
4663 drivers/video/via/dvi.c | 160 +----------
4664 drivers/video/via/dvi.h | 2 +-
4665 drivers/video/via/global.c | 4 -
4666 drivers/video/via/global.h | 2 -
4667 drivers/video/via/hw.c | 624 ++++++++++++++---------------------------
4668 drivers/video/via/hw.h | 15 +-
4669 drivers/video/via/lcd.c | 23 +-
4670 drivers/video/via/lcd.h | 2 +-
4671 drivers/video/via/share.h | 17 +-
4672 drivers/video/via/via-core.c | 9 +-
4673 drivers/video/via/via_clock.c | 349 +++++++++++++++++++++++
4674 drivers/video/via/via_clock.h | 76 +++++
4675 drivers/video/via/viafbdev.c | 23 +-
4676 drivers/video/via/viafbdev.h | 4 -
4677 drivers/video/via/viamode.c | 46 +---
4678 drivers/video/via/viamode.h | 9 -
4679 19 files changed, 688 insertions(+), 696 deletions(-)
4680 create mode 100644 drivers/video/via/via_clock.c
4681 create mode 100644 drivers/video/via/via_clock.h
4682 Merging omap_dss2/for-next
4683 $ git merge omap_dss2/for-next
4684 Auto-merging arch/arm/mach-omap2/board-4430sdp.c
4685 Merge made by recursive.
4686 arch/arm/mach-omap2/board-4430sdp.c | 153 +++++++++-
4687 arch/arm/mach-omap2/display.c | 75 ++++--
4688 arch/arm/plat-omap/include/plat/display.h | 53 +++-
4689 drivers/video/omap2/displays/panel-generic-dpi.c | 4 +-
4690 .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 4 +-
4691 drivers/video/omap2/displays/panel-taal.c | 4 +-
4692 .../video/omap2/displays/panel-tpo-td043mtea1.c | 8 +-
4693 drivers/video/omap2/dss/Kconfig | 31 ++-
4694 drivers/video/omap2/dss/core.c | 20 +-
4695 drivers/video/omap2/dss/dispc.c | 19 +-
4696 drivers/video/omap2/dss/display.c | 44 ++-
4697 drivers/video/omap2/dss/dpi.c | 85 +++---
4698 drivers/video/omap2/dss/dsi.c | 304 ++++++++++++--------
4699 drivers/video/omap2/dss/dss.c | 77 +++--
4700 drivers/video/omap2/dss/dss.h | 23 +-
4701 drivers/video/omap2/dss/dss_features.c | 31 ++-
4702 drivers/video/omap2/dss/dss_features.h | 34 ++-
4703 drivers/video/omap2/dss/hdmi.c | 35 ++--
4704 drivers/video/omap2/dss/manager.c | 2 +-
4705 drivers/video/omap2/dss/overlay.c | 43 ++-
4706 drivers/video/omap2/dss/rfbi.c | 7 +-
4707 drivers/video/omap2/dss/sdi.c | 2 +-
4708 drivers/video/omap2/dss/venc.c | 28 ++-
4709 drivers/video/omap2/omapfb/omapfb-ioctl.c | 12 +-
4710 drivers/video/omap2/omapfb/omapfb-main.c | 105 +++++---
4711 drivers/video/omap2/omapfb/omapfb-sysfs.c | 21 +-
4712 26 files changed, 792 insertions(+), 432 deletions(-)
4713 Merging voltage/for-next
4714 $ git merge voltage/for-next
4715 Auto-merging drivers/regulator/core.c
4716 Auto-merging drivers/regulator/tps6105x-regulator.c
4717 Merge made by recursive.
4718 drivers/regulator/core.c | 24 +++--
4719 drivers/regulator/tps6105x-regulator.c | 1 +
4720 drivers/regulator/twl-regulator.c | 209 ++++++++++++++++++++++++--------
4721 3 files changed, 175 insertions(+), 59 deletions(-)
4722 Merging security-testing/next
4723 $ git merge security-testing/next
4724 Merge made by recursive.
4725 fs/binfmt_flat.c | 8 +++
4726 include/linux/capability.h | 7 +--
4727 include/linux/init_task.h | 7 ---
4728 include/linux/key.h | 13 +++++
4729 include/linux/kmod.h | 3 +
4730 kernel/capability.c | 4 --
4731 kernel/cred.c | 6 +-
4732 kernel/kmod.c | 100 ++++++++++++++++++++++++++++++++++++++
4733 kernel/sysctl.c | 6 ++
4734 net/dns_resolver/dns_key.c | 10 ++--
4735 security/Kconfig | 1 +
4736 security/commoncap.c | 13 ++---
4737 security/keys/internal.h | 4 +-
4738 security/keys/keyctl.c | 6 ++
4739 security/keys/keyring.c | 37 +++++++++-----
4740 security/keys/proc.c | 2 +-
4741 security/keys/process_keys.c | 12 +++--
4742 security/keys/request_key.c | 3 +-
4743 security/keys/request_key_auth.c | 3 +-
4744 security/keys/user_defined.c | 4 +-
4745 security/tomoyo/common.c | 17 +++++--
4746 security/tomoyo/file.c | 1 -
4747 security/tomoyo/memory.c | 1 +
4748 security/tomoyo/mount.c | 1 +
4749 24 files changed, 206 insertions(+), 63 deletions(-)
4750 Merging selinux/master
4751 $ git merge selinux/master
4752 Resolved 'security/selinux/avc.c' using previous resolution.
4753 Resolved 'security/selinux/hooks.c' using previous resolution.
4754 Resolved 'security/smack/smack_lsm.c' using previous resolution.
4755 Auto-merging MAINTAINERS
4756 Auto-merging security/selinux/avc.c
4757 CONFLICT (content): Merge conflict in security/selinux/avc.c
4758 Auto-merging security/selinux/hooks.c
4759 CONFLICT (content): Merge conflict in security/selinux/hooks.c
4760 Auto-merging security/selinux/ss/services.c
4761 Auto-merging security/smack/smack_lsm.c
4762 CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
4763 Automatic merge failed; fix conflicts and then commit the result.
4765 [master 72c55a3] Merge remote-tracking branch 'selinux/master'
4766 $ git diff -M --stat --summary HEAD^..
4767 Documentation/flexible-arrays.txt | 4 +-
4769 include/linux/flex_array.h | 2 +-
4770 include/linux/lsm_audit.h | 11 +-
4771 lib/flex_array.c | 48 +++++--
4772 security/lsm_audit.c | 59 +++++---
4773 security/selinux/avc.c | 2 +-
4774 security/selinux/hooks.c | 95 ++++++++-----
4775 security/selinux/include/security.h | 9 +-
4776 security/selinux/netnode.c | 1 +
4777 security/selinux/selinuxfs.c | 16 ++-
4778 security/selinux/ss/policydb.c | 254 +++++++++++++++++++++++------------
4779 security/selinux/ss/policydb.h | 12 ++-
4780 security/selinux/ss/services.c | 72 ++++++-----
4781 security/smack/smack.h | 11 +-
4782 security/smack/smack_lsm.c | 48 ++++---
4783 16 files changed, 412 insertions(+), 235 deletions(-)
4784 Merging lblnet/master
4785 $ git merge lblnet/master
4787 Merging agp/agp-next
4788 $ git merge agp/agp-next
4789 Merge made by recursive.
4790 Merging watchdog/master
4791 $ git merge watchdog/master
4794 $ git merge bdev/master
4796 Merging dwmw2-iommu/master
4797 $ git merge dwmw2-iommu/master
4799 Merging cputime/cputime
4800 $ git merge cputime/cputime
4802 Merging osd/linux-next
4803 $ git merge osd/linux-next
4805 Merging jc_docs/docs-next
4806 $ git merge jc_docs/docs-next
4808 Merging nommu/master
4809 $ git merge nommu/master
4811 Merging trivial/for-next
4812 $ git merge trivial/for-next
4813 Auto-merging CREDITS
4814 Auto-merging MAINTAINERS
4815 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
4816 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
4817 Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
4818 CONFLICT (delete/modify): arch/arm/mach-u300/gpio.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-u300/gpio.c left in tree.
4819 Auto-merging drivers/leds/leds-mc13783.c
4820 Auto-merging drivers/net/atlx/atl1.c
4821 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-calib.c
4822 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
4823 Auto-merging drivers/net/wireless/rtlwifi/core.c
4824 Auto-merging drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
4825 Auto-merging drivers/scsi/be2iscsi/be_main.c
4826 Auto-merging drivers/scsi/lpfc/lpfc_bsg.c
4827 Auto-merging drivers/scsi/qla2xxx/qla_isr.c
4828 Auto-merging lib/Kconfig.debug
4829 Auto-merging security/selinux/selinuxfs.c
4830 Automatic merge failed; fix conflicts and then commit the result.
4831 $ git rm -f arch/arm/mach-u300/gpio.c
4832 arch/arm/mach-u300/gpio.c: needs merge
4833 rm 'arch/arm/mach-u300/gpio.c'
4835 [master 518eadb] Merge remote-tracking branch 'trivial/for-next'
4836 $ git diff -M --stat --summary HEAD^..
4838 Documentation/stable_api_nonsense.txt | 2 +-
4839 Documentation/sysctl/vm.txt | 4 +-
4842 arch/arm/mach-at91/at91cap9_devices.c | 2 +-
4843 arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
4844 arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
4845 arch/arm/mach-tegra/tegra2_clocks.c | 2 +-
4846 arch/arm/mach-ux500/mbox-db5500.c | 6 +---
4847 arch/arm/plat-iop/time.c | 1 -
4848 arch/arm/plat-mxc/cpufreq.c | 4 +-
4849 arch/m68k/include/asm/MC68EZ328.h | 2 +-
4850 arch/m68k/include/asm/MC68VZ328.h | 2 +-
4851 arch/mips/fw/arc/cmdline.c | 2 +-
4852 arch/mips/fw/arc/env.c | 2 +-
4853 arch/mips/fw/arc/identify.c | 2 +-
4854 arch/mips/fw/arc/init.c | 2 +-
4855 arch/mips/fw/arc/misc.c | 2 +-
4856 arch/mips/fw/arc/salone.c | 2 +-
4857 arch/mips/fw/arc/time.c | 2 +-
4858 arch/mips/fw/arc/tree.c | 2 +-
4859 arch/mips/include/asm/asmmacro-32.h | 2 +-
4860 arch/mips/include/asm/asmmacro-64.h | 2 +-
4861 arch/mips/include/asm/cpu.h | 2 +-
4862 arch/mips/include/asm/r4kcache.h | 2 +-
4863 arch/mips/include/asm/sgialib.h | 2 +-
4864 arch/mips/include/asm/sgiarcs.h | 2 +-
4865 arch/mips/kernel/octeon_switch.S | 2 +-
4866 arch/mips/kernel/r2300_fpu.S | 2 +-
4867 arch/mips/kernel/r2300_switch.S | 2 +-
4868 arch/mips/kernel/r4k_fpu.S | 2 +-
4869 arch/mips/kernel/r4k_switch.S | 2 +-
4870 arch/mips/kernel/r6000_fpu.S | 2 +-
4871 arch/mips/mm/c-r3k.c | 2 +-
4872 arch/mips/mm/c-r4k.c | 2 +-
4873 arch/mips/mm/c-tx39.c | 2 +-
4874 arch/mips/mm/sc-ip22.c | 2 +-
4875 arch/mips/mm/sc-r5k.c | 2 +-
4876 arch/mips/mm/tlb-r3k.c | 2 +-
4877 arch/mips/mm/tlb-r4k.c | 2 +-
4878 arch/mips/mm/tlb-r8k.c | 2 +-
4879 arch/mips/rb532/gpio.c | 2 +-
4880 arch/mips/sgi-ip22/ip22-hpc.c | 2 +-
4881 arch/mips/sgi-ip22/ip22-int.c | 2 +-
4882 arch/mips/sgi-ip22/ip22-mc.c | 2 +-
4883 arch/mips/sgi-ip22/ip22-setup.c | 2 +-
4884 arch/s390/hypfs/hypfs.h | 2 +-
4885 arch/um/drivers/mmapper_kern.c | 2 +-
4886 arch/xtensa/configs/s6105_defconfig | 1 -
4887 drivers/base/memory.c | 9 +++----
4888 drivers/dma/dmatest.c | 4 +-
4889 drivers/firmware/iscsi_ibft.c | 4 +-
4890 drivers/gpio/ab8500-gpio.c | 7 ++---
4891 drivers/gpio/langwell_gpio.c | 2 +-
4892 drivers/gpu/drm/radeon/radeon_fence.c | 2 +-
4893 drivers/gpu/drm/radeon/radeon_ring.c | 2 +-
4894 drivers/gpu/drm/ttm/ttm_object.c | 2 +-
4895 drivers/leds/leds-mc13783.c | 2 +-
4896 drivers/media/video/usbvision/usbvision-video.c | 5 ++-
4897 drivers/message/fusion/mptbase.c | 22 ++++++++----------
4898 drivers/misc/bh1780gli.c | 8 +++---
4899 drivers/misc/cs5535-mfgpt.c | 4 +-
4900 drivers/misc/ibmasm/ibmasmfs.c | 2 +-
4901 drivers/misc/spear13xx_pcie_gadget.c | 4 +-
4902 drivers/net/atlx/atl1.c | 5 ++-
4903 drivers/net/can/softing/softing_main.c | 2 +-
4904 drivers/net/sgiseeq.c | 2 +-
4905 drivers/net/sgiseeq.h | 2 +-
4906 drivers/net/wireless/airo.c | 27 ++++++++++++-----------
4907 drivers/net/wireless/iwlegacy/iwl-4965-calib.c | 4 +-
4908 drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 4 +-
4909 drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +-
4910 drivers/net/wireless/rtlwifi/core.c | 2 +-
4911 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 4 +-
4912 drivers/power/intel_mid_battery.c | 2 +-
4913 drivers/regulator/max8998.c | 4 +-
4914 drivers/scsi/be2iscsi/be_main.c | 4 +-
4915 drivers/scsi/lpfc/lpfc_bsg.c | 2 +-
4916 drivers/scsi/pm8001/pm8001_init.c | 2 +-
4917 drivers/scsi/qla2xxx/qla_isr.c | 4 +-
4918 drivers/scsi/sgiwd93.c | 2 +-
4919 drivers/target/target_core_alua.c | 4 +-
4920 drivers/target/target_core_transport.c | 2 +-
4921 drivers/tty/serial/bfin_sport_uart.c | 3 +-
4922 drivers/tty/serial/mfd.c | 4 +-
4923 drivers/tty/serial/mrst_max3110.c | 2 +-
4924 drivers/tty/tty_ioctl.c | 2 +-
4925 drivers/usb/host/uhci-hcd.c | 7 +++--
4926 drivers/usb/storage/ene_ub6250.c | 4 +-
4927 drivers/video/console/newport_con.c | 2 +-
4928 drivers/video/msm/mddi.c | 2 +-
4929 drivers/video/mxsfb.c | 2 +-
4930 drivers/watchdog/bcm63xx_wdt.c | 2 +-
4931 drivers/xen/evtchn.c | 2 +-
4932 drivers/xen/swiotlb-xen.c | 2 +-
4933 fs/logfs/readwrite.c | 2 +-
4934 fs/ocfs2/refcounttree.c | 2 +-
4935 fs/partitions/ldm.c | 2 +-
4936 fs/ufs/inode.c | 2 +-
4937 include/linux/leds-regulator.h | 2 +-
4938 include/video/newport.h | 2 +-
4939 kernel/Kconfig.locks | 2 +-
4940 kernel/auditsc.c | 27 ++++++++++++++--------
4941 kernel/pm_qos_params.c | 2 +-
4942 lib/Kconfig.debug | 3 +-
4943 lib/vsprintf.c | 9 ++-----
4945 mm/page_alloc.c | 2 +-
4946 net/netfilter/ipset/ip_set_bitmap_ip.c | 2 +-
4947 net/sunrpc/addr.c | 2 +-
4948 security/selinux/selinuxfs.c | 8 +++---
4949 tools/power/x86/turbostat/turbostat.c | 2 +-
4950 113 files changed, 186 insertions(+), 188 deletions(-)
4951 Merging audit/for-next
4952 $ git merge audit/for-next
4954 Merging suspend/linux-next
4955 $ git merge suspend/linux-next
4956 Resolved 'arch/x86/Kconfig' using previous resolution.
4957 Auto-merging arch/arm/mach-omap2/Makefile
4958 Removing arch/arm/mach-omap2/pm_bus.c
4959 Auto-merging arch/x86/Kconfig
4960 CONFLICT (content): Merge conflict in arch/x86/Kconfig
4961 Automatic merge failed; fix conflicts and then commit the result.
4963 [master 957dcc0] Merge remote-tracking branch 'suspend/linux-next'
4964 $ git diff -M --stat --summary HEAD^..
4965 arch/arm/common/vic.c | 69 ++---
4966 arch/arm/include/asm/mach/time.h | 1 -
4967 arch/arm/kernel/leds.c | 28 +-
4968 arch/arm/kernel/time.c | 35 +--
4969 arch/arm/mach-exynos4/pm.c | 45 ++--
4970 arch/arm/mach-integrator/integrator_ap.c | 26 +--
4971 arch/arm/mach-omap1/pm_bus.c | 69 ++---
4972 arch/arm/mach-omap2/Makefile | 6 +-
4973 arch/arm/mach-omap2/pm_bus.c | 85 ------
4974 arch/arm/mach-pxa/balloon3.c | 1 -
4975 arch/arm/mach-pxa/clock-pxa2xx.c | 18 +-
4976 arch/arm/mach-pxa/clock-pxa3xx.c | 17 +-
4977 arch/arm/mach-pxa/clock.h | 7 +-
4978 arch/arm/mach-pxa/cm-x270.c | 1 -
4979 arch/arm/mach-pxa/cm-x2xx.c | 23 +-
4980 arch/arm/mach-pxa/colibri-evalboard.c | 1 -
4981 arch/arm/mach-pxa/colibri-pxa270-income.c | 1 -
4982 arch/arm/mach-pxa/colibri-pxa270.c | 1 -
4983 arch/arm/mach-pxa/generic.h | 8 +-
4984 arch/arm/mach-pxa/irq.c | 17 +-
4985 arch/arm/mach-pxa/lpd270.c | 20 +-
4986 arch/arm/mach-pxa/lubbock.c | 21 +-
4987 arch/arm/mach-pxa/mainstone.c | 22 +-
4988 arch/arm/mach-pxa/mfp-pxa2xx.c | 12 +-
4989 arch/arm/mach-pxa/mfp-pxa3xx.c | 21 +-
4990 arch/arm/mach-pxa/mioa701.c | 43 +---
4991 arch/arm/mach-pxa/palmld.c | 1 -
4992 arch/arm/mach-pxa/palmtreo.c | 1 -
4993 arch/arm/mach-pxa/palmz72.c | 24 +-
4994 arch/arm/mach-pxa/pxa25x.c | 25 +--
4995 arch/arm/mach-pxa/pxa27x.c | 25 +--
4996 arch/arm/mach-pxa/pxa3xx.c | 25 +--
4997 arch/arm/mach-pxa/pxa95x.c | 20 +-
4998 arch/arm/mach-pxa/raumfeld.c | 1 -
4999 arch/arm/mach-pxa/smemc.c | 29 +--
5000 arch/arm/mach-pxa/trizeps4.c | 1 -
5001 arch/arm/mach-pxa/viper.c | 12 +-
5002 arch/arm/mach-pxa/vpac270.c | 1 -
5003 arch/arm/mach-s3c2410/irq.c | 30 +--
5004 arch/arm/mach-s3c2410/mach-bast.c | 17 +-
5005 arch/arm/mach-s3c2410/pm.c | 13 +-
5006 arch/arm/mach-s3c2410/s3c2410.c | 5 +
5007 arch/arm/mach-s3c2412/irq.c | 2 -
5008 arch/arm/mach-s3c2412/mach-jive.c | 19 +-
5009 arch/arm/mach-s3c2412/pm.c | 27 +-
5010 arch/arm/mach-s3c2412/s3c2412.c | 4 +
5011 arch/arm/mach-s3c2416/irq.c | 2 -
5012 arch/arm/mach-s3c2416/pm.c | 27 +-
5013 arch/arm/mach-s3c2416/s3c2416.c | 5 +
5014 arch/arm/mach-s3c2440/mach-osiris.c | 18 +-
5015 arch/arm/mach-s3c2440/s3c2440.c | 8 +
5016 arch/arm/mach-s3c2440/s3c2442.c | 6 +
5017 arch/arm/mach-s3c2440/s3c244x-irq.c | 4 -
5018 arch/arm/mach-s3c2440/s3c244x.c | 62 ++--
5019 arch/arm/mach-s3c64xx/irq-pm.c | 18 +-
5020 arch/arm/mach-s5pv210/pm.c | 25 ++-
5021 arch/arm/mach-sa1100/irq.c | 19 +-
5022 arch/arm/mach-shmobile/pm_runtime.c | 145 ++---------
5023 arch/arm/plat-omap/gpio.c | 35 +--
5024 arch/arm/plat-omap/omap_device.c | 23 ++
5025 arch/arm/plat-pxa/gpio.c | 17 +-
5026 arch/arm/plat-pxa/mfp.c | 1 -
5027 arch/arm/plat-s3c24xx/dma.c | 68 ++---
5028 arch/arm/plat-s3c24xx/irq-pm.c | 7 +-
5029 arch/arm/plat-s5p/irq-pm.c | 7 +-
5030 arch/arm/plat-samsung/include/plat/cpu.h | 6 +
5031 arch/arm/plat-samsung/include/plat/pm.h | 6 +-
5032 arch/arm/vfp/vfpmodule.c | 19 +-
5033 arch/avr32/mach-at32ap/intc.c | 38 +--
5034 arch/blackfin/kernel/nmi.c | 30 +--
5035 arch/mips/alchemy/common/dbdma.c | 92 ++-----
5036 arch/mips/alchemy/common/irq.c | 62 ++---
5037 arch/mips/jz4740/gpio.c | 52 ++--
5038 arch/mips/kernel/i8259.c | 26 +--
5039 arch/powerpc/include/asm/mpic.h | 3 -
5040 arch/powerpc/platforms/cell/spu_base.c | 28 ++-
5041 arch/powerpc/platforms/powermac/pic.c | 42 +--
5042 arch/powerpc/sysdev/ipic.c | 36 +--
5043 arch/powerpc/sysdev/mpic.c | 48 ++--
5044 arch/sh/Kconfig | 1 -
5045 arch/sh/kernel/cpu/shmobile/pm_runtime.c | 33 ++-
5046 arch/unicore32/kernel/irq.c | 23 +-
5047 arch/x86/Kconfig | 1 -
5048 arch/x86/kernel/apm_32.c | 4 -
5049 drivers/base/Kconfig | 7 -
5050 drivers/base/base.h | 2 -
5051 drivers/base/dd.c | 6 +-
5052 drivers/base/platform.c | 138 ++--------
5053 drivers/base/power/Makefile | 1 +
5054 drivers/base/power/clock_ops.c | 431 +++++++++++++++++++++++++++++
5055 drivers/base/power/main.c | 64 ++---
5056 drivers/base/power/runtime.c | 29 +--
5057 drivers/base/sys.c | 202 +-------------
5058 drivers/xen/manage.c | 8 +-
5059 include/linux/device.h | 7 -
5060 include/linux/platform_device.h | 63 ++++-
5061 include/linux/pm.h | 9 +-
5062 include/linux/pm_runtime.h | 42 +++
5063 include/linux/sysdev.h | 11 -
5064 kernel/freezer.c | 4 +-
5065 kernel/kexec.c | 9 +-
5066 kernel/power/Kconfig | 4 +
5067 kernel/power/hibernate.c | 18 +-
5068 kernel/power/suspend.c | 10 +-
5070 105 files changed, 1269 insertions(+), 1726 deletions(-)
5071 delete mode 100644 arch/arm/mach-omap2/pm_bus.c
5072 create mode 100644 drivers/base/power/clock_ops.c
5073 Merging fsnotify/for-next
5074 $ git merge fsnotify/for-next
5075 Auto-merging fs/cachefiles/namei.c
5076 Auto-merging fs/nfsd/vfs.c
5077 Auto-merging fs/notify/fanotify/fanotify_user.c
5078 Auto-merging fs/notify/mark.c
5079 Auto-merging include/linux/fsnotify_backend.h
5080 Merge made by recursive.
5081 fs/cachefiles/namei.c | 1 -
5082 fs/cachefiles/xattr.c | 1 -
5084 fs/notify/dnotify/dnotify.c | 15 +++---
5085 fs/notify/fanotify/fanotify.c | 24 +++++----
5086 fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++-----------
5087 fs/notify/group.c | 1 +
5088 fs/notify/mark.c | 36 +++++--------
5089 include/linux/fanotify.h | 5 ++-
5090 include/linux/fsnotify_backend.h | 14 ++++-
5091 10 files changed, 121 insertions(+), 80 deletions(-)
5092 Merging irda/for-next
5093 $ git merge irda/for-next
5095 Merging i7core_edac/linux_next
5096 $ git merge i7core_edac/linux_next
5097 Auto-merging drivers/edac/i7core_edac.c
5098 Merge made by recursive.
5099 drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++---
5100 1 files changed, 20 insertions(+), 3 deletions(-)
5101 Merging i7300_edac/linux_next
5102 $ git merge i7300_edac/linux_next
5104 Merge made by recursive.
5105 Merging devicetree/devicetree/next
5106 $ git merge devicetree/devicetree/next
5107 Auto-merging arch/powerpc/kernel/prom.c
5108 Merge made by recursive.
5109 arch/microblaze/kernel/prom.c | 2 +-
5110 arch/mips/include/asm/prom.h | 3 -
5111 arch/mips/kernel/prom.c | 3 +-
5112 arch/powerpc/kernel/prom.c | 2 +-
5113 arch/powerpc/platforms/52xx/mpc52xx_common.c | 10 ++---
5114 drivers/of/fdt.c | 8 ++--
5115 drivers/of/platform.c | 54 ++++++++++++++++++++++++--
5116 include/linux/of_platform.h | 3 +
5117 8 files changed, 65 insertions(+), 20 deletions(-)
5118 Merging spi/spi/next
5119 $ git merge spi/spi/next
5120 Auto-merging drivers/spi/dw_spi.c
5121 Auto-merging drivers/spi/dw_spi.h
5122 Merge made by recursive.
5123 drivers/spi/dw_spi.c | 202 ++++++++++++++++---------------------------------
5124 drivers/spi/dw_spi.h | 2 -
5125 2 files changed, 66 insertions(+), 138 deletions(-)
5126 Merging tip/auto-latest
5127 $ git merge tip/auto-latest
5128 Auto-merging arch/arm/kernel/smp.c
5129 Auto-merging arch/blackfin/mach-common/smp.c
5130 Auto-merging arch/mips/sgi-ip27/ip27-timer.c
5131 Auto-merging arch/powerpc/kernel/smp.c
5132 Auto-merging arch/s390/Kconfig
5133 Auto-merging arch/s390/kernel/smp.c
5134 Auto-merging arch/sparc/kernel/smp_32.c
5135 Auto-merging arch/x86/Kconfig
5136 Removing arch/x86/include/asm/srat.h
5137 Auto-merging arch/x86/kernel/probe_roms.c
5138 Auto-merging arch/x86/kernel/setup.c
5139 Auto-merging arch/x86/lguest/boot.c
5140 Auto-merging arch/x86/mm/amdtopology.c
5141 Auto-merging arch/x86/mm/srat.c
5142 Removing arch/x86/mm/srat_32.c
5143 Auto-merging drivers/cpufreq/Kconfig.x86
5144 Auto-merging include/asm-generic/vmlinux.lds.h
5145 Auto-merging include/linux/init_task.h
5146 Removing include/linux/jump_label_ref.h
5147 Auto-merging init/Kconfig
5148 Auto-merging kernel/events/core.c
5149 Auto-merging lib/Kconfig.debug
5150 Auto-merging tools/perf/config/feature-tests.mak
5151 Merge made by recursive.
5152 Documentation/trace/kprobetrace.txt | 1 -
5153 arch/alpha/kernel/smp.c | 3 +-
5154 arch/alpha/kernel/time.c | 3 +-
5155 arch/arm/kernel/smp.c | 5 +-
5156 arch/blackfin/kernel/time-ts.c | 35 +-
5157 arch/blackfin/mach-common/smp.c | 3 +
5158 arch/cris/arch-v32/kernel/smp.c | 13 +-
5159 arch/ia64/kernel/cyclone.c | 6 +-
5160 arch/ia64/kernel/irq_ia64.c | 2 +
5161 arch/ia64/kernel/time.c | 9 +-
5162 arch/ia64/sn/kernel/sn2/timer.c | 6 +-
5163 arch/ia64/xen/irq_xen.c | 10 +-
5164 arch/m32r/kernel/smp.c | 4 +-
5165 arch/microblaze/kernel/timer.c | 6 +-
5166 arch/mips/alchemy/common/time.c | 3 +-
5167 arch/mips/cavium-octeon/csrc-octeon.c | 3 +-
5168 arch/mips/cavium-octeon/smp.c | 2 +
5169 arch/mips/include/asm/jump_label.h | 22 +-
5170 arch/mips/include/asm/time.h | 6 -
5171 arch/mips/jz4740/time.c | 3 +-
5172 arch/mips/kernel/cevt-txx9.c | 3 +-
5173 arch/mips/kernel/csrc-bcm1480.c | 3 +-
5174 arch/mips/kernel/csrc-ioasic.c | 4 +-
5175 arch/mips/kernel/csrc-powertv.c | 35 +-
5176 arch/mips/kernel/csrc-r4k.c | 4 +-
5177 arch/mips/kernel/csrc-sb1250.c | 3 +-
5178 arch/mips/kernel/i8253.c | 5 +-
5179 arch/mips/kernel/smtc.c | 2 +-
5180 arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 5 +-
5181 arch/mips/mti-malta/malta-int.c | 2 +
5182 arch/mips/pmc-sierra/yosemite/smp.c | 4 +
5183 arch/mips/sgi-ip27/ip27-irq.c | 2 +
5184 arch/mips/sgi-ip27/ip27-timer.c | 3 +-
5185 arch/mips/sibyte/bcm1480/smp.c | 7 +-
5186 arch/mips/sibyte/sb1250/smp.c | 7 +-
5187 arch/mn10300/kernel/smp.c | 5 +-
5188 arch/parisc/kernel/smp.c | 5 +-
5189 arch/powerpc/kernel/smp.c | 4 +-
5190 arch/s390/Kconfig | 1 +
5191 arch/s390/include/asm/jump_label.h | 37 +
5192 arch/s390/kernel/Makefile | 2 +-
5193 arch/s390/kernel/jump_label.c | 59 +
5194 arch/s390/kernel/smp.c | 6 +-
5195 arch/sh/kernel/smp.c | 2 +
5196 arch/sparc/include/asm/jump_label.h | 25 +-
5197 arch/sparc/include/asm/topology_64.h | 6 +-
5198 arch/sparc/kernel/smp_32.c | 4 +-
5199 arch/sparc/kernel/smp_64.c | 1 +
5200 arch/tile/kernel/smp.c | 6 +-
5201 arch/um/kernel/smp.c | 2 +-
5202 arch/x86/Kconfig | 47 +-
5203 arch/x86/Kconfig.cpu | 16 +-
5204 arch/x86/Makefile_32.cpu | 2 +-
5205 arch/x86/include/asm/acpi.h | 2 -
5206 arch/x86/include/asm/alternative.h | 9 -
5207 arch/x86/include/asm/amd_nb.h | 1 -
5208 arch/x86/include/asm/apic.h | 9 +-
5209 arch/x86/include/asm/cpufeature.h | 13 +-
5210 arch/x86/include/asm/dma.h | 12 +-
5211 arch/x86/include/asm/jump_label.h | 27 +-
5212 arch/x86/include/asm/mach_traps.h | 18 +-
5213 arch/x86/include/asm/mce.h | 2 -
5214 arch/x86/include/asm/mmzone_32.h | 20 -
5215 arch/x86/include/asm/mmzone_64.h | 23 -
5216 arch/x86/include/asm/module.h | 2 +-
5217 arch/x86/include/asm/nops.h | 146 ++-
5218 arch/x86/include/asm/numa.h | 32 +-
5219 arch/x86/include/asm/numa_32.h | 10 -
5220 arch/x86/include/asm/numa_64.h | 36 -
5221 arch/x86/include/asm/numaq.h | 7 +-
5222 arch/x86/include/asm/olpc_ofw.h | 9 +-
5223 arch/x86/include/asm/percpu.h | 29 +-
5224 arch/x86/include/asm/probe_roms.h | 8 +
5225 arch/x86/include/asm/setup.h | 2 +-
5226 arch/x86/include/asm/srat.h | 39 -
5227 arch/x86/include/asm/system.h | 85 +-
5228 arch/x86/include/asm/topology.h | 8 -
5229 arch/x86/kernel/Makefile | 2 +-
5230 arch/x86/kernel/alternative.c | 194 ++-
5231 arch/x86/kernel/apb_timer.c | 10 +-
5232 arch/x86/kernel/aperture_64.c | 34 +-
5233 arch/x86/kernel/apic/apic.c | 69 +-
5234 arch/x86/kernel/apic/apic_noop.c | 9 -
5235 arch/x86/kernel/apic/bigsmp_32.c | 1 -
5236 arch/x86/kernel/apic/es7000_32.c | 7 -
5237 arch/x86/kernel/apic/numaq_32.c | 34 +-
5238 arch/x86/kernel/apic/probe_32.c | 1 -
5239 arch/x86/kernel/apic/summit_32.c | 1 -
5240 arch/x86/kernel/cpu/mcheck/mce.c | 25 +-
5241 arch/x86/kernel/cpu/mcheck/therm_throt.c | 10 +-
5242 arch/x86/kernel/cpu/perf_event.c | 15 +-
5243 arch/x86/kernel/cpu/perf_event_amd.c | 14 +-
5244 arch/x86/kernel/cpu/perf_event_intel.c | 31 +-
5245 arch/x86/kernel/cpu/perf_event_p4.c | 7 +-
5246 arch/x86/kernel/ftrace.c | 4 +-
5247 arch/x86/kernel/head32.c | 1 -
5248 arch/x86/kernel/i8253.c | 6 +-
5249 arch/x86/kernel/jump_label.c | 5 +-
5250 arch/x86/kernel/kvmclock.c | 6 +-
5251 arch/x86/kernel/module.c | 1 +
5252 arch/x86/kernel/mpparse.c | 6 +-
5253 arch/x86/kernel/{probe_roms_32.c => probe_roms.c} | 101 ++
5254 arch/x86/kernel/process.c | 4 +-
5255 arch/x86/kernel/reboot.c | 24 +-
5256 arch/x86/kernel/setup.c | 6 +-
5257 arch/x86/kernel/smp.c | 5 +-
5258 arch/x86/kernel/smpboot.c | 4 +-
5259 arch/x86/kernel/x86_init.c | 2 +-
5260 arch/x86/lguest/boot.c | 4 +-
5261 arch/x86/lib/memcpy_64.S | 2 +-
5262 arch/x86/mm/Makefile | 4 +-
5263 arch/x86/mm/{amdtopology_64.c => amdtopology.c} | 21 +-
5264 arch/x86/mm/init_32.c | 1 +
5265 arch/x86/mm/init_64.c | 8 -
5266 arch/x86/mm/ioremap.c | 14 +-
5267 arch/x86/mm/numa.c | 550 +++++++-
5268 arch/x86/mm/numa_32.c | 398 ++----
5269 arch/x86/mm/numa_64.c | 644 +--------
5270 arch/x86/mm/numa_emulation.c | 16 +-
5271 arch/x86/mm/numa_internal.h | 8 +
5272 arch/x86/mm/{srat_64.c => srat.c} | 82 +-
5273 arch/x86/mm/srat_32.c | 288 ----
5274 arch/x86/platform/olpc/Makefile | 4 +-
5275 arch/x86/platform/olpc/olpc.c | 51 +-
5276 arch/x86/platform/olpc/olpc_dt.c | 19 +
5277 arch/x86/platform/uv/uv_time.c | 6 +-
5278 arch/x86/xen/smp.c | 5 +-
5279 arch/x86/xen/time.c | 6 +-
5280 drivers/acpi/processor_throttling.c | 32 +-
5281 drivers/char/hpet.c | 6 +-
5282 drivers/clocksource/cyclone.c | 10 +-
5283 drivers/cpufreq/Kconfig.x86 | 4 +-
5284 drivers/firmware/edd.c | 22 +-
5285 include/asm-generic/vmlinux.lds.h | 14 +-
5286 include/linux/clocksource.h | 2 +-
5287 include/linux/dynamic_debug.h | 2 -
5288 include/linux/ftrace.h | 8 +-
5289 include/linux/init_task.h | 1 -
5290 include/linux/jump_label.h | 89 +-
5291 include/linux/jump_label_ref.h | 44 -
5292 include/linux/mutex.h | 2 +-
5293 include/linux/perf_event.h | 25 +-
5294 include/linux/sched.h | 56 +-
5295 include/linux/tracepoint.h | 22 +-
5297 kernel/Makefile | 5 +-
5298 kernel/cpuset.c | 2 +-
5299 kernel/events/Makefile | 5 +
5300 kernel/{perf_event.c => events/core.c} | 4 +-
5302 kernel/hung_task.c | 2 +-
5303 kernel/irq/Kconfig | 4 +
5304 kernel/irq/Makefile | 2 +-
5305 kernel/jump_label.c | 539 +++----
5306 kernel/lockdep.c | 206 +++-
5307 kernel/mutex-debug.c | 2 +-
5308 kernel/mutex-debug.h | 2 +-
5309 kernel/mutex.c | 9 +-
5310 kernel/mutex.h | 2 +-
5311 kernel/sched.c | 1630 ++++++++-------------
5312 kernel/sched_debug.c | 6 +-
5313 kernel/sched_fair.c | 110 +-
5314 kernel/sched_features.h | 6 +
5315 kernel/sched_idletask.c | 2 +-
5316 kernel/sched_rt.c | 54 +-
5317 kernel/sched_stoptask.c | 5 +-
5318 kernel/trace/ftrace.c | 359 ++---
5319 kernel/trace/trace.c | 15 +-
5320 kernel/trace/trace_kprobe.c | 1 -
5321 kernel/trace/trace_output.c | 3 +
5322 kernel/trace/trace_printk.c | 120 ++-
5323 kernel/tracepoint.c | 23 +-
5324 lib/Kconfig.debug | 15 +
5325 tools/perf/Documentation/perf-script-perl.txt | 1 -
5326 tools/perf/Documentation/perf-script-python.txt | 1 -
5327 tools/perf/Documentation/perf-script.txt | 52 +-
5328 tools/perf/Makefile | 107 +-
5329 tools/perf/builtin-script.c | 296 +++-
5330 tools/perf/builtin-stat.c | 284 ++++-
5331 tools/perf/{ => config}/feature-tests.mak | 16 +-
5332 tools/perf/config/utilities.mak | 188 +++
5333 tools/perf/util/parse-events.c | 120 +-
5334 tools/perf/util/probe-finder.c | 72 +
5335 tools/perf/util/probe-finder.h | 2 +
5336 tools/perf/util/python.c | 3 +
5337 tools/perf/util/session.c | 12 +
5338 tools/perf/util/session.h | 3 +
5339 tools/perf/util/symbol.c | 629 ++++----
5340 tools/perf/util/symbol.h | 78 +-
5341 189 files changed, 4600 insertions(+), 4525 deletions(-)
5342 create mode 100644 arch/s390/include/asm/jump_label.h
5343 create mode 100644 arch/s390/kernel/jump_label.c
5344 create mode 100644 arch/x86/include/asm/probe_roms.h
5345 delete mode 100644 arch/x86/include/asm/srat.h
5346 rename arch/x86/kernel/{probe_roms_32.c => probe_roms.c} (65%)
5347 rename arch/x86/mm/{amdtopology_64.c => amdtopology.c} (90%)
5348 rename arch/x86/mm/{srat_64.c => srat.c} (67%)
5349 delete mode 100644 arch/x86/mm/srat_32.c
5350 delete mode 100644 include/linux/jump_label_ref.h
5351 create mode 100644 kernel/events/Makefile
5352 rename kernel/{perf_event.c => events/core.c} (99%)
5353 rename tools/perf/{ => config}/feature-tests.mak (86%)
5354 create mode 100644 tools/perf/config/utilities.mak
5355 Merging rcu/rcu/next
5356 $ git merge rcu/rcu/next
5357 Resolved 'net/core/filter.c' using previous resolution.
5358 Auto-merging drivers/net/ixgbe/ixgbe_main.c
5359 Auto-merging drivers/net/macvlan.c
5360 Auto-merging include/net/sctp/sctp.h
5361 Auto-merging include/net/sock.h
5362 Auto-merging init/Kconfig
5363 Auto-merging kernel/events/core.c
5364 Auto-merging lib/Kconfig.debug
5365 Auto-merging net/batman-adv/gateway_client.c
5366 Auto-merging net/batman-adv/originator.c
5367 Auto-merging net/batman-adv/soft-interface.c
5368 Auto-merging net/core/filter.c
5369 CONFLICT (content): Merge conflict in net/core/filter.c
5370 Auto-merging net/core/net-sysfs.c
5371 Auto-merging net/core/net_namespace.c
5372 Auto-merging net/decnet/dn_dev.c
5373 Auto-merging net/ipv4/fib_trie.c
5374 Auto-merging net/ipv4/igmp.c
5375 Auto-merging net/ipv6/addrconf.c
5376 Auto-merging net/ipv6/mcast.c
5377 Auto-merging net/ipv6/sit.c
5378 Auto-merging net/mac80211/work.c
5379 Auto-merging net/phonet/pn_dev.c
5380 Auto-merging net/sctp/ipv6.c
5381 Auto-merging net/sctp/protocol.c
5382 Auto-merging net/socket.c
5383 Auto-merging security/keys/user_defined.c
5384 Automatic merge failed; fix conflicts and then commit the result.
5386 [master 7c99d47] Merge remote-tracking branch 'rcu/rcu/next'
5387 $ git diff -M --stat --summary HEAD^..
5388 Documentation/RCU/00-INDEX | 2 +-
5389 Documentation/RCU/stallwarn.txt | 23 +-
5390 Documentation/RCU/trace.txt | 295 +++++++++++++----
5391 Documentation/filesystems/proc.txt | 1 -
5392 drivers/net/ixgbe/ixgbe_main.c | 7 +-
5393 drivers/net/macvlan.c | 10 +-
5394 include/linux/interrupt.h | 1 -
5395 include/linux/rcupdate.h | 70 ++++-
5396 include/linux/rcutree.h | 3 +
5397 include/net/sctp/sctp.h | 1 -
5398 include/net/sock.h | 4 +-
5399 include/trace/events/irq.h | 3 +-
5401 kernel/cgroup.c | 27 +--
5402 kernel/events/core.c | 20 +-
5403 kernel/rcupdate.c | 32 ++-
5404 kernel/rcutiny.c | 45 ++--
5405 kernel/rcutiny_plugin.h | 203 +++++------
5406 kernel/rcutorture.c | 26 +-
5407 kernel/rcutree.c | 658 +++++++++++++++++++++++++++++------
5408 kernel/rcutree.h | 116 +++++--
5409 kernel/rcutree_plugin.h | 595 +++++++++++++++++++++++++-------
5410 kernel/rcutree_trace.c | 192 +++++++++--
5411 kernel/softirq.c | 2 +-
5412 lib/Kconfig.debug | 32 +--
5413 net/batman-adv/gateway_client.c | 10 +-
5414 net/batman-adv/originator.c | 10 +-
5415 net/batman-adv/soft-interface.c | 10 +-
5416 net/core/dev_addr_lists.c | 12 +-
5417 net/core/drop_monitor.c | 12 +-
5418 net/core/filter.c | 13 -
5419 net/core/gen_estimator.c | 9 +-
5420 net/core/net-sysfs.c | 34 +--
5421 net/core/net_namespace.c | 10 +-
5422 net/decnet/dn_dev.c | 7 +-
5423 net/ipv4/fib_semantics.c | 12 +-
5424 net/ipv4/fib_trie.c | 7 +-
5425 net/ipv4/igmp.c | 32 +--
5426 net/ipv6/addrconf.c | 16 +-
5427 net/ipv6/mcast.c | 8 +-
5428 net/ipv6/sit.c | 7 +-
5429 net/mac80211/agg-tx.c | 14 +-
5430 net/mac80211/work.c | 10 +-
5431 net/netfilter/nf_conntrack_extend.c | 8 +-
5432 net/netfilter/xt_osf.c | 11 +-
5433 net/netlabel/netlabel_unlabeled.c | 42 +---
5434 net/netlink/af_netlink.c | 8 +-
5435 net/phonet/pn_dev.c | 10 +-
5436 net/sched/act_api.c | 7 +-
5437 net/sched/act_police.c | 8 +-
5438 net/sctp/bind_addr.c | 2 +-
5439 net/sctp/ipv6.c | 2 +-
5440 net/sctp/protocol.c | 9 +-
5441 net/socket.c | 11 +-
5442 security/keys/user_defined.c | 16 +-
5443 security/selinux/netif.c | 18 +-
5444 tools/perf/util/trace-event-parse.c | 1 -
5445 57 files changed, 1813 insertions(+), 943 deletions(-)
5446 $ git am -3 ../patches/0001-Revert-net-rcu-convert-call_rcu-sk_filter_release_rc.patch
5447 Applying: Revert "net,rcu: convert call_rcu(sk_filter_release_rcu) to kfree_rcu"
5449 Unstaged changes after reset:
5450 M include/net/sock.h
5453 $ git commit -v -a --amend
5454 [master f92f43d] Merge remote-tracking branch 'rcu/rcu/next'
5455 Merging oprofile/for-next
5456 $ git merge oprofile/for-next
5457 Auto-merging arch/s390/oprofile/init.c
5458 Merge made by recursive.
5459 arch/alpha/oprofile/common.c | 5 +----
5460 arch/avr32/oprofile/op_model_avr32.c | 5 +----
5461 arch/blackfin/oprofile/bfin_oprofile.c | 4 +---
5462 arch/ia64/oprofile/init.c | 2 +-
5463 arch/m32r/oprofile/init.c | 4 +---
5464 arch/microblaze/oprofile/microblaze_oprofile.c | 4 +---
5465 arch/mips/oprofile/common.c | 2 +-
5466 arch/mn10300/oprofile/op_model_null.c | 5 +----
5467 arch/parisc/oprofile/init.c | 4 +---
5468 arch/powerpc/oprofile/common.c | 4 +---
5469 arch/s390/oprofile/init.c | 2 +-
5470 arch/sparc/oprofile/init.c | 4 +---
5471 arch/x86/oprofile/init.c | 2 +-
5472 13 files changed, 13 insertions(+), 34 deletions(-)
5473 Merging ptrace/ptrace
5474 $ git merge ptrace/ptrace
5475 Auto-merging include/linux/sched.h
5476 Auto-merging include/linux/tracehook.h
5477 Auto-merging kernel/exit.c
5478 Auto-merging kernel/ptrace.c
5479 Auto-merging kernel/signal.c
5480 Merge made by recursive.
5482 include/linux/sched.h | 17 ++-
5483 include/linux/tracehook.h | 27 ----
5484 kernel/exit.c | 84 ++++++++--
5485 kernel/ptrace.c | 118 ++++++++++-----
5486 kernel/signal.c | 375 +++++++++++++++++++++++++++++++++------------
5487 6 files changed, 442 insertions(+), 180 deletions(-)
5488 Merging xen-two/linux-next
5489 $ git merge xen-two/linux-next
5490 Auto-merging MAINTAINERS
5491 Merge made by recursive.
5492 MAINTAINERS | 12 +++++
5493 arch/x86/include/asm/xen/page.h | 5 +-
5494 arch/x86/include/asm/xen/pci.h | 16 +++++++
5495 arch/x86/pci/xen.c | 94 ++++++++++++++++++++++++++++++++++++--
5496 arch/x86/xen/p2m.c | 43 ++++++++++++++----
5497 arch/x86/xen/setup.c | 2 +-
5498 drivers/xen/Makefile | 24 +++++-----
5499 drivers/xen/balloon.c | 25 +++++------
5500 drivers/xen/events.c | 39 ++++++++++++++--
5501 drivers/xen/gntalloc.c | 14 +++++-
5502 drivers/xen/gntdev.c | 16 ++++++-
5503 drivers/xen/grant-table.c | 31 ++++++++++---
5504 include/xen/events.h | 9 +++-
5505 13 files changed, 270 insertions(+), 60 deletions(-)
5506 Merging xen-pvhvm/linux-next
5507 $ git merge xen-pvhvm/linux-next
5509 Merging edac-amd/for-next
5510 $ git merge edac-amd/for-next
5512 Merging percpu/for-next
5513 $ git merge percpu/for-next
5514 Resolved 'arch/x86/include/asm/percpu.h' using previous resolution.
5515 Auto-merging arch/mips/kernel/vmlinux.lds.S
5516 Auto-merging arch/parisc/kernel/vmlinux.lds.S
5517 Auto-merging arch/x86/include/asm/percpu.h
5518 CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h
5519 Auto-merging include/asm-generic/vmlinux.lds.h
5520 Auto-merging kernel/workqueue.c
5521 Auto-merging mm/percpu.c
5522 Automatic merge failed; fix conflicts and then commit the result.
5524 [master 5179074] Merge remote-tracking branch 'percpu/for-next'
5525 $ git diff -M --stat --summary HEAD^..
5526 arch/alpha/kernel/vmlinux.lds.S | 2 +-
5527 arch/arm/kernel/vmlinux.lds.S | 2 +-
5528 arch/blackfin/kernel/vmlinux.lds.S | 2 +-
5529 arch/cris/kernel/vmlinux.lds.S | 2 +-
5530 arch/frv/kernel/vmlinux.lds.S | 2 +-
5531 arch/m32r/kernel/vmlinux.lds.S | 2 +-
5532 arch/mips/kernel/vmlinux.lds.S | 2 +-
5533 arch/mn10300/kernel/vmlinux.lds.S | 2 +-
5534 arch/parisc/kernel/vmlinux.lds.S | 2 +-
5535 arch/powerpc/kernel/vmlinux.lds.S | 2 +-
5536 arch/s390/kernel/vmlinux.lds.S | 2 +-
5537 arch/sh/kernel/vmlinux.lds.S | 2 +-
5538 arch/sparc/kernel/vmlinux.lds.S | 2 +-
5539 arch/tile/kernel/vmlinux.lds.S | 2 +-
5540 arch/um/include/asm/common.lds.S | 2 +-
5541 arch/x86/include/asm/percpu.h | 7 ++++++-
5542 arch/x86/kernel/vmlinux.lds.S | 2 +-
5543 arch/xtensa/kernel/vmlinux.lds.S | 2 +-
5544 include/asm-generic/vmlinux.lds.h | 17 ++++++++---------
5545 kernel/workqueue.c | 4 +---
5546 mm/percpu.c | 6 ++++--
5547 21 files changed, 36 insertions(+), 32 deletions(-)
5548 Merging workqueues/for-next
5549 $ git merge workqueues/for-next
5551 Merging sfi/sfi-test
5552 $ git merge sfi/sfi-test
5554 Merging asm-generic/next
5555 $ git merge asm-generic/next
5557 Merging drivers-x86/linux-next
5558 $ git merge drivers-x86/linux-next
5559 Resolved 'drivers/platform/x86/intel_pmic_gpio.c' using previous resolution.
5560 Auto-merging drivers/platform/x86/Kconfig
5561 Auto-merging drivers/platform/x86/acer-wmi.c
5562 Auto-merging drivers/platform/x86/asus-wmi.c
5563 Auto-merging drivers/platform/x86/eeepc-wmi.c
5564 Auto-merging drivers/platform/x86/intel_pmic_gpio.c
5565 CONFLICT (content): Merge conflict in drivers/platform/x86/intel_pmic_gpio.c
5566 Auto-merging drivers/platform/x86/sony-laptop.c
5567 Auto-merging drivers/platform/x86/thinkpad_acpi.c
5568 Automatic merge failed; fix conflicts and then commit the result.
5570 [master 7f82b64] Merge remote-tracking branch 'drivers-x86/linux-next'
5571 $ git diff -M --stat --summary HEAD^..
5572 drivers/platform/x86/Kconfig | 9 +
5573 drivers/platform/x86/Makefile | 1 +
5574 drivers/platform/x86/acer-wmi.c | 32 +-
5575 drivers/platform/x86/asus-laptop.c | 34 +-
5576 drivers/platform/x86/asus-wmi.c | 22 +-
5577 drivers/platform/x86/asus_acpi.c | 77 ++---
5578 drivers/platform/x86/compal-laptop.c | 22 +-
5579 drivers/platform/x86/dell-laptop.c | 12 +-
5580 drivers/platform/x86/dell-wmi-aio.c | 3 +-
5581 drivers/platform/x86/dell-wmi.c | 17 +-
5582 drivers/platform/x86/eeepc-laptop.c | 20 +-
5583 drivers/platform/x86/eeepc-wmi.c | 14 +-
5584 drivers/platform/x86/fujitsu-laptop.c | 39 +-
5585 drivers/platform/x86/hdaps.c | 19 +-
5586 drivers/platform/x86/hp-wmi.c | 43 +--
5587 drivers/platform/x86/ibm_rtl.c | 23 +-
5588 drivers/platform/x86/ideapad-laptop.c | 2 +
5589 drivers/platform/x86/intel_menlow.c | 5 +-
5590 drivers/platform/x86/intel_mid_thermal.c | 606 +++++++++++++++---------------
5591 drivers/platform/x86/intel_oaktrail.c | 396 +++++++++++++++++++
5592 drivers/platform/x86/intel_pmic_gpio.c | 14 +-
5593 drivers/platform/x86/msi-laptop.c | 9 +-
5594 drivers/platform/x86/msi-wmi.c | 45 +--
5595 drivers/platform/x86/sony-laptop.c | 109 +++---
5596 drivers/platform/x86/tc1100-wmi.c | 7 +-
5597 drivers/platform/x86/thinkpad_acpi.c | 490 ++++++++++--------------
5598 drivers/platform/x86/topstar-laptop.c | 2 +-
5599 drivers/platform/x86/toshiba_acpi.c | 59 ++--
5600 drivers/platform/x86/toshiba_bluetooth.c | 11 +-
5601 drivers/platform/x86/wmi.c | 10 +-
5602 drivers/platform/x86/xo15-ebook.c | 5 +-
5603 31 files changed, 1214 insertions(+), 943 deletions(-)
5604 create mode 100644 drivers/platform/x86/intel_oaktrail.c
5605 Merging hwpoison/hwpoison
5606 $ git merge hwpoison/hwpoison
5608 Merging sysctl/master
5609 $ git merge sysctl/master
5611 Merging driver-core/driver-core-next
5612 $ git merge driver-core/driver-core-next
5613 Auto-merging drivers/base/dd.c
5614 Auto-merging drivers/base/memory.c
5615 Auto-merging drivers/base/platform.c
5616 Auto-merging include/linux/device.h
5617 Merge made by recursive.
5618 Documentation/ABI/testing/sysfs-firmware-dmi | 18 +-
5619 Documentation/ABI/testing/sysfs-firmware-gsmi | 58 ++
5620 Documentation/ABI/testing/sysfs-firmware-log | 7 +
5621 Documentation/ABI/testing/sysfs-kernel-fscaps | 8 +
5622 Documentation/ja_JP/HOWTO | 129 ++---
5623 arch/x86/include/asm/bios_ebda.h | 28 +-
5624 drivers/base/core.c | 7 +-
5625 drivers/base/dd.c | 12 +-
5626 drivers/base/memory.c | 3 +-
5627 drivers/base/platform.c | 38 +-
5628 drivers/char/mem.c | 42 +-
5629 drivers/firmware/Kconfig | 2 +
5630 drivers/firmware/Makefile | 2 +
5631 drivers/firmware/efivars.c | 15 +-
5632 drivers/firmware/google/Kconfig | 31 +
5633 drivers/firmware/google/Makefile | 3 +
5634 drivers/firmware/google/gsmi.c | 940 +++++++++++++++++++++++++
5635 drivers/firmware/google/memconsole.c | 166 +++++
5636 drivers/misc/ti-st/Kconfig | 2 +-
5637 drivers/misc/ti-st/st_core.c | 23 +-
5638 drivers/misc/ti-st/st_kim.c | 1 +
5639 drivers/uio/uio.c | 16 +-
5640 drivers/uio/uio_netx.c | 19 +
5641 drivers/uio/uio_pdrv_genirq.c | 4 +
5642 include/linux/device.h | 10 +-
5643 include/linux/ti_wilink_st.h | 3 +-
5644 kernel/ksysfs.c | 10 +
5645 27 files changed, 1432 insertions(+), 165 deletions(-)
5646 create mode 100644 Documentation/ABI/testing/sysfs-firmware-gsmi
5647 create mode 100644 Documentation/ABI/testing/sysfs-firmware-log
5648 create mode 100644 Documentation/ABI/testing/sysfs-kernel-fscaps
5649 create mode 100644 drivers/firmware/google/Kconfig
5650 create mode 100644 drivers/firmware/google/Makefile
5651 create mode 100644 drivers/firmware/google/gsmi.c
5652 create mode 100644 drivers/firmware/google/memconsole.c
5653 Merging tty/tty-next
5654 $ git merge tty/tty-next
5655 Recorded preimage for 'drivers/tty/serial/Makefile'
5656 Resolved 'drivers/bluetooth/hci_ldisc.c' using previous resolution.
5657 Auto-merging drivers/bluetooth/hci_ldisc.c
5658 CONFLICT (content): Merge conflict in drivers/bluetooth/hci_ldisc.c
5659 Auto-merging drivers/misc/ti-st/st_core.c
5660 Auto-merging drivers/tty/cyclades.c
5661 Auto-merging drivers/tty/n_gsm.c
5662 Auto-merging drivers/tty/nozomi.c
5663 Auto-merging drivers/tty/serial/Kconfig
5664 Auto-merging drivers/tty/serial/Makefile
5665 CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
5666 Auto-merging drivers/tty/serial/atmel_serial.c
5667 Auto-merging drivers/tty/serial/imx.c
5668 Auto-merging drivers/tty/tty_ioctl.c
5669 Automatic merge failed; fix conflicts and then commit the result.
5671 Recorded resolution for 'drivers/tty/serial/Makefile'.
5672 [master 475062b] Merge remote-tracking branch 'tty/tty-next'
5673 $ git diff -M --stat --summary HEAD^..
5674 drivers/bluetooth/hci_ldisc.c | 15 +-
5675 drivers/input/serio/serport.c | 10 +-
5676 drivers/isdn/gigaset/ser-gigaset.c | 8 +-
5677 drivers/misc/ti-st/st_core.c | 6 +-
5678 drivers/net/caif/caif_serial.c | 6 +-
5679 drivers/net/can/slcan.c | 9 +-
5680 drivers/net/hamradio/6pack.c | 8 +-
5681 drivers/net/hamradio/mkiss.c | 11 +-
5682 drivers/net/irda/irtty-sir.c | 16 +-
5683 drivers/net/ppp_async.c | 6 +-
5684 drivers/net/ppp_synctty.c | 6 +-
5685 drivers/net/slip.c | 11 +-
5686 drivers/net/wan/x25_asy.c | 7 +-
5687 drivers/tty/amiserial.c | 2 -
5688 drivers/tty/cyclades.c | 5 +-
5689 drivers/tty/ipwireless/Makefile | 2 -
5690 drivers/tty/moxa.c | 18 +-
5691 drivers/tty/n_gsm.c | 41 +-
5692 drivers/tty/n_hdlc.c | 18 +-
5693 drivers/tty/n_r3964.c | 10 +-
5694 drivers/tty/n_tty.c | 61 +--
5695 drivers/tty/nozomi.c | 29 +-
5696 drivers/tty/pty.c | 35 +-
5697 drivers/tty/rocket.c | 47 --
5698 drivers/tty/serial/21285.c | 2 -
5699 drivers/tty/serial/8250.c | 2 -
5700 drivers/tty/serial/8250.h | 2 -
5701 drivers/tty/serial/8250_accent.c | 2 -
5702 drivers/tty/serial/8250_boca.c | 2 -
5703 drivers/tty/serial/8250_exar_st16c554.c | 2 -
5704 drivers/tty/serial/8250_fourport.c | 2 -
5705 drivers/tty/serial/8250_hub6.c | 2 -
5706 drivers/tty/serial/8250_mca.c | 2 -
5707 drivers/tty/serial/8250_pci.c | 2 -
5708 drivers/tty/serial/8250_pnp.c | 2 -
5709 drivers/tty/serial/Kconfig | 13 +
5710 drivers/tty/serial/Makefile | 1 +
5711 drivers/tty/serial/altera_uart.c | 26 +-
5712 drivers/tty/serial/amba-pl010.c | 2 -
5713 drivers/tty/serial/amba-pl011.c | 2 -
5714 drivers/tty/serial/atmel_serial.c | 2 -
5715 drivers/tty/serial/clps711x.c | 2 -
5716 drivers/tty/serial/cpm_uart/cpm_uart.h | 2 -
5717 drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 -
5718 drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c | 2 -
5719 drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h | 2 -
5720 drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c | 2 -
5721 drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h | 2 -
5722 drivers/tty/serial/ifx6x60.c | 2 -
5723 drivers/tty/serial/imx.c | 2 -
5724 drivers/tty/serial/msm_serial.c | 2 +-
5725 drivers/tty/serial/msm_serial.h | 2 -
5726 drivers/tty/serial/msm_smd_tty.c | 3 +-
5727 drivers/tty/serial/netx-serial.c | 2 -
5728 drivers/tty/serial/pmac_zilog.c | 2 -
5729 drivers/tty/serial/pxa.c | 2 -
5730 drivers/tty/serial/s3c2400.c | 3 +-
5731 drivers/tty/serial/s3c2410.c | 3 +-
5732 drivers/tty/serial/s3c2412.c | 3 +-
5733 drivers/tty/serial/s3c2440.c | 3 +-
5734 drivers/tty/serial/s3c24a0.c | 3 +-
5735 drivers/tty/serial/s3c6400.c | 3 +-
5736 drivers/tty/serial/s5pv210.c | 3 +-
5737 drivers/tty/serial/sa1100.c | 2 -
5738 drivers/tty/serial/samsung.c | 3 +-
5739 drivers/tty/serial/samsung.h | 3 +-
5740 drivers/tty/serial/sb1250-duart.c | 2 -
5741 drivers/tty/serial/serial_core.c | 90 +--
5742 drivers/tty/serial/serial_ks8695.c | 2 -
5743 drivers/tty/serial/serial_txx9.c | 2 -
5744 drivers/tty/serial/sh-sci.c | 2 -
5745 drivers/tty/serial/vt8500_serial.c | 2 -
5746 drivers/tty/serial/xilinx_uartps.c | 1113 +++++++++++++++++++++++++++
5747 drivers/tty/synclink.c | 2 -
5748 drivers/tty/tty_buffer.c | 15 +-
5749 drivers/tty/tty_io.c | 53 +-
5750 drivers/tty/tty_ioctl.c | 2 -
5751 drivers/tty/tty_ldisc.c | 13 +
5752 drivers/tty/tty_mutex.c | 3 -
5753 drivers/tty/vt/keyboard.c | 2 -
5754 drivers/tty/vt/selection.c | 5 +-
5755 drivers/tty/vt/vc_screen.c | 2 -
5756 drivers/tty/vt/vt.c | 13 +-
5757 drivers/tty/vt/vt_ioctl.c | 25 +-
5758 include/linux/serial_core.h | 3 +
5759 include/linux/tty.h | 2 +
5760 include/linux/tty_ldisc.h | 9 +-
5761 87 files changed, 1405 insertions(+), 472 deletions(-)
5762 create mode 100644 drivers/tty/serial/xilinx_uartps.c
5763 Merging usb/usb-next
5764 $ git merge usb/usb-next
5765 Resolved 'arch/arm/mach-exynos4/mach-nuri.c' using previous resolution.
5766 Resolved 'drivers/usb/host/isp1760-hcd.c' using previous resolution.
5767 Auto-merging arch/arm/mach-exynos4/Kconfig
5768 Auto-merging arch/arm/mach-exynos4/Makefile
5769 Auto-merging arch/arm/mach-exynos4/mach-nuri.c
5770 CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c
5771 Auto-merging drivers/hid/hid-core.c
5772 Auto-merging drivers/hid/hid-ids.h
5773 Auto-merging drivers/usb/host/ehci-omap.c
5774 Auto-merging drivers/usb/host/isp1760-hcd.c
5775 CONFLICT (content): Merge conflict in drivers/usb/host/isp1760-hcd.c
5776 Auto-merging drivers/usb/host/uhci-hcd.c
5777 Auto-merging drivers/usb/host/xhci-hub.c
5778 Removing drivers/usb/serial/sam-ba.c
5779 Automatic merge failed; fix conflicts and then commit the result.
5781 [master b5753da] Merge remote-tracking branch 'usb/usb-next'
5782 $ git diff -M --stat --summary HEAD^..
5783 Documentation/usb/callbacks.txt | 8 +-
5784 Documentation/usb/linux-cdc-acm.inf | 4 +-
5785 Documentation/usb/linux.inf | 6 +-
5786 arch/arm/mach-exynos4/Kconfig | 1 +
5787 arch/arm/mach-exynos4/Makefile | 2 +
5788 arch/arm/mach-exynos4/cpu.c | 7 +-
5789 arch/arm/mach-exynos4/include/mach/map.h | 4 +
5790 arch/arm/mach-exynos4/include/mach/regs-pmu.h | 3 +
5791 arch/arm/mach-exynos4/include/mach/regs-usb-phy.h | 64 +
5792 arch/arm/mach-exynos4/mach-nuri.c | 16 +
5793 arch/arm/mach-exynos4/usb-phy.c | 136 ++
5794 arch/arm/plat-s5p/Kconfig | 5 +
5795 arch/arm/plat-s5p/Makefile | 1 +
5796 arch/arm/plat-s5p/dev-ehci.c | 57 +
5797 arch/arm/plat-s5p/include/plat/ehci.h | 21 +
5798 arch/arm/plat-s5p/include/plat/map-s5p.h | 2 +-
5799 arch/arm/plat-s5p/include/plat/usb-phy.h | 22 +
5800 arch/arm/plat-samsung/include/plat/devs.h | 2 +
5801 arch/mips/ath79/Kconfig | 5 +
5802 drivers/Makefile | 5 +-
5803 drivers/hid/hid-core.c | 20 +-
5804 drivers/hid/hid-ids.h | 21 +-
5805 drivers/usb/Kconfig | 4 +
5806 drivers/usb/Makefile | 6 +
5807 drivers/usb/class/cdc-acm.c | 466 +++----
5808 drivers/usb/class/cdc-acm.h | 23 +-
5809 drivers/usb/class/cdc-wdm.c | 14 +
5810 drivers/usb/core/config.c | 2 +-
5811 drivers/usb/core/devices.c | 22 +-
5812 drivers/usb/core/file.c | 8 -
5813 drivers/usb/core/hcd.c | 1 +
5814 drivers/usb/core/hub.c | 131 ++-
5815 drivers/usb/core/sysfs.c | 13 +-
5816 drivers/usb/core/usb.c | 3 +-
5817 drivers/usb/core/usb.h | 2 +-
5818 drivers/usb/early/ehci-dbgp.c | 5 +-
5819 drivers/usb/gadget/Kconfig | 18 +
5820 drivers/usb/gadget/ci13xxx_udc.c | 65 +-
5821 drivers/usb/gadget/dbgp.c | 14 +-
5822 drivers/usb/gadget/dummy_hcd.c | 21 +-
5823 drivers/usb/gadget/f_mass_storage.c | 60 +-
5824 drivers/usb/gadget/file_storage.c | 53 +-
5825 drivers/usb/gadget/fsl_qe_udc.h | 2 +-
5826 drivers/usb/gadget/fsl_udc_core.c | 411 +++++-
5827 drivers/usb/gadget/fsl_usb2_udc.h | 6 +
5828 drivers/usb/gadget/gadget_chips.h | 9 +
5829 drivers/usb/gadget/printer.c | 2 +
5830 drivers/usb/gadget/s3c-hsotg.c | 226 ++--
5831 drivers/usb/gadget/storage_common.c | 18 +-
5832 drivers/usb/host/Kconfig | 37 +-
5833 drivers/usb/host/ehci-ath79.c | 202 +++
5834 drivers/usb/host/ehci-atmel.c | 2 +-
5835 drivers/usb/host/ehci-au1xxx.c | 3 +-
5836 drivers/usb/host/ehci-cns3xxx.c | 2 +-
5837 drivers/usb/host/ehci-dbg.c | 2 +-
5838 drivers/usb/host/ehci-fsl.c | 221 +++-
5839 drivers/usb/host/ehci-fsl.h | 4 +
5840 drivers/usb/host/ehci-grlib.c | 242 ++++
5841 drivers/usb/host/ehci-hcd.c | 17 +-
5842 drivers/usb/host/ehci-hub.c | 10 +-
5843 drivers/usb/host/ehci-ixp4xx.c | 2 +-
5844 drivers/usb/host/ehci-msm.c | 2 +-
5845 drivers/usb/host/ehci-mxc.c | 2 +-
5846 drivers/usb/host/ehci-octeon.c | 2 +-
5847 drivers/usb/host/ehci-omap.c | 2 +-
5848 drivers/usb/host/ehci-orion.c | 2 +-
5849 drivers/usb/host/ehci-pci.c | 2 +-
5850 drivers/usb/host/ehci-pmcmsp.c | 2 +-
5851 drivers/usb/host/ehci-ppc-of.c | 2 +-
5852 drivers/usb/host/ehci-ps3.c | 2 +-
5853 drivers/usb/host/ehci-q.c | 4 +
5854 drivers/usb/host/ehci-s5p.c | 202 +++
5855 drivers/usb/host/ehci-sh.c | 2 +-
5856 drivers/usb/host/ehci-spear.c | 2 +-
5857 drivers/usb/host/ehci-tegra.c | 74 +-
5858 drivers/usb/host/ehci-vt8500.c | 3 +-
5859 drivers/usb/host/ehci-w90x900.c | 2 +-
5860 drivers/usb/host/ehci-xilinx-of.c | 2 +-
5861 drivers/usb/host/ehci.h | 15 +
5862 drivers/usb/host/isp1760-hcd.c | 1583 ++++++++++-----------
5863 drivers/usb/host/isp1760-hcd.h | 78 +-
5864 drivers/usb/host/octeon2-common.c | 45 +-
5865 drivers/usb/host/ohci-ath79.c | 151 ++
5866 drivers/usb/host/ohci-hcd.c | 5 +
5867 drivers/usb/host/ohci-s3c2410.c | 8 +-
5868 drivers/usb/host/sl811-hcd.c | 8 +-
5869 drivers/usb/host/u132-hcd.c | 3 +-
5870 drivers/usb/host/uhci-hcd.c | 26 +-
5871 drivers/usb/host/xhci-dbg.c | 51 +-
5872 drivers/usb/host/xhci-hub.c | 165 ++-
5873 drivers/usb/host/xhci-mem.c | 124 +-
5874 drivers/usb/host/xhci-pci.c | 1 +
5875 drivers/usb/host/xhci-ring.c | 477 ++++---
5876 drivers/usb/host/xhci.c | 124 +-
5877 drivers/usb/host/xhci.h | 136 +-
5878 drivers/usb/misc/ftdi-elan.c | 3 +-
5879 drivers/usb/misc/ldusb.c | 52 +-
5880 drivers/usb/misc/usbtest.c | 125 ++-
5881 drivers/usb/otg/Kconfig | 8 +
5882 drivers/usb/otg/Makefile | 2 +
5883 drivers/usb/otg/fsl_otg.c | 1169 +++++++++++++++
5884 drivers/usb/otg/fsl_otg.h | 406 ++++++
5885 drivers/usb/otg/gpio_vbus.c | 14 +-
5886 drivers/usb/otg/isp1301_omap.c | 26 +-
5887 drivers/usb/otg/langwell_otg.c | 40 +-
5888 drivers/usb/otg/msm_otg.c | 4 +-
5889 drivers/usb/otg/otg.c | 35 +
5890 drivers/usb/otg/otg_fsm.c | 349 +++++
5891 drivers/usb/otg/otg_fsm.h | 154 ++
5892 drivers/usb/otg/twl4030-usb.c | 9 +-
5893 drivers/usb/otg/twl6030-usb.c | 2 +-
5894 drivers/usb/renesas_usbhs/Kconfig | 16 +
5895 drivers/usb/renesas_usbhs/Makefile | 9 +
5896 drivers/usb/renesas_usbhs/common.c | 437 ++++++
5897 drivers/usb/renesas_usbhs/common.h | 230 +++
5898 drivers/usb/renesas_usbhs/mod.c | 328 +++++
5899 drivers/usb/renesas_usbhs/mod.h | 137 ++
5900 drivers/usb/renesas_usbhs/mod_gadget.c | 1384 ++++++++++++++++++
5901 drivers/usb/renesas_usbhs/pipe.c | 877 ++++++++++++
5902 drivers/usb/renesas_usbhs/pipe.h | 104 ++
5903 drivers/usb/serial/Kconfig | 9 -
5904 drivers/usb/serial/Makefile | 1 -
5905 drivers/usb/serial/cp210x.c | 4 +
5906 drivers/usb/serial/ftdi_sio.c | 1 +
5907 drivers/usb/serial/ftdi_sio_ids.h | 5 +
5908 drivers/usb/serial/garmin_gps.c | 20 +-
5909 drivers/usb/serial/moto_modem.c | 1 +
5910 drivers/usb/serial/option.c | 8 +-
5911 drivers/usb/serial/sam-ba.c | 206 ---
5912 include/linux/fsl_devices.h | 16 +
5913 include/linux/usb.h | 6 +-
5914 include/linux/usb/ch9.h | 2 +-
5915 include/linux/usb/ehci_def.h | 15 +-
5916 include/linux/usb/gadget.h | 4 +-
5917 include/linux/usb/otg.h | 1 +
5918 include/linux/usb/renesas_usbhs.h | 156 ++
5919 136 files changed, 10090 insertions(+), 2355 deletions(-)
5920 create mode 100644 arch/arm/mach-exynos4/include/mach/regs-usb-phy.h
5921 create mode 100644 arch/arm/mach-exynos4/usb-phy.c
5922 create mode 100644 arch/arm/plat-s5p/dev-ehci.c
5923 create mode 100644 arch/arm/plat-s5p/include/plat/ehci.h
5924 create mode 100644 arch/arm/plat-s5p/include/plat/usb-phy.h
5925 create mode 100644 drivers/usb/host/ehci-ath79.c
5926 create mode 100644 drivers/usb/host/ehci-grlib.c
5927 create mode 100644 drivers/usb/host/ehci-s5p.c
5928 create mode 100644 drivers/usb/host/ohci-ath79.c
5929 create mode 100644 drivers/usb/otg/fsl_otg.c
5930 create mode 100644 drivers/usb/otg/fsl_otg.h
5931 create mode 100644 drivers/usb/otg/otg_fsm.c
5932 create mode 100644 drivers/usb/otg/otg_fsm.h
5933 create mode 100644 drivers/usb/renesas_usbhs/Kconfig
5934 create mode 100644 drivers/usb/renesas_usbhs/Makefile
5935 create mode 100644 drivers/usb/renesas_usbhs/common.c
5936 create mode 100644 drivers/usb/renesas_usbhs/common.h
5937 create mode 100644 drivers/usb/renesas_usbhs/mod.c
5938 create mode 100644 drivers/usb/renesas_usbhs/mod.h
5939 create mode 100644 drivers/usb/renesas_usbhs/mod_gadget.c
5940 create mode 100644 drivers/usb/renesas_usbhs/pipe.c
5941 create mode 100644 drivers/usb/renesas_usbhs/pipe.h
5942 delete mode 100644 drivers/usb/serial/sam-ba.c
5943 create mode 100644 include/linux/usb/renesas_usbhs.h
5944 Merging staging/staging-next
5945 $ git merge staging/staging-next
5946 Removing drivers/staging/ath6kl/include/a_types.h
5947 Removing drivers/staging/ath6kl/include/athendpack.h
5948 Removing drivers/staging/ath6kl/include/athstartpack.h
5949 Removing drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h
5950 Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_intf_reg.h
5951 Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_reg.h
5952 Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h
5953 Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_host_reg.h
5954 Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_reg.h
5955 Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/rtc_reg.h
5956 Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h
5957 Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/uart_reg.h
5958 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_ares_reg.h
5959 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h
5960 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_reg.h
5961 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/bb_lc_reg.h
5962 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/efuse_reg.h
5963 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_dma_reg.h
5964 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_pcu_reg.h
5965 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rdma_reg.h
5966 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_reg.h
5967 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_wlan_reg.h
5968 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_reg.h
5969 Removing drivers/staging/ath6kl/include/common/btcoexGpio.h
5970 Removing drivers/staging/ath6kl/include/common/ini_dset.h
5971 Removing drivers/staging/ath6kl/include/common/regDb.h
5972 Removing drivers/staging/ath6kl/include/common/regdump.h
5973 Removing drivers/staging/ath6kl/include/common/wlan_dset.h
5974 Removing drivers/staging/ath6kl/os/linux/ar6000_android.c
5975 Removing drivers/staging/ath6kl/os/linux/ar6k_pal.c
5976 Removing drivers/staging/ath6kl/os/linux/include/athtypes_linux.h
5977 Removing drivers/staging/ath6kl/os/linux/ioctl.c
5978 Removing drivers/staging/ath6kl/os/linux/wireless_ext.c
5979 Removing drivers/staging/brcm80211/brcmfmac/hndpmu.c
5980 Removing drivers/staging/brcm80211/brcmfmac/sbutils.c
5981 Removing drivers/staging/brcm80211/brcmfmac/siutils.c
5982 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h
5983 Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_pmu.c
5984 Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_pmu.h
5985 Removing drivers/staging/brcm80211/util/aiutils.c
5986 Removing drivers/staging/brcm80211/util/qmath.c
5987 Removing drivers/staging/brcm80211/util/sbutils.c
5988 Removing drivers/staging/gma500/psb_buffer.c
5989 Removing drivers/staging/gma500/psb_fence.c
5990 Removing drivers/staging/gma500/psb_pvr_glue.c
5991 Removing drivers/staging/gma500/psb_pvr_glue.h
5992 Removing drivers/staging/gma500/psb_sgx.c
5993 Removing drivers/staging/gma500/psb_sgx.h
5994 Removing drivers/staging/gma500/psb_ttm_fence.c
5995 Removing drivers/staging/gma500/psb_ttm_fence_api.h
5996 Removing drivers/staging/gma500/psb_ttm_fence_driver.h
5997 Removing drivers/staging/gma500/psb_ttm_fence_user.c
5998 Removing drivers/staging/gma500/psb_ttm_fence_user.h
5999 Removing drivers/staging/gma500/psb_ttm_glue.c
6000 Removing drivers/staging/gma500/psb_ttm_placement_user.c
6001 Removing drivers/staging/gma500/psb_ttm_placement_user.h
6002 Removing drivers/staging/gma500/psb_ttm_userobj_api.h
6003 Removing drivers/staging/hv/blkvsc.c
6004 Auto-merging drivers/staging/hv/netvsc_drv.c
6005 Auto-merging drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
6006 Removing drivers/staging/rt2860/Kconfig
6007 Removing drivers/staging/rt2860/Makefile
6008 Removing drivers/staging/rt2860/TODO
6009 Removing drivers/staging/rt2860/ap.h
6010 Removing drivers/staging/rt2860/chip/mac_pci.h
6011 Removing drivers/staging/rt2860/chip/mac_usb.h
6012 Removing drivers/staging/rt2860/chip/rt2860.h
6013 Removing drivers/staging/rt2860/chip/rt2870.h
6014 Removing drivers/staging/rt2860/chip/rt3070.h
6015 Removing drivers/staging/rt2860/chip/rt3090.h
6016 Removing drivers/staging/rt2860/chip/rt30xx.h
6017 Removing drivers/staging/rt2860/chip/rtmp_mac.h
6018 Removing drivers/staging/rt2860/chip/rtmp_phy.h
6019 Removing drivers/staging/rt2860/chips/rt3070.c
6020 Removing drivers/staging/rt2860/chips/rt3090.c
6021 Removing drivers/staging/rt2860/chips/rt30xx.c
6022 Removing drivers/staging/rt2860/chlist.h
6023 Removing drivers/staging/rt2860/common/action.c
6024 Removing drivers/staging/rt2860/common/action.h
6025 Removing drivers/staging/rt2860/common/ba_action.c
6026 Removing drivers/staging/rt2860/common/cmm_aes.c
6027 Removing drivers/staging/rt2860/common/cmm_asic.c
6028 Removing drivers/staging/rt2860/common/cmm_cfg.c
6029 Removing drivers/staging/rt2860/common/cmm_data.c
6030 CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_pci.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_pci.c left in tree.
6031 CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_usb.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_usb.c left in tree.
6032 Removing drivers/staging/rt2860/common/cmm_info.c
6033 Removing drivers/staging/rt2860/common/cmm_mac_pci.c
6034 Removing drivers/staging/rt2860/common/cmm_mac_usb.c
6035 Removing drivers/staging/rt2860/common/cmm_sanity.c
6036 Removing drivers/staging/rt2860/common/cmm_sync.c
6037 Removing drivers/staging/rt2860/common/cmm_tkip.c
6038 Removing drivers/staging/rt2860/common/cmm_wep.c
6039 Removing drivers/staging/rt2860/common/cmm_wpa.c
6040 Removing drivers/staging/rt2860/common/crypt_hmac.c
6041 Removing drivers/staging/rt2860/common/crypt_md5.c
6042 Removing drivers/staging/rt2860/common/crypt_sha2.c
6043 Removing drivers/staging/rt2860/common/dfs.c
6044 Removing drivers/staging/rt2860/common/ee_efuse.c
6045 Removing drivers/staging/rt2860/common/ee_prom.c
6046 Removing drivers/staging/rt2860/common/eeprom.c
6047 Removing drivers/staging/rt2860/common/mlme.c
6048 Removing drivers/staging/rt2860/common/rt_channel.c
6049 Removing drivers/staging/rt2860/common/rt_rf.c
6050 Removing drivers/staging/rt2860/common/rtmp_init.c
6051 Removing drivers/staging/rt2860/common/rtmp_mcu.c
6052 Removing drivers/staging/rt2860/common/rtmp_timer.c
6053 Removing drivers/staging/rt2860/common/spectrum.c
6054 Removing drivers/staging/rt2860/crypt_hmac.h
6055 Removing drivers/staging/rt2860/crypt_md5.h
6056 Removing drivers/staging/rt2860/crypt_sha2.h
6057 Removing drivers/staging/rt2860/dfs.h
6058 Removing drivers/staging/rt2860/eeprom.h
6059 Removing drivers/staging/rt2860/iface/rtmp_pci.h
6060 Removing drivers/staging/rt2860/iface/rtmp_usb.h
6061 Removing drivers/staging/rt2860/mlme.h
6062 Removing drivers/staging/rt2860/oid.h
6063 Removing drivers/staging/rt2860/pci_main_dev.c
6064 Removing drivers/staging/rt2860/rt_config.h
6065 Removing drivers/staging/rt2860/rt_linux.c
6066 Removing drivers/staging/rt2860/rt_linux.h
6067 Removing drivers/staging/rt2860/rt_main_dev.c
6068 Removing drivers/staging/rt2860/rt_pci_rbus.c
6069 Removing drivers/staging/rt2860/rt_usb.c
6070 Removing drivers/staging/rt2860/rtmp.h
6071 Removing drivers/staging/rt2860/rtmp_chip.h
6072 Removing drivers/staging/rt2860/rtmp_ckipmic.h
6073 Removing drivers/staging/rt2860/rtmp_def.h
6074 Removing drivers/staging/rt2860/rtmp_dot11.h
6075 Removing drivers/staging/rt2860/rtmp_iface.h
6076 Removing drivers/staging/rt2860/rtmp_mcu.h
6077 Removing drivers/staging/rt2860/rtmp_os.h
6078 Removing drivers/staging/rt2860/rtmp_timer.h
6079 Removing drivers/staging/rt2860/rtmp_type.h
6080 Removing drivers/staging/rt2860/rtusb_io.h
6081 Removing drivers/staging/rt2860/spectrum.h
6082 Removing drivers/staging/rt2860/spectrum_def.h
6083 Removing drivers/staging/rt2860/sta/assoc.c
6084 Removing drivers/staging/rt2860/sta/auth.c
6085 Removing drivers/staging/rt2860/sta/auth_rsp.c
6086 Removing drivers/staging/rt2860/sta/connect.c
6087 Removing drivers/staging/rt2860/sta/rtmp_data.c
6088 Removing drivers/staging/rt2860/sta/sanity.c
6089 Removing drivers/staging/rt2860/sta/sync.c
6090 Removing drivers/staging/rt2860/sta/wpa.c
6091 Removing drivers/staging/rt2860/sta_ioctl.c
6092 Removing drivers/staging/rt2860/usb_main_dev.c
6093 Removing drivers/staging/rt2860/wpa.h
6094 Removing drivers/staging/rt2870/Kconfig
6095 Removing drivers/staging/rt2870/Makefile
6096 Removing drivers/staging/rt2870/TODO
6097 Removing drivers/staging/rt2870/aironet.h
6098 Removing drivers/staging/rt2870/ap.h
6099 Removing drivers/staging/rt2870/chips/rt3070.c
6100 Removing drivers/staging/rt2870/chips/rt30xx.c
6101 Removing drivers/staging/rt2870/chlist.h
6102 Removing drivers/staging/rt2870/common/acction.c
6103 Removing drivers/staging/rt2870/common/action.c
6104 Removing drivers/staging/rt2870/common/action.h
6105 Removing drivers/staging/rt2870/common/ba_action.c
6106 Removing drivers/staging/rt2870/common/cmm_aes.c
6107 Removing drivers/staging/rt2870/common/cmm_asic.c
6108 Removing drivers/staging/rt2870/common/cmm_cfg.c
6109 Removing drivers/staging/rt2870/common/cmm_data.c
6110 Removing drivers/staging/rt2870/common/cmm_data_usb.c
6111 Removing drivers/staging/rt2870/common/cmm_info.c
6112 Removing drivers/staging/rt2870/common/cmm_mac_usb.c
6113 Removing drivers/staging/rt2870/common/cmm_profile.c
6114 Removing drivers/staging/rt2870/common/cmm_sanity.c
6115 Removing drivers/staging/rt2870/common/cmm_sync.c
6116 Removing drivers/staging/rt2870/common/cmm_tkip.c
6117 Removing drivers/staging/rt2870/common/cmm_wep.c
6118 Removing drivers/staging/rt2870/common/cmm_wpa.c
6119 Removing drivers/staging/rt2870/common/crypt_hmac.c
6120 Removing drivers/staging/rt2870/common/crypt_md5.c
6121 Removing drivers/staging/rt2870/common/crypt_sha2.c
6122 Removing drivers/staging/rt2870/common/dfs.c
6123 Removing drivers/staging/rt2870/common/ee_efuse.c
6124 Removing drivers/staging/rt2870/common/eeprom.c
6125 Removing drivers/staging/rt2870/common/md5.c
6126 Removing drivers/staging/rt2870/common/mlme.c
6127 Removing drivers/staging/rt2870/common/rt_channel.c
6128 Removing drivers/staging/rt2870/common/rt_rf.c
6129 Removing drivers/staging/rt2870/common/rtmp_init.c
6130 Removing drivers/staging/rt2870/common/rtmp_mcu.c
6131 Removing drivers/staging/rt2870/common/rtmp_timer.c
6132 Removing drivers/staging/rt2870/common/rtmp_tkip.c
6133 Removing drivers/staging/rt2870/common/rtmp_wep.c
6134 Removing drivers/staging/rt2870/common/rtusb_bulk.c
6135 Removing drivers/staging/rt2870/common/rtusb_data.c
6136 Removing drivers/staging/rt2870/common/rtusb_io.c
6137 Removing drivers/staging/rt2870/common/spectrum.c
6138 Removing drivers/staging/rt2870/dfs.h
6139 Removing drivers/staging/rt2870/md5.h
6140 Removing drivers/staging/rt2870/mlme.h
6141 Removing drivers/staging/rt2870/oid.h
6142 Removing drivers/staging/rt2870/rt28xx.h
6143 Removing drivers/staging/rt2870/rt_config.h
6144 Removing drivers/staging/rt2870/rt_linux.c
6145 Removing drivers/staging/rt2870/rt_linux.h
6146 Removing drivers/staging/rt2870/rt_main_dev.c
6147 Removing drivers/staging/rt2870/rt_profile.c
6148 Removing drivers/staging/rt2870/rt_usb.c
6149 Removing drivers/staging/rt2870/rtmp.h
6150 Removing drivers/staging/rt2870/rtmp_ckipmic.h
6151 Removing drivers/staging/rt2870/rtmp_def.h
6152 Removing drivers/staging/rt2870/rtmp_type.h
6153 Removing drivers/staging/rt2870/spectrum.h
6154 Removing drivers/staging/rt2870/spectrum_def.h
6155 Removing drivers/staging/rt2870/sta/aironet.c
6156 Removing drivers/staging/rt2870/sta/assoc.c
6157 Removing drivers/staging/rt2870/sta/auth.c
6158 Removing drivers/staging/rt2870/sta/auth_rsp.c
6159 Removing drivers/staging/rt2870/sta/connect.c
6160 Removing drivers/staging/rt2870/sta/rtmp_data.c
6161 Removing drivers/staging/rt2870/sta/sanity.c
6162 Removing drivers/staging/rt2870/sta/sync.c
6163 Removing drivers/staging/rt2870/sta/wpa.c
6164 Removing drivers/staging/rt2870/sta_ioctl.c
6165 Removing drivers/staging/rt2870/usb_main_dev.c
6166 Removing drivers/staging/rt2870/wpa.h
6167 Auto-merging drivers/staging/rts_pstor/ms.c
6168 Auto-merging drivers/staging/rts_pstor/sd.c
6169 Auto-merging drivers/staging/rts_pstor/xd.c
6170 Auto-merging kernel/module.c
6171 Automatic merge failed; fix conflicts and then commit the result.
6172 $ git rm -f drivers/staging/rt2860/common/cmm_data_pci.c drivers/staging/rt2860/common/cmm_data_usb.c
6173 drivers/staging/rt2860/common/cmm_data_pci.c: needs merge
6174 drivers/staging/rt2860/common/cmm_data_usb.c: needs merge
6175 rm 'drivers/staging/rt2860/common/cmm_data_pci.c'
6176 rm 'drivers/staging/rt2860/common/cmm_data_usb.c'
6178 [master 24edd08] Merge remote-tracking branch 'staging/staging-next'
6179 $ git diff -M --stat --summary HEAD^..
6180 drivers/staging/Kconfig | 4 -
6181 drivers/staging/Makefile | 5 +-
6182 drivers/staging/ath6kl/Kconfig | 6 -
6183 drivers/staging/ath6kl/Makefile | 39 +-
6184 drivers/staging/ath6kl/bmi/include/bmi_internal.h | 3 +-
6185 drivers/staging/ath6kl/bmi/src/bmi.c | 8 +-
6186 .../hif/sdio/linux_sdio/include/hif_internal.h | 1 -
6187 .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 382 +-
6188 .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 10 +-
6189 drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 5 +-
6190 drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 3 -
6191 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 3 +-
6192 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 1 -
6193 .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 3 +-
6194 drivers/staging/ath6kl/htc2/htc.c | 10 +-
6195 drivers/staging/ath6kl/htc2/htc_internal.h | 9 -
6196 drivers/staging/ath6kl/htc2/htc_recv.c | 6 -
6197 drivers/staging/ath6kl/htc2/htc_send.c | 5 -
6198 drivers/staging/ath6kl/include/a_config.h | 22 -
6199 drivers/staging/ath6kl/include/a_debug.h | 29 -
6200 drivers/staging/ath6kl/include/a_drv.h | 22 -
6201 drivers/staging/ath6kl/include/a_drv_api.h | 28 -
6202 drivers/staging/ath6kl/include/a_osapi.h | 29 -
6203 drivers/staging/ath6kl/include/a_types.h | 58 -
6204 drivers/staging/ath6kl/include/ar6000_api.h | 22 -
6205 drivers/staging/ath6kl/include/athendpack.h | 52 -
6206 drivers/staging/ath6kl/include/athstartpack.h | 55 -
6207 drivers/staging/ath6kl/include/bmi.h | 1 -
6208 .../ath6kl/include/common/AR6002/AR6002_regdump.h | 60 -
6209 .../common/AR6002/hw2.0/hw/analog_intf_reg.h | 64 -
6210 .../include/common/AR6002/hw2.0/hw/analog_reg.h | 1932 -----
6211 .../include/common/AR6002/hw2.0/hw/apb_map.h | 13 -
6212 .../include/common/AR6002/hw2.0/hw/gpio_reg.h | 805 --
6213 .../include/common/AR6002/hw2.0/hw/mbox_host_reg.h | 386 -
6214 .../include/common/AR6002/hw2.0/hw/mbox_reg.h | 481 --
6215 .../include/common/AR6002/hw2.0/hw/rtc_reg.h | 1163 ---
6216 .../ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h | 186 -
6217 .../include/common/AR6002/hw2.0/hw/uart_reg.h | 327 -
6218 .../include/common/AR6002/hw2.0/hw/vmc_reg.h | 40 -
6219 .../common/AR6002/hw4.0/hw/analog_intf_ares_reg.h | 3291 --------
6220 .../AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h | 3674 ---------
6221 .../common/AR6002/hw4.0/hw/analog_intf_reg.h | 37 -
6222 .../include/common/AR6002/hw4.0/hw/apb_map.h | 8 -
6223 .../include/common/AR6002/hw4.0/hw/bb_lc_reg.h | 7076 -----------------
6224 .../include/common/AR6002/hw4.0/hw/efuse_reg.h | 108 -
6225 .../common/AR6002/hw4.0/hw/gpio_athr_wlan_reg.h | 998 ---
6226 .../include/common/AR6002/hw4.0/hw/gpio_reg.h | 843 --
6227 .../include/common/AR6002/hw4.0/hw/mac_dma_reg.h | 605 --
6228 .../include/common/AR6002/hw4.0/hw/mac_pcu_reg.h | 3065 --------
6229 .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 13 -
6230 .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 8 -
6231 .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h | 51 -
6232 .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h | 49 -
6233 .../include/common/AR6002/hw4.0/hw/rdma_reg.h | 564 --
6234 .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 788 --
6235 .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h | 1903 -----
6236 .../include/common/AR6002/hw4.0/hw/uart_reg.h | 220 -
6237 .../include/common/AR6002/hw4.0/hw/umbox_reg.h | 37 -
6238 .../common/AR6002/hw4.0/hw/umbox_wlan_reg.h | 322 -
6239 .../include/common/AR6002/hw4.0/hw/vmc_reg.h | 167 -
6240 drivers/staging/ath6kl/include/common/bmi_msg.h | 8 -
6241 drivers/staging/ath6kl/include/common/btcoexGpio.h | 86 -
6242 drivers/staging/ath6kl/include/common/dbglog.h | 8 -
6243 .../staging/ath6kl/include/common/dset_internal.h | 8 -
6244 drivers/staging/ath6kl/include/common/dsetid.h | 8 -
6245 .../staging/ath6kl/include/common/epping_test.h | 9 -
6246 drivers/staging/ath6kl/include/common/gmboxif.h | 8 -
6247 drivers/staging/ath6kl/include/common/htc.h | 9 -
6248 drivers/staging/ath6kl/include/common/ini_dset.h | 82 -
6249 drivers/staging/ath6kl/include/common/regDb.h | 29 -
6250 drivers/staging/ath6kl/include/common/regdump.h | 59 -
6251 drivers/staging/ath6kl/include/common/targaddrs.h | 234 +-
6252 drivers/staging/ath6kl/include/common/wlan_dset.h | 33 -
6253 drivers/staging/ath6kl/include/common/wmi.h | 135 +-
6254 drivers/staging/ath6kl/include/common/wmix.h | 7 -
6255 drivers/staging/ath6kl/include/common_drv.h | 4 -
6256 drivers/staging/ath6kl/include/hif.h | 3 +-
6257 drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 23 +-
6258 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 22 +-
6259 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 28 +-
6260 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 6 -
6261 drivers/staging/ath6kl/miscdrv/common_drv.c | 45 +-
6262 drivers/staging/ath6kl/miscdrv/credit_dist.c | 1 -
6263 drivers/staging/ath6kl/os/linux/ar6000_android.c | 388 -
6264 drivers/staging/ath6kl/os/linux/ar6000_drv.c | 792 +--
6265 drivers/staging/ath6kl/os/linux/ar6000_pm.c | 77 -
6266 drivers/staging/ath6kl/os/linux/ar6k_pal.c | 479 --
6267 drivers/staging/ath6kl/os/linux/cfg80211.c | 193 +-
6268 drivers/staging/ath6kl/os/linux/eeprom.c | 215 +-
6269 .../staging/ath6kl/os/linux/export_hci_transport.c | 1 -
6270 drivers/staging/ath6kl/os/linux/hci_bridge.c | 5 +-
6271 .../staging/ath6kl/os/linux/include/ar6000_drv.h | 148 +-
6272 .../ath6kl/os/linux/include/ar6xapi_linux.h | 8 -
6273 .../staging/ath6kl/os/linux/include/athdrv_linux.h | 4 +-
6274 .../ath6kl/os/linux/include/athtypes_linux.h | 51 -
6275 .../staging/ath6kl/os/linux/include/config_linux.h | 7 -
6276 .../staging/ath6kl/os/linux/include/osapi_linux.h | 49 +-
6277 .../staging/ath6kl/os/linux/include/wlan_config.h | 10 -
6278 .../ath6kl/os/linux/include/wmi_filter_linux.h | 2 +-
6279 drivers/staging/ath6kl/os/linux/ioctl.c | 4767 ------------
6280 drivers/staging/ath6kl/os/linux/netbuf.c | 1 -
6281 drivers/staging/ath6kl/os/linux/wireless_ext.c | 2723 -------
6282 drivers/staging/ath6kl/reorder/rcv_aggr.c | 15 +-
6283 drivers/staging/ath6kl/wlan/include/ieee80211.h | 4 -
6284 drivers/staging/ath6kl/wlan/src/wlan_node.c | 11 +-
6285 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 1 -
6286 drivers/staging/ath6kl/wlan/src/wlan_utils.c | 1 -
6287 drivers/staging/ath6kl/wmi/wmi.c | 247 +-
6288 drivers/staging/brcm80211/Kconfig | 17 +-
6289 drivers/staging/brcm80211/README | 102 +-
6290 drivers/staging/brcm80211/TODO | 56 +-
6291 drivers/staging/brcm80211/brcmfmac/Makefile | 6 +-
6292 drivers/staging/brcm80211/brcmfmac/README | 35 -
6293 drivers/staging/brcm80211/brcmfmac/bcmchip.h | 35 +
6294 drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 38 +-
6295 drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 10 +-
6296 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 25 +-
6297 .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 7 +-
6298 drivers/staging/brcm80211/brcmfmac/dhd.h | 10 +
6299 drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 12 +-
6300 drivers/staging/brcm80211/brcmfmac/dhd_common.c | 32 +-
6301 drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 67 +-
6302 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 735 ++-
6303 drivers/staging/brcm80211/brcmfmac/hndpmu.c | 1 -
6304 drivers/staging/brcm80211/brcmfmac/sbutils.c | 1 -
6305 drivers/staging/brcm80211/brcmfmac/siutils.c | 1 -
6306 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4 +
6307 drivers/staging/brcm80211/brcmfmac/wl_iw.c | 54 +-
6308 drivers/staging/brcm80211/brcmsmac/Makefile | 7 +-
6309 drivers/staging/brcm80211/brcmsmac/aiutils.c | 2054 +++++
6310 drivers/staging/brcm80211/brcmsmac/aiutils.h | 546 ++
6311 drivers/staging/brcm80211/brcmsmac/d11.h | 2 +
6312 .../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 117 +-
6313 .../staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h | 5 +-
6314 .../staging/brcm80211/brcmsmac/phy/wlc_phy_int.h | 1 +
6315 .../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 48 +-
6316 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | 169 +-
6317 .../staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c | 296 +
6318 .../qmath.h => brcmsmac/phy/wlc_phy_qmath.h} | 38 -
6319 drivers/staging/brcm80211/brcmsmac/wl_dbg.h | 24 +-
6320 drivers/staging/brcm80211/brcmsmac/wl_export.h | 1 +
6321 drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 410 +-
6322 drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 1 +
6323 drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 66 +-
6324 drivers/staging/brcm80211/brcmsmac/wlc_alloc.h | 2 -
6325 drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 235 +-
6326 drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | 12 +-
6327 drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 615 +-
6328 drivers/staging/brcm80211/brcmsmac/wlc_bmac.h | 1 -
6329 drivers/staging/brcm80211/brcmsmac/wlc_channel.c | 60 +-
6330 drivers/staging/brcm80211/brcmsmac/wlc_key.h | 10 +-
6331 drivers/staging/brcm80211/brcmsmac/wlc_main.c | 1214 ++--
6332 drivers/staging/brcm80211/brcmsmac/wlc_main.h | 17 +-
6333 drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 9 +-
6334 .../{util/hndpmu.c => brcmsmac/wlc_pmu.c} | 3191 +++-----
6335 .../{include/hndpmu.h => brcmsmac/wlc_pmu.h} | 54 +-
6336 drivers/staging/brcm80211/brcmsmac/wlc_pub.h | 14 +-
6337 drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 16 +-
6338 drivers/staging/brcm80211/brcmsmac/wlc_rate.h | 15 +-
6339 drivers/staging/brcm80211/brcmsmac/wlc_stf.c | 61 +-
6340 drivers/staging/brcm80211/include/bcmdefs.h | 6 -
6341 drivers/staging/brcm80211/include/bcmdevs.h | 72 +-
6342 drivers/staging/brcm80211/include/bcmsrom_fmt.h | 2 +-
6343 drivers/staging/brcm80211/include/bcmutils.h | 114 -
6344 drivers/staging/brcm80211/include/pcicfg.h | 510 +--
6345 drivers/staging/brcm80211/include/wlioctl.h | 2 -
6346 drivers/staging/brcm80211/util/aiutils.c | 705 --
6347 drivers/staging/brcm80211/util/bcmotp.c | 127 +-
6348 drivers/staging/brcm80211/util/bcmsrom.c | 1398 +----
6349 drivers/staging/brcm80211/util/bcmutils.c | 293 +-
6350 drivers/staging/brcm80211/util/bcmwifi.c | 3 -
6351 drivers/staging/brcm80211/util/hnddma.c | 75 +-
6352 drivers/staging/brcm80211/util/nicpci.c | 76 +-
6353 drivers/staging/brcm80211/util/nvram/nvram_ro.c | 9 +-
6354 drivers/staging/brcm80211/util/qmath.c | 681 --
6355 drivers/staging/brcm80211/util/sbutils.c | 476 --
6356 drivers/staging/brcm80211/util/siutils.c | 134 +-
6357 .../comedi/drivers/addi-data/APCI1710_Ssi.c | 16 +-
6358 drivers/staging/comedi/drivers/adl_pci9118.c | 4 +-
6359 drivers/staging/comedi/drivers/cb_pcidda.c | 2 +-
6360 drivers/staging/comedi/drivers/cb_pcimdas.c | 2 +-
6361 drivers/staging/comedi/drivers/ni_660x.c | 2 +-
6362 drivers/staging/comedi/drivers/ni_mio_common.c | 6 +-
6363 drivers/staging/comedi/drivers/ni_tio.c | 6 +-
6364 drivers/staging/comedi/drivers/pcl724.c | 2 +-
6365 drivers/staging/comedi/drivers/pcl818.c | 2 +-
6366 drivers/staging/comedi/drivers/pcm3724.c | 2 +-
6367 drivers/staging/comedi/drivers/usbdux.c | 2 +-
6368 drivers/staging/crystalhd/bc_dts_types.h | 1 -
6369 drivers/staging/crystalhd/crystalhd_misc.c | 4 +-
6370 drivers/staging/cx25821/cx25821-video.c | 3 +-
6371 drivers/staging/easycap/easycap_main.c | 229 +-
6372 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 158 +-
6373 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 19 -
6374 drivers/staging/gma500/Makefile | 15 +-
6375 drivers/staging/gma500/mrst.h | 217 +
6376 drivers/staging/gma500/mrst_crtc.c | 619 ++
6377 drivers/staging/gma500/mrst_lvds.c | 371 +
6378 drivers/staging/gma500/psb_2d.c | 9 +-
6379 drivers/staging/gma500/psb_bl.c | 118 +-
6380 drivers/staging/gma500/psb_buffer.c | 450 --
6381 drivers/staging/gma500/psb_drm.h | 122 -
6382 drivers/staging/gma500/psb_drv.c | 731 +--
6383 drivers/staging/gma500/psb_drv.h | 462 +-
6384 drivers/staging/gma500/psb_fb.c | 363 +-
6385 drivers/staging/gma500/psb_fb.h | 16 +-
6386 drivers/staging/gma500/psb_fence.c | 122 -
6387 drivers/staging/gma500/psb_gem.c | 209 +
6388 drivers/staging/gma500/psb_gtt.c | 1224 +---
6389 drivers/staging/gma500/psb_gtt.h | 83 +-
6390 drivers/staging/gma500/psb_intel_display.c | 147 +-
6391 drivers/staging/gma500/psb_intel_drv.h | 13 +-
6392 drivers/staging/gma500/psb_intel_lvds.c | 50 +-
6393 drivers/staging/gma500/psb_intel_sdvo.c | 4 +-
6394 drivers/staging/gma500/psb_irq.c | 178 +-
6395 drivers/staging/gma500/{psb_reset.c => psb_lid.c} | 0
6396 drivers/staging/gma500/psb_mmu.c | 61 -
6397 drivers/staging/gma500/psb_powermgmt.c | 755 +--
6398 drivers/staging/gma500/psb_powermgmt.h | 55 +-
6399 drivers/staging/gma500/psb_pvr_glue.c | 73 -
6400 drivers/staging/gma500/psb_pvr_glue.h | 25 -
6401 drivers/staging/gma500/psb_sgx.c | 238 -
6402 drivers/staging/gma500/psb_sgx.h | 32 -
6403 drivers/staging/gma500/psb_ttm_fence.c | 605 --
6404 drivers/staging/gma500/psb_ttm_fence_api.h | 272 -
6405 drivers/staging/gma500/psb_ttm_fence_driver.h | 302 -
6406 drivers/staging/gma500/psb_ttm_fence_user.c | 237 -
6407 drivers/staging/gma500/psb_ttm_fence_user.h | 140 -
6408 drivers/staging/gma500/psb_ttm_glue.c | 349 -
6409 drivers/staging/gma500/psb_ttm_placement_user.c | 628 --
6410 drivers/staging/gma500/psb_ttm_placement_user.h | 252 -
6411 drivers/staging/gma500/psb_ttm_userobj_api.h | 85 -
6412 drivers/staging/hv/Kconfig | 2 +-
6413 drivers/staging/hv/Makefile | 2 +-
6414 drivers/staging/hv/blkvsc.c | 102 -
6415 drivers/staging/hv/blkvsc_drv.c | 1534 ++---
6416 drivers/staging/hv/channel.c | 79 +-
6417 drivers/staging/hv/channel_mgmt.c | 105 +-
6418 drivers/staging/hv/channel_mgmt.h | 2 -
6419 drivers/staging/hv/connection.c | 65 +-
6420 drivers/staging/hv/hv.c | 64 +-
6421 drivers/staging/hv/hv_kvp.c | 9 +-
6422 drivers/staging/hv/hv_mouse.c | 452 +-
6423 drivers/staging/hv/hv_timesource.c | 3 +-
6424 drivers/staging/hv/hv_util.c | 31 +-
6425 drivers/staging/hv/netvsc.c | 950 +--
6426 drivers/staging/hv/netvsc_api.h | 8 +
6427 drivers/staging/hv/netvsc_drv.c | 88 +-
6428 drivers/staging/hv/ring_buffer.c | 21 +-
6429 drivers/staging/hv/rndis_filter.c | 64 +-
6430 drivers/staging/hv/storvsc.c | 398 +-
6431 drivers/staging/hv/storvsc_api.h | 115 +-
6432 drivers/staging/hv/storvsc_drv.c | 232 +-
6433 drivers/staging/hv/vmbus_api.h | 24 +-
6434 drivers/staging/hv/vmbus_drv.c | 1088 ++--
6435 drivers/staging/hv/vstorage.h | 5 +
6436 drivers/staging/iio/Documentation/device.txt | 2 +-
6437 drivers/staging/iio/Documentation/generic_buffer.c | 2 +-
6438 drivers/staging/iio/Documentation/sysfs-bus-iio | 13 +
6439 .../staging/iio/Documentation/sysfs-bus-iio-light | 13 +
6440 .../iio/Documentation/sysfs-bus-iio-light-tsl2583 | 20 +
6441 drivers/staging/iio/accel/adis16201_core.c | 28 +-
6442 drivers/staging/iio/accel/adis16201_trigger.c | 45 +-
6443 drivers/staging/iio/accel/adis16203_core.c | 28 +-
6444 drivers/staging/iio/accel/adis16203_trigger.c | 46 +-
6445 drivers/staging/iio/accel/adis16204_core.c | 28 +-
6446 drivers/staging/iio/accel/adis16204_trigger.c | 46 +-
6447 drivers/staging/iio/accel/adis16209_core.c | 28 +-
6448 drivers/staging/iio/accel/adis16209_trigger.c | 45 +-
6449 drivers/staging/iio/accel/adis16220_core.c | 2 +-
6450 drivers/staging/iio/accel/adis16240_core.c | 28 +-
6451 drivers/staging/iio/accel/adis16240_trigger.c | 46 +-
6452 drivers/staging/iio/accel/kxsd9.c | 2 +-
6453 drivers/staging/iio/accel/lis3l02dq_core.c | 4 +-
6454 drivers/staging/iio/accel/sca3000_core.c | 2 +-
6455 drivers/staging/iio/accel/sca3000_ring.c | 8 +-
6456 drivers/staging/iio/adc/Kconfig | 11 +
6457 drivers/staging/iio/adc/Makefile | 1 +
6458 drivers/staging/iio/adc/ad7150.c | 2 +-
6459 drivers/staging/iio/adc/ad7152.c | 2 +-
6460 drivers/staging/iio/adc/ad7291.c | 2 +-
6461 drivers/staging/iio/adc/ad7298_core.c | 2 +-
6462 drivers/staging/iio/adc/ad7314.c | 2 +-
6463 drivers/staging/iio/adc/ad7476_core.c | 2 +-
6464 drivers/staging/iio/adc/ad7606_core.c | 2 +-
6465 drivers/staging/iio/adc/ad7745.c | 2 +-
6466 drivers/staging/iio/adc/ad7780.c | 329 +
6467 drivers/staging/iio/adc/ad7780.h | 30 +
6468 drivers/staging/iio/adc/ad7816.c | 2 +-
6469 drivers/staging/iio/adc/ad7887_core.c | 2 +-
6470 drivers/staging/iio/adc/ad799x_core.c | 2 +-
6471 drivers/staging/iio/adc/adt7310.c | 2 +-
6472 drivers/staging/iio/adc/adt7410.c | 2 +-
6473 drivers/staging/iio/adc/adt75.c | 2 +-
6474 drivers/staging/iio/adc/max1363.h | 2 -
6475 drivers/staging/iio/adc/max1363_core.c | 189 +-
6476 drivers/staging/iio/adc/max1363_ring.c | 21 +-
6477 drivers/staging/iio/addac/adt7316.c | 8 +-
6478 drivers/staging/iio/dac/Kconfig | 21 +
6479 drivers/staging/iio/dac/Makefile | 2 +
6480 drivers/staging/iio/dac/ad5446.c | 9 +-
6481 drivers/staging/iio/dac/ad5446.h | 1 +
6482 drivers/staging/iio/dac/ad5504.c | 426 +
6483 drivers/staging/iio/dac/ad5504.h | 74 +
6484 drivers/staging/iio/dac/ad5624r_spi.c | 2 +-
6485 drivers/staging/iio/dac/ad5791.c | 440 ++
6486 drivers/staging/iio/dac/ad5791.h | 116 +
6487 drivers/staging/iio/dac/max517.c | 2 +-
6488 drivers/staging/iio/dds/Kconfig | 4 +-
6489 drivers/staging/iio/dds/ad5930.c | 2 +-
6490 drivers/staging/iio/dds/ad9832.c | 2 +-
6491 drivers/staging/iio/dds/ad9834.c | 33 +-
6492 drivers/staging/iio/dds/ad9834.h | 8 +-
6493 drivers/staging/iio/dds/ad9850.c | 2 +-
6494 drivers/staging/iio/dds/ad9852.c | 2 +-
6495 drivers/staging/iio/dds/ad9910.c | 2 +-
6496 drivers/staging/iio/dds/ad9951.c | 2 +-
6497 drivers/staging/iio/gyro/Kconfig | 10 +
6498 drivers/staging/iio/gyro/Makefile | 3 +
6499 drivers/staging/iio/gyro/adis16060_core.c | 2 +-
6500 drivers/staging/iio/gyro/adis16080_core.c | 2 +-
6501 drivers/staging/iio/gyro/adis16130_core.c | 2 +-
6502 drivers/staging/iio/gyro/adis16260_core.c | 27 +-
6503 drivers/staging/iio/gyro/adis16260_trigger.c | 46 +-
6504 drivers/staging/iio/gyro/adxrs450.h | 58 +
6505 drivers/staging/iio/gyro/adxrs450_core.c | 451 ++
6506 drivers/staging/iio/gyro/gyro.h | 3 +
6507 drivers/staging/iio/iio.h | 17 +-
6508 drivers/staging/iio/imu/adis16300_core.c | 28 +-
6509 drivers/staging/iio/imu/adis16300_trigger.c | 48 +-
6510 drivers/staging/iio/imu/adis16350_core.c | 28 +-
6511 drivers/staging/iio/imu/adis16350_trigger.c | 48 +-
6512 drivers/staging/iio/imu/adis16400_core.c | 28 +-
6513 drivers/staging/iio/imu/adis16400_trigger.c | 47 +-
6514 drivers/staging/iio/industrialio-core.c | 15 +-
6515 drivers/staging/iio/industrialio-ring.c | 12 +-
6516 drivers/staging/iio/industrialio-trigger.c | 27 +-
6517 drivers/staging/iio/kfifo_buf.c | 8 +-
6518 drivers/staging/iio/kfifo_buf.h | 10 +-
6519 drivers/staging/iio/light/Kconfig | 6 +
6520 drivers/staging/iio/light/Makefile | 1 +
6521 drivers/staging/iio/light/isl29018.c | 2 +-
6522 drivers/staging/iio/light/tsl2563.c | 72 +-
6523 drivers/staging/iio/light/tsl2583.c | 960 +++
6524 drivers/staging/iio/magnetometer/ak8975.c | 122 +-
6525 drivers/staging/iio/magnetometer/hmc5843.c | 2 +-
6526 drivers/staging/iio/meter/ade7753.c | 2 +-
6527 drivers/staging/iio/meter/ade7754.c | 2 +-
6528 drivers/staging/iio/meter/ade7758_core.c | 32 +-
6529 drivers/staging/iio/meter/ade7758_trigger.c | 48 +-
6530 drivers/staging/iio/meter/ade7759.c | 2 +-
6531 drivers/staging/iio/meter/ade7854.c | 2 +-
6532 drivers/staging/iio/resolver/ad2s120x.c | 2 +-
6533 drivers/staging/iio/resolver/ad2s1210.c | 2 +-
6534 drivers/staging/iio/resolver/ad2s90.c | 2 +-
6535 drivers/staging/iio/ring_generic.h | 10 +-
6536 drivers/staging/iio/ring_sw.c | 13 +-
6537 drivers/staging/iio/ring_sw.h | 14 +-
6538 drivers/staging/iio/sysfs.h | 1 +
6539 drivers/staging/iio/trigger.h | 7 -
6540 .../staging/intel_sst/intel_sst_app_interface.c | 8 +-
6541 drivers/staging/intel_sst/intel_sst_pvt.c | 2 +-
6542 drivers/staging/keucr/msscsi.c | 29 +-
6543 drivers/staging/keucr/scsiglue.c | 35 +-
6544 drivers/staging/keucr/smilmain.c | 16 +-
6545 drivers/staging/keucr/transport.c | 140 +-
6546 drivers/staging/keucr/usb.c | 88 +-
6547 drivers/staging/lirc/lirc_parallel.c | 27 +-
6548 drivers/staging/lirc/lirc_serial.c | 2 +-
6549 drivers/staging/lirc/lirc_sir.c | 30 +-
6550 drivers/staging/octeon/ethernet-mdio.c | 2 -
6551 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 2 +-
6552 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 22 +-
6553 drivers/staging/rt2860/Kconfig | 10 -
6554 drivers/staging/rt2860/Makefile | 52 -
6555 drivers/staging/rt2860/TODO | 16 -
6556 drivers/staging/rt2860/ap.h | 68 -
6557 drivers/staging/rt2860/chip/mac_pci.h | 355 -
6558 drivers/staging/rt2860/chip/mac_usb.h | 345 -
6559 drivers/staging/rt2860/chip/rt2860.h | 54 -
6560 drivers/staging/rt2860/chip/rt2870.h | 46 -
6561 drivers/staging/rt2860/chip/rt3070.h | 67 -
6562 drivers/staging/rt2860/chip/rt3090.h | 72 -
6563 drivers/staging/rt2860/chip/rt30xx.h | 47 -
6564 drivers/staging/rt2860/chip/rtmp_mac.h | 1308 ----
6565 drivers/staging/rt2860/chip/rtmp_phy.h | 516 --
6566 drivers/staging/rt2860/chips/rt3070.c | 169 -
6567 drivers/staging/rt2860/chips/rt3090.c | 121 -
6568 drivers/staging/rt2860/chips/rt30xx.c | 516 --
6569 drivers/staging/rt2860/chlist.h | 113 -
6570 drivers/staging/rt2860/common/action.c | 606 --
6571 drivers/staging/rt2860/common/action.h | 56 -
6572 drivers/staging/rt2860/common/ba_action.c | 1650 ----
6573 drivers/staging/rt2860/common/cmm_aes.c | 1311 ----
6574 drivers/staging/rt2860/common/cmm_asic.c | 2565 ------
6575 drivers/staging/rt2860/common/cmm_cfg.c | 258 -
6576 drivers/staging/rt2860/common/cmm_data.c | 2361 ------
6577 drivers/staging/rt2860/common/cmm_data_pci.c | 1096 ---
6578 drivers/staging/rt2860/common/cmm_data_usb.c | 951 ---
6579 drivers/staging/rt2860/common/cmm_info.c | 955 ---
6580 drivers/staging/rt2860/common/cmm_mac_pci.c | 1661 ----
6581 drivers/staging/rt2860/common/cmm_mac_usb.c | 1162 ---
6582 drivers/staging/rt2860/common/cmm_sanity.c | 1205 ---
6583 drivers/staging/rt2860/common/cmm_sync.c | 718 --
6584 drivers/staging/rt2860/common/cmm_tkip.c | 833 --
6585 drivers/staging/rt2860/common/cmm_wep.c | 473 --
6586 drivers/staging/rt2860/common/cmm_wpa.c | 3010 --------
6587 drivers/staging/rt2860/common/crypt_hmac.c | 187 -
6588 drivers/staging/rt2860/common/crypt_md5.c | 339 -
6589 drivers/staging/rt2860/common/crypt_sha2.c | 269 -
6590 drivers/staging/rt2860/common/dfs.c | 68 -
6591 drivers/staging/rt2860/common/ee_efuse.c | 351 -
6592 drivers/staging/rt2860/common/ee_prom.c | 197 -
6593 drivers/staging/rt2860/common/eeprom.c | 91 -
6594 drivers/staging/rt2860/common/mlme.c | 6068 ---------------
6595 drivers/staging/rt2860/common/rt_channel.c | 1705 ----
6596 drivers/staging/rt2860/common/rt_rf.c | 187 -
6597 drivers/staging/rt2860/common/rtmp_init.c | 3536 ---------
6598 drivers/staging/rt2860/common/rtmp_mcu.c | 336 -
6599 drivers/staging/rt2860/common/rtmp_timer.c | 302 -
6600 drivers/staging/rt2860/common/spectrum.c | 2205 ------
6601 drivers/staging/rt2860/crypt_hmac.h | 65 -
6602 drivers/staging/rt2860/crypt_md5.h | 73 -
6603 drivers/staging/rt2860/crypt_sha2.h | 73 -
6604 drivers/staging/rt2860/dfs.h | 39 -
6605 drivers/staging/rt2860/eeprom.h | 67 -
6606 drivers/staging/rt2860/iface/rtmp_pci.h | 80 -
6607 drivers/staging/rt2860/iface/rtmp_usb.h | 196 -
6608 drivers/staging/rt2860/mlme.h | 1050 ---
6609 drivers/staging/rt2860/oid.h | 779 --
6610 drivers/staging/rt2860/pci_main_dev.c | 1192 ---
6611 drivers/staging/rt2860/rt_config.h | 71 -
6612 drivers/staging/rt2860/rt_linux.c | 1367 ----
6613 drivers/staging/rt2860/rt_linux.h | 835 --
6614 drivers/staging/rt2860/rt_main_dev.c | 736 --
6615 drivers/staging/rt2860/rt_pci_rbus.c | 837 --
6616 drivers/staging/rt2860/rt_usb.c | 794 --
6617 drivers/staging/rt2860/rtmp.h | 4332 -----------
6618 drivers/staging/rt2860/rtmp_chip.h | 258 -
6619 drivers/staging/rt2860/rtmp_ckipmic.h | 63 -
6620 drivers/staging/rt2860/rtmp_def.h | 1427 ----
6621 drivers/staging/rt2860/rtmp_dot11.h | 100 -
6622 drivers/staging/rt2860/rtmp_iface.h | 75 -
6623 drivers/staging/rt2860/rtmp_mcu.h | 49 -
6624 drivers/staging/rt2860/rtmp_os.h | 90 -
6625 drivers/staging/rt2860/rtmp_timer.h | 148 -
6626 drivers/staging/rt2860/rtmp_type.h | 89 -
6627 drivers/staging/rt2860/rtusb_io.h | 185 -
6628 drivers/staging/rt2860/spectrum.h | 189 -
6629 drivers/staging/rt2860/spectrum_def.h | 202 -
6630 drivers/staging/rt2860/sta/assoc.c | 1602 ----
6631 drivers/staging/rt2860/sta/auth.c | 517 --
6632 drivers/staging/rt2860/sta/auth_rsp.c | 142 -
6633 drivers/staging/rt2860/sta/connect.c | 2613 -------
6634 drivers/staging/rt2860/sta/rtmp_data.c | 2552 ------
6635 drivers/staging/rt2860/sta/sanity.c | 362 -
6636 drivers/staging/rt2860/sta/sync.c | 1968 -----
6637 drivers/staging/rt2860/sta/wpa.c | 374 -
6638 drivers/staging/rt2860/sta_ioctl.c | 2912 -------
6639 drivers/staging/rt2860/usb_main_dev.c | 927 ---
6640 drivers/staging/rt2860/wpa.h | 390 -
6641 drivers/staging/rt2870/Kconfig | 9 -
6642 drivers/staging/rt2870/Makefile | 55 -
6643 drivers/staging/rt2870/TODO | 17 -
6644 drivers/staging/rt2870/aironet.h | 1 -
6645 drivers/staging/rt2870/ap.h | 1 -
6646 drivers/staging/rt2870/chips/rt3070.c | 1 -
6647 drivers/staging/rt2870/chips/rt30xx.c | 1 -
6648 drivers/staging/rt2870/chlist.h | 1 -
6649 drivers/staging/rt2870/common/acction.c | 1 -
6650 drivers/staging/rt2870/common/action.c | 1 -
6651 drivers/staging/rt2870/common/action.h | 1 -
6652 drivers/staging/rt2870/common/ba_action.c | 1 -
6653 drivers/staging/rt2870/common/cmm_aes.c | 1 -
6654 drivers/staging/rt2870/common/cmm_asic.c | 1 -
6655 drivers/staging/rt2870/common/cmm_cfg.c | 1 -
6656 drivers/staging/rt2870/common/cmm_data.c | 1 -
6657 drivers/staging/rt2870/common/cmm_data_usb.c | 1 -
6658 drivers/staging/rt2870/common/cmm_info.c | 1 -
6659 drivers/staging/rt2870/common/cmm_mac_usb.c | 1 -
6660 drivers/staging/rt2870/common/cmm_profile.c | 1 -
6661 drivers/staging/rt2870/common/cmm_sanity.c | 1 -
6662 drivers/staging/rt2870/common/cmm_sync.c | 1 -
6663 drivers/staging/rt2870/common/cmm_tkip.c | 1 -
6664 drivers/staging/rt2870/common/cmm_wep.c | 1 -
6665 drivers/staging/rt2870/common/cmm_wpa.c | 1 -
6666 drivers/staging/rt2870/common/crypt_hmac.c | 1 -
6667 drivers/staging/rt2870/common/crypt_md5.c | 1 -
6668 drivers/staging/rt2870/common/crypt_sha2.c | 1 -
6669 drivers/staging/rt2870/common/dfs.c | 1 -
6670 drivers/staging/rt2870/common/ee_efuse.c | 1 -
6671 drivers/staging/rt2870/common/eeprom.c | 1 -
6672 drivers/staging/rt2870/common/md5.c | 1 -
6673 drivers/staging/rt2870/common/mlme.c | 1 -
6674 drivers/staging/rt2870/common/rt_channel.c | 1 -
6675 drivers/staging/rt2870/common/rt_rf.c | 1 -
6676 drivers/staging/rt2870/common/rtmp_init.c | 1 -
6677 drivers/staging/rt2870/common/rtmp_mcu.c | 1 -
6678 drivers/staging/rt2870/common/rtmp_timer.c | 1 -
6679 drivers/staging/rt2870/common/rtmp_tkip.c | 1 -
6680 drivers/staging/rt2870/common/rtmp_wep.c | 1 -
6681 drivers/staging/rt2870/common/rtusb_bulk.c | 1232 ---
6682 drivers/staging/rt2870/common/rtusb_data.c | 262 -
6683 drivers/staging/rt2870/common/rtusb_io.c | 2104 -----
6684 drivers/staging/rt2870/common/spectrum.c | 1 -
6685 drivers/staging/rt2870/dfs.h | 1 -
6686 drivers/staging/rt2870/md5.h | 1 -
6687 drivers/staging/rt2870/mlme.h | 1 -
6688 drivers/staging/rt2870/oid.h | 1 -
6689 drivers/staging/rt2870/rt28xx.h | 1 -
6690 drivers/staging/rt2870/rt_config.h | 1 -
6691 drivers/staging/rt2870/rt_linux.c | 1 -
6692 drivers/staging/rt2870/rt_linux.h | 1 -
6693 drivers/staging/rt2870/rt_main_dev.c | 1 -
6694 drivers/staging/rt2870/rt_profile.c | 1 -
6695 drivers/staging/rt2870/rt_usb.c | 1 -
6696 drivers/staging/rt2870/rtmp.h | 1 -
6697 drivers/staging/rt2870/rtmp_ckipmic.h | 1 -
6698 drivers/staging/rt2870/rtmp_def.h | 1 -
6699 drivers/staging/rt2870/rtmp_type.h | 1 -
6700 drivers/staging/rt2870/spectrum.h | 1 -
6701 drivers/staging/rt2870/spectrum_def.h | 1 -
6702 drivers/staging/rt2870/sta/aironet.c | 1 -
6703 drivers/staging/rt2870/sta/assoc.c | 1 -
6704 drivers/staging/rt2870/sta/auth.c | 1 -
6705 drivers/staging/rt2870/sta/auth_rsp.c | 1 -
6706 drivers/staging/rt2870/sta/connect.c | 1 -
6707 drivers/staging/rt2870/sta/rtmp_data.c | 1 -
6708 drivers/staging/rt2870/sta/sanity.c | 1 -
6709 drivers/staging/rt2870/sta/sync.c | 1 -
6710 drivers/staging/rt2870/sta/wpa.c | 1 -
6711 drivers/staging/rt2870/sta_ioctl.c | 1 -
6712 drivers/staging/rt2870/usb_main_dev.c | 1 -
6713 drivers/staging/rt2870/wpa.h | 1 -
6714 drivers/staging/rtl8712/ieee80211.h | 26 +-
6715 drivers/staging/rtl8712/if_ether.h | 4 +-
6716 drivers/staging/rtl8712/ip.h | 34 +-
6717 drivers/staging/rtl8712/mlme_osdep.h | 4 +-
6718 drivers/staging/rtl8712/osdep_service.h | 3 +-
6719 drivers/staging/rtl8712/recv_osdep.h | 4 +-
6720 drivers/staging/rtl8712/rtl8712_event.h | 25 +-
6721 drivers/staging/rtl8712/rtl8712_hal.h | 100 +-
6722 drivers/staging/rtl8712/rtl8712_led.c | 2 +-
6723 drivers/staging/rtl8712/rtl8712_recv.c | 2 +-
6724 drivers/staging/rtl8712/rtl8712_recv.h | 2 +-
6725 drivers/staging/rtl8712/rtl8712_xmit.h | 11 +-
6726 drivers/staging/rtl8712/rtl871x_cmd.c | 7 +-
6727 drivers/staging/rtl8712/rtl871x_cmd.h | 26 +-
6728 drivers/staging/rtl8712/rtl871x_event.h | 12 +-
6729 drivers/staging/rtl8712/rtl871x_io.c | 6 +-
6730 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 9 +-
6731 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 2 +-
6732 drivers/staging/rtl8712/rtl871x_ioctl_set.c | 5 +-
6733 drivers/staging/rtl8712/rtl871x_ioctl_set.h | 16 +-
6734 drivers/staging/rtl8712/rtl871x_mp.c | 8 +-
6735 drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 10 +-
6736 drivers/staging/rtl8712/rtl871x_recv.c | 16 +-
6737 drivers/staging/rtl8712/rtl871x_recv.h | 4 +-
6738 drivers/staging/rtl8712/rtl871x_rf.h | 2 +-
6739 drivers/staging/rtl8712/rtl871x_security.h | 51 +-
6740 drivers/staging/rtl8712/rtl871x_xmit.c | 3 +-
6741 drivers/staging/rtl8712/rtl871x_xmit.h | 3 +-
6742 drivers/staging/rtl8712/wifi.h | 63 +-
6743 drivers/staging/rtl8712/wlan_bssdef.h | 212 +-
6744 drivers/staging/rts_pstor/ms.c | 52 +-
6745 drivers/staging/rts_pstor/rtsx.c | 4 +-
6746 drivers/staging/rts_pstor/rtsx.h | 3 -
6747 drivers/staging/rts_pstor/sd.c | 1 +
6748 drivers/staging/rts_pstor/spi.c | 34 +-
6749 drivers/staging/rts_pstor/xd.c | 4 +-
6750 drivers/staging/sbe-2t3e3/dc.c | 33 +-
6751 drivers/staging/sep/sep_driver.c | 9 +-
6752 drivers/staging/sm7xx/TODO | 1 -
6753 drivers/staging/sm7xx/smtcfb.c | 86 +-
6754 drivers/staging/tty/istallion.c | 2 +-
6755 drivers/staging/vt6655/bssdb.c | 8 +-
6756 drivers/staging/vt6655/device_main.c | 14 +-
6757 drivers/staging/vt6655/dpc.c | 10 +-
6758 drivers/staging/vt6655/ioctl.c | 44 +-
6759 drivers/staging/vt6655/power.c | 2 +-
6760 drivers/staging/vt6655/rxtx.c | 4 +-
6761 drivers/staging/vt6655/wcmd.c | 14 +-
6762 drivers/staging/vt6655/wmgr.c | 46 +-
6763 drivers/staging/vt6655/wpactl.c | 10 +-
6764 drivers/staging/vt6656/bssdb.c | 8 +-
6765 drivers/staging/vt6656/dpc.c | 10 +-
6766 drivers/staging/vt6656/ioctl.c | 44 +-
6767 drivers/staging/vt6656/main_usb.c | 4 +-
6768 drivers/staging/vt6656/rxtx.c | 4 +-
6769 drivers/staging/vt6656/wcmd.c | 8 +-
6770 drivers/staging/vt6656/wmgr.c | 48 +-
6771 drivers/staging/vt6656/wpactl.c | 10 +-
6772 .../arch/arm/mach-omap2/cyashalomap_kernel.c | 2 +-
6773 .../westbridge/astoria/block/cyasblkdev_block.c | 2 +-
6774 drivers/staging/winbond/mto.c | 10 -
6775 drivers/staging/winbond/phy_calibration.c | 8 +-
6776 drivers/staging/winbond/wb35tx.c | 3 +-
6777 drivers/staging/xgifb/XGI_main.h | 792 +-
6778 drivers/staging/xgifb/XGI_main_26.c | 1259 ++--
6779 drivers/staging/xgifb/XGIfb.h | 142 +-
6780 drivers/staging/xgifb/vb_def.h | 1269 ++--
6781 drivers/staging/xgifb/vb_ext.c | 138 +-
6782 drivers/staging/xgifb/vb_ext.h | 25 +-
6783 drivers/staging/xgifb/vb_init.c | 527 +-
6784 drivers/staging/xgifb/vb_init.h | 7 +-
6785 drivers/staging/xgifb/vb_setmode.c | 1885 +++--
6786 drivers/staging/xgifb/vb_setmode.h | 97 +-
6787 drivers/staging/xgifb/vb_struct.h | 823 +--
6788 drivers/staging/xgifb/vb_table.h | 8147 ++++++++++----------
6789 drivers/staging/xgifb/vb_util.c | 2 +-
6790 drivers/staging/xgifb/vgatypes.h | 113 +-
6791 kernel/module.c | 4 +-
6792 612 files changed, 24732 insertions(+), 142633 deletions(-)
6793 delete mode 100644 drivers/staging/ath6kl/include/a_types.h
6794 delete mode 100644 drivers/staging/ath6kl/include/athendpack.h
6795 delete mode 100644 drivers/staging/ath6kl/include/athstartpack.h
6796 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h
6797 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_intf_reg.h
6798 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_reg.h
6799 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h
6800 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_host_reg.h
6801 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_reg.h
6802 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/rtc_reg.h
6803 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h
6804 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/uart_reg.h
6805 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_ares_reg.h
6806 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h
6807 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_reg.h
6808 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/bb_lc_reg.h
6809 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/efuse_reg.h
6810 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_dma_reg.h
6811 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_pcu_reg.h
6812 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rdma_reg.h
6813 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_reg.h
6814 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_wlan_reg.h
6815 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_reg.h
6816 delete mode 100644 drivers/staging/ath6kl/include/common/btcoexGpio.h
6817 delete mode 100644 drivers/staging/ath6kl/include/common/ini_dset.h
6818 delete mode 100644 drivers/staging/ath6kl/include/common/regDb.h
6819 delete mode 100644 drivers/staging/ath6kl/include/common/regdump.h
6820 delete mode 100644 drivers/staging/ath6kl/include/common/wlan_dset.h
6821 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_android.c
6822 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6k_pal.c
6823 delete mode 100644 drivers/staging/ath6kl/os/linux/include/athtypes_linux.h
6824 delete mode 100644 drivers/staging/ath6kl/os/linux/ioctl.c
6825 delete mode 100644 drivers/staging/ath6kl/os/linux/wireless_ext.c
6826 create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmchip.h
6827 delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndpmu.c
6828 delete mode 100644 drivers/staging/brcm80211/brcmfmac/sbutils.c
6829 delete mode 100644 drivers/staging/brcm80211/brcmfmac/siutils.c
6830 create mode 100644 drivers/staging/brcm80211/brcmsmac/aiutils.c
6831 create mode 100644 drivers/staging/brcm80211/brcmsmac/aiutils.h
6832 create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c
6833 rename drivers/staging/brcm80211/{include/qmath.h => brcmsmac/phy/wlc_phy_qmath.h} (63%)
6834 rename drivers/staging/brcm80211/{util/hndpmu.c => brcmsmac/wlc_pmu.c} (67%)
6835 rename drivers/staging/brcm80211/{include/hndpmu.h => brcmsmac/wlc_pmu.h} (77%)
6836 delete mode 100644 drivers/staging/brcm80211/util/aiutils.c
6837 delete mode 100644 drivers/staging/brcm80211/util/qmath.c
6838 delete mode 100644 drivers/staging/brcm80211/util/sbutils.c
6839 create mode 100644 drivers/staging/gma500/mrst.h
6840 create mode 100644 drivers/staging/gma500/mrst_crtc.c
6841 create mode 100644 drivers/staging/gma500/mrst_lvds.c
6842 delete mode 100644 drivers/staging/gma500/psb_buffer.c
6843 delete mode 100644 drivers/staging/gma500/psb_fence.c
6844 create mode 100644 drivers/staging/gma500/psb_gem.c
6845 rename drivers/staging/gma500/{psb_reset.c => psb_lid.c} (100%)
6846 delete mode 100644 drivers/staging/gma500/psb_pvr_glue.c
6847 delete mode 100644 drivers/staging/gma500/psb_pvr_glue.h
6848 delete mode 100644 drivers/staging/gma500/psb_sgx.c
6849 delete mode 100644 drivers/staging/gma500/psb_sgx.h
6850 delete mode 100644 drivers/staging/gma500/psb_ttm_fence.c
6851 delete mode 100644 drivers/staging/gma500/psb_ttm_fence_api.h
6852 delete mode 100644 drivers/staging/gma500/psb_ttm_fence_driver.h
6853 delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.c
6854 delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.h
6855 delete mode 100644 drivers/staging/gma500/psb_ttm_glue.c
6856 delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.c
6857 delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.h
6858 delete mode 100644 drivers/staging/gma500/psb_ttm_userobj_api.h
6859 delete mode 100644 drivers/staging/hv/blkvsc.c
6860 create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-light-tsl2583
6861 create mode 100644 drivers/staging/iio/adc/ad7780.c
6862 create mode 100644 drivers/staging/iio/adc/ad7780.h
6863 create mode 100644 drivers/staging/iio/dac/ad5504.c
6864 create mode 100644 drivers/staging/iio/dac/ad5504.h
6865 create mode 100644 drivers/staging/iio/dac/ad5791.c
6866 create mode 100644 drivers/staging/iio/dac/ad5791.h
6867 create mode 100644 drivers/staging/iio/gyro/adxrs450.h
6868 create mode 100644 drivers/staging/iio/gyro/adxrs450_core.c
6869 create mode 100644 drivers/staging/iio/light/tsl2583.c
6870 delete mode 100644 drivers/staging/rt2860/Kconfig
6871 delete mode 100644 drivers/staging/rt2860/Makefile
6872 delete mode 100644 drivers/staging/rt2860/TODO
6873 delete mode 100644 drivers/staging/rt2860/ap.h
6874 delete mode 100644 drivers/staging/rt2860/chip/mac_pci.h
6875 delete mode 100644 drivers/staging/rt2860/chip/mac_usb.h
6876 delete mode 100644 drivers/staging/rt2860/chip/rt2860.h
6877 delete mode 100644 drivers/staging/rt2860/chip/rt2870.h
6878 delete mode 100644 drivers/staging/rt2860/chip/rt3070.h
6879 delete mode 100644 drivers/staging/rt2860/chip/rt3090.h
6880 delete mode 100644 drivers/staging/rt2860/chip/rt30xx.h
6881 delete mode 100644 drivers/staging/rt2860/chip/rtmp_mac.h
6882 delete mode 100644 drivers/staging/rt2860/chip/rtmp_phy.h
6883 delete mode 100644 drivers/staging/rt2860/chips/rt3070.c
6884 delete mode 100644 drivers/staging/rt2860/chips/rt3090.c
6885 delete mode 100644 drivers/staging/rt2860/chips/rt30xx.c
6886 delete mode 100644 drivers/staging/rt2860/chlist.h
6887 delete mode 100644 drivers/staging/rt2860/common/action.c
6888 delete mode 100644 drivers/staging/rt2860/common/action.h
6889 delete mode 100644 drivers/staging/rt2860/common/ba_action.c
6890 delete mode 100644 drivers/staging/rt2860/common/cmm_aes.c
6891 delete mode 100644 drivers/staging/rt2860/common/cmm_asic.c
6892 delete mode 100644 drivers/staging/rt2860/common/cmm_cfg.c
6893 delete mode 100644 drivers/staging/rt2860/common/cmm_data.c
6894 delete mode 100644 drivers/staging/rt2860/common/cmm_data_pci.c
6895 delete mode 100644 drivers/staging/rt2860/common/cmm_data_usb.c
6896 delete mode 100644 drivers/staging/rt2860/common/cmm_info.c
6897 delete mode 100644 drivers/staging/rt2860/common/cmm_mac_pci.c
6898 delete mode 100644 drivers/staging/rt2860/common/cmm_mac_usb.c
6899 delete mode 100644 drivers/staging/rt2860/common/cmm_sanity.c
6900 delete mode 100644 drivers/staging/rt2860/common/cmm_sync.c
6901 delete mode 100644 drivers/staging/rt2860/common/cmm_tkip.c
6902 delete mode 100644 drivers/staging/rt2860/common/cmm_wep.c
6903 delete mode 100644 drivers/staging/rt2860/common/cmm_wpa.c
6904 delete mode 100644 drivers/staging/rt2860/common/crypt_hmac.c
6905 delete mode 100644 drivers/staging/rt2860/common/crypt_md5.c
6906 delete mode 100644 drivers/staging/rt2860/common/crypt_sha2.c
6907 delete mode 100644 drivers/staging/rt2860/common/dfs.c
6908 delete mode 100644 drivers/staging/rt2860/common/ee_efuse.c
6909 delete mode 100644 drivers/staging/rt2860/common/ee_prom.c
6910 delete mode 100644 drivers/staging/rt2860/common/eeprom.c
6911 delete mode 100644 drivers/staging/rt2860/common/mlme.c
6912 delete mode 100644 drivers/staging/rt2860/common/rt_channel.c
6913 delete mode 100644 drivers/staging/rt2860/common/rt_rf.c
6914 delete mode 100644 drivers/staging/rt2860/common/rtmp_init.c
6915 delete mode 100644 drivers/staging/rt2860/common/rtmp_mcu.c
6916 delete mode 100644 drivers/staging/rt2860/common/rtmp_timer.c
6917 delete mode 100644 drivers/staging/rt2860/common/spectrum.c
6918 delete mode 100644 drivers/staging/rt2860/crypt_hmac.h
6919 delete mode 100644 drivers/staging/rt2860/crypt_md5.h
6920 delete mode 100644 drivers/staging/rt2860/crypt_sha2.h
6921 delete mode 100644 drivers/staging/rt2860/dfs.h
6922 delete mode 100644 drivers/staging/rt2860/eeprom.h
6923 delete mode 100644 drivers/staging/rt2860/iface/rtmp_pci.h
6924 delete mode 100644 drivers/staging/rt2860/iface/rtmp_usb.h
6925 delete mode 100644 drivers/staging/rt2860/mlme.h
6926 delete mode 100644 drivers/staging/rt2860/oid.h
6927 delete mode 100644 drivers/staging/rt2860/pci_main_dev.c
6928 delete mode 100644 drivers/staging/rt2860/rt_config.h
6929 delete mode 100644 drivers/staging/rt2860/rt_linux.c
6930 delete mode 100644 drivers/staging/rt2860/rt_linux.h
6931 delete mode 100644 drivers/staging/rt2860/rt_main_dev.c
6932 delete mode 100644 drivers/staging/rt2860/rt_pci_rbus.c
6933 delete mode 100644 drivers/staging/rt2860/rt_usb.c
6934 delete mode 100644 drivers/staging/rt2860/rtmp.h
6935 delete mode 100644 drivers/staging/rt2860/rtmp_chip.h
6936 delete mode 100644 drivers/staging/rt2860/rtmp_ckipmic.h
6937 delete mode 100644 drivers/staging/rt2860/rtmp_def.h
6938 delete mode 100644 drivers/staging/rt2860/rtmp_dot11.h
6939 delete mode 100644 drivers/staging/rt2860/rtmp_iface.h
6940 delete mode 100644 drivers/staging/rt2860/rtmp_mcu.h
6941 delete mode 100644 drivers/staging/rt2860/rtmp_os.h
6942 delete mode 100644 drivers/staging/rt2860/rtmp_timer.h
6943 delete mode 100644 drivers/staging/rt2860/rtmp_type.h
6944 delete mode 100644 drivers/staging/rt2860/rtusb_io.h
6945 delete mode 100644 drivers/staging/rt2860/spectrum.h
6946 delete mode 100644 drivers/staging/rt2860/spectrum_def.h
6947 delete mode 100644 drivers/staging/rt2860/sta/assoc.c
6948 delete mode 100644 drivers/staging/rt2860/sta/auth.c
6949 delete mode 100644 drivers/staging/rt2860/sta/auth_rsp.c
6950 delete mode 100644 drivers/staging/rt2860/sta/connect.c
6951 delete mode 100644 drivers/staging/rt2860/sta/rtmp_data.c
6952 delete mode 100644 drivers/staging/rt2860/sta/sanity.c
6953 delete mode 100644 drivers/staging/rt2860/sta/sync.c
6954 delete mode 100644 drivers/staging/rt2860/sta/wpa.c
6955 delete mode 100644 drivers/staging/rt2860/sta_ioctl.c
6956 delete mode 100644 drivers/staging/rt2860/usb_main_dev.c
6957 delete mode 100644 drivers/staging/rt2860/wpa.h
6958 delete mode 100644 drivers/staging/rt2870/Kconfig
6959 delete mode 100644 drivers/staging/rt2870/Makefile
6960 delete mode 100644 drivers/staging/rt2870/TODO
6961 delete mode 100644 drivers/staging/rt2870/aironet.h
6962 delete mode 100644 drivers/staging/rt2870/ap.h
6963 delete mode 100644 drivers/staging/rt2870/chips/rt3070.c
6964 delete mode 100644 drivers/staging/rt2870/chips/rt30xx.c
6965 delete mode 100644 drivers/staging/rt2870/chlist.h
6966 delete mode 100644 drivers/staging/rt2870/common/acction.c
6967 delete mode 100644 drivers/staging/rt2870/common/action.c
6968 delete mode 100644 drivers/staging/rt2870/common/action.h
6969 delete mode 100644 drivers/staging/rt2870/common/ba_action.c
6970 delete mode 100644 drivers/staging/rt2870/common/cmm_aes.c
6971 delete mode 100644 drivers/staging/rt2870/common/cmm_asic.c
6972 delete mode 100644 drivers/staging/rt2870/common/cmm_cfg.c
6973 delete mode 100644 drivers/staging/rt2870/common/cmm_data.c
6974 delete mode 100644 drivers/staging/rt2870/common/cmm_data_usb.c
6975 delete mode 100644 drivers/staging/rt2870/common/cmm_info.c
6976 delete mode 100644 drivers/staging/rt2870/common/cmm_mac_usb.c
6977 delete mode 100644 drivers/staging/rt2870/common/cmm_profile.c
6978 delete mode 100644 drivers/staging/rt2870/common/cmm_sanity.c
6979 delete mode 100644 drivers/staging/rt2870/common/cmm_sync.c
6980 delete mode 100644 drivers/staging/rt2870/common/cmm_tkip.c
6981 delete mode 100644 drivers/staging/rt2870/common/cmm_wep.c
6982 delete mode 100644 drivers/staging/rt2870/common/cmm_wpa.c
6983 delete mode 100644 drivers/staging/rt2870/common/crypt_hmac.c
6984 delete mode 100644 drivers/staging/rt2870/common/crypt_md5.c
6985 delete mode 100644 drivers/staging/rt2870/common/crypt_sha2.c
6986 delete mode 100644 drivers/staging/rt2870/common/dfs.c
6987 delete mode 100644 drivers/staging/rt2870/common/ee_efuse.c
6988 delete mode 100644 drivers/staging/rt2870/common/eeprom.c
6989 delete mode 100644 drivers/staging/rt2870/common/md5.c
6990 delete mode 100644 drivers/staging/rt2870/common/mlme.c
6991 delete mode 100644 drivers/staging/rt2870/common/rt_channel.c
6992 delete mode 100644 drivers/staging/rt2870/common/rt_rf.c
6993 delete mode 100644 drivers/staging/rt2870/common/rtmp_init.c
6994 delete mode 100644 drivers/staging/rt2870/common/rtmp_mcu.c
6995 delete mode 100644 drivers/staging/rt2870/common/rtmp_timer.c
6996 delete mode 100644 drivers/staging/rt2870/common/rtmp_tkip.c
6997 delete mode 100644 drivers/staging/rt2870/common/rtmp_wep.c
6998 delete mode 100644 drivers/staging/rt2870/common/rtusb_bulk.c
6999 delete mode 100644 drivers/staging/rt2870/common/rtusb_data.c
7000 delete mode 100644 drivers/staging/rt2870/common/rtusb_io.c
7001 delete mode 100644 drivers/staging/rt2870/common/spectrum.c
7002 delete mode 100644 drivers/staging/rt2870/dfs.h
7003 delete mode 100644 drivers/staging/rt2870/md5.h
7004 delete mode 100644 drivers/staging/rt2870/mlme.h
7005 delete mode 100644 drivers/staging/rt2870/oid.h
7006 delete mode 100644 drivers/staging/rt2870/rt28xx.h
7007 delete mode 100644 drivers/staging/rt2870/rt_config.h
7008 delete mode 100644 drivers/staging/rt2870/rt_linux.c
7009 delete mode 100644 drivers/staging/rt2870/rt_linux.h
7010 delete mode 100644 drivers/staging/rt2870/rt_main_dev.c
7011 delete mode 100644 drivers/staging/rt2870/rt_profile.c
7012 delete mode 100644 drivers/staging/rt2870/rt_usb.c
7013 delete mode 100644 drivers/staging/rt2870/rtmp.h
7014 delete mode 100644 drivers/staging/rt2870/rtmp_ckipmic.h
7015 delete mode 100644 drivers/staging/rt2870/rtmp_def.h
7016 delete mode 100644 drivers/staging/rt2870/rtmp_type.h
7017 delete mode 100644 drivers/staging/rt2870/spectrum.h
7018 delete mode 100644 drivers/staging/rt2870/spectrum_def.h
7019 delete mode 100644 drivers/staging/rt2870/sta/aironet.c
7020 delete mode 100644 drivers/staging/rt2870/sta/assoc.c
7021 delete mode 100644 drivers/staging/rt2870/sta/auth.c
7022 delete mode 100644 drivers/staging/rt2870/sta/auth_rsp.c
7023 delete mode 100644 drivers/staging/rt2870/sta/connect.c
7024 delete mode 100644 drivers/staging/rt2870/sta/rtmp_data.c
7025 delete mode 100644 drivers/staging/rt2870/sta/sanity.c
7026 delete mode 100644 drivers/staging/rt2870/sta/sync.c
7027 delete mode 100644 drivers/staging/rt2870/sta/wpa.c
7028 delete mode 100644 drivers/staging/rt2870/sta_ioctl.c
7029 delete mode 100644 drivers/staging/rt2870/usb_main_dev.c
7030 delete mode 100644 drivers/staging/rt2870/wpa.h
7032 $ git merge slabh/slabh
7034 Merging bkl-config/config
7035 $ git merge bkl-config/config
7037 Merging cleancache/linux-next
7038 $ git merge cleancache/linux-next
7039 Auto-merging drivers/xen/Makefile
7040 Auto-merging fs/btrfs/extent_io.c
7041 Auto-merging fs/btrfs/super.c
7042 Auto-merging fs/ext4/super.c
7043 Merge made by recursive.
7044 .../ABI/testing/sysfs-kernel-mm-cleancache | 11 +
7045 Documentation/vm/cleancache.txt | 278 ++++++++++++++++++++
7046 arch/x86/include/asm/xen/hypercall.h | 7 +
7047 drivers/xen/Makefile | 1 +
7048 drivers/xen/tmem.c | 264 +++++++++++++++++++
7049 fs/btrfs/extent_io.c | 9 +
7050 fs/btrfs/super.c | 2 +
7052 fs/ext3/super.c | 2 +
7053 fs/ext4/super.c | 2 +
7055 fs/ocfs2/super.c | 2 +
7057 include/linux/cleancache.h | 122 +++++++++
7058 include/linux/fs.h | 5 +
7059 include/xen/interface/xen.h | 22 ++
7062 mm/cleancache.c | 244 +++++++++++++++++
7065 21 files changed, 1027 insertions(+), 0 deletions(-)
7066 create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache
7067 create mode 100644 Documentation/vm/cleancache.txt
7068 create mode 100644 drivers/xen/tmem.c
7069 create mode 100644 include/linux/cleancache.h
7070 create mode 100644 mm/cleancache.c
7071 Merging scsi-post-merge/merge-base:master
7072 $ git clone -s -l -n -q . ../rebase-tmp
7074 $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master
7076 * [new branch] scsi-post-merge/master -> scsi-post-merge/master
7077 $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base
7079 * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base
7080 $ git checkout scsi-post-merge/master
7081 Switched to branch 'scsi-post-merge/master'
7082 $ git rebase --onto master scsi-post-merge/merge-base
7083 First, rewinding head to replay your work on top of it...
7084 Fast-forwarded scsi-post-merge/master to master.
7086 $ git pull -f ../rebase-tmp scsi-post-merge/master
7088 * branch scsi-post-merge/master -> FETCH_HEAD
7090 $ rm -rf ../rebase-tmp