2 Wed Jun 22 10:40:35 EST 2011
5 $ git reset --hard stable
6 HEAD is now at ef46222 Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
8 $ git merge origin/master
9 Updating ef46222..e08f6d4
13 arch/arm/mach-msm/timer.c | 14 +-
14 drivers/bluetooth/btmrvl_debugfs.c | 12 +
15 drivers/gpu/drm/nouveau/nouveau_acpi.c | 1 -
16 drivers/gpu/drm/nouveau/nouveau_fence.c | 59 ++--
17 drivers/gpu/drm/nouveau/nouveau_perf.c | 5 +
18 drivers/gpu/drm/nouveau/nouveau_state.c | 4 +-
19 drivers/gpu/drm/nouveau/nv50_display.c | 17 +-
20 drivers/gpu/drm/radeon/evergreen.c | 23 +-
21 drivers/gpu/drm/radeon/r600.c | 18 +-
22 drivers/gpu/drm/radeon/radeon_atombios.c | 4 +
23 drivers/gpu/drm/radeon/radeon_encoders.c | 11 +-
24 drivers/gpu/drm/radeon/rv770.c | 3 +
25 drivers/infiniband/hw/cxgb4/cm.c | 46 +++-
26 drivers/infiniband/hw/cxgb4/cq.c | 4 +
27 drivers/infiniband/hw/cxgb4/mem.c | 2 +-
28 drivers/infiniband/hw/cxgb4/qp.c | 5 +-
29 drivers/infiniband/hw/qib/qib_iba7322.c | 25 ++-
30 drivers/infiniband/hw/qib/qib_intr.c | 6 +-
31 drivers/isdn/gigaset/interface.c | 4 +-
32 drivers/misc/sgi-xp/xpnet.c | 6 +-
33 drivers/net/3c503.c | 3 +-
34 drivers/net/bfin_mac.c | 20 +-
35 drivers/net/bonding/bond_main.c | 1 +
36 drivers/net/fs_enet/mac-fcc.c | 2 +-
37 drivers/net/hp100.c | 4 +-
38 drivers/net/hplance.c | 2 +-
39 drivers/net/netxen/netxen_nic_main.c | 4 +-
40 drivers/net/phy/Kconfig | 1 +
41 drivers/net/phy/dp83640.c | 24 +-
42 drivers/net/ppp_async.c | 4 +-
43 drivers/net/pxa168_eth.c | 2 +-
44 drivers/net/r8169.c | 10 +-
45 drivers/net/tun.c | 24 ++-
46 drivers/net/usb/Kconfig | 10 +
47 drivers/net/usb/Makefile | 1 +
48 drivers/net/usb/kalmia.c | 384 ++++++++++++++++++++++++
49 drivers/net/wan/farsync.c | 4 +-
50 drivers/net/wireless/mwifiex/cfg80211.c | 2 +
51 drivers/net/wireless/mwl8k.c | 4 +-
53 fs/cifs/cifsfs.c | 3 -
54 fs/coda/pioctl.c | 2 -
55 fs/ext4/ext4_extents.h | 9 +-
56 fs/ext4/extents.c | 42 ++--
57 fs/ext4/inode.c | 2 +-
58 fs/ext4/mballoc.c | 8 +-
59 fs/ext4/move_extent.c | 10 +-
60 fs/ext4/super.c | 15 +-
61 fs/jbd2/checkpoint.c | 28 +-
62 fs/jbd2/commit.c | 33 ++-
63 fs/jbd2/journal.c | 91 ++----
64 fs/jbd2/transaction.c | 69 +++--
68 fs/nfsd/nfsctl.c | 19 +-
70 fs/nilfs2/inode.c | 7 +-
72 fs/proc/proc_sysctl.c | 3 -
73 fs/reiserfs/xattr.c | 2 -
74 fs/ubifs/super.c | 1 +
75 include/linux/device_cgroup.h | 10 +-
76 include/linux/fs.h | 2 +-
77 include/linux/jbd2.h | 2 -
78 include/linux/sunrpc/gss_krb5_enctypes.h | 4 +
79 include/net/netfilter/nf_conntrack.h | 6 +
80 include/trace/events/ext4.h | 179 +++++-------
81 net/8021q/vlan.c | 2 +-
82 net/bluetooth/hci_event.c | 18 +-
83 net/bluetooth/l2cap_sock.c | 1 +
84 net/bluetooth/rfcomm/sock.c | 1 +
85 net/bluetooth/sco.c | 13 +-
86 net/bridge/br_device.c | 1 +
87 net/bridge/br_multicast.c | 4 +-
88 net/caif/cfmuxl.c | 2 +-
89 net/ieee802154/nl-phy.c | 3 +-
90 net/ipv4/af_inet.c | 1 +
91 net/ipv4/inet_diag.c | 14 +-
92 net/ipv4/netfilter/ip_queue.c | 3 +-
93 net/ipv4/netfilter/ip_tables.c | 2 +-
94 net/ipv4/netfilter/ipt_ecn.c | 7 +-
95 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 4 +-
97 net/ipv4/route.c | 4 +-
98 net/ipv4/tcp_ipv4.c | 1 +
99 net/ipv6/netfilter/ip6_queue.c | 3 +-
100 net/ipv6/tcp_ipv6.c | 1 +
101 net/netfilter/ipvs/ip_vs_conn.c | 10 +-
102 net/netfilter/ipvs/ip_vs_core.c | 1 +
103 net/netfilter/nfnetlink_log.c | 3 +-
104 net/netfilter/nfnetlink_queue.c | 3 +-
105 net/sunrpc/auth_gss/gss_krb5_mech.c | 3 +-
106 security/device_cgroup.c | 8 +-
107 96 files changed, 989 insertions(+), 495 deletions(-)
108 create mode 100644 drivers/net/usb/kalmia.c
109 create mode 100644 include/linux/sunrpc/gss_krb5_enctypes.h
111 $ git merge fixes/fixes
113 Merging kbuild-current/rc-fixes
114 $ git merge kbuild-current/rc-fixes
116 Merging arm-current/master
117 $ git merge arm-current/master
119 Merging m68k-current/for-linus
120 $ git merge m68k-current/for-linus
122 Merging powerpc-merge/merge
123 $ git merge powerpc-merge/merge
125 Merging 52xx-and-virtex-current/powerpc/merge
126 $ git merge 52xx-and-virtex-current/powerpc/merge
128 Merging sparc-current/master
129 $ git merge sparc-current/master
131 Merging scsi-rc-fixes/master
132 $ git merge scsi-rc-fixes/master
134 Merging net-current/master
135 $ git merge net-current/master
136 Merge made by recursive.
137 drivers/net/Kconfig | 3 ++-
138 1 files changed, 2 insertions(+), 1 deletions(-)
139 Merging sound-current/for-linus
140 $ git merge sound-current/for-linus
142 Merging pci-current/for-linus
143 $ git merge pci-current/for-linus
144 Auto-merging drivers/pci/pci.c
145 Merge made by recursive.
146 arch/x86/pci/acpi.c | 2 +-
147 drivers/pci/pci.c | 2 +-
148 drivers/pci/probe.c | 2 +-
149 3 files changed, 3 insertions(+), 3 deletions(-)
150 Merging wireless-current/master
151 $ git merge wireless-current/master
152 Merge made by recursive.
153 drivers/net/wireless/rtlwifi/pci.c | 13 ++++++++++++-
154 net/bluetooth/hci_conn.c | 6 +++---
155 net/bluetooth/l2cap_core.c | 21 +++++++++++++++------
156 3 files changed, 30 insertions(+), 10 deletions(-)
157 Merging driver-core.current/driver-core-linus
158 $ git merge driver-core.current/driver-core-linus
159 Merge made by recursive.
160 drivers/base/platform.c | 2 +-
161 drivers/connector/connector.c | 1 +
162 drivers/firmware/google/Kconfig | 1 +
163 drivers/misc/pti.c | 11 +++++++----
164 drivers/misc/ti-st/st_core.c | 2 +-
165 drivers/misc/ti-st/st_kim.c | 8 ++++++--
166 include/linux/connector.h | 2 +-
167 7 files changed, 18 insertions(+), 9 deletions(-)
168 Merging tty.current/tty-linus
169 $ git merge tty.current/tty-linus
170 Merge made by recursive.
171 arch/arm/mach-exynos4/init.c | 1 +
172 arch/arm/mach-ux500/board-mop500-pins.c | 16 ++-
173 arch/arm/mach-ux500/board-mop500.c | 54 ++++++++++
174 arch/arm/plat-samsung/include/plat/regs-serial.h | 2 +
175 drivers/tty/n_gsm.c | 26 ++++-
176 drivers/tty/n_tty.c | 1 +
177 drivers/tty/serial/8250.c | 1 +
178 drivers/tty/serial/8250_pci.c | 61 +++++++++++-
179 drivers/tty/serial/amba-pl011.c | 123 +++++++++++++++++++++-
180 drivers/tty/serial/bcm63xx_uart.c | 18 +++-
181 drivers/tty/serial/jsm/jsm_driver.c | 2 +-
182 drivers/tty/serial/s5pv210.c | 4 +-
183 drivers/tty/tty_ldisc.c | 4 +-
184 include/linux/amba/serial.h | 3 +
185 14 files changed, 296 insertions(+), 20 deletions(-)
186 Merging usb.current/usb-linus
187 $ git merge usb.current/usb-linus
188 Auto-merging MAINTAINERS
189 Merge made by recursive.
190 MAINTAINERS | 6 ++++--
191 drivers/usb/core/driver.c | 11 ++++++++++-
192 drivers/usb/core/hub.c | 13 ++++++++-----
193 drivers/usb/host/ehci-hcd.c | 4 ++++
194 drivers/usb/host/ohci-hcd.c | 4 +++-
195 drivers/usb/musb/musb_gadget.c | 6 ++++++
196 drivers/usb/musb/musb_host.c | 2 +-
197 drivers/usb/serial/ti_usb_3410_5052.c | 1 +
198 8 files changed, 37 insertions(+), 10 deletions(-)
199 Merging staging.current/staging-linus
200 $ git merge staging.current/staging-linus
202 Merging cpufreq-current/fixes
203 $ git merge cpufreq-current/fixes
205 Merging input-current/for-linus
206 $ git merge input-current/for-linus
208 Merging md-current/for-linus
209 $ git merge md-current/for-linus
211 Merging audit-current/for-linus
212 $ git merge audit-current/for-linus
214 Merging crypto-current/master
215 $ git merge crypto-current/master
216 Merge made by recursive.
217 drivers/crypto/picoxcell_crypto.c | 2 +-
218 1 files changed, 1 insertions(+), 1 deletions(-)
219 Merging ide-curent/master
220 $ git merge ide-curent/master
223 $ git merge dwmw2/master
225 Merging sh-current/sh-fixes-for-linus
226 $ git merge sh-current/sh-fixes-for-linus
227 Merge made by recursive.
228 arch/sh/configs/sh7757lcr_defconfig | 8 ++---
229 arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 50 ++++++++++++++++++++++++++++++++
230 2 files changed, 53 insertions(+), 5 deletions(-)
231 Merging rmobile-current/rmobile-fixes-for-linus
232 $ git merge rmobile-current/rmobile-fixes-for-linus
233 Merge made by recursive.
234 arch/arm/mach-shmobile/board-ag5evm.c | 4 ++--
235 arch/arm/mach-shmobile/board-mackerel.c | 2 +-
236 2 files changed, 3 insertions(+), 3 deletions(-)
237 Merging fbdev-current/fbdev-fixes-for-linus
238 $ git merge fbdev-current/fbdev-fixes-for-linus
240 Merging devicetree-current/devicetree/merge
241 $ git merge devicetree-current/devicetree/merge
242 Merge made by recursive.
243 include/linux/of_address.h | 1 +
244 1 files changed, 1 insertions(+), 0 deletions(-)
245 Merging spi-current/spi/merge
246 $ git merge spi-current/spi/merge
249 $ git merge arm/for-next
250 Merge made by recursive.
251 arch/arm/Kconfig | 3 +
252 arch/arm/boot/compressed/head.S | 14 ++-
253 arch/arm/include/asm/assembler.h | 4 +
254 arch/arm/include/asm/dma-mapping.h | 3 +-
255 arch/arm/include/asm/entry-macro-multi.S | 2 +
256 arch/arm/include/asm/mach/map.h | 2 +
257 arch/arm/include/asm/memory.h | 7 +
258 arch/arm/include/asm/pgalloc.h | 2 +-
259 arch/arm/include/asm/pgtable.h | 23 ++-
260 arch/arm/include/asm/scatterlist.h | 4 +
261 arch/arm/include/asm/tlb.h | 1 +
262 arch/arm/kernel/module.c | 13 +-
263 arch/arm/kernel/sleep.S | 70 +++----
264 arch/arm/kernel/smp.c | 6 +-
265 arch/arm/mach-exynos4/sleep.S | 10 +-
266 arch/arm/mach-h720x/Kconfig | 2 +
267 arch/arm/mach-pxa/sleep.S | 48 +++---
268 arch/arm/mach-s3c64xx/sleep.S | 11 +-
269 arch/arm/mach-s5pv210/sleep.S | 10 +-
270 arch/arm/mach-sa1100/sleep.S | 17 +--
271 arch/arm/mm/dma-mapping.c | 314 ++++++++++++++++--------------
272 arch/arm/mm/init.c | 1 +
273 arch/arm/mm/mm.h | 2 +
274 arch/arm/mm/mmu.c | 24 +++
275 arch/arm/plat-iop/cp6.c | 1 +
276 arch/arm/plat-s3c24xx/sleep.S | 12 +-
277 26 files changed, 330 insertions(+), 276 deletions(-)
278 Merging arm-lpae/for-next
279 $ git merge arm-lpae/for-next
280 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
281 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
282 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
283 Resolved 'arch/arm/mm/context.c' using previous resolution.
284 Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution.
285 Resolved 'arch/arm/mm/proc-v7.S' using previous resolution.
286 Auto-merging arch/arm/Kconfig
287 Auto-merging arch/arm/boot/compressed/head.S
288 Auto-merging arch/arm/include/asm/assembler.h
289 Auto-merging arch/arm/include/asm/memory.h
290 Auto-merging arch/arm/include/asm/pgalloc.h
291 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
292 Auto-merging arch/arm/include/asm/pgtable.h
293 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
294 Auto-merging arch/arm/include/asm/tlb.h
295 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
296 Auto-merging arch/arm/kernel/module.c
297 Auto-merging arch/arm/kernel/sleep.S
298 Auto-merging arch/arm/mm/context.c
299 CONFLICT (content): Merge conflict in arch/arm/mm/context.c
300 Auto-merging arch/arm/mm/dma-mapping.c
301 CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
302 Auto-merging arch/arm/mm/mm.h
303 Auto-merging arch/arm/mm/mmu.c
304 Auto-merging arch/arm/mm/proc-v7.S
305 CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S
306 Automatic merge failed; fix conflicts and then commit the result.
308 [master 6c27a43] Merge remote-tracking branch 'arm-lpae/for-next'
309 $ git diff -M --stat --summary HEAD^..
310 arch/arm/Kconfig | 2 +-
311 arch/arm/boot/compressed/head.S | 1 +
312 arch/arm/include/asm/assembler.h | 11 +
313 arch/arm/include/asm/memory.h | 4 +-
314 arch/arm/include/asm/page.h | 44 +---
315 arch/arm/include/asm/pgalloc.h | 28 ++-
316 arch/arm/include/asm/pgtable-2level-hwdef.h | 93 ++++++
317 arch/arm/include/asm/pgtable-2level-types.h | 69 +++++
318 arch/arm/include/asm/pgtable-2level.h | 143 +++++++++
319 arch/arm/include/asm/pgtable-3level-hwdef.h | 82 ++++++
320 arch/arm/include/asm/pgtable-3level-types.h | 71 +++++
321 arch/arm/include/asm/pgtable-3level.h | 107 +++++++
322 arch/arm/include/asm/pgtable-hwdef.h | 81 +-----
323 arch/arm/include/asm/pgtable.h | 211 +++++---------
324 arch/arm/include/asm/proc-fns.h | 25 ++
325 arch/arm/include/asm/setup.h | 8 +
326 arch/arm/include/asm/tlb.h | 11 +-
327 arch/arm/include/asm/tlbflush.h | 4 +-
328 arch/arm/include/asm/types.h | 11 +-
329 arch/arm/kernel/head.S | 119 ++++++---
330 arch/arm/kernel/module.c | 2 +-
331 arch/arm/kernel/setup.c | 10 +
332 arch/arm/kernel/sleep.S | 2 +
333 arch/arm/mm/Kconfig | 13 +
334 arch/arm/mm/Makefile | 4 +
335 arch/arm/mm/alignment.c | 8 +-
336 arch/arm/mm/context.c | 19 +-
337 arch/arm/mm/fault.c | 82 +++++-
338 arch/arm/mm/idmap.c | 36 +++-
339 arch/arm/mm/ioremap.c | 17 +-
340 arch/arm/mm/mm.h | 4 +-
341 arch/arm/mm/mmu.c | 51 +++-
342 arch/arm/mm/pgd.c | 51 +++-
343 arch/arm/mm/proc-macros.S | 5 +-
344 arch/arm/mm/proc-v7.S | 10 +-
345 arch/arm/mm/proc-v7lpae.S | 422 +++++++++++++++++++++++++++
346 36 files changed, 1516 insertions(+), 345 deletions(-)
347 create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
348 create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
349 create mode 100644 arch/arm/include/asm/pgtable-2level.h
350 create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
351 create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
352 create mode 100644 arch/arm/include/asm/pgtable-3level.h
353 create mode 100644 arch/arm/mm/proc-v7lpae.S
354 Merging at91/at91-next
355 $ git merge at91/at91-next
356 Merge made by recursive.
357 arch/arm/mach-at91/Makefile | 2 +-
358 arch/arm/mach-at91/at91cap9.c | 45 +---
359 arch/arm/mach-at91/at91rm9200.c | 47 +---
360 arch/arm/mach-at91/at91sam9260.c | 100 ++-------
361 arch/arm/mach-at91/at91sam9261.c | 62 +-----
362 arch/arm/mach-at91/at91sam9263.c | 51 +----
363 arch/arm/mach-at91/at91sam9g45.c | 45 +---
364 arch/arm/mach-at91/at91sam9rl.c | 59 +----
365 arch/arm/mach-at91/board-1arm.c | 11 +-
366 arch/arm/mach-at91/board-afeb-9260v1.c | 12 +-
367 arch/arm/mach-at91/board-cam60.c | 12 +-
368 arch/arm/mach-at91/board-cap9adk.c | 12 +-
369 arch/arm/mach-at91/board-carmeva.c | 11 +-
370 arch/arm/mach-at91/board-cpu9krea.c | 11 +-
371 arch/arm/mach-at91/board-cpuat91.c | 11 +-
372 arch/arm/mach-at91/board-csb337.c | 11 +-
373 arch/arm/mach-at91/board-csb637.c | 11 +-
374 arch/arm/mach-at91/board-eb9200.c | 11 +-
375 arch/arm/mach-at91/board-ecbat91.c | 11 +-
376 arch/arm/mach-at91/board-eco920.c | 11 +-
377 arch/arm/mach-at91/board-flexibity.c | 11 +-
378 arch/arm/mach-at91/board-foxg20.c | 12 +-
379 arch/arm/mach-at91/board-gsia18s.c | 7 +-
380 arch/arm/mach-at91/board-kafa.c | 11 +-
381 arch/arm/mach-at91/board-kb9202.c | 11 +-
382 arch/arm/mach-at91/board-neocore926.c | 12 +-
383 arch/arm/mach-at91/board-pcontrol-g20.c | 9 +-
384 arch/arm/mach-at91/board-picotux200.c | 11 +-
385 arch/arm/mach-at91/board-qil-a9260.c | 12 +-
386 arch/arm/mach-at91/board-rm9200dk.c | 11 +-
387 arch/arm/mach-at91/board-rm9200ek.c | 11 +-
388 arch/arm/mach-at91/board-sam9-l9260.c | 12 +-
389 arch/arm/mach-at91/board-sam9260ek.c | 12 +-
390 arch/arm/mach-at91/board-sam9261ek.c | 12 +-
391 arch/arm/mach-at91/board-sam9263ek.c | 12 +-
392 arch/arm/mach-at91/board-sam9g20ek.c | 16 +-
393 arch/arm/mach-at91/board-sam9m10g45ek.c | 12 +-
394 arch/arm/mach-at91/board-sam9rlek.c | 12 +-
395 arch/arm/mach-at91/board-snapper9260.c | 11 +-
396 arch/arm/mach-at91/board-stamp9g20.c | 12 +-
397 arch/arm/mach-at91/board-usb-a9260.c | 12 +-
398 arch/arm/mach-at91/board-usb-a9263.c | 12 +-
399 arch/arm/mach-at91/board-yl-9200.c | 12 +-
400 arch/arm/mach-at91/generic.h | 34 +--
401 arch/arm/mach-at91/include/mach/at91_dbgu.h | 27 ++-
402 arch/arm/mach-at91/include/mach/at91cap9.h | 1 -
403 arch/arm/mach-at91/include/mach/at91rm9200.h | 1 -
404 arch/arm/mach-at91/include/mach/at91sam9260.h | 1 -
405 arch/arm/mach-at91/include/mach/at91sam9261.h | 1 -
406 arch/arm/mach-at91/include/mach/at91sam9263.h | 1 -
407 arch/arm/mach-at91/include/mach/at91sam9g45.h | 1 -
408 arch/arm/mach-at91/include/mach/at91sam9rl.h | 1 -
409 arch/arm/mach-at91/include/mach/cpu.h | 159 ++++++++------
410 arch/arm/mach-at91/include/mach/debug-macro.S | 14 +-
411 arch/arm/mach-at91/include/mach/hardware.h | 14 ++
412 arch/arm/mach-at91/include/mach/io.h | 16 ++-
413 arch/arm/mach-at91/setup.c | 295 +++++++++++++++++++++++++
414 arch/arm/mach-at91/soc.h | 59 +++++
415 58 files changed, 695 insertions(+), 741 deletions(-)
416 create mode 100644 arch/arm/mach-at91/setup.c
417 create mode 100644 arch/arm/mach-at91/soc.h
418 Merging davinci/davinci-next
419 $ git merge davinci/davinci-next
421 Merging i.MX/for-next
422 $ git merge i.MX/for-next
423 Auto-merging arch/arm/Kconfig
424 Removing arch/arm/mach-mxs/gpio.h
425 Auto-merging arch/arm/plat-mxc/devices/platform-imx-dma.c
426 Removing arch/arm/plat-mxc/include/mach/iomux.h
427 Auto-merging drivers/gpio/Kconfig
428 Auto-merging drivers/gpio/gpio-mxc.c
429 Auto-merging drivers/gpio/gpio-mxs.c
430 Merge made by recursive.
431 arch/arm/Kconfig | 1 +
432 arch/arm/configs/mx51_defconfig | 3 +-
433 arch/arm/configs/mxs_defconfig | 4 +-
434 arch/arm/mach-imx/Kconfig | 5 +
435 arch/arm/mach-imx/dma-v1.c | 25 +--
436 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 23 +--
437 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 15 +-
438 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 13 +-
439 arch/arm/mach-imx/mach-apf9328.c | 9 +-
440 arch/arm/mach-imx/mach-armadillo5x0.c | 2 +
441 arch/arm/mach-imx/mach-bug.c | 2 +
442 arch/arm/mach-imx/mach-cpuimx27.c | 2 +
443 arch/arm/mach-imx/mach-cpuimx35.c | 2 +
444 arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 +
445 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 4 +-
446 arch/arm/mach-imx/mach-imx27ipcam.c | 2 +
447 arch/arm/mach-imx/mach-imx27lite.c | 2 +
448 arch/arm/mach-imx/mach-kzm_arm11_01.c | 2 +
449 arch/arm/mach-imx/mach-mx1ads.c | 2 +
450 arch/arm/mach-imx/mach-mx21ads.c | 2 +
451 arch/arm/mach-imx/mach-mx25_3ds.c | 2 +
452 arch/arm/mach-imx/mach-mx27_3ds.c | 4 +-
453 arch/arm/mach-imx/mach-mx27ads.c | 2 +
454 arch/arm/mach-imx/mach-mx31_3ds.c | 12 +-
455 arch/arm/mach-imx/mach-mx31ads.c | 2 +
456 arch/arm/mach-imx/mach-mx31lilly.c | 2 +
457 arch/arm/mach-imx/mach-mx31lite.c | 2 +
458 arch/arm/mach-imx/mach-mx31moboard.c | 16 +-
459 arch/arm/mach-imx/mach-mx35_3ds.c | 4 +-
460 arch/arm/mach-imx/mach-mxt_td60.c | 2 +
461 arch/arm/mach-imx/mach-pca100.c | 2 +
462 arch/arm/mach-imx/mach-pcm037.c | 2 +
463 arch/arm/mach-imx/mach-pcm038.c | 2 +
464 arch/arm/mach-imx/mach-pcm043.c | 2 +
465 arch/arm/mach-imx/mach-qong.c | 2 +
466 arch/arm/mach-imx/mach-scb9328.c | 19 +-
467 arch/arm/mach-imx/mach-vpr200.c | 2 +
468 arch/arm/mach-imx/mm-imx1.c | 21 +-
469 arch/arm/mach-imx/mm-imx21.c | 21 +-
470 arch/arm/mach-imx/mm-imx25.c | 16 +-
471 arch/arm/mach-imx/mm-imx27.c | 21 +-
472 arch/arm/mach-imx/mm-imx31.c | 15 +-
473 arch/arm/mach-imx/mm-imx35.c | 15 +-
474 arch/arm/mach-imx/mx31lite-db.c | 15 +-
475 arch/arm/mach-mx5/Kconfig | 16 ++
476 arch/arm/mach-mx5/Makefile | 1 +
477 arch/arm/mach-mx5/board-cpuimx51.c | 14 +-
478 arch/arm/mach-mx5/board-cpuimx51sd.c | 2 +
479 arch/arm/mach-mx5/board-mx50_rdp.c | 2 +
480 arch/arm/mach-mx5/board-mx51_3ds.c | 5 +-
481 arch/arm/mach-mx5/board-mx51_babbage.c | 58 +++--
482 arch/arm/mach-mx5/board-mx51_efikamx.c | 17 +-
483 arch/arm/mach-mx5/board-mx51_efikasb.c | 18 +-
484 arch/arm/mach-mx5/board-mx53_ard.c | 199 +++++++++++++++
485 arch/arm/mach-mx5/board-mx53_evk.c | 19 ++
486 arch/arm/mach-mx5/board-mx53_loco.c | 37 +++-
487 arch/arm/mach-mx5/board-mx53_smd.c | 2 +
488 arch/arm/mach-mx5/clock-mx51-mx53.c | 1 +
489 arch/arm/mach-mx5/devices.c | 64 -----
490 arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 24 +--
491 arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 19 +--
492 arch/arm/mach-mx5/mm-mx50.c | 21 +-
493 arch/arm/mach-mx5/mm.c | 25 ++-
494 arch/arm/mach-mxs/Kconfig | 2 +
495 arch/arm/mach-mxs/Makefile | 2 +-
496 arch/arm/mach-mxs/devices.c | 11 +
497 arch/arm/mach-mxs/devices/Makefile | 1 +
498 arch/arm/mach-mxs/devices/platform-gpio-mxs.c | 53 ++++
499 arch/arm/mach-mxs/gpio.h | 34 ---
500 arch/arm/mach-mxs/include/mach/devices-common.h | 2 +
501 arch/arm/mach-mxs/mach-mx28evk.c | 22 ++-
502 arch/arm/mach-mxs/mach-tx28.c | 5 +-
503 arch/arm/mach-mxs/mm-mx23.c | 1 -
504 arch/arm/mach-mxs/mm-mx28.c | 1 -
505 arch/arm/plat-mxc/Makefile | 2 +-
506 arch/arm/plat-mxc/avic.c | 12 +-
507 arch/arm/plat-mxc/devices.c | 11 +
508 arch/arm/plat-mxc/devices/Makefile | 1 +
509 arch/arm/plat-mxc/devices/platform-gpio-mxc.c | 32 +++
510 arch/arm/plat-mxc/devices/platform-imx-dma.c | 28 ++
511 arch/arm/plat-mxc/include/mach/common.h | 12 +-
512 arch/arm/plat-mxc/include/mach/devices-common.h | 2 +
513 arch/arm/plat-mxc/include/mach/gpio.h | 27 --
514 arch/arm/plat-mxc/include/mach/hardware.h | 28 +--
515 arch/arm/plat-mxc/include/mach/iomux-mx53.h | 10 +-
516 arch/arm/plat-mxc/include/mach/iomux-v1.h | 4 -
517 arch/arm/plat-mxc/include/mach/iomux.h | 26 --
518 arch/arm/plat-mxc/include/mach/mx53.h | 16 +-
519 arch/arm/plat-mxc/include/mach/mxc.h | 8 +-
520 arch/arm/plat-mxc/include/mach/timex.h | 13 +-
521 arch/arm/plat-mxc/include/mach/uncompress.h | 1 +
522 arch/arm/plat-mxc/iomux-v1.c | 32 ---
523 arch/arm/plat-mxc/irq-common.c | 13 +-
524 arch/arm/plat-mxc/pwm.c | 8 +-
525 arch/arm/plat-mxc/tzic.c | 99 ++------
526 drivers/gpio/Kconfig | 9 +
527 drivers/gpio/Makefile | 2 +
528 .../arm/plat-mxc/gpio.c => drivers/gpio/gpio-mxc.c | 266 +++++++++++---------
529 .../arm/mach-mxs/gpio.c => drivers/gpio/gpio-mxs.c | 227 ++++++++++-------
530 99 files changed, 1067 insertions(+), 825 deletions(-)
531 create mode 100644 arch/arm/mach-mx5/board-mx53_ard.c
532 create mode 100644 arch/arm/mach-mxs/devices/platform-gpio-mxs.c
533 delete mode 100644 arch/arm/mach-mxs/gpio.h
534 create mode 100644 arch/arm/plat-mxc/devices/platform-gpio-mxc.c
535 delete mode 100644 arch/arm/plat-mxc/include/mach/iomux.h
536 rename arch/arm/plat-mxc/gpio.c => drivers/gpio/gpio-mxc.c (60%)
537 rename arch/arm/mach-mxs/gpio.c => drivers/gpio/gpio-mxs.c (58%)
538 Merging linux-spec/for-next
539 $ git merge linux-spec/for-next
542 $ git merge msm/for-next
543 Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
544 Merge made by recursive.
545 arch/arm/mach-msm/Makefile | 5 +-
546 arch/arm/mach-msm/acpuclock-arm11.c | 2 +-
547 arch/arm/mach-msm/board-halibut.c | 1 +
548 arch/arm/mach-msm/board-mahimahi.c | 1 +
549 arch/arm/mach-msm/board-msm7x30.c | 1 +
550 arch/arm/mach-msm/board-msm8960.c | 18 +
551 arch/arm/mach-msm/board-msm8x60.c | 9 +-
552 arch/arm/mach-msm/board-qsd8x50.c | 1 +
553 arch/arm/mach-msm/board-trout.c | 1 +
554 arch/arm/mach-msm/clock-dummy.c | 81 +++++
555 arch/arm/mach-msm/clock.h | 11 +
556 arch/arm/mach-msm/devices-msm7x00.c | 21 ++-
557 arch/arm/mach-msm/devices-msm7x30.c | 21 ++-
558 arch/arm/mach-msm/devices-msm8960.c | 181 +++++++++++
559 arch/arm/mach-msm/devices-msm8x60.c | 56 ++++
560 arch/arm/mach-msm/devices-qsd8x50.c | 21 ++-
561 arch/arm/mach-msm/devices.h | 8 +
562 arch/arm/mach-msm/dma.c | 391 ++++++++++++++++++-----
563 arch/arm/mach-msm/include/mach/dma.h | 84 +++---
564 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 5 +-
565 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 5 +-
566 arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 3 +
567 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 5 +-
568 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 6 +
569 arch/arm/mach-msm/io.c | 3 -
570 25 files changed, 808 insertions(+), 133 deletions(-)
571 create mode 100644 arch/arm/mach-msm/clock-dummy.c
572 create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
573 Merging omap/for-next
574 $ git merge omap/for-next
577 $ git merge pxa/for-next
579 Merging samsung/next-samsung
580 $ git merge samsung/next-samsung
583 $ git merge s5p/for-next
584 Auto-merging arch/arm/Kconfig
585 Auto-merging drivers/tty/serial/s5pv210.c
586 Merge made by recursive.
587 arch/arm/Kconfig | 6 +
588 arch/arm/mach-exynos4/clock.c | 341 +++++++++-----
589 arch/arm/mach-exynos4/cpu.c | 7 +-
590 arch/arm/mach-exynos4/dev-audio.c | 5 +
591 arch/arm/mach-exynos4/include/mach/clkdev.h | 7 +
592 arch/arm/mach-exynos4/include/mach/map.h | 3 +
593 arch/arm/mach-exynos4/include/mach/pm-core.h | 10 +
594 arch/arm/mach-exynos4/include/mach/regs-audss.h | 25 +
595 arch/arm/mach-exynos4/mach-smdkc210.c | 7 +
596 arch/arm/mach-exynos4/mach-smdkv310.c | 7 +
597 arch/arm/mach-exynos4/time.c | 2 +
598 arch/arm/mach-s3c2410/include/mach/pm-core.h | 3 +
599 arch/arm/mach-s3c2412/clock.c | 36 +--
600 arch/arm/mach-s3c2416/clock.c | 10 +-
601 arch/arm/mach-s3c2440/clock.c | 3 -
602 arch/arm/mach-s3c2443/clock.c | 16 +-
603 arch/arm/mach-s3c64xx/Kconfig | 23 +
604 arch/arm/mach-s3c64xx/Makefile | 1 +
605 arch/arm/mach-s3c64xx/clock.c | 86 +---
606 arch/arm/mach-s3c64xx/include/mach/clkdev.h | 7 +
607 arch/arm/mach-s3c64xx/include/mach/irqs.h | 4 +-
608 arch/arm/mach-s3c64xx/include/mach/pm-core.h | 19 +-
609 arch/arm/mach-s3c64xx/irq.c | 12 +-
610 arch/arm/mach-s3c64xx/mach-crag6410.c | 574 +++++++++++++++++++++++
611 arch/arm/mach-s3c64xx/mach-smdk6410.c | 26 +-
612 arch/arm/mach-s5p64x0/clock-s5p6440.c | 74 +---
613 arch/arm/mach-s5p64x0/clock-s5p6450.c | 68 +--
614 arch/arm/mach-s5p64x0/include/mach/clkdev.h | 7 +
615 arch/arm/mach-s5pc100/clock.c | 163 ++-----
616 arch/arm/mach-s5pc100/include/mach/clkdev.h | 7 +
617 arch/arm/mach-s5pv210/clock.c | 130 ++----
618 arch/arm/mach-s5pv210/include/mach/clkdev.h | 7 +
619 arch/arm/mach-s5pv210/include/mach/pm-core.h | 3 +
620 arch/arm/plat-s3c24xx/clock-dclk.c | 4 -
621 arch/arm/plat-s3c24xx/include/mach/clkdev.h | 7 +
622 arch/arm/plat-s3c24xx/s3c2410-clock.c | 21 +-
623 arch/arm/plat-s3c24xx/s3c2443-clock.c | 39 +--
624 arch/arm/plat-s5p/Kconfig | 1 +
625 arch/arm/plat-s5p/include/plat/map-s5p.h | 1 +
626 arch/arm/plat-s5p/s5p-time.c | 9 +
627 arch/arm/plat-samsung/clock.c | 98 +----
628 arch/arm/plat-samsung/include/plat/audio.h | 8 +
629 arch/arm/plat-samsung/include/plat/clock.h | 3 +
630 arch/arm/plat-samsung/pm.c | 2 +
631 arch/arm/plat-samsung/pwm-clock.c | 10 +
632 arch/arm/plat-samsung/time.c | 2 +
633 drivers/tty/serial/s3c2400.c | 2 -
634 drivers/tty/serial/s3c2410.c | 2 -
635 drivers/tty/serial/s3c2412.c | 2 -
636 drivers/tty/serial/s3c2440.c | 2 -
637 drivers/tty/serial/s3c24a0.c | 2 -
638 drivers/tty/serial/s3c6400.c | 2 -
639 drivers/tty/serial/s5pv210.c | 7 -
640 drivers/tty/serial/samsung.c | 9 +-
641 drivers/tty/serial/samsung.h | 19 -
642 55 files changed, 1182 insertions(+), 769 deletions(-)
643 create mode 100644 arch/arm/mach-exynos4/include/mach/clkdev.h
644 create mode 100644 arch/arm/mach-exynos4/include/mach/regs-audss.h
645 create mode 100644 arch/arm/mach-s3c64xx/include/mach/clkdev.h
646 create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410.c
647 create mode 100644 arch/arm/mach-s5p64x0/include/mach/clkdev.h
648 create mode 100644 arch/arm/mach-s5pc100/include/mach/clkdev.h
649 create mode 100644 arch/arm/mach-s5pv210/include/mach/clkdev.h
650 create mode 100644 arch/arm/plat-s3c24xx/include/mach/clkdev.h
651 Merging tegra/for-next
652 $ git merge tegra/for-next
654 Merging ux500-core/ux500-core
655 $ git merge ux500-core/ux500-core
656 Auto-merging arch/arm/mach-ux500/board-mop500.c
657 Merge made by recursive.
658 arch/arm/configs/u8500_defconfig | 6 +++-
659 arch/arm/mach-ux500/Kconfig | 8 ++++-
660 arch/arm/mach-ux500/board-mop500-regulators.c | 9 +++++-
661 arch/arm/mach-ux500/board-mop500-sdi.c | 42 +++++++++++++++++-------
662 arch/arm/mach-ux500/board-mop500.c | 3 ++
663 arch/arm/mach-ux500/cpu-db5500.c | 1 +
664 6 files changed, 54 insertions(+), 15 deletions(-)
665 Merging xilinx/arm-next
666 $ git merge xilinx/arm-next
667 Auto-merging arch/arm/Kconfig
668 Auto-merging arch/arm/mm/Kconfig
669 Merge made by recursive.
670 Documentation/devicetree/bindings/arm/xilinx.txt | 7 +
671 arch/arm/Kconfig | 14 +
672 arch/arm/Makefile | 2 +
673 arch/arm/boot/dts/zynq-ep107.dts | 52 ++++
674 arch/arm/mach-zynq/Makefile | 6 +
675 arch/arm/mach-zynq/Makefile.boot | 3 +
676 arch/arm/mach-zynq/board_dt.c | 37 +++
677 arch/arm/mach-zynq/common.c | 102 ++++++++
678 arch/arm/mach-zynq/common.h | 29 ++
679 arch/arm/mach-zynq/include/mach/clkdev.h | 32 +++
680 arch/arm/mach-zynq/include/mach/debug-macro.S | 36 +++
681 arch/arm/mach-zynq/include/mach/entry-macro.S | 30 +++
682 arch/arm/mach-zynq/include/mach/hardware.h | 18 ++
683 arch/arm/mach-zynq/include/mach/io.h | 33 +++
684 arch/arm/mach-zynq/include/mach/irqs.h | 21 ++
685 arch/arm/mach-zynq/include/mach/memory.h | 22 ++
686 arch/arm/mach-zynq/include/mach/system.h | 28 ++
687 arch/arm/mach-zynq/include/mach/timex.h | 23 ++
688 arch/arm/mach-zynq/include/mach/uart.h | 25 ++
689 arch/arm/mach-zynq/include/mach/uncompress.h | 51 ++++
690 arch/arm/mach-zynq/include/mach/vmalloc.h | 20 ++
691 arch/arm/mach-zynq/include/mach/zynq_soc.h | 48 ++++
692 arch/arm/mach-zynq/timer.c | 298 ++++++++++++++++++++++
693 arch/arm/mm/Kconfig | 2 +-
694 24 files changed, 938 insertions(+), 1 deletions(-)
695 create mode 100644 Documentation/devicetree/bindings/arm/xilinx.txt
696 create mode 100644 arch/arm/boot/dts/zynq-ep107.dts
697 create mode 100644 arch/arm/mach-zynq/Makefile
698 create mode 100644 arch/arm/mach-zynq/Makefile.boot
699 create mode 100644 arch/arm/mach-zynq/board_dt.c
700 create mode 100644 arch/arm/mach-zynq/common.c
701 create mode 100644 arch/arm/mach-zynq/common.h
702 create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h
703 create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S
704 create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S
705 create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h
706 create mode 100644 arch/arm/mach-zynq/include/mach/io.h
707 create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h
708 create mode 100644 arch/arm/mach-zynq/include/mach/memory.h
709 create mode 100644 arch/arm/mach-zynq/include/mach/system.h
710 create mode 100644 arch/arm/mach-zynq/include/mach/timex.h
711 create mode 100644 arch/arm/mach-zynq/include/mach/uart.h
712 create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h
713 create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h
714 create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h
715 create mode 100644 arch/arm/mach-zynq/timer.c
716 Merging blackfin/for-linus
717 $ git merge blackfin/for-linus
718 Merge made by recursive.
719 arch/blackfin/Kconfig | 10 +
720 arch/blackfin/configs/BF561-EZKIT_defconfig | 8 +-
721 arch/blackfin/include/asm/gptimers.h | 19 ++
722 arch/blackfin/include/asm/mutex.h | 77 +--------
723 arch/blackfin/include/asm/pda.h | 10 +
724 arch/blackfin/kernel/Makefile | 1 +
725 arch/blackfin/kernel/asm-offsets.c | 10 +
726 arch/blackfin/kernel/debug-mmrs.c | 56 ++++--
727 arch/blackfin/kernel/gptimers.c | 93 +++++------
728 arch/blackfin/kernel/process.c | 1 -
729 arch/blackfin/kernel/pwm.c | 100 ++++++++++
730 arch/blackfin/kernel/setup.c | 16 +-
731 arch/blackfin/kernel/time.c | 4 +-
732 arch/blackfin/kernel/vmlinux.lds.S | 1 +
733 arch/blackfin/mach-bf518/boards/ezbrd.c | 50 -----
734 arch/blackfin/mach-bf518/boards/tcm-bf518.c | 38 ----
735 arch/blackfin/mach-bf518/include/mach/anomaly.h | 24 ++-
736 arch/blackfin/mach-bf527/boards/ad7160eval.c | 10 -
737 arch/blackfin/mach-bf527/boards/cm_bf527.c | 37 ----
738 arch/blackfin/mach-bf527/boards/ezbrd.c | 53 ------
739 arch/blackfin/mach-bf527/boards/ezkit.c | 56 +------
740 arch/blackfin/mach-bf527/boards/tll6527m.c | 70 -------
741 arch/blackfin/mach-bf527/include/mach/anomaly.h | 34 +++--
742 arch/blackfin/mach-bf533/boards/H8606.c | 20 --
743 arch/blackfin/mach-bf533/boards/blackstamp.c | 10 -
744 arch/blackfin/mach-bf533/boards/cm_bf533.c | 21 ---
745 arch/blackfin/mach-bf533/boards/ezkit.c | 28 ---
746 arch/blackfin/mach-bf533/boards/ip0x.c | 1 -
747 arch/blackfin/mach-bf533/boards/stamp.c | 70 +++++---
748 arch/blackfin/mach-bf533/include/mach/anomaly.h | 19 ++-
749 arch/blackfin/mach-bf537/boards/cm_bf537e.c | 43 +++---
750 arch/blackfin/mach-bf537/boards/cm_bf537u.c | 55 ++++---
751 arch/blackfin/mach-bf537/boards/dnp5370.c | 2 -
752 arch/blackfin/mach-bf537/boards/minotaur.c | 2 -
753 arch/blackfin/mach-bf537/boards/pnav10.c | 29 ---
754 arch/blackfin/mach-bf537/boards/stamp.c | 125 +++-----------
755 arch/blackfin/mach-bf537/boards/tcm_bf537.c | 43 +++---
756 arch/blackfin/mach-bf537/include/mach/anomaly.h | 34 +++--
757 arch/blackfin/mach-bf538/boards/ezkit.c | 25 ---
758 arch/blackfin/mach-bf538/include/mach/anomaly.h | 38 +++--
759 arch/blackfin/mach-bf548/boards/cm_bf548.c | 15 --
760 arch/blackfin/mach-bf548/boards/ezkit.c | 23 ---
761 arch/blackfin/mach-bf548/include/mach/anomaly.h | 220 ++++++++++++-----------
762 arch/blackfin/mach-bf561/boards/acvilon.c | 9 -
763 arch/blackfin/mach-bf561/boards/cm_bf561.c | 50 +++---
764 arch/blackfin/mach-bf561/boards/ezkit.c | 32 +++-
765 arch/blackfin/mach-bf561/include/mach/anomaly.h | 132 ++++++++------
766 arch/blackfin/mach-bf561/secondary.S | 152 ++++++----------
767 arch/blackfin/mach-common/head.S | 36 ++---
768 arch/blackfin/mach-common/smp.c | 17 +-
769 50 files changed, 805 insertions(+), 1224 deletions(-)
770 create mode 100644 arch/blackfin/kernel/pwm.c
771 Merging cris/for-next
772 $ git merge cris/for-next
773 Auto-merging drivers/net/cris/eth_v10.c
774 Merge made by recursive.
775 Documentation/cris/README | 62 +++++++++++++++---------------
776 arch/cris/arch-v32/drivers/cryptocop.c | 6 +--
777 arch/cris/arch-v32/kernel/ptrace.c | 2 -
778 arch/cris/include/arch-v32/arch/cache.h | 2 +-
779 drivers/net/cris/eth_v10.c | 1 -
780 5 files changed, 34 insertions(+), 39 deletions(-)
782 $ git merge ia64/test
783 Merge made by recursive.
784 arch/ia64/Kconfig | 4 +++
785 arch/ia64/include/asm/gpio.h | 55 ++++++++++++++++++++++++++++++++++++++++++
786 2 files changed, 59 insertions(+), 0 deletions(-)
787 create mode 100644 arch/ia64/include/asm/gpio.h
788 Merging m68k/for-next
789 $ git merge m68k/for-next
790 Merge made by recursive.
791 arch/m68k/amiga/chipram.c | 136 +++++-----
792 arch/m68k/include/asm/atarihw.h | 4 +-
793 arch/m68k/include/asm/bitops_mm.h | 22 +-
794 arch/m68k/kernel/setup_mm.c | 2 +
795 arch/m68k/math-emu/fp_log.c | 3 -
796 arch/m68k/math-emu/multi_arith.h | 530 -------------------------------------
797 arch/sparc/kernel/ioport.c | 32 +--
798 include/linux/ioport.h | 1 +
799 kernel/resource.c | 21 ++
800 9 files changed, 110 insertions(+), 641 deletions(-)
801 Merging m68knommu/for-next
802 $ git merge m68knommu/for-next
803 CONFLICT (delete/modify): arch/m68k/include/asm/bitops_mm.h deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68k/include/asm/bitops_mm.h left in tree.
804 Removing arch/m68k/include/asm/bitops_no.h
805 Removing arch/m68k/include/asm/hardirq_mm.h
806 Removing arch/m68k/include/asm/hardirq_no.h
807 Removing arch/m68k/include/asm/system_mm.h
808 Removing arch/m68k/include/asm/system_no.h
809 Removing arch/m68k/kernel/module_mm.c
810 Removing arch/m68k/kernel/module_no.c
811 Removing arch/m68k/platform/5206e/Makefile
812 Removing arch/m68k/platform/5206e/config.c
813 Removing arch/m68k/platform/5206e/gpio.c
814 Automatic merge failed; fix conflicts and then commit the result.
815 $ git rm -f arch/m68k/include/asm/bitops_mm.h
816 arch/m68k/include/asm/bitops_mm.h: needs merge
817 rm 'arch/m68k/include/asm/bitops_mm.h'
819 [master 367945f] Merge remote-tracking branch 'm68knommu/for-next'
820 $ git diff -M --stat --summary HEAD^..
821 arch/m68k/Makefile_no | 2 +-
822 arch/m68k/include/asm/bitops.h | 522 ++++++++++++++++++++++++++++++++++-
823 arch/m68k/include/asm/bitops_mm.h | 507 ----------------------------------
824 arch/m68k/include/asm/bitops_no.h | 333 ----------------------
825 arch/m68k/include/asm/entry_no.h | 12 +-
826 arch/m68k/include/asm/hardirq.h | 35 +++-
827 arch/m68k/include/asm/hardirq_mm.h | 16 -
828 arch/m68k/include/asm/hardirq_no.h | 19 --
829 arch/m68k/include/asm/irq.h | 9 -
830 arch/m68k/include/asm/module.h | 31 +--
831 arch/m68k/include/asm/system.h | 194 +++++++++++++-
832 arch/m68k/include/asm/system_mm.h | 193 -------------
833 arch/m68k/include/asm/system_no.h | 153 ----------
834 arch/m68k/kernel/module.c | 157 ++++++++++-
835 arch/m68k/kernel/module_mm.c | 155 -----------
836 arch/m68k/kernel/module_no.c | 126 ---------
837 arch/m68k/platform/5206/config.c | 6 +
838 arch/m68k/platform/5206e/Makefile | 18 --
839 arch/m68k/platform/5206e/config.c | 127 ---------
840 arch/m68k/platform/5206e/gpio.c | 49 ----
841 arch/m68k/platform/68328/entry.S | 13 +-
842 arch/m68k/platform/68360/entry.S | 13 +-
843 arch/m68k/platform/coldfire/entry.S | 24 +-
844 23 files changed, 947 insertions(+), 1767 deletions(-)
845 delete mode 100644 arch/m68k/include/asm/bitops_mm.h
846 delete mode 100644 arch/m68k/include/asm/bitops_no.h
847 delete mode 100644 arch/m68k/include/asm/hardirq_mm.h
848 delete mode 100644 arch/m68k/include/asm/hardirq_no.h
849 delete mode 100644 arch/m68k/include/asm/system_mm.h
850 delete mode 100644 arch/m68k/include/asm/system_no.h
851 delete mode 100644 arch/m68k/kernel/module_mm.c
852 delete mode 100644 arch/m68k/kernel/module_no.c
853 delete mode 100644 arch/m68k/platform/5206e/Makefile
854 delete mode 100644 arch/m68k/platform/5206e/config.c
855 delete mode 100644 arch/m68k/platform/5206e/gpio.c
856 Merging microblaze/next
857 $ git merge microblaze/next
859 Merging mips/mips-for-linux-next
860 $ git merge mips/mips-for-linux-next
861 Auto-merging MAINTAINERS
862 Merge made by recursive.
864 arch/mips/Kbuild.platforms | 1 +
865 arch/mips/Makefile | 12 --
866 arch/mips/ar7/clock.c | 2 +-
867 arch/mips/include/asm/fixmap.h | 10 +-
868 arch/mips/include/asm/gt64120.h | 2 -
869 arch/mips/include/asm/irq.h | 1 -
870 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 1 -
871 arch/mips/include/asm/mach-bcm63xx/spaces.h | 17 ++
872 arch/mips/include/asm/mach-generic/dma-coherence.h | 1 -
873 arch/mips/include/asm/mach-generic/spaces.h | 4 +
874 arch/mips/include/asm/mach-ip27/dma-coherence.h | 1 -
875 arch/mips/include/asm/mach-jazz/dma-coherence.h | 1 -
876 .../mips/include/asm/mach-loongson/dma-coherence.h | 1 -
877 .../include/asm/mach-malta/cpu-feature-overrides.h | 2 +
878 .../asm/mach-mipssim/cpu-feature-overrides.h | 2 +
879 .../asm/mach-powertv/cpu-feature-overrides.h | 59 ++++++
880 arch/mips/include/asm/mach-powertv/dma-coherence.h | 1 -
881 arch/mips/include/asm/mach-tx39xx/spaces.h | 17 ++
882 arch/mips/include/asm/mach-tx49xx/spaces.h | 17 ++
883 arch/mips/include/asm/pgtable.h | 1 +
884 arch/mips/include/asm/smp-ops.h | 43 ++++-
885 arch/mips/include/asm/smtc.h | 1 +
886 arch/mips/include/asm/unistd.h | 21 ++-
887 arch/mips/kernel/cpu-probe.c | 1 -
888 arch/mips/kernel/i8259.c | 22 +--
889 arch/mips/kernel/irq_cpu.c | 14 +-
890 arch/mips/kernel/perf_event.c | 2 -
891 arch/mips/kernel/scall32-o32.S | 1 +
892 arch/mips/kernel/scall64-64.S | 1 +
893 arch/mips/kernel/scall64-n32.S | 1 +
894 arch/mips/kernel/scall64-o32.S | 1 +
895 arch/mips/lantiq/clk.c | 13 ++
896 arch/mips/loongson/lemote-2f/ec_kb3310b.c | 2 -
897 arch/mips/mipssim/sim_setup.c | 18 +-
898 arch/mips/mm/c-r4k.c | 4 +
899 arch/mips/mm/dma-default.c | 114 +++++++-----
900 arch/mips/mm/init.c | 8 +-
901 arch/mips/mm/mmap.c | 193 +++++++++++++++++---
902 arch/mips/mm/pgtable-32.c | 2 +-
903 arch/mips/mm/pgtable-64.c | 2 +-
904 arch/mips/mti-malta/malta-init.c | 14 +-
905 arch/mips/mti-malta/malta-smtc.c | 2 +-
906 arch/mips/netlogic/Platform | 11 +
907 arch/mips/netlogic/xlr/irq.c | 2 +-
908 arch/mips/netlogic/xlr/smp.c | 13 +-
909 arch/mips/nxp/pnx8550/common/setup.c | 2 -
910 arch/mips/pci/ops-nile4.c | 1 -
911 arch/mips/pmc-sierra/msp71xx/msp_setup.c | 8 +-
912 arch/mips/pnx8550/common/setup.c | 2 -
913 arch/mips/rb532/devices.c | 24 +--
914 arch/mips/sibyte/sb1250/irq.c | 8 +
915 52 files changed, 505 insertions(+), 202 deletions(-)
916 create mode 100644 arch/mips/include/asm/mach-bcm63xx/spaces.h
917 create mode 100644 arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h
918 create mode 100644 arch/mips/include/asm/mach-tx39xx/spaces.h
919 create mode 100644 arch/mips/include/asm/mach-tx49xx/spaces.h
920 create mode 100644 arch/mips/netlogic/Platform
921 Merging parisc/for-next
922 $ git merge parisc/for-next
924 Merge made by recursive.
926 $ git merge powerpc/next
927 Auto-merging arch/powerpc/kernel/prom.c
928 Merge made by recursive.
929 Documentation/kernel-parameters.txt | 5 +++++
930 arch/powerpc/include/asm/dbell.h | 2 +-
931 arch/powerpc/include/asm/smp.h | 2 +-
932 arch/powerpc/kernel/head_64.S | 2 +-
933 arch/powerpc/kernel/prom.c | 8 ++++++++
934 arch/powerpc/kernel/setup_32.c | 1 -
935 arch/powerpc/kernel/setup_64.c | 6 +++---
936 arch/powerpc/kernel/smp.c | 18 ++++++++++++++----
937 arch/powerpc/mm/tlb_nohash.c | 4 ++--
938 arch/powerpc/platforms/85xx/smp.c | 2 +-
939 arch/powerpc/platforms/iseries/smp.c | 2 +-
940 arch/powerpc/platforms/powermac/smp.c | 2 +-
941 arch/powerpc/platforms/pseries/smp.c | 2 +-
942 arch/powerpc/platforms/wsp/smp.c | 2 +-
943 arch/powerpc/sysdev/mpic.c | 2 +-
944 15 files changed, 41 insertions(+), 19 deletions(-)
948 Merging 52xx-and-virtex/powerpc/next
949 $ git merge 52xx-and-virtex/powerpc/next
950 Merge made by recursive.
951 arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++
952 arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++-
953 arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
954 3 files changed, 249 insertions(+), 8 deletions(-)
955 create mode 100644 arch/powerpc/boot/dts/charon.dts
957 $ git merge galak/next
958 Resolved 'arch/powerpc/boot/dts/p2020ds.dts' using previous resolution.
959 Resolved 'arch/powerpc/boot/dts/p2020rdb.dts' using previous resolution.
960 Resolved 'arch/powerpc/sysdev/mpic.c' using previous resolution.
961 Auto-merging arch/powerpc/boot/dts/p2020ds.dts
962 CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020ds.dts
963 Auto-merging arch/powerpc/boot/dts/p2020rdb.dts
964 CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020rdb.dts
965 Auto-merging arch/powerpc/sysdev/fsl_lbc.c
966 Auto-merging arch/powerpc/sysdev/mpic.c
967 CONFLICT (content): Merge conflict in arch/powerpc/sysdev/mpic.c
968 Automatic merge failed; fix conflicts and then commit the result.
970 [master 84c042d] Merge remote-tracking branch 'galak/next'
971 $ git diff -M --stat --summary HEAD^..
972 arch/powerpc/sysdev/fsl_lbc.c | 4 ++++
973 1 files changed, 4 insertions(+), 0 deletions(-)
974 Merging s390/features
975 $ git merge s390/features
976 Removing arch/s390/kvm/sie64a.S
977 Merge made by recursive.
978 arch/s390/Kconfig | 1 +
979 arch/s390/boot/compressed/head31.S | 4 +-
980 arch/s390/boot/compressed/head64.S | 4 +-
981 arch/s390/include/asm/kvm_host.h | 1 +
982 arch/s390/include/asm/linkage.h | 5 +-
983 arch/s390/include/asm/lowcore.h | 2 +-
984 arch/s390/include/asm/mmu.h | 4 +-
985 arch/s390/include/asm/pgalloc.h | 7 +-
986 arch/s390/include/asm/pgtable.h | 42 ++
987 arch/s390/include/asm/processor.h | 1 +
988 arch/s390/include/asm/thread_info.h | 2 +
989 arch/s390/include/asm/tlbflush.h | 2 +-
990 arch/s390/kernel/asm-offsets.c | 2 +-
991 arch/s390/kernel/base.S | 25 +-
992 arch/s390/kernel/compat_wrapper.S | 836 ++++++++++++----------------------
993 arch/s390/kernel/entry.S | 32 +-
994 arch/s390/kernel/entry.h | 7 +-
995 arch/s390/kernel/entry64.S | 111 ++++--
996 arch/s390/kernel/head.S | 7 +-
997 arch/s390/kernel/head31.S | 11 +-
998 arch/s390/kernel/head64.S | 11 +-
999 arch/s390/kernel/mcount.S | 16 +-
1000 arch/s390/kernel/mcount64.S | 16 +-
1001 arch/s390/kernel/reipl.S | 5 +-
1002 arch/s390/kernel/reipl64.S | 5 +-
1003 arch/s390/kernel/relocate_kernel.S | 6 +-
1004 arch/s390/kernel/relocate_kernel64.S | 6 +-
1005 arch/s390/kernel/s390_ksyms.c | 4 +
1006 arch/s390/kernel/sclp.S | 5 +-
1007 arch/s390/kernel/switch_cpu.S | 8 +-
1008 arch/s390/kernel/switch_cpu64.S | 8 +-
1009 arch/s390/kernel/swsusp_asm64.S | 8 +-
1010 arch/s390/kernel/traps.c | 13 +-
1011 arch/s390/kvm/Makefile | 2 +-
1012 arch/s390/kvm/intercept.c | 1 +
1013 arch/s390/kvm/kvm-s390.c | 1 +
1014 arch/s390/kvm/kvm-s390.h | 1 +
1015 arch/s390/kvm/priv.c | 49 ++
1016 arch/s390/kvm/sie64a.S | 98 ----
1017 arch/s390/lib/qrnnd.S | 5 +-
1018 arch/s390/mm/fault.c | 17 +-
1019 arch/s390/mm/hugetlbpage.c | 2 +-
1020 arch/s390/mm/pgtable.c | 418 ++++++++++++++++-
1021 arch/s390/mm/vmem.c | 8 +-
1022 arch/s390/oprofile/init.c | 8 +-
1023 45 files changed, 992 insertions(+), 835 deletions(-)
1024 delete mode 100644 arch/s390/kvm/sie64a.S
1025 Merging sh/sh-latest
1026 $ git merge sh/sh-latest
1027 Merge made by recursive.
1028 arch/sh/Makefile | 1 +
1029 arch/sh/include/cpu-sh3/cpu/serial.h | 10 +
1030 arch/sh/include/cpu-sh4a/cpu/serial.h | 7 +
1031 arch/sh/kernel/cpu/sh3/Makefile | 18 +-
1032 arch/sh/kernel/cpu/sh3/serial-sh770x.c | 33 ++
1033 arch/sh/kernel/cpu/sh3/serial-sh7710.c | 20 ++
1034 arch/sh/kernel/cpu/sh3/serial-sh7720.c | 37 ++
1035 arch/sh/kernel/cpu/sh3/setup-sh7705.c | 5 +
1036 arch/sh/kernel/cpu/sh3/setup-sh770x.c | 9 +
1037 arch/sh/kernel/cpu/sh3/setup-sh7720.c | 5 +
1038 arch/sh/kernel/cpu/sh4/setup-sh7750.c | 4 +-
1039 arch/sh/kernel/cpu/sh4/setup-sh7760.c | 4 +
1040 arch/sh/kernel/cpu/sh4a/Makefile | 2 +-
1041 arch/sh/kernel/cpu/sh4a/serial-sh7722.c | 23 ++
1042 arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 1 +
1043 arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 7 +
1044 arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 9 +
1045 arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 9 +
1046 arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 3 +
1047 arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 3 +-
1048 arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 8 +-
1049 arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 8 +-
1050 drivers/dma/shdma.c | 88 ++++--
1051 drivers/dma/shdma.h | 4 +
1052 drivers/tty/serial/Kconfig | 2 +-
1053 drivers/tty/serial/sh-sci.c | 564 +++++++++++++++++++------------
1054 drivers/tty/serial/sh-sci.h | 434 +-----------------------
1055 include/linux/serial_sci.h | 68 ++++
1056 include/linux/sh_dma.h | 8 +
1057 29 files changed, 701 insertions(+), 693 deletions(-)
1058 create mode 100644 arch/sh/include/cpu-sh3/cpu/serial.h
1059 create mode 100644 arch/sh/include/cpu-sh4a/cpu/serial.h
1060 create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh770x.c
1061 create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh7710.c
1062 create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh7720.c
1063 create mode 100644 arch/sh/kernel/cpu/sh4a/serial-sh7722.c
1064 Merging rmobile/rmobile-latest
1065 $ git merge rmobile/rmobile-latest
1067 Merging sparc/master
1068 $ git merge sparc/master
1071 $ git merge tile/master
1072 Removing arch/tile/include/asm/bug.h
1073 Removing arch/tile/include/asm/bugs.h
1074 Removing arch/tile/include/asm/cputime.h
1075 Removing arch/tile/include/asm/device.h
1076 Removing arch/tile/include/asm/div64.h
1077 Removing arch/tile/include/asm/emergency-restart.h
1078 Removing arch/tile/include/asm/errno.h
1079 Removing arch/tile/include/asm/fb.h
1080 Removing arch/tile/include/asm/fcntl.h
1081 Removing arch/tile/include/asm/ioctl.h
1082 Removing arch/tile/include/asm/ioctls.h
1083 Removing arch/tile/include/asm/ipc.h
1084 Removing arch/tile/include/asm/ipcbuf.h
1085 Removing arch/tile/include/asm/irq_regs.h
1086 Removing arch/tile/include/asm/kdebug.h
1087 Removing arch/tile/include/asm/local.h
1088 Removing arch/tile/include/asm/module.h
1089 Removing arch/tile/include/asm/msgbuf.h
1090 Removing arch/tile/include/asm/mutex.h
1091 Removing arch/tile/include/asm/param.h
1092 Removing arch/tile/include/asm/parport.h
1093 Removing arch/tile/include/asm/poll.h
1094 Removing arch/tile/include/asm/posix_types.h
1095 Removing arch/tile/include/asm/resource.h
1096 Removing arch/tile/include/asm/scatterlist.h
1097 Removing arch/tile/include/asm/sembuf.h
1098 Removing arch/tile/include/asm/serial.h
1099 Removing arch/tile/include/asm/shmbuf.h
1100 Removing arch/tile/include/asm/shmparam.h
1101 Removing arch/tile/include/asm/socket.h
1102 Removing arch/tile/include/asm/sockios.h
1103 Removing arch/tile/include/asm/statfs.h
1104 Removing arch/tile/include/asm/termbits.h
1105 Removing arch/tile/include/asm/termios.h
1106 Removing arch/tile/include/asm/types.h
1107 Removing arch/tile/include/asm/ucontext.h
1108 Removing arch/tile/include/asm/xor.h
1109 Merge made by recursive.
1110 Documentation/ioctl/ioctl-number.txt | 1 +
1111 arch/tile/include/asm/Kbuild | 38 +++
1112 arch/tile/include/asm/bug.h | 1 -
1113 arch/tile/include/asm/bugs.h | 1 -
1114 arch/tile/include/asm/cputime.h | 1 -
1115 arch/tile/include/asm/device.h | 1 -
1116 arch/tile/include/asm/div64.h | 1 -
1117 arch/tile/include/asm/emergency-restart.h | 1 -
1118 arch/tile/include/asm/errno.h | 1 -
1119 arch/tile/include/asm/fb.h | 1 -
1120 arch/tile/include/asm/fcntl.h | 1 -
1121 arch/tile/include/asm/ioctl.h | 1 -
1122 arch/tile/include/asm/ioctls.h | 1 -
1123 arch/tile/include/asm/ipc.h | 1 -
1124 arch/tile/include/asm/ipcbuf.h | 1 -
1125 arch/tile/include/asm/irq_regs.h | 1 -
1126 arch/tile/include/asm/kdebug.h | 1 -
1127 arch/tile/include/asm/local.h | 1 -
1128 arch/tile/include/asm/module.h | 1 -
1129 arch/tile/include/asm/msgbuf.h | 1 -
1130 arch/tile/include/asm/mutex.h | 1 -
1131 arch/tile/include/asm/param.h | 1 -
1132 arch/tile/include/asm/parport.h | 1 -
1133 arch/tile/include/asm/poll.h | 1 -
1134 arch/tile/include/asm/posix_types.h | 1 -
1135 arch/tile/include/asm/resource.h | 1 -
1136 arch/tile/include/asm/scatterlist.h | 1 -
1137 arch/tile/include/asm/sembuf.h | 1 -
1138 arch/tile/include/asm/serial.h | 1 -
1139 arch/tile/include/asm/shmbuf.h | 1 -
1140 arch/tile/include/asm/shmparam.h | 1 -
1141 arch/tile/include/asm/socket.h | 1 -
1142 arch/tile/include/asm/sockios.h | 1 -
1143 arch/tile/include/asm/statfs.h | 1 -
1144 arch/tile/include/asm/termbits.h | 1 -
1145 arch/tile/include/asm/termios.h | 1 -
1146 arch/tile/include/asm/types.h | 1 -
1147 arch/tile/include/asm/ucontext.h | 1 -
1148 arch/tile/include/asm/xor.h | 1 -
1149 arch/tile/include/hv/drv_srom_intf.h | 41 +++
1150 arch/tile/kernel/time.c | 5 +-
1151 drivers/char/Kconfig | 11 +
1152 drivers/char/Makefile | 2 +
1153 drivers/char/tile-srom.c | 481 +++++++++++++++++++++++++++++
1154 44 files changed, 575 insertions(+), 41 deletions(-)
1155 delete mode 100644 arch/tile/include/asm/bug.h
1156 delete mode 100644 arch/tile/include/asm/bugs.h
1157 delete mode 100644 arch/tile/include/asm/cputime.h
1158 delete mode 100644 arch/tile/include/asm/device.h
1159 delete mode 100644 arch/tile/include/asm/div64.h
1160 delete mode 100644 arch/tile/include/asm/emergency-restart.h
1161 delete mode 100644 arch/tile/include/asm/errno.h
1162 delete mode 100644 arch/tile/include/asm/fb.h
1163 delete mode 100644 arch/tile/include/asm/fcntl.h
1164 delete mode 100644 arch/tile/include/asm/ioctl.h
1165 delete mode 100644 arch/tile/include/asm/ioctls.h
1166 delete mode 100644 arch/tile/include/asm/ipc.h
1167 delete mode 100644 arch/tile/include/asm/ipcbuf.h
1168 delete mode 100644 arch/tile/include/asm/irq_regs.h
1169 delete mode 100644 arch/tile/include/asm/kdebug.h
1170 delete mode 100644 arch/tile/include/asm/local.h
1171 delete mode 100644 arch/tile/include/asm/module.h
1172 delete mode 100644 arch/tile/include/asm/msgbuf.h
1173 delete mode 100644 arch/tile/include/asm/mutex.h
1174 delete mode 100644 arch/tile/include/asm/param.h
1175 delete mode 100644 arch/tile/include/asm/parport.h
1176 delete mode 100644 arch/tile/include/asm/poll.h
1177 delete mode 100644 arch/tile/include/asm/posix_types.h
1178 delete mode 100644 arch/tile/include/asm/resource.h
1179 delete mode 100644 arch/tile/include/asm/scatterlist.h
1180 delete mode 100644 arch/tile/include/asm/sembuf.h
1181 delete mode 100644 arch/tile/include/asm/serial.h
1182 delete mode 100644 arch/tile/include/asm/shmbuf.h
1183 delete mode 100644 arch/tile/include/asm/shmparam.h
1184 delete mode 100644 arch/tile/include/asm/socket.h
1185 delete mode 100644 arch/tile/include/asm/sockios.h
1186 delete mode 100644 arch/tile/include/asm/statfs.h
1187 delete mode 100644 arch/tile/include/asm/termbits.h
1188 delete mode 100644 arch/tile/include/asm/termios.h
1189 delete mode 100644 arch/tile/include/asm/types.h
1190 delete mode 100644 arch/tile/include/asm/ucontext.h
1191 delete mode 100644 arch/tile/include/asm/xor.h
1192 create mode 100644 arch/tile/include/hv/drv_srom_intf.h
1193 create mode 100644 drivers/char/tile-srom.c
1194 Merging unicore32/unicore32
1195 $ git merge unicore32/unicore32
1196 Merge made by recursive.
1197 arch/unicore32/include/asm/bitops.h | 12 ++++++------
1198 arch/unicore32/kernel/ksyms.c | 4 ++--
1199 arch/unicore32/lib/findbit.S | 14 ++++++++------
1200 3 files changed, 16 insertions(+), 14 deletions(-)
1201 Merging xtensa/master
1202 $ git merge xtensa/master
1203 Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution.
1204 Auto-merging arch/xtensa/Kconfig
1205 Auto-merging arch/xtensa/Makefile
1206 Auto-merging arch/xtensa/boot/Makefile
1207 Auto-merging arch/xtensa/configs/iss_defconfig
1208 CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
1209 Auto-merging arch/xtensa/include/asm/coprocessor.h
1210 Auto-merging arch/xtensa/kernel/Makefile
1211 Auto-merging arch/xtensa/kernel/time.c
1212 Automatic merge failed; fix conflicts and then commit the result.
1214 [master f6dc804] Merge remote-tracking branch 'xtensa/master'
1215 $ git diff -M --stat --summary HEAD^..
1216 arch/xtensa/Kconfig | 17 +-
1217 arch/xtensa/Makefile | 5 +-
1218 arch/xtensa/boot/Makefile | 1 +
1219 arch/xtensa/include/asm/coprocessor.h | 9 +-
1220 arch/xtensa/include/asm/io.h | 40 ++--
1221 arch/xtensa/include/asm/irq.h | 7 +-
1222 arch/xtensa/include/asm/serial.h | 12 +-
1223 arch/xtensa/kernel/Makefile | 4 +-
1224 arch/xtensa/kernel/time.c | 2 +-
1225 arch/xtensa/platforms/xtavnet/Makefile | 10 +
1226 .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++
1227 .../platforms/xtavnet/include/platform/lcd.h | 22 ++
1228 .../platforms/xtavnet/include/platform/serial.h | 1 +
1229 arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++
1230 arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++
1231 15 files changed, 526 insertions(+), 37 deletions(-)
1232 create mode 100644 arch/xtensa/platforms/xtavnet/Makefile
1233 create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h
1234 create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h
1235 create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h
1236 create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c
1237 create mode 100644 arch/xtensa/platforms/xtavnet/setup.c
1238 Merging ceph/for-next
1239 $ git merge ceph/for-next
1240 Resolved 'fs/ceph/export.c' using previous resolution.
1241 Auto-merging fs/ceph/export.c
1242 CONFLICT (content): Merge conflict in fs/ceph/export.c
1243 Automatic merge failed; fix conflicts and then commit the result.
1245 [master 76f00b0] Merge remote-tracking branch 'ceph/for-next'
1246 $ git diff -M --stat --summary HEAD^..
1248 $ git merge cifs/master
1249 Merge made by recursive.
1250 fs/cifs/connect.c | 6 +++++-
1251 1 files changed, 5 insertions(+), 1 deletions(-)
1252 Merging configfs/linux-next
1253 $ git merge configfs/linux-next
1255 Merging ecryptfs/next
1256 $ git merge ecryptfs/next
1257 Merge made by recursive.
1258 Merging ext3/for_next
1259 $ git merge ext3/for_next
1260 Merge made by recursive.
1261 fs/ext3/balloc.c | 34 +-
1262 fs/ext3/file.c | 1 -
1263 fs/ext3/fsync.c | 15 +-
1264 fs/ext3/ialloc.c | 4 +
1265 fs/ext3/inode.c | 56 ++-
1266 fs/ext3/namei.c | 3 +
1267 fs/ext3/super.c | 13 +
1268 fs/ext3/xattr.c | 12 +-
1269 fs/jbd/checkpoint.c | 4 +
1270 fs/jbd/commit.c | 11 +
1271 fs/jbd/journal.c | 4 +
1272 fs/jbd/transaction.c | 10 +-
1273 include/linux/ext3_fs.h | 2 +-
1274 include/trace/events/ext3.h | 864 +++++++++++++++++++++++++++++++++++++++++++
1275 include/trace/events/jbd.h | 203 ++++++++++
1276 15 files changed, 1197 insertions(+), 39 deletions(-)
1277 create mode 100644 include/trace/events/ext3.h
1278 create mode 100644 include/trace/events/jbd.h
1280 $ git merge ext4/dev
1282 Merging fatfs/master
1283 $ git merge fatfs/master
1285 Merging fuse/for-next
1286 $ git merge fuse/for-next
1289 $ git merge gfs2/master
1290 Merge made by recursive.
1291 fs/gfs2/dir.c | 221 +++++++++++++++++++++++++-------------------------
1293 fs/gfs2/file.c | 4 +-
1294 fs/gfs2/glock.c | 39 +++++++---
1295 fs/gfs2/glock.h | 6 ++
1296 fs/gfs2/glops.c | 11 ++-
1297 fs/gfs2/incore.h | 3 +-
1298 fs/gfs2/main.c | 1 +
1299 fs/gfs2/ops_fstype.c | 1 +
1300 fs/gfs2/super.c | 2 +-
1301 10 files changed, 160 insertions(+), 129 deletions(-)
1302 Merging hfsplus/for-next
1303 $ git merge hfsplus/for-next
1304 Merge made by recursive.
1305 fs/hfsplus/extents.c | 9 ++++++---
1306 fs/hfsplus/super.c | 9 +++++++++
1307 fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++--------
1308 fs/hfsplus/wrapper.c | 9 +++------
1309 4 files changed, 45 insertions(+), 17 deletions(-)
1311 $ git merge jfs/next
1312 Merge made by recursive.
1313 fs/jfs/file.c | 6 +++---
1314 fs/jfs/jfs_imap.c | 12 +++++-------
1315 fs/jfs/jfs_incore.h | 3 ++-
1316 fs/jfs/resize.c | 2 +-
1317 4 files changed, 11 insertions(+), 12 deletions(-)
1318 Merging logfs/master
1319 $ git merge logfs/master
1320 Resolved 'fs/logfs/logfs.h' using previous resolution.
1321 Auto-merging fs/logfs/logfs.h
1322 CONFLICT (content): Merge conflict in fs/logfs/logfs.h
1323 Automatic merge failed; fix conflicts and then commit the result.
1325 [master caee892] Merge remote-tracking branch 'logfs/master'
1326 $ git diff -M --stat --summary HEAD^..
1327 Merging nfs/linux-next
1328 $ git merge nfs/linux-next
1329 Merge made by recursive.
1330 fs/lockd/clntproc.c | 17 ++-
1331 fs/nfs/callback_proc.c | 57 ++++--
1332 fs/nfs/client.c | 5 +-
1333 fs/nfs/inode.c | 6 +-
1334 fs/nfs/internal.h | 20 ++
1335 fs/nfs/namespace.c | 2 +-
1336 fs/nfs/nfs4_fs.h | 5 +
1337 fs/nfs/nfs4filelayout.c | 100 ++++++++--
1338 fs/nfs/nfs4filelayout.h | 17 ++-
1339 fs/nfs/nfs4filelayoutdev.c | 452 ++++++++++++++++++++++++++++++----------
1340 fs/nfs/nfs4proc.c | 258 +++++++++++++++++++++--
1341 fs/nfs/nfs4state.c | 9 +-
1342 fs/nfs/nfs4xdr.c | 273 +++++++++++++++++++++++--
1343 fs/nfs/objlayout/objio_osd.c | 16 ++-
1344 fs/nfs/objlayout/objlayout.c | 2 +-
1345 fs/nfs/pagelist.c | 15 +-
1346 fs/nfs/pnfs.c | 135 +++++++++---
1347 fs/nfs/pnfs.h | 55 +++---
1348 fs/nfs/pnfs_dev.c | 81 ++++----
1349 fs/nfs/read.c | 60 ++++--
1350 fs/nfs/write.c | 46 +++--
1351 include/linux/nfs4.h | 3 +
1352 include/linux/nfs_fs_sb.h | 5 +-
1353 include/linux/nfs_page.h | 18 ++-
1354 include/linux/nfs_xdr.h | 33 +++-
1355 include/linux/pnfs_osd_xdr.h | 31 +---
1356 include/linux/sunrpc/sched.h | 3 +-
1357 net/sunrpc/auth_gss/auth_gss.c | 4 +-
1358 net/sunrpc/clnt.c | 8 +-
1359 net/sunrpc/sched.c | 1 +
1360 30 files changed, 1352 insertions(+), 385 deletions(-)
1361 Merging nfsd/nfsd-next
1362 $ git merge nfsd/nfsd-next
1364 Merging nilfs2/for-next
1365 $ git merge nilfs2/for-next
1366 Merge made by recursive.
1367 Documentation/filesystems/nilfs2.txt | 1 -
1368 1 files changed, 0 insertions(+), 1 deletions(-)
1369 Merging ocfs2/linux-next
1370 $ git merge ocfs2/linux-next
1371 Auto-merging fs/ocfs2/super.c
1372 Merge made by recursive.
1373 fs/ocfs2/dlmglue.c | 21 +++++++++++++++------
1374 fs/ocfs2/ioctl.c | 8 ++++----
1375 fs/ocfs2/move_extents.c | 2 +-
1376 fs/ocfs2/ocfs2.h | 4 ++--
1377 fs/ocfs2/super.c | 3 ++-
1378 5 files changed, 24 insertions(+), 14 deletions(-)
1379 Merging omfs/for-next
1380 $ git merge omfs/for-next
1382 Merging squashfs/master
1383 $ git merge squashfs/master
1385 Merging udf/for_next
1386 $ git merge udf/for_next
1388 Merging v9fs/for-next
1389 $ git merge v9fs/for-next
1390 Merge made by recursive.
1391 fs/9p/vfs_inode.c | 5 -----
1392 include/net/9p/9p.h | 6 ++++++
1393 net/9p/client.c | 39 ++++++++++++++++++++-------------------
1394 net/9p/protocol.c | 44 +++++++++++++++++---------------------------
1395 4 files changed, 43 insertions(+), 51 deletions(-)
1396 Merging ubifs/linux-next
1397 $ git merge ubifs/linux-next
1400 $ git merge xfs/master
1402 Merging vfs/for-next
1403 $ git merge vfs/for-next
1404 Auto-merging fs/cifs/connect.c
1405 Merge made by recursive.
1406 fs/binfmt_elf.c | 3 +-
1407 fs/binfmt_elf_fdpic.c | 3 +-
1408 fs/binfmt_misc.c | 3 +-
1409 fs/cifs/cifs_fs_sb.h | 1 +
1410 fs/cifs/cifsfs.c | 156 +++++++++++++++++++---------------------------
1411 fs/cifs/cifsproto.h | 8 +-
1412 fs/cifs/connect.c | 49 +++++++++------
1413 fs/dcache.c | 34 ++++++++++-
1415 fs/namei.c | 127 ++++++++++++++++++++++++--------------
1416 fs/super.c | 36 +++++++++++
1417 fs/udf/file.c | 2 +-
1418 include/linux/binfmts.h | 1 +
1419 include/linux/dcache.h | 7 ++
1420 include/linux/fs.h | 3 +-
1421 kernel/cgroup.c | 3 +-
1422 16 files changed, 274 insertions(+), 176 deletions(-)
1423 Merging vfs-scale/vfs-scale-working
1424 $ git merge vfs-scale/vfs-scale-working
1426 Merging pci/linux-next
1427 $ git merge pci/linux-next
1428 Merge made by recursive.
1429 arch/x86/Kconfig | 2 +-
1430 drivers/pci/hotplug/acpi_pcihp.c | 6 +-
1431 drivers/pci/pcie/aer/aerdrv_core.c | 76 +++++++++++++++++++++++++++++---
1432 drivers/pci/pcie/aer/aerdrv_errprint.c | 3 +-
1433 include/linux/aer.h | 3 +
1434 5 files changed, 78 insertions(+), 12 deletions(-)
1435 Merging of-pci/of-pci
1436 $ git merge of-pci/of-pci
1437 Removing arch/microblaze/pci/pci_32.c
1438 Auto-merging arch/sparc/include/asm/pci_32.h
1439 Auto-merging arch/x86/kernel/devicetree.c
1440 Auto-merging drivers/pci/Makefile
1441 Auto-merging drivers/pci/probe.c
1442 Merge made by recursive.
1443 arch/microblaze/include/asm/pci-bridge.h | 13 -
1444 arch/microblaze/include/asm/pci.h | 3 +-
1445 arch/microblaze/include/asm/prom.h | 15 -
1446 arch/microblaze/pci/Makefile | 2 +-
1447 arch/microblaze/pci/pci-common.c | 112 ++++++++
1448 arch/microblaze/pci/pci_32.c | 432 ------------------------------
1449 arch/powerpc/include/asm/pci-bridge.h | 29 +--
1450 arch/powerpc/include/asm/pci.h | 3 +-
1451 arch/powerpc/include/asm/prom.h | 14 -
1452 arch/powerpc/kernel/pci-common.c | 11 +-
1453 arch/powerpc/kernel/pci_32.c | 150 +----------
1454 arch/powerpc/kernel/pci_dn.c | 47 ----
1455 arch/powerpc/kernel/pci_of_scan.c | 9 +-
1456 arch/powerpc/platforms/powermac/pci.c | 3 +-
1457 arch/sparc/include/asm/pci_32.h | 3 -
1458 arch/sparc/include/asm/pci_64.h | 3 -
1459 arch/sparc/kernel/pci.c | 8 +-
1460 arch/sparc/kernel/pcic.c | 8 -
1461 arch/x86/include/asm/prom.h | 11 -
1462 arch/x86/kernel/devicetree.c | 60 ++---
1463 drivers/of/Kconfig | 8 +-
1464 drivers/of/Makefile | 1 +
1465 drivers/of/of_pci.c | 112 ++------
1466 drivers/of/of_pci_irq.c | 92 +++++++
1467 drivers/pci/Makefile | 2 +
1468 drivers/pci/hotplug/rpadlpar_core.c | 2 +-
1469 drivers/pci/of.c | 61 +++++
1470 drivers/pci/probe.c | 7 +-
1471 include/linux/of_pci.h | 5 +
1472 include/linux/pci.h | 28 ++
1473 30 files changed, 395 insertions(+), 859 deletions(-)
1474 delete mode 100644 arch/microblaze/pci/pci_32.c
1475 create mode 100644 drivers/of/of_pci_irq.c
1476 create mode 100644 drivers/pci/of.c
1477 Merging hid/for-next
1478 $ git merge hid/for-next
1479 Auto-merging drivers/hid/Kconfig
1480 Auto-merging drivers/hid/hid-core.c
1481 Auto-merging drivers/hid/hid-ids.h
1482 Merge made by recursive.
1483 .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 8 ++
1484 drivers/hid/Kconfig | 23 +++--
1485 drivers/hid/Makefile | 1 +
1486 drivers/hid/hid-core.c | 8 ++-
1487 drivers/hid/hid-ids.h | 4 +
1488 drivers/hid/hid-lg.c | 74 ++++++++++++++++-
1489 drivers/hid/hid-microsoft.c | 2 +
1490 drivers/hid/hid-roccat-arvo.c | 21 +++--
1491 drivers/hid/hid-roccat-arvo.h | 13 ---
1492 drivers/hid/hid-roccat-common.c | 20 +++--
1493 drivers/hid/hid-roccat-common.h | 4 +-
1494 drivers/hid/hid-roccat-kone.c | 56 +++++++++++--
1495 drivers/hid/hid-roccat-kone.h | 2 +-
1496 drivers/hid/hid-roccat-koneplus.c | 49 ++++++++----
1497 drivers/hid/hid-roccat-koneplus.h | 23 ++---
1498 drivers/hid/hid-roccat-kovaplus.c | 25 +++---
1499 drivers/hid/hid-roccat-kovaplus.h | 9 --
1500 drivers/hid/hid-roccat-pyra.c | 25 +++---
1501 drivers/hid/hid-roccat-pyra.h | 9 --
1502 drivers/hid/hid-sony.c | 35 ++++++++
1503 drivers/hid/hid-speedlink.c | 89 ++++++++++++++++++++
1504 drivers/hid/usbhid/hid-core.c | 2 +
1505 include/linux/hid.h | 3 +-
1506 23 files changed, 384 insertions(+), 121 deletions(-)
1507 create mode 100644 drivers/hid/hid-speedlink.c
1509 $ git merge quilt/i2c
1510 Merge made by recursive.
1511 drivers/i2c/busses/i2c-taos-evm.c | 8 ++++----
1512 1 files changed, 4 insertions(+), 4 deletions(-)
1513 Merging bjdooks-i2c/next-i2c
1514 $ git merge bjdooks-i2c/next-i2c
1516 Merging quilt/jdelvare-hwmon
1517 $ git merge quilt/jdelvare-hwmon
1518 Merge made by recursive.
1519 Documentation/hwmon/f71882fg | 4 +
1520 Documentation/hwmon/k10temp | 8 +-
1521 Documentation/hwmon/sch5636 | 31 +++
1522 drivers/hwmon/Kconfig | 22 ++-
1523 drivers/hwmon/Makefile | 2 +
1524 drivers/hwmon/emc6w201.c | 58 ++++-
1525 drivers/hwmon/f71882fg.c | 19 ++-
1526 drivers/hwmon/hwmon-vid.c | 2 +-
1527 drivers/hwmon/sch5627.c | 336 ++-----------------------
1528 drivers/hwmon/sch5636.c | 539 ++++++++++++++++++++++++++++++++++++++++
1529 drivers/hwmon/sch56xx-common.c | 340 +++++++++++++++++++++++++
1530 drivers/hwmon/sch56xx-common.h | 24 ++
1531 12 files changed, 1053 insertions(+), 332 deletions(-)
1532 create mode 100644 Documentation/hwmon/sch5636
1533 create mode 100644 drivers/hwmon/sch5636.c
1534 create mode 100644 drivers/hwmon/sch56xx-common.c
1535 create mode 100644 drivers/hwmon/sch56xx-common.h
1536 Merging hwmon-staging/hwmon-next
1537 $ git merge hwmon-staging/hwmon-next
1538 Auto-merging MAINTAINERS
1539 Auto-merging drivers/hwmon/Kconfig
1540 Auto-merging drivers/hwmon/Makefile
1541 Merge made by recursive.
1542 Documentation/hwmon/max1668 | 60 +++++
1544 drivers/hwmon/Kconfig | 10 +
1545 drivers/hwmon/Makefile | 1 +
1546 drivers/hwmon/max1668.c | 502 +++++++++++++++++++++++++++++++++++++++++++
1547 5 files changed, 580 insertions(+), 0 deletions(-)
1548 create mode 100644 Documentation/hwmon/max1668
1549 create mode 100644 drivers/hwmon/max1668.c
1550 Merging quilt/kernel-doc
1551 $ git merge quilt/kernel-doc
1553 Merging docs/docs-move
1554 $ git merge docs/docs-move
1556 Merging v4l-dvb/master
1557 $ git merge v4l-dvb/master
1558 Removing Documentation/DocBook/dvb/frontend.h.xml
1559 Removing Documentation/DocBook/media-entities.tmpl
1560 Removing Documentation/DocBook/media-indices.tmpl
1561 Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml
1562 Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
1563 Removing Documentation/DocBook/v4l/videodev2.h.xml
1564 Merge made by recursive.
1565 Documentation/DocBook/.gitignore | 11 +-
1566 Documentation/DocBook/Makefile | 30 +-
1567 Documentation/DocBook/dvb/frontend.h.xml | 428 -----
1568 Documentation/DocBook/media-entities.tmpl | 464 -----
1569 Documentation/DocBook/media-indices.tmpl | 89 -
1570 Documentation/DocBook/media/Makefile | 259 +++
1571 Documentation/DocBook/{ => media}/dvb/.gitignore | 0
1572 Documentation/DocBook/{ => media}/dvb/audio.xml | 0
1573 Documentation/DocBook/{ => media}/dvb/ca.xml | 0
1574 Documentation/DocBook/{ => media}/dvb/demux.xml | 0
1575 Documentation/DocBook/{ => media}/dvb/dvbapi.xml | 0
1576 .../DocBook/{ => media}/dvb/dvbproperty.xml | 0
1577 Documentation/DocBook/{ => media}/dvb/dvbstb.pdf | Bin 1881 -> 1881 bytes
1578 Documentation/DocBook/{ => media}/dvb/dvbstb.png | Bin 22655 -> 22655 bytes
1579 Documentation/DocBook/{ => media}/dvb/examples.xml | 0
1580 Documentation/DocBook/{ => media}/dvb/frontend.xml | 0
1581 Documentation/DocBook/{ => media}/dvb/intro.xml | 0
1582 Documentation/DocBook/{ => media}/dvb/kdapi.xml | 0
1583 Documentation/DocBook/{ => media}/dvb/net.xml | 0
1584 Documentation/DocBook/{ => media}/dvb/video.xml | 0
1585 Documentation/DocBook/{ => media}/v4l/.gitignore | 0
1586 Documentation/DocBook/{ => media}/v4l/bayer.pdf | Bin 12116 -> 12116 bytes
1587 Documentation/DocBook/{ => media}/v4l/bayer.png | Bin 9725 -> 9725 bytes
1588 Documentation/DocBook/{ => media}/v4l/biblio.xml | 0
1589 .../DocBook/{ => media}/v4l/capture.c.xml | 0
1590 Documentation/DocBook/{ => media}/v4l/common.xml | 0
1591 Documentation/DocBook/{ => media}/v4l/compat.xml | 0
1592 Documentation/DocBook/{ => media}/v4l/controls.xml | 0
1593 Documentation/DocBook/{ => media}/v4l/crop.gif | Bin 5967 -> 5967 bytes
1594 Documentation/DocBook/{ => media}/v4l/crop.pdf | Bin 5846 -> 5846 bytes
1595 .../DocBook/{ => media}/v4l/dev-capture.xml | 0
1596 .../DocBook/{ => media}/v4l/dev-codec.xml | 0
1597 .../DocBook/{ => media}/v4l/dev-effect.xml | 0
1598 .../DocBook/{ => media}/v4l/dev-event.xml | 0
1599 Documentation/DocBook/{ => media}/v4l/dev-osd.xml | 0
1600 .../DocBook/{ => media}/v4l/dev-output.xml | 0
1601 .../DocBook/{ => media}/v4l/dev-overlay.xml | 0
1602 .../DocBook/{ => media}/v4l/dev-radio.xml | 0
1603 .../DocBook/{ => media}/v4l/dev-raw-vbi.xml | 0
1604 Documentation/DocBook/{ => media}/v4l/dev-rds.xml | 0
1605 .../DocBook/{ => media}/v4l/dev-sliced-vbi.xml | 0
1606 .../DocBook/{ => media}/v4l/dev-subdev.xml | 0
1607 .../DocBook/{ => media}/v4l/dev-teletext.xml | 0
1608 Documentation/DocBook/{ => media}/v4l/driver.xml | 0
1609 .../DocBook/{ => media}/v4l/fdl-appendix.xml | 0
1610 .../DocBook/{ => media}/v4l/fieldseq_bt.gif | Bin 25430 -> 25430 bytes
1611 .../DocBook/{ => media}/v4l/fieldseq_bt.pdf | Bin 9185 -> 9185 bytes
1612 .../DocBook/{ => media}/v4l/fieldseq_tb.gif | Bin 25323 -> 25323 bytes
1613 .../DocBook/{ => media}/v4l/fieldseq_tb.pdf | Bin 9173 -> 9173 bytes
1614 .../DocBook/{ => media}/v4l/func-close.xml | 0
1615 .../DocBook/{ => media}/v4l/func-ioctl.xml | 0
1616 .../DocBook/{ => media}/v4l/func-mmap.xml | 0
1617 .../DocBook/{ => media}/v4l/func-munmap.xml | 0
1618 .../DocBook/{ => media}/v4l/func-open.xml | 0
1619 .../DocBook/{ => media}/v4l/func-poll.xml | 0
1620 .../DocBook/{ => media}/v4l/func-read.xml | 0
1621 .../DocBook/{ => media}/v4l/func-select.xml | 0
1622 .../DocBook/{ => media}/v4l/func-write.xml | 0
1623 Documentation/DocBook/{ => media}/v4l/io.xml | 0
1624 .../DocBook/{ => media}/v4l/keytable.c.xml | 0
1625 Documentation/DocBook/{ => media}/v4l/libv4l.xml | 0
1626 .../{ => media}/v4l/lirc_device_interface.xml | 0
1627 .../DocBook/{ => media}/v4l/media-controller.xml | 0
1628 .../DocBook/{ => media}/v4l/media-func-close.xml | 0
1629 .../DocBook/{ => media}/v4l/media-func-ioctl.xml | 0
1630 .../DocBook/{ => media}/v4l/media-func-open.xml | 0
1631 .../{ => media}/v4l/media-ioc-device-info.xml | 0
1632 .../{ => media}/v4l/media-ioc-enum-entities.xml | 0
1633 .../{ => media}/v4l/media-ioc-enum-links.xml | 0
1634 .../{ => media}/v4l/media-ioc-setup-link.xml | 0
1635 Documentation/DocBook/{ => media}/v4l/nv12mt.gif | Bin 2108 -> 2108 bytes
1636 .../DocBook/{ => media}/v4l/nv12mt_example.gif | Bin 6858 -> 6858 bytes
1637 Documentation/DocBook/{ => media}/v4l/pipeline.pdf | Bin 20276 -> 20276 bytes
1638 Documentation/DocBook/{ => media}/v4l/pipeline.png | Bin 12130 -> 12130 bytes
1639 .../DocBook/{ => media}/v4l/pixfmt-grey.xml | 0
1640 .../DocBook/{ => media}/v4l/pixfmt-m420.xml | 0
1641 .../DocBook/{ => media}/v4l/pixfmt-nv12.xml | 0
1642 .../DocBook/{ => media}/v4l/pixfmt-nv12m.xml | 0
1643 .../DocBook/{ => media}/v4l/pixfmt-nv12mt.xml | 0
1644 .../DocBook/{ => media}/v4l/pixfmt-nv16.xml | 0
1645 .../DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml | 0
1646 .../DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml | 0
1647 .../DocBook/{ => media}/v4l/pixfmt-sbggr16.xml | 0
1648 .../DocBook/{ => media}/v4l/pixfmt-sbggr8.xml | 0
1649 .../DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml | 0
1650 .../DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml | 0
1651 .../DocBook/{ => media}/v4l/pixfmt-srggb10.xml | 0
1652 .../DocBook/{ => media}/v4l/pixfmt-srggb12.xml | 0
1653 .../DocBook/{ => media}/v4l/pixfmt-srggb8.xml | 0
1654 .../DocBook/{ => media}/v4l/pixfmt-uyvy.xml | 0
1655 .../DocBook/{ => media}/v4l/pixfmt-vyuy.xml | 0
1656 .../DocBook/{ => media}/v4l/pixfmt-y10.xml | 0
1657 .../DocBook/{ => media}/v4l/pixfmt-y10b.xml | 0
1658 .../DocBook/{ => media}/v4l/pixfmt-y12.xml | 0
1659 .../DocBook/{ => media}/v4l/pixfmt-y16.xml | 0
1660 .../DocBook/{ => media}/v4l/pixfmt-y41p.xml | 0
1661 .../DocBook/{ => media}/v4l/pixfmt-yuv410.xml | 0
1662 .../DocBook/{ => media}/v4l/pixfmt-yuv411p.xml | 0
1663 .../DocBook/{ => media}/v4l/pixfmt-yuv420.xml | 0
1664 .../DocBook/{ => media}/v4l/pixfmt-yuv420m.xml | 0
1665 .../DocBook/{ => media}/v4l/pixfmt-yuv422p.xml | 0
1666 .../DocBook/{ => media}/v4l/pixfmt-yuyv.xml | 0
1667 .../DocBook/{ => media}/v4l/pixfmt-yvyu.xml | 0
1668 Documentation/DocBook/{ => media}/v4l/pixfmt.xml | 0
1669 .../DocBook/{ => media}/v4l/planar-apis.xml | 0
1670 .../DocBook/{ => media}/v4l/remote_controllers.xml | 0
1671 .../DocBook/{ => media}/v4l/subdev-formats.xml | 0
1672 Documentation/DocBook/{ => media}/v4l/v4l2.xml | 0
1673 .../DocBook/{ => media}/v4l/v4l2grab.c.xml | 0
1674 Documentation/DocBook/{ => media}/v4l/vbi_525.gif | Bin 4741 -> 4741 bytes
1675 Documentation/DocBook/{ => media}/v4l/vbi_525.pdf | Bin 3395 -> 3395 bytes
1676 Documentation/DocBook/{ => media}/v4l/vbi_625.gif | Bin 5095 -> 5095 bytes
1677 Documentation/DocBook/{ => media}/v4l/vbi_625.pdf | Bin 3683 -> 3683 bytes
1678 .../DocBook/{ => media}/v4l/vbi_hsync.gif | Bin 2400 -> 2400 bytes
1679 .../DocBook/{ => media}/v4l/vbi_hsync.pdf | Bin 7405 -> 7405 bytes
1680 .../DocBook/{ => media}/v4l/vidioc-cropcap.xml | 0
1681 .../{ => media}/v4l/vidioc-dbg-g-chip-ident.xml | 0
1682 .../{ => media}/v4l/vidioc-dbg-g-register.xml | 0
1683 .../DocBook/{ => media}/v4l/vidioc-dqevent.xml | 0
1684 .../DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml | 0
1685 .../{ => media}/v4l/vidioc-enum-dv-presets.xml | 0
1686 .../DocBook/{ => media}/v4l/vidioc-enum-fmt.xml | 0
1687 .../{ => media}/v4l/vidioc-enum-frameintervals.xml | 0
1688 .../{ => media}/v4l/vidioc-enum-framesizes.xml | 0
1689 .../DocBook/{ => media}/v4l/vidioc-enumaudio.xml | 0
1690 .../{ => media}/v4l/vidioc-enumaudioout.xml | 0
1691 .../DocBook/{ => media}/v4l/vidioc-enuminput.xml | 0
1692 .../DocBook/{ => media}/v4l/vidioc-enumoutput.xml | 0
1693 .../DocBook/{ => media}/v4l/vidioc-enumstd.xml | 0
1694 .../DocBook/{ => media}/v4l/vidioc-g-audio.xml | 0
1695 .../DocBook/{ => media}/v4l/vidioc-g-audioout.xml | 0
1696 .../DocBook/{ => media}/v4l/vidioc-g-crop.xml | 0
1697 .../DocBook/{ => media}/v4l/vidioc-g-ctrl.xml | 7 +
1698 .../DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml | 0
1699 .../{ => media}/v4l/vidioc-g-dv-timings.xml | 0
1700 .../DocBook/{ => media}/v4l/vidioc-g-enc-index.xml | 0
1701 .../DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml | 7 +
1702 .../DocBook/{ => media}/v4l/vidioc-g-fbuf.xml | 0
1703 .../DocBook/{ => media}/v4l/vidioc-g-fmt.xml | 0
1704 .../DocBook/{ => media}/v4l/vidioc-g-frequency.xml | 0
1705 .../DocBook/{ => media}/v4l/vidioc-g-input.xml | 0
1706 .../DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml | 0
1707 .../DocBook/{ => media}/v4l/vidioc-g-modulator.xml | 0
1708 .../DocBook/{ => media}/v4l/vidioc-g-output.xml | 0
1709 .../DocBook/{ => media}/v4l/vidioc-g-parm.xml | 0
1710 .../DocBook/{ => media}/v4l/vidioc-g-priority.xml | 0
1711 .../{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml | 0
1712 .../DocBook/{ => media}/v4l/vidioc-g-std.xml | 0
1713 .../DocBook/{ => media}/v4l/vidioc-g-tuner.xml | 0
1714 .../DocBook/{ => media}/v4l/vidioc-log-status.xml | 0
1715 .../DocBook/{ => media}/v4l/vidioc-overlay.xml | 0
1716 .../DocBook/{ => media}/v4l/vidioc-qbuf.xml | 0
1717 .../{ => media}/v4l/vidioc-query-dv-preset.xml | 0
1718 .../DocBook/{ => media}/v4l/vidioc-querybuf.xml | 0
1719 .../DocBook/{ => media}/v4l/vidioc-querycap.xml | 0
1720 .../DocBook/{ => media}/v4l/vidioc-queryctrl.xml | 0
1721 .../DocBook/{ => media}/v4l/vidioc-querystd.xml | 0
1722 .../DocBook/{ => media}/v4l/vidioc-reqbufs.xml | 0
1723 .../{ => media}/v4l/vidioc-s-hw-freq-seek.xml | 0
1724 .../DocBook/{ => media}/v4l/vidioc-streamon.xml | 0
1725 .../v4l/vidioc-subdev-enum-frame-interval.xml | 0
1726 .../v4l/vidioc-subdev-enum-frame-size.xml | 0
1727 .../v4l/vidioc-subdev-enum-mbus-code.xml | 0
1728 .../{ => media}/v4l/vidioc-subdev-g-crop.xml | 0
1729 .../{ => media}/v4l/vidioc-subdev-g-fmt.xml | 0
1730 .../v4l/vidioc-subdev-g-frame-interval.xml | 0
1731 .../{ => media}/v4l/vidioc-subscribe-event.xml | 0
1732 .../DocBook/{media.tmpl => media_api.tmpl} | 0
1733 Documentation/DocBook/v4l/videodev2.h.xml | 1946 --------------------
1734 Documentation/video4linux/CARDLIST.cx23885 | 2 +
1735 Documentation/video4linux/CARDLIST.cx88 | 1 +
1736 Documentation/video4linux/CARDLIST.em28xx | 2 +
1737 Documentation/video4linux/CARDLIST.saa7134 | 4 +
1738 Documentation/video4linux/CARDLIST.tuner | 1 +
1739 Documentation/video4linux/CARDLIST.usbvision | 2 +
1740 drivers/media/Kconfig | 12 +-
1741 drivers/media/dvb/dvb-core/Makefile | 4 +-
1742 drivers/media/dvb/dvb-core/dvb_net.h | 21 +-
1743 drivers/media/dvb/dvb-usb/anysee.c | 69 +-
1744 drivers/media/dvb/dvb-usb/anysee.h | 16 +-
1745 drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +-
1746 drivers/media/dvb/frontends/cx24113.c | 20 +-
1747 drivers/media/dvb/frontends/cxd2820r.h | 4 +-
1748 drivers/media/dvb/frontends/cxd2820r_core.c | 22 +-
1749 drivers/media/dvb/frontends/cxd2820r_priv.h | 4 +-
1750 drivers/media/dvb/frontends/itd1000.c | 25 +-
1751 drivers/media/radio/radio-sf16fmr2.c | 531 ++----
1752 drivers/media/radio/si470x/radio-si470x-usb.c | 4 +-
1753 drivers/media/video/cx23885/cx23885-input.c | 3 +
1754 drivers/media/video/em28xx/em28xx-cards.c | 12 +-
1755 drivers/media/video/em28xx/em28xx-dvb.c | 2 +-
1756 drivers/media/video/em28xx/em28xx-input.c | 1 +
1757 drivers/media/video/em28xx/em28xx.h | 2 +-
1758 drivers/media/video/gspca/ov519.c | 109 +-
1759 drivers/media/video/saa7164/saa7164-encoder.c | 6 +-
1760 drivers/media/video/saa7164/saa7164-vbi.c | 6 +-
1761 drivers/media/video/v4l2-ioctl.c | 4 +-
1762 drivers/media/video/videobuf-dma-sg.c | 5 +-
1763 drivers/media/video/videobuf2-dma-sg.c | 8 +-
1764 drivers/media/video/videobuf2-memops.c | 6 +-
1765 include/sound/tea575x-tuner.h | 6 +-
1766 sound/i2c/other/tea575x-tuner.c | 106 +-
1767 sound/pci/Kconfig | 4 +-
1768 203 files changed, 749 insertions(+), 3518 deletions(-)
1769 delete mode 100644 Documentation/DocBook/dvb/frontend.h.xml
1770 delete mode 100644 Documentation/DocBook/media-entities.tmpl
1771 delete mode 100644 Documentation/DocBook/media-indices.tmpl
1772 create mode 100644 Documentation/DocBook/media/Makefile
1773 rename Documentation/DocBook/{ => media}/dvb/.gitignore (100%)
1774 rename Documentation/DocBook/{ => media}/dvb/audio.xml (100%)
1775 rename Documentation/DocBook/{ => media}/dvb/ca.xml (100%)
1776 rename Documentation/DocBook/{ => media}/dvb/demux.xml (100%)
1777 rename Documentation/DocBook/{ => media}/dvb/dvbapi.xml (100%)
1778 rename Documentation/DocBook/{ => media}/dvb/dvbproperty.xml (100%)
1779 rename Documentation/DocBook/{ => media}/dvb/dvbstb.pdf (100%)
1780 rename Documentation/DocBook/{ => media}/dvb/dvbstb.png (100%)
1781 rename Documentation/DocBook/{ => media}/dvb/examples.xml (100%)
1782 rename Documentation/DocBook/{ => media}/dvb/frontend.xml (100%)
1783 rename Documentation/DocBook/{ => media}/dvb/intro.xml (100%)
1784 rename Documentation/DocBook/{ => media}/dvb/kdapi.xml (100%)
1785 rename Documentation/DocBook/{ => media}/dvb/net.xml (100%)
1786 rename Documentation/DocBook/{ => media}/dvb/video.xml (100%)
1787 rename Documentation/DocBook/{ => media}/v4l/.gitignore (100%)
1788 rename Documentation/DocBook/{ => media}/v4l/bayer.pdf (100%)
1789 rename Documentation/DocBook/{ => media}/v4l/bayer.png (100%)
1790 rename Documentation/DocBook/{ => media}/v4l/biblio.xml (100%)
1791 rename Documentation/DocBook/{ => media}/v4l/capture.c.xml (100%)
1792 rename Documentation/DocBook/{ => media}/v4l/common.xml (100%)
1793 rename Documentation/DocBook/{ => media}/v4l/compat.xml (100%)
1794 rename Documentation/DocBook/{ => media}/v4l/controls.xml (100%)
1795 rename Documentation/DocBook/{ => media}/v4l/crop.gif (100%)
1796 rename Documentation/DocBook/{ => media}/v4l/crop.pdf (100%)
1797 rename Documentation/DocBook/{ => media}/v4l/dev-capture.xml (100%)
1798 rename Documentation/DocBook/{ => media}/v4l/dev-codec.xml (100%)
1799 rename Documentation/DocBook/{ => media}/v4l/dev-effect.xml (100%)
1800 rename Documentation/DocBook/{ => media}/v4l/dev-event.xml (100%)
1801 rename Documentation/DocBook/{ => media}/v4l/dev-osd.xml (100%)
1802 rename Documentation/DocBook/{ => media}/v4l/dev-output.xml (100%)
1803 rename Documentation/DocBook/{ => media}/v4l/dev-overlay.xml (100%)
1804 rename Documentation/DocBook/{ => media}/v4l/dev-radio.xml (100%)
1805 rename Documentation/DocBook/{ => media}/v4l/dev-raw-vbi.xml (100%)
1806 rename Documentation/DocBook/{ => media}/v4l/dev-rds.xml (100%)
1807 rename Documentation/DocBook/{ => media}/v4l/dev-sliced-vbi.xml (100%)
1808 rename Documentation/DocBook/{ => media}/v4l/dev-subdev.xml (100%)
1809 rename Documentation/DocBook/{ => media}/v4l/dev-teletext.xml (100%)
1810 rename Documentation/DocBook/{ => media}/v4l/driver.xml (100%)
1811 rename Documentation/DocBook/{ => media}/v4l/fdl-appendix.xml (100%)
1812 rename Documentation/DocBook/{ => media}/v4l/fieldseq_bt.gif (100%)
1813 rename Documentation/DocBook/{ => media}/v4l/fieldseq_bt.pdf (100%)
1814 rename Documentation/DocBook/{ => media}/v4l/fieldseq_tb.gif (100%)
1815 rename Documentation/DocBook/{ => media}/v4l/fieldseq_tb.pdf (100%)
1816 rename Documentation/DocBook/{ => media}/v4l/func-close.xml (100%)
1817 rename Documentation/DocBook/{ => media}/v4l/func-ioctl.xml (100%)
1818 rename Documentation/DocBook/{ => media}/v4l/func-mmap.xml (100%)
1819 rename Documentation/DocBook/{ => media}/v4l/func-munmap.xml (100%)
1820 rename Documentation/DocBook/{ => media}/v4l/func-open.xml (100%)
1821 rename Documentation/DocBook/{ => media}/v4l/func-poll.xml (100%)
1822 rename Documentation/DocBook/{ => media}/v4l/func-read.xml (100%)
1823 rename Documentation/DocBook/{ => media}/v4l/func-select.xml (100%)
1824 rename Documentation/DocBook/{ => media}/v4l/func-write.xml (100%)
1825 rename Documentation/DocBook/{ => media}/v4l/io.xml (100%)
1826 rename Documentation/DocBook/{ => media}/v4l/keytable.c.xml (100%)
1827 rename Documentation/DocBook/{ => media}/v4l/libv4l.xml (100%)
1828 rename Documentation/DocBook/{ => media}/v4l/lirc_device_interface.xml (100%)
1829 rename Documentation/DocBook/{ => media}/v4l/media-controller.xml (100%)
1830 rename Documentation/DocBook/{ => media}/v4l/media-func-close.xml (100%)
1831 rename Documentation/DocBook/{ => media}/v4l/media-func-ioctl.xml (100%)
1832 rename Documentation/DocBook/{ => media}/v4l/media-func-open.xml (100%)
1833 rename Documentation/DocBook/{ => media}/v4l/media-ioc-device-info.xml (100%)
1834 rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-entities.xml (100%)
1835 rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-links.xml (100%)
1836 rename Documentation/DocBook/{ => media}/v4l/media-ioc-setup-link.xml (100%)
1837 rename Documentation/DocBook/{ => media}/v4l/nv12mt.gif (100%)
1838 rename Documentation/DocBook/{ => media}/v4l/nv12mt_example.gif (100%)
1839 rename Documentation/DocBook/{ => media}/v4l/pipeline.pdf (100%)
1840 rename Documentation/DocBook/{ => media}/v4l/pipeline.png (100%)
1841 rename Documentation/DocBook/{ => media}/v4l/pixfmt-grey.xml (100%)
1842 rename Documentation/DocBook/{ => media}/v4l/pixfmt-m420.xml (100%)
1843 rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12.xml (100%)
1844 rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12m.xml (100%)
1845 rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12mt.xml (100%)
1846 rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv16.xml (100%)
1847 rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml (100%)
1848 rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml (100%)
1849 rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr16.xml (100%)
1850 rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr8.xml (100%)
1851 rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml (100%)
1852 rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml (100%)
1853 rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb10.xml (100%)
1854 rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb12.xml (100%)
1855 rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb8.xml (100%)
1856 rename Documentation/DocBook/{ => media}/v4l/pixfmt-uyvy.xml (100%)
1857 rename Documentation/DocBook/{ => media}/v4l/pixfmt-vyuy.xml (100%)
1858 rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10.xml (100%)
1859 rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10b.xml (100%)
1860 rename Documentation/DocBook/{ => media}/v4l/pixfmt-y12.xml (100%)
1861 rename Documentation/DocBook/{ => media}/v4l/pixfmt-y16.xml (100%)
1862 rename Documentation/DocBook/{ => media}/v4l/pixfmt-y41p.xml (100%)
1863 rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv410.xml (100%)
1864 rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv411p.xml (100%)
1865 rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420.xml (100%)
1866 rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420m.xml (100%)
1867 rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv422p.xml (100%)
1868 rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuyv.xml (100%)
1869 rename Documentation/DocBook/{ => media}/v4l/pixfmt-yvyu.xml (100%)
1870 rename Documentation/DocBook/{ => media}/v4l/pixfmt.xml (100%)
1871 rename Documentation/DocBook/{ => media}/v4l/planar-apis.xml (100%)
1872 rename Documentation/DocBook/{ => media}/v4l/remote_controllers.xml (100%)
1873 rename Documentation/DocBook/{ => media}/v4l/subdev-formats.xml (100%)
1874 rename Documentation/DocBook/{ => media}/v4l/v4l2.xml (100%)
1875 rename Documentation/DocBook/{ => media}/v4l/v4l2grab.c.xml (100%)
1876 rename Documentation/DocBook/{ => media}/v4l/vbi_525.gif (100%)
1877 rename Documentation/DocBook/{ => media}/v4l/vbi_525.pdf (100%)
1878 rename Documentation/DocBook/{ => media}/v4l/vbi_625.gif (100%)
1879 rename Documentation/DocBook/{ => media}/v4l/vbi_625.pdf (100%)
1880 rename Documentation/DocBook/{ => media}/v4l/vbi_hsync.gif (100%)
1881 rename Documentation/DocBook/{ => media}/v4l/vbi_hsync.pdf (100%)
1882 rename Documentation/DocBook/{ => media}/v4l/vidioc-cropcap.xml (100%)
1883 rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-chip-ident.xml (100%)
1884 rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-register.xml (100%)
1885 rename Documentation/DocBook/{ => media}/v4l/vidioc-dqevent.xml (100%)
1886 rename Documentation/DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml (100%)
1887 rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-dv-presets.xml (100%)
1888 rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-fmt.xml (100%)
1889 rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-frameintervals.xml (100%)
1890 rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-framesizes.xml (100%)
1891 rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudio.xml (100%)
1892 rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudioout.xml (100%)
1893 rename Documentation/DocBook/{ => media}/v4l/vidioc-enuminput.xml (100%)
1894 rename Documentation/DocBook/{ => media}/v4l/vidioc-enumoutput.xml (100%)
1895 rename Documentation/DocBook/{ => media}/v4l/vidioc-enumstd.xml (100%)
1896 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audio.xml (100%)
1897 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audioout.xml (100%)
1898 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-crop.xml (100%)
1899 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ctrl.xml (94%)
1900 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml (100%)
1901 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-timings.xml (100%)
1902 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-enc-index.xml (100%)
1903 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml (98%)
1904 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fbuf.xml (100%)
1905 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fmt.xml (100%)
1906 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-frequency.xml (100%)
1907 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-input.xml (100%)
1908 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml (100%)
1909 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-modulator.xml (100%)
1910 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-output.xml (100%)
1911 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-parm.xml (100%)
1912 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-priority.xml (100%)
1913 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml (100%)
1914 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-std.xml (100%)
1915 rename Documentation/DocBook/{ => media}/v4l/vidioc-g-tuner.xml (100%)
1916 rename Documentation/DocBook/{ => media}/v4l/vidioc-log-status.xml (100%)
1917 rename Documentation/DocBook/{ => media}/v4l/vidioc-overlay.xml (100%)
1918 rename Documentation/DocBook/{ => media}/v4l/vidioc-qbuf.xml (100%)
1919 rename Documentation/DocBook/{ => media}/v4l/vidioc-query-dv-preset.xml (100%)
1920 rename Documentation/DocBook/{ => media}/v4l/vidioc-querybuf.xml (100%)
1921 rename Documentation/DocBook/{ => media}/v4l/vidioc-querycap.xml (100%)
1922 rename Documentation/DocBook/{ => media}/v4l/vidioc-queryctrl.xml (100%)
1923 rename Documentation/DocBook/{ => media}/v4l/vidioc-querystd.xml (100%)
1924 rename Documentation/DocBook/{ => media}/v4l/vidioc-reqbufs.xml (100%)
1925 rename Documentation/DocBook/{ => media}/v4l/vidioc-s-hw-freq-seek.xml (100%)
1926 rename Documentation/DocBook/{ => media}/v4l/vidioc-streamon.xml (100%)
1927 rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-interval.xml (100%)
1928 rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-size.xml (100%)
1929 rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-mbus-code.xml (100%)
1930 rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-crop.xml (100%)
1931 rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-fmt.xml (100%)
1932 rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-frame-interval.xml (100%)
1933 rename Documentation/DocBook/{ => media}/v4l/vidioc-subscribe-event.xml (100%)
1934 rename Documentation/DocBook/{media.tmpl => media_api.tmpl} (100%)
1935 delete mode 100644 Documentation/DocBook/v4l/videodev2.h.xml
1936 Merging kbuild/for-next
1937 $ git merge kbuild/for-next
1938 Removing scripts/kconfig/kconfig_load.c
1939 Merge made by recursive.
1940 scripts/Makefile.modpost | 2 +-
1941 scripts/kconfig/Makefile | 23 +++++++-------------
1942 scripts/kconfig/conf.c | 5 +++-
1943 scripts/kconfig/confdata.c | 36 +++++++++++++++++++++++++++++++-
1944 scripts/kconfig/expr.c | 1 -
1945 scripts/kconfig/expr.h | 3 --
1946 scripts/kconfig/gconf.c | 38 +----------------------------------
1947 scripts/kconfig/kconfig_load.c | 35 --------------------------------
1948 scripts/kconfig/kxgettext.c | 1 -
1949 scripts/kconfig/lex.zconf.c_shipped | 1 -
1950 scripts/kconfig/lkc.h | 5 ----
1951 scripts/kconfig/mconf.c | 2 +-
1952 scripts/kconfig/menu.c | 3 +-
1953 scripts/kconfig/nconf.c | 2 +-
1954 scripts/kconfig/qconf.cc | 4 ---
1955 scripts/kconfig/symbol.c | 1 -
1956 scripts/kconfig/util.c | 2 +
1957 scripts/kconfig/zconf.l | 1 -
1958 scripts/kconfig/zconf.tab.c_shipped | 1 -
1959 scripts/kconfig/zconf.y | 1 -
1960 20 files changed, 54 insertions(+), 113 deletions(-)
1961 delete mode 100644 scripts/kconfig/kconfig_load.c
1962 Merging kconfig/for-next
1963 $ git merge kconfig/for-next
1965 Merge made by recursive.
1967 $ git merge ide/master
1970 $ git merge libata/NEXT
1971 Merge made by recursive.
1972 drivers/ata/acard-ahci.c | 27 ++--
1973 drivers/ata/ahci.c | 53 +++---
1974 drivers/ata/ata_generic.c | 5 +-
1975 drivers/ata/ata_piix.c | 44 +++---
1976 drivers/ata/libahci.c | 95 +++++------
1977 drivers/ata/libata-acpi.c | 66 +++----
1978 drivers/ata/libata-core.c | 400 +++++++++++++++++++++++------------------
1979 drivers/ata/libata-eh.c | 154 ++++++++--------
1980 drivers/ata/libata-pmp.c | 123 ++++++-------
1981 drivers/ata/libata-scsi.c | 22 +--
1982 drivers/ata/libata-sff.c | 52 +++---
1983 drivers/ata/pata_ali.c | 8 +-
1984 drivers/ata/pata_amd.c | 8 +-
1985 drivers/ata/pata_artop.c | 5 +-
1986 drivers/ata/pata_atp867x.c | 13 +-
1987 drivers/ata/pata_bf54x.c | 4 +-
1988 drivers/ata/pata_cs5520.c | 3 +-
1989 drivers/ata/pata_efar.c | 5 +-
1990 drivers/ata/pata_hpt3x3.c | 4 +-
1991 drivers/ata/pata_icside.c | 4 +-
1992 drivers/ata/pata_it8213.c | 5 +-
1993 drivers/ata/pata_it821x.c | 14 +-
1994 drivers/ata/pata_ixp4xx_cf.c | 4 +-
1995 drivers/ata/pata_legacy.c | 2 +-
1996 drivers/ata/pata_macio.c | 10 +-
1997 drivers/ata/pata_mpiix.c | 4 +-
1998 drivers/ata/pata_netcell.c | 5 +-
1999 drivers/ata/pata_ns87410.c | 2 +-
2000 drivers/ata/pata_ns87415.c | 5 +-
2001 drivers/ata/pata_octeon_cf.c | 8 +-
2002 drivers/ata/pata_oldpiix.c | 5 +-
2003 drivers/ata/pata_opti.c | 4 +-
2004 drivers/ata/pata_optidma.c | 4 +-
2005 drivers/ata/pata_pcmcia.c | 5 +-
2006 drivers/ata/pata_pdc2027x.c | 6 +-
2007 drivers/ata/pata_platform.c | 2 +-
2008 drivers/ata/pata_radisys.c | 5 +-
2009 drivers/ata/pata_rdc.c | 5 +-
2010 drivers/ata/pata_rz1000.c | 4 +-
2011 drivers/ata/pata_samsung_cf.c | 2 +-
2012 drivers/ata/pata_scc.c | 8 +-
2013 drivers/ata/pata_sch.c | 5 +-
2014 drivers/ata/pata_sil680.c | 4 +-
2015 drivers/ata/pata_sis.c | 5 +-
2016 drivers/ata/pata_sl82c105.c | 6 +-
2017 drivers/ata/pata_triflex.c | 4 +-
2018 drivers/ata/pata_via.c | 8 +-
2019 drivers/ata/pdc_adma.c | 10 +-
2020 drivers/ata/sata_fsl.c | 43 ++---
2021 drivers/ata/sata_inic162x.c | 31 ++--
2022 drivers/ata/sata_mv.c | 94 +++++------
2023 drivers/ata/sata_nv.c | 79 ++++-----
2024 drivers/ata/sata_promise.c | 6 +-
2025 drivers/ata/sata_qstor.c | 13 +-
2026 drivers/ata/sata_sil.c | 21 +--
2027 drivers/ata/sata_sil24.c | 43 ++---
2028 drivers/ata/sata_sis.c | 26 ++--
2029 drivers/ata/sata_svw.c | 4 +-
2030 drivers/ata/sata_sx4.c | 4 +-
2031 drivers/ata/sata_uli.c | 4 +-
2032 drivers/ata/sata_via.c | 42 ++---
2033 drivers/ata/sata_vsc.c | 9 +-
2034 include/linux/libata.h | 68 ++++++--
2035 63 files changed, 831 insertions(+), 902 deletions(-)
2036 Merging infiniband/for-next
2037 $ git merge infiniband/for-next
2040 $ git merge acpi/test
2042 Merging idle-test/idle-test
2043 $ git merge idle-test/idle-test
2044 Resolved 'arch/x86/kernel/process.c' using previous resolution.
2045 Auto-merging arch/x86/kernel/process.c
2046 CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
2047 Automatic merge failed; fix conflicts and then commit the result.
2049 [master 975e353] Merge remote-tracking branch 'idle-test/idle-test'
2050 $ git diff -M --stat --summary HEAD^..
2051 arch/x86/kernel/process.c | 2 +-
2052 1 files changed, 1 insertions(+), 1 deletions(-)
2053 Merging powertools/tools-test
2054 $ git merge powertools/tools-test
2056 Merging cpupowerutils/master
2057 $ git merge cpupowerutils/master
2058 Auto-merging CREDITS
2059 Auto-merging MAINTAINERS
2060 Merge made by recursive.
2063 tools/power/cpupower/.gitignore | 22 +
2064 tools/power/cpupower/Makefile | 279 ++++++
2065 tools/power/cpupower/README | 49 +
2066 tools/power/cpupower/ToDo | 11 +
2067 tools/power/cpupower/bench/Makefile | 29 +
2068 tools/power/cpupower/bench/README-BENCH | 124 +++
2069 tools/power/cpupower/bench/benchmark.c | 194 ++++
2070 tools/power/cpupower/bench/benchmark.h | 29 +
2071 tools/power/cpupower/bench/config.h | 36 +
2072 tools/power/cpupower/bench/cpufreq-bench_plot.sh | 104 +++
2073 tools/power/cpupower/bench/cpufreq-bench_script.sh | 101 ++
2074 tools/power/cpupower/bench/example.cfg | 11 +
2075 tools/power/cpupower/bench/main.c | 202 ++++
2076 tools/power/cpupower/bench/parse.c | 225 +++++
2077 tools/power/cpupower/bench/parse.h | 53 ++
2078 tools/power/cpupower/bench/system.c | 191 ++++
2079 tools/power/cpupower/bench/system.h | 29 +
2080 tools/power/cpupower/debug/i386/Makefile | 20 +
2081 tools/power/cpupower/debug/i386/centrino-decode.c | 113 +++
2082 tools/power/cpupower/debug/i386/dump_psb.c | 196 ++++
2083 tools/power/cpupower/debug/i386/intel_gsic.c | 78 ++
2084 .../power/cpupower/debug/i386/powernow-k8-decode.c | 96 ++
2085 tools/power/cpupower/debug/kernel/Makefile | 23 +
2086 .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 113 +++
2087 tools/power/cpupower/debug/x86_64/Makefile | 14 +
2088 .../power/cpupower/debug/x86_64/centrino-decode.c | 1 +
2089 .../cpupower/debug/x86_64/powernow-k8-decode.c | 1 +
2090 tools/power/cpupower/lib/cpufreq.c | 208 +++++
2091 tools/power/cpupower/lib/cpufreq.h | 223 +++++
2092 tools/power/cpupower/lib/sysfs.c | 672 ++++++++++++++
2093 tools/power/cpupower/lib/sysfs.h | 31 +
2094 tools/power/cpupower/man/cpupower-frequency-info.1 | 76 ++
2095 tools/power/cpupower/man/cpupower-frequency-set.1 | 54 ++
2096 tools/power/cpupower/man/cpupower-info.1 | 19 +
2097 tools/power/cpupower/man/cpupower-monitor.1 | 179 ++++
2098 tools/power/cpupower/man/cpupower-set.1 | 103 +++
2099 tools/power/cpupower/man/cpupower.1 | 72 ++
2100 tools/power/cpupower/po/cs.po | 944 +++++++++++++++++++
2101 tools/power/cpupower/po/de.po | 961 ++++++++++++++++++++
2102 tools/power/cpupower/po/fr.po | 947 +++++++++++++++++++
2103 tools/power/cpupower/po/it.po | 961 ++++++++++++++++++++
2104 tools/power/cpupower/po/pt.po | 957 +++++++++++++++++++
2105 tools/power/cpupower/utils/builtin.h | 18 +
2106 tools/power/cpupower/utils/cpufreq-info.c | 678 ++++++++++++++
2107 tools/power/cpupower/utils/cpufreq-set.c | 358 ++++++++
2108 tools/power/cpupower/utils/cpuidle-info.c | 244 +++++
2109 tools/power/cpupower/utils/cpupower-info.c | 153 ++++
2110 tools/power/cpupower/utils/cpupower-set.c | 153 ++++
2111 tools/power/cpupower/utils/cpupower.c | 203 ++++
2112 tools/power/cpupower/utils/helpers/amd.c | 137 +++
2113 tools/power/cpupower/utils/helpers/bitmask.c | 292 ++++++
2114 tools/power/cpupower/utils/helpers/bitmask.h | 33 +
2115 tools/power/cpupower/utils/helpers/cpuid.c | 143 +++
2116 tools/power/cpupower/utils/helpers/helpers.h | 180 ++++
2117 tools/power/cpupower/utils/helpers/misc.c | 35 +
2118 tools/power/cpupower/utils/helpers/msr.c | 122 +++
2119 tools/power/cpupower/utils/helpers/pci.c | 44 +
2120 tools/power/cpupower/utils/helpers/sysfs.c | 358 ++++++++
2121 tools/power/cpupower/utils/helpers/sysfs.h | 28 +
2122 tools/power/cpupower/utils/helpers/topology.c | 108 +++
2123 .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 338 +++++++
2124 .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 196 ++++
2125 .../cpupower/utils/idle_monitor/cpupower-monitor.c | 448 +++++++++
2126 .../cpupower/utils/idle_monitor/cpupower-monitor.h | 68 ++
2127 .../cpupower/utils/idle_monitor/idle_monitors.def | 7 +
2128 .../cpupower/utils/idle_monitor/idle_monitors.h | 18 +
2129 .../cpupower/utils/idle_monitor/mperf_monitor.c | 255 ++++++
2130 tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 216 +++++
2131 tools/power/cpupower/utils/idle_monitor/snb_idle.c | 190 ++++
2132 tools/power/cpupower/utils/version-gen.sh | 35 +
2133 72 files changed, 13831 insertions(+), 1 deletions(-)
2134 create mode 100644 tools/power/cpupower/.gitignore
2135 create mode 100644 tools/power/cpupower/Makefile
2136 create mode 100644 tools/power/cpupower/README
2137 create mode 100644 tools/power/cpupower/ToDo
2138 create mode 100644 tools/power/cpupower/bench/Makefile
2139 create mode 100644 tools/power/cpupower/bench/README-BENCH
2140 create mode 100644 tools/power/cpupower/bench/benchmark.c
2141 create mode 100644 tools/power/cpupower/bench/benchmark.h
2142 create mode 100644 tools/power/cpupower/bench/config.h
2143 create mode 100644 tools/power/cpupower/bench/cpufreq-bench_plot.sh
2144 create mode 100644 tools/power/cpupower/bench/cpufreq-bench_script.sh
2145 create mode 100644 tools/power/cpupower/bench/example.cfg
2146 create mode 100644 tools/power/cpupower/bench/main.c
2147 create mode 100644 tools/power/cpupower/bench/parse.c
2148 create mode 100644 tools/power/cpupower/bench/parse.h
2149 create mode 100644 tools/power/cpupower/bench/system.c
2150 create mode 100644 tools/power/cpupower/bench/system.h
2151 create mode 100644 tools/power/cpupower/debug/i386/Makefile
2152 create mode 100644 tools/power/cpupower/debug/i386/centrino-decode.c
2153 create mode 100644 tools/power/cpupower/debug/i386/dump_psb.c
2154 create mode 100644 tools/power/cpupower/debug/i386/intel_gsic.c
2155 create mode 100644 tools/power/cpupower/debug/i386/powernow-k8-decode.c
2156 create mode 100644 tools/power/cpupower/debug/kernel/Makefile
2157 create mode 100644 tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
2158 create mode 100644 tools/power/cpupower/debug/x86_64/Makefile
2159 create mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c
2160 create mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
2161 create mode 100644 tools/power/cpupower/lib/cpufreq.c
2162 create mode 100644 tools/power/cpupower/lib/cpufreq.h
2163 create mode 100644 tools/power/cpupower/lib/sysfs.c
2164 create mode 100644 tools/power/cpupower/lib/sysfs.h
2165 create mode 100644 tools/power/cpupower/man/cpupower-frequency-info.1
2166 create mode 100644 tools/power/cpupower/man/cpupower-frequency-set.1
2167 create mode 100644 tools/power/cpupower/man/cpupower-info.1
2168 create mode 100644 tools/power/cpupower/man/cpupower-monitor.1
2169 create mode 100644 tools/power/cpupower/man/cpupower-set.1
2170 create mode 100644 tools/power/cpupower/man/cpupower.1
2171 create mode 100644 tools/power/cpupower/po/cs.po
2172 create mode 100644 tools/power/cpupower/po/de.po
2173 create mode 100644 tools/power/cpupower/po/fr.po
2174 create mode 100644 tools/power/cpupower/po/it.po
2175 create mode 100644 tools/power/cpupower/po/pt.po
2176 create mode 100644 tools/power/cpupower/utils/builtin.h
2177 create mode 100644 tools/power/cpupower/utils/cpufreq-info.c
2178 create mode 100644 tools/power/cpupower/utils/cpufreq-set.c
2179 create mode 100644 tools/power/cpupower/utils/cpuidle-info.c
2180 create mode 100644 tools/power/cpupower/utils/cpupower-info.c
2181 create mode 100644 tools/power/cpupower/utils/cpupower-set.c
2182 create mode 100644 tools/power/cpupower/utils/cpupower.c
2183 create mode 100644 tools/power/cpupower/utils/helpers/amd.c
2184 create mode 100644 tools/power/cpupower/utils/helpers/bitmask.c
2185 create mode 100644 tools/power/cpupower/utils/helpers/bitmask.h
2186 create mode 100644 tools/power/cpupower/utils/helpers/cpuid.c
2187 create mode 100644 tools/power/cpupower/utils/helpers/helpers.h
2188 create mode 100644 tools/power/cpupower/utils/helpers/misc.c
2189 create mode 100644 tools/power/cpupower/utils/helpers/msr.c
2190 create mode 100644 tools/power/cpupower/utils/helpers/pci.c
2191 create mode 100644 tools/power/cpupower/utils/helpers/sysfs.c
2192 create mode 100644 tools/power/cpupower/utils/helpers/sysfs.h
2193 create mode 100644 tools/power/cpupower/utils/helpers/topology.c
2194 create mode 100644 tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
2195 create mode 100644 tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
2196 create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
2197 create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
2198 create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.def
2199 create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.h
2200 create mode 100644 tools/power/cpupower/utils/idle_monitor/mperf_monitor.c
2201 create mode 100644 tools/power/cpupower/utils/idle_monitor/nhm_idle.c
2202 create mode 100644 tools/power/cpupower/utils/idle_monitor/snb_idle.c
2203 create mode 100755 tools/power/cpupower/utils/version-gen.sh
2204 Merging ieee1394/for-next
2205 $ git merge ieee1394/for-next
2206 Merge made by recursive.
2207 drivers/firewire/net.c | 5 +++--
2208 drivers/firewire/ohci.c | 14 +++++---------
2209 2 files changed, 8 insertions(+), 11 deletions(-)
2210 Merging ubi/linux-next
2211 $ git merge ubi/linux-next
2212 Merge made by recursive.
2213 drivers/mtd/ubi/build.c | 28 +++++-
2214 drivers/mtd/ubi/debug.c | 269 +++++++++++++++++++++++++++++++++++++++++++++--
2215 drivers/mtd/ubi/debug.h | 113 ++++++++++++--------
2216 drivers/mtd/ubi/io.c | 20 ++--
2217 drivers/mtd/ubi/scan.c | 2 +-
2218 drivers/mtd/ubi/ubi.h | 8 ++-
2219 drivers/mtd/ubi/vmt.c | 2 +-
2220 drivers/mtd/ubi/vtbl.c | 18 +---
2221 drivers/mtd/ubi/wl.c | 42 ++++---
2222 9 files changed, 398 insertions(+), 104 deletions(-)
2224 $ git merge dlm/next
2226 Merging swiotlb/master
2227 $ git merge swiotlb/master
2228 Merge made by recursive.
2230 $ git merge ibft/master
2231 Merge made by recursive.
2233 $ git merge scsi/master
2235 Merging slave-dma/next
2236 $ git merge slave-dma/next
2237 Auto-merging arch/arm/mach-ep93xx/core.c
2238 Removing arch/arm/mach-ep93xx/dma-m2p.c
2239 Merge made by recursive.
2240 Documentation/spi/ep93xx_spi | 10 +
2241 arch/arm/mach-ep93xx/Makefile | 4 +-
2242 arch/arm/mach-ep93xx/core.c | 6 +-
2243 arch/arm/mach-ep93xx/dma-m2p.c | 411 -------
2244 arch/arm/mach-ep93xx/dma.c | 108 ++
2245 arch/arm/mach-ep93xx/include/mach/dma.h | 190 ++---
2246 arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h | 2 +
2247 drivers/dma/Kconfig | 7 +
2248 drivers/dma/Makefile | 1 +
2249 drivers/dma/at_hdmac.c | 4 +-
2250 drivers/dma/ep93xx_dma.c | 1355 ++++++++++++++++++++++++
2251 drivers/dma/ipu/ipu_idmac.c | 6 +-
2252 drivers/dma/pch_dma.c | 69 +-
2253 drivers/spi/ep93xx_spi.c | 303 +++++-
2254 sound/soc/ep93xx/ep93xx-ac97.c | 4 +-
2255 sound/soc/ep93xx/ep93xx-i2s.c | 4 +-
2256 sound/soc/ep93xx/ep93xx-pcm.c | 137 ++--
2257 17 files changed, 1989 insertions(+), 632 deletions(-)
2258 delete mode 100644 arch/arm/mach-ep93xx/dma-m2p.c
2259 create mode 100644 arch/arm/mach-ep93xx/dma.c
2260 create mode 100644 drivers/dma/ep93xx_dma.c
2261 Merging async_tx/next
2262 $ git merge async_tx/next
2265 $ git merge net/master
2266 Auto-merging drivers/net/Kconfig
2267 Removing drivers/net/myri_sbus.c
2268 Removing drivers/net/myri_sbus.h
2269 Auto-merging drivers/net/wireless/rtlwifi/pci.c
2270 Merge made by recursive.
2271 Documentation/networking/ip-sysctl.txt | 10 -
2272 arch/m68k/emu/nfeth.c | 1 +
2273 drivers/atm/eni.h | 1 +
2274 drivers/atm/firestream.c | 1 +
2275 drivers/atm/horizon.c | 1 +
2276 drivers/atm/idt77252.c | 1 +
2277 drivers/atm/iphase.c | 1 +
2278 drivers/atm/zatm.c | 1 +
2279 drivers/bcma/Kconfig | 5 +
2280 drivers/bcma/Makefile | 2 +-
2281 drivers/bcma/bcma_private.h | 3 +
2282 drivers/bcma/driver_pci.c | 23 +
2283 drivers/bcma/host_pci.c | 52 +
2284 drivers/bcma/main.c | 9 +
2285 drivers/bcma/sprom.c | 162 +
2286 drivers/infiniband/core/netlink.c | 2 +-
2287 drivers/infiniband/hw/amso1100/c2.c | 1 +
2288 drivers/infiniband/ulp/iser/iscsi_iser.h | 1 +
2289 drivers/isdn/hardware/mISDN/avmfritz.c | 1 +
2290 drivers/isdn/hardware/mISDN/hfcmulti.c | 1 +
2291 drivers/isdn/hardware/mISDN/hfcpci.c | 1 +
2292 drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1 +
2293 drivers/isdn/hardware/mISDN/mISDNipac.c | 1 +
2294 drivers/isdn/hardware/mISDN/netjet.c | 1 +
2295 drivers/isdn/hardware/mISDN/speedfax.c | 1 +
2296 drivers/isdn/hardware/mISDN/w6692.c | 1 +
2297 drivers/isdn/hisax/hisax.h | 1 +
2298 drivers/isdn/hisax/hisax_fcpcipnp.c | 1 +
2299 drivers/media/dvb/b2c2/flexcop-common.h | 1 +
2300 drivers/media/dvb/dm1105/dm1105.c | 1 +
2301 drivers/media/dvb/mantis/mantis_common.h | 1 +
2302 drivers/media/dvb/pluto2/pluto2.c | 1 +
2303 drivers/net/3c503.c | 1 +
2304 drivers/net/8139cp.c | 1 +
2305 drivers/net/8139too.c | 1 +
2306 drivers/net/8390.h | 1 +
2307 drivers/net/Kconfig | 19 +-
2308 drivers/net/Makefile | 2 +-
2309 drivers/net/a2065.c | 11 +-
2310 drivers/net/ac3200.c | 1 +
2311 drivers/net/acenic.h | 1 +
2312 drivers/net/amd8111e.c | 3 +-
2313 drivers/net/apne.c | 1 +
2314 drivers/net/appletalk/ltpc.c | 8 +-
2315 drivers/net/arcnet/arc-rimi.c | 1 +
2316 drivers/net/arcnet/com20020-isa.c | 1 +
2317 drivers/net/arcnet/com20020-pci.c | 1 +
2318 drivers/net/arcnet/com20020.c | 1 +
2319 drivers/net/arcnet/com90io.c | 1 +
2320 drivers/net/arcnet/com90xx.c | 1 +
2321 drivers/net/arm/at91_ether.c | 1 +
2322 drivers/net/arm/ep93xx_eth.c | 1 +
2323 drivers/net/arm/ks8695net.c | 1 +
2324 drivers/net/atl1c/atl1c.h | 1 +
2325 drivers/net/atl1e/atl1e.h | 1 +
2326 drivers/net/atl1e/atl1e_main.c | 5 +-
2327 drivers/net/atlx/atl2.c | 3 +-
2328 drivers/net/b44.c | 1 +
2329 drivers/net/bcm63xx_enet.c | 1 +
2330 drivers/net/benet/be.h | 13 +-
2331 drivers/net/benet/be_cmds.c | 68 +-
2332 drivers/net/benet/be_cmds.h | 8 +
2333 drivers/net/benet/be_ethtool.c | 54 +-
2334 drivers/net/benet/be_main.c | 241 +-
2335 drivers/net/bmac.c | 1 +
2336 drivers/net/bna/bfa_cee.c | 2 +-
2337 drivers/net/bna/cna.h | 2 +-
2338 drivers/net/bnx2.c | 7 +
2339 drivers/net/bnx2x/Makefile | 2 +-
2340 drivers/net/bnx2x/bnx2x.h | 919 ++--
2341 drivers/net/bnx2x/bnx2x_cmn.c | 1105 +++--
2342 drivers/net/bnx2x/bnx2x_cmn.h | 568 ++-
2343 drivers/net/bnx2x/bnx2x_dcb.c | 671 ++-
2344 drivers/net/bnx2x/bnx2x_dcb.h | 30 +-
2345 drivers/net/bnx2x/bnx2x_dump.h | 913 ++--
2346 drivers/net/bnx2x/bnx2x_ethtool.c | 456 +-
2347 drivers/net/bnx2x/bnx2x_fw_defs.h | 519 +-
2348 drivers/net/bnx2x/bnx2x_hsi.h | 5479 +++++++++++------
2349 drivers/net/bnx2x/bnx2x_init.h | 327 +-
2350 drivers/net/bnx2x/bnx2x_init_ops.h | 194 +-
2351 drivers/net/bnx2x/bnx2x_link.c | 6159 +++++++++++++++----
2352 drivers/net/bnx2x/bnx2x_link.h | 181 +-
2353 drivers/net/bnx2x/bnx2x_main.c | 5444 ++++++++++-------
2354 drivers/net/bnx2x/bnx2x_reg.h | 906 +++-
2355 drivers/net/bnx2x/bnx2x_sp.c | 5333 ++++++++++++++++
2356 drivers/net/bnx2x/bnx2x_sp.h | 1235 ++++
2357 drivers/net/bnx2x/bnx2x_stats.c | 868 ++--
2358 drivers/net/bnx2x/bnx2x_stats.h | 228 +-
2359 drivers/net/bonding/bond_3ad.c | 40 +-
2360 drivers/net/bonding/bond_3ad.h | 8 +-
2361 drivers/net/bonding/bond_main.c | 22 +-
2362 drivers/net/bonding/bond_sysfs.c | 1 +
2363 drivers/net/bonding/bonding.h | 1 -
2364 drivers/net/caif/Kconfig | 9 +
2365 drivers/net/caif/Makefile | 3 +
2366 drivers/net/caif/caif_hsi.c | 1220 ++++
2367 drivers/net/caif/caif_serial.c | 1 +
2368 drivers/net/caif/caif_shmcore.c | 2 +-
2369 drivers/net/can/Kconfig | 5 +-
2370 drivers/net/can/at91_can.c | 366 +-
2371 drivers/net/can/sja1000/sja1000.h | 1 +
2372 drivers/net/cassini.c | 1 +
2373 drivers/net/cnic.c | 307 +-
2374 drivers/net/cnic.h | 52 +-
2375 drivers/net/cnic_defs.h | 6488 +++++++++++---------
2376 drivers/net/cnic_if.h | 8 +-
2377 drivers/net/cpmac.c | 1 +
2378 drivers/net/cxgb3/cxgb3_offload.c | 2 +-
2379 drivers/net/cxgb4/cxgb4_main.c | 2 +-
2380 drivers/net/cxgb4vf/adapter.h | 1 +
2381 drivers/net/davinci_cpdma.c | 2 +-
2382 drivers/net/davinci_emac.c | 6 +-
2383 drivers/net/declance.c | 38 +-
2384 drivers/net/depca.c | 4 +-
2385 drivers/net/dl2k.c | 4 +-
2386 drivers/net/dm9000.c | 27 +-
2387 drivers/net/dnet.c | 3 +
2388 drivers/net/e100.c | 2 +
2389 drivers/net/e1000/e1000_ethtool.c | 69 -
2390 drivers/net/e1000/e1000_hw.c | 7 +-
2391 drivers/net/e1000/e1000_main.c | 30 +-
2392 drivers/net/e1000e/e1000.h | 42 +-
2393 drivers/net/e1000e/es2lan.c | 8 +
2394 drivers/net/e1000e/ethtool.c | 1 +
2395 drivers/net/e1000e/hw.h | 21 +-
2396 drivers/net/e1000e/ich8lan.c | 191 +-
2397 drivers/net/e1000e/netdev.c | 132 +-
2398 drivers/net/e1000e/phy.c | 352 +-
2399 drivers/net/e2100.c | 1 +
2400 drivers/net/ehea/ehea_qmr.c | 2 +-
2401 drivers/net/enic/enic.h | 3 +-
2402 drivers/net/enic/enic_main.c | 97 +-
2403 drivers/net/enic/enic_res.c | 23 +-
2404 drivers/net/enic/vnic_cq.c | 2 +
2405 drivers/net/enic/vnic_cq.h | 1 +
2406 drivers/net/enic/vnic_enet.h | 7 +
2407 drivers/net/epic100.c | 4 +-
2408 drivers/net/es3210.c | 1 +
2409 drivers/net/ethoc.c | 2 +
2410 drivers/net/fealnx.c | 4 +-
2411 drivers/net/fec.c | 5 +-
2412 drivers/net/fec_mpc52xx.c | 5 +-
2413 drivers/net/fs_enet/fs_enet-main.c | 2 +
2414 drivers/net/ftgmac100.c | 1365 ++++
2415 drivers/net/ftgmac100.h | 246 +
2416 drivers/net/gianfar.c | 127 +-
2417 drivers/net/gianfar.h | 53 +
2418 drivers/net/gianfar_ethtool.c | 951 +++-
2419 drivers/net/greth.c | 1 +
2420 drivers/net/hamachi.c | 4 +-
2421 drivers/net/hamradio/baycom_ser_fdx.c | 1 +
2422 drivers/net/hamradio/baycom_ser_hdx.c | 1 +
2423 drivers/net/hp-plus.c | 1 +
2424 drivers/net/hp.c | 1 +
2425 drivers/net/ibmveth.c | 1 +
2426 drivers/net/ifb.c | 57 +-
2427 drivers/net/igb/igb_ethtool.c | 67 -
2428 drivers/net/igb/igb_main.c | 36 +-
2429 drivers/net/igbvf/netdev.c | 2 +-
2430 drivers/net/ipg.c | 1 +
2431 drivers/net/irda/ali-ircc.c | 1 +
2432 drivers/net/irda/donauboe.c | 1 +
2433 drivers/net/irda/nsc-ircc.c | 1 +
2434 drivers/net/irda/pxaficp_ir.c | 1 +
2435 drivers/net/irda/sir_dev.c | 1 +
2436 drivers/net/irda/smsc-ircc2.c | 1 +
2437 drivers/net/irda/via-ircc.c | 1 +
2438 drivers/net/irda/via-ircc.h | 2 +-
2439 drivers/net/irda/vlsi_ir.c | 1 +
2440 drivers/net/irda/w83977af_ir.c | 1 +
2441 drivers/net/iseries_veth.c | 4 +-
2442 drivers/net/ixgbe/ixgbe.h | 2 -
2443 drivers/net/ixgbe/ixgbe_82598.c | 43 +
2444 drivers/net/ixgbe/ixgbe_82599.c | 44 +-
2445 drivers/net/ixgbe/ixgbe_common.c | 244 +-
2446 drivers/net/ixgbe/ixgbe_common.h | 5 +
2447 drivers/net/ixgbe/ixgbe_dcb.c | 10 +-
2448 drivers/net/ixgbe/ixgbe_dcb.h | 7 -
2449 drivers/net/ixgbe/ixgbe_dcb_82598.c | 43 +-
2450 drivers/net/ixgbe/ixgbe_dcb_82598.h | 3 +-
2451 drivers/net/ixgbe/ixgbe_dcb_82599.c | 119 +-
2452 drivers/net/ixgbe/ixgbe_dcb_82599.h | 14 +-
2453 drivers/net/ixgbe/ixgbe_dcb_nl.c | 52 +-
2454 drivers/net/ixgbe/ixgbe_ethtool.c | 1 +
2455 drivers/net/ixgbe/ixgbe_fcoe.c | 105 +-
2456 drivers/net/ixgbe/ixgbe_fcoe.h | 13 +-
2457 drivers/net/ixgbe/ixgbe_main.c | 398 +-
2458 drivers/net/ixgbe/ixgbe_type.h | 71 +
2459 drivers/net/ixgbe/ixgbe_x540.c | 2 +
2460 drivers/net/ixgbevf/ixgbevf.h | 2 +-
2461 drivers/net/ixgbevf/ixgbevf_main.c | 26 +-
2462 drivers/net/ixp2000/ixpdev.c | 1 +
2463 drivers/net/jme.h | 1 +
2464 drivers/net/ks8842.c | 1 +
2465 drivers/net/ks8851.c | 1 +
2466 drivers/net/ks8851_mll.c | 1 +
2467 drivers/net/ksz884x.c | 1 +
2468 drivers/net/lib8390.c | 5 +-
2469 drivers/net/ll_temac_main.c | 6 +-
2470 drivers/net/lne390.c | 1 +
2471 drivers/net/macb.c | 3 +
2472 drivers/net/mace.c | 1 +
2473 drivers/net/macmace.c | 2 +-
2474 drivers/net/macvlan.c | 39 +-
2475 drivers/net/macvtap.c | 2 +
2476 drivers/net/mipsnet.c | 1 +
2477 drivers/net/mlx4/en_rx.c | 2 +-
2478 drivers/net/mlx4/en_tx.c | 5 +-
2479 drivers/net/mv643xx_eth.c | 8 +-
2480 drivers/net/myri10ge/myri10ge.c | 26 +-
2481 drivers/net/myri_sbus.c | 1187 ----
2482 drivers/net/myri_sbus.h | 311 -
2483 drivers/net/netx-eth.c | 1 +
2484 drivers/net/netxen/netxen_nic_ctx.c | 16 +-
2485 drivers/net/netxen/netxen_nic_hw.c | 6 +
2486 drivers/net/netxen/netxen_nic_init.c | 2 +-
2487 drivers/net/netxen/netxen_nic_main.c | 9 +-
2488 drivers/net/niu.c | 37 +-
2489 drivers/net/ns83820.c | 1 +
2490 drivers/net/octeon/octeon_mgmt.c | 1 +
2491 drivers/net/phy/icplus.c | 6 +-
2492 drivers/net/ppp_async.c | 1 +
2493 drivers/net/ppp_synctty.c | 1 +
2494 drivers/net/ps3_gelic_net.c | 3 +-
2495 drivers/net/pxa168_eth.c | 5 +-
2496 drivers/net/qla3xxx.c | 5 +-
2497 drivers/net/qlcnic/qlcnic_ctx.c | 26 +-
2498 drivers/net/qlcnic/qlcnic_ethtool.c | 2 +-
2499 drivers/net/qlcnic/qlcnic_hw.c | 3 +-
2500 drivers/net/qlcnic/qlcnic_main.c | 2 +-
2501 drivers/net/qlge/qlge.h | 1 +
2502 drivers/net/qlge/qlge_ethtool.c | 2 -
2503 drivers/net/qlge/qlge_main.c | 4 +-
2504 drivers/net/r6040.c | 3 +
2505 drivers/net/r8169.c | 218 +-
2506 drivers/net/s2io.c | 18 +-
2507 drivers/net/sc92031.c | 1 +
2508 drivers/net/sfc/nic.c | 1 +
2509 drivers/net/sfc/siena.c | 2 +-
2510 drivers/net/sis190.c | 1 +
2511 drivers/net/sis900.c | 4 +-
2512 drivers/net/skge.h | 1 +
2513 drivers/net/sky2.c | 1 +
2514 drivers/net/slhc.c | 2 +-
2515 drivers/net/smc-mca.c | 1 +
2516 drivers/net/smc-ultra.c | 1 +
2517 drivers/net/smsc911x.c | 2 +
2518 drivers/net/smsc9420.c | 3 +
2519 drivers/net/spider_net.c | 1 +
2520 drivers/net/starfire.c | 1 +
2521 drivers/net/stmmac/stmmac_ethtool.c | 1 +
2522 drivers/net/stmmac/stmmac_main.c | 2 +
2523 drivers/net/sungem.c | 891 ++--
2524 drivers/net/sungem.h | 25 -
2525 drivers/net/tg3.c | 316 +-
2526 drivers/net/tg3.h | 17 +-
2527 drivers/net/tlan.c | 2 +
2528 drivers/net/tokenring/3c359.c | 6 +-
2529 drivers/net/tokenring/ibmtr.c | 3 +-
2530 drivers/net/tokenring/madgemc.c | 2 +-
2531 drivers/net/tsi108_eth.c | 1 +
2532 drivers/net/tulip/de2104x.c | 1 +
2533 drivers/net/tulip/pnic.c | 1 +
2534 drivers/net/tulip/tulip_core.c | 1 +
2535 drivers/net/tun.c | 32 +-
2536 drivers/net/typhoon.c | 2 +-
2537 drivers/net/ucc_geth.c | 2 +
2538 drivers/net/usb/ipheth.c | 15 +-
2539 drivers/net/veth.c | 70 +-
2540 drivers/net/via-velocity.c | 2 +-
2541 drivers/net/virtio_net.c | 2 +
2542 drivers/net/vmxnet3/vmxnet3_drv.c | 4 +-
2543 drivers/net/vmxnet3/vmxnet3_ethtool.c | 44 +-
2544 drivers/net/vmxnet3/vmxnet3_int.h | 5 +-
2545 drivers/net/vxge/vxge-config.c | 44 +-
2546 drivers/net/vxge/vxge-config.h | 1 +
2547 drivers/net/vxge/vxge-main.c | 52 +-
2548 drivers/net/vxge/vxge-main.h | 48 +-
2549 drivers/net/vxge/vxge-traffic.c | 6 +-
2550 drivers/net/wan/cycx_main.c | 1 +
2551 drivers/net/wan/dscc4.c | 1 +
2552 drivers/net/wan/farsync.c | 1 +
2553 drivers/net/wan/pc300_tty.c | 2 +-
2554 drivers/net/wan/wanxl.c | 1 +
2555 drivers/net/wireless/adm8211.c | 1 +
2556 drivers/net/wireless/ath/ath.h | 1 +
2557 drivers/net/wireless/ath/ath9k/ar9002_mac.c | 6 -
2558 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 8 -
2559 drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 24 +-
2560 drivers/net/wireless/ath/ath9k/ath9k.h | 9 +-
2561 drivers/net/wireless/ath/ath9k/beacon.c | 21 +-
2562 drivers/net/wireless/ath/ath9k/debug.c | 59 +-
2563 drivers/net/wireless/ath/ath9k/debug.h | 1 +
2564 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 8 +-
2565 drivers/net/wireless/ath/ath9k/hw-ops.h | 5 -
2566 drivers/net/wireless/ath/ath9k/hw.c | 6 +-
2567 drivers/net/wireless/ath/ath9k/hw.h | 2 -
2568 drivers/net/wireless/ath/ath9k/init.c | 2 +-
2569 drivers/net/wireless/ath/ath9k/main.c | 150 +-
2570 drivers/net/wireless/ath/ath9k/xmit.c | 338 +-
2571 drivers/net/wireless/atmel.c | 1 +
2572 drivers/net/wireless/b43/Kconfig | 5 +
2573 drivers/net/wireless/b43/Makefile | 1 +
2574 drivers/net/wireless/b43/b43.h | 51 +-
2575 drivers/net/wireless/b43/bus.c | 122 +
2576 drivers/net/wireless/b43/bus.h | 62 +
2577 drivers/net/wireless/b43/dma.c | 38 +-
2578 drivers/net/wireless/b43/leds.c | 15 +-
2579 drivers/net/wireless/b43/lo.c | 6 +-
2580 drivers/net/wireless/b43/main.c | 236 +-
2581 drivers/net/wireless/b43/main.h | 2 +-
2582 drivers/net/wireless/b43/phy_a.c | 21 +-
2583 drivers/net/wireless/b43/phy_common.c | 8 +-
2584 drivers/net/wireless/b43/phy_g.c | 92 +-
2585 drivers/net/wireless/b43/phy_lp.c | 135 +-
2586 drivers/net/wireless/b43/phy_n.c | 37 +-
2587 drivers/net/wireless/b43/pio.c | 10 +-
2588 drivers/net/wireless/b43/rfkill.c | 9 +-
2589 drivers/net/wireless/b43/sdio.c | 4 +-
2590 drivers/net/wireless/b43/sysfs.c | 4 +-
2591 drivers/net/wireless/b43/tables_lpphy.c | 15 +-
2592 drivers/net/wireless/b43/wa.c | 24 +-
2593 drivers/net/wireless/b43/xmit.c | 2 +-
2594 drivers/net/wireless/b43legacy/dma.c | 10 +-
2595 drivers/net/wireless/b43legacy/main.c | 10 +-
2596 drivers/net/wireless/b43legacy/xmit.c | 2 -
2597 drivers/net/wireless/hostap/hostap_wlan.h | 1 +
2598 drivers/net/wireless/ipw2x00/ipw2200.h | 1 +
2599 drivers/net/wireless/ipw2x00/libipw_wx.c | 1 +
2600 drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 3 +
2601 drivers/net/wireless/iwlegacy/iwl-4965.c | 6 +-
2602 drivers/net/wireless/iwlegacy/iwl-dev.h | 1 +
2603 drivers/net/wireless/iwlegacy/iwl-eeprom.c | 1 -
2604 drivers/net/wireless/iwlwifi/iwl-1000.c | 2 +-
2605 drivers/net/wireless/iwlwifi/iwl-2000.c | 1 -
2606 drivers/net/wireless/iwlwifi/iwl-5000.c | 2 -
2607 drivers/net/wireless/iwlwifi/iwl-6000.c | 2 -
2608 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 3 -
2609 drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 7 +-
2610 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 +-
2611 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 72 +-
2612 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 10 +-
2613 drivers/net/wireless/iwlwifi/iwl-agn.c | 207 +-
2614 drivers/net/wireless/iwlwifi/iwl-core.c | 7 +-
2615 drivers/net/wireless/iwlwifi/iwl-core.h | 14 +-
2616 drivers/net/wireless/iwlwifi/iwl-dev.h | 1 +
2617 drivers/net/wireless/iwlwifi/iwl-scan.c | 10 +-
2618 drivers/net/wireless/iwlwifi/iwl-tx.c | 6 +-
2619 drivers/net/wireless/iwmc3200wifi/fw.c | 2 +-
2620 drivers/net/wireless/libertas/cfg.c | 1 +
2621 drivers/net/wireless/libertas/cmd.c | 1 +
2622 drivers/net/wireless/libertas/cmdresp.c | 1 +
2623 drivers/net/wireless/libertas/debugfs.c | 1 +
2624 drivers/net/wireless/libertas/ethtool.c | 1 +
2625 drivers/net/wireless/libertas/if_spi.c | 2 +
2626 drivers/net/wireless/libertas/main.c | 1 +
2627 drivers/net/wireless/libertas/mesh.c | 1 +
2628 drivers/net/wireless/libertas/rx.c | 1 +
2629 drivers/net/wireless/libertas/tx.c | 1 +
2630 drivers/net/wireless/libertas_tf/cmd.c | 1 +
2631 drivers/net/wireless/libertas_tf/main.c | 1 +
2632 drivers/net/wireless/mac80211_hwsim.c | 462 ++-
2633 drivers/net/wireless/mac80211_hwsim.h | 133 +
2634 drivers/net/wireless/mwifiex/11n_aggr.c | 54 +-
2635 drivers/net/wireless/mwifiex/main.c | 18 +-
2636 drivers/net/wireless/mwifiex/main.h | 12 +-
2637 drivers/net/wireless/mwifiex/sdio.c | 8 +-
2638 drivers/net/wireless/mwifiex/sdio.h | 2 +
2639 drivers/net/wireless/mwifiex/wmm.c | 30 +-
2640 drivers/net/wireless/mwl8k.c | 1 +
2641 drivers/net/wireless/orinoco/main.c | 2 +-
2642 drivers/net/wireless/p54/p54pci.h | 1 +
2643 drivers/net/wireless/prism54/islpci_dev.c | 1 +
2644 drivers/net/wireless/prism54/islpci_dev.h | 1 +
2645 drivers/net/wireless/prism54/islpci_hotplug.c | 1 +
2646 drivers/net/wireless/rt2x00/Kconfig | 9 +-
2647 drivers/net/wireless/rt2x00/rt2800.h | 16 +
2648 drivers/net/wireless/rt2x00/rt2800lib.c | 378 +-
2649 drivers/net/wireless/rt2x00/rt2800lib.h | 1 -
2650 drivers/net/wireless/rt2x00/rt2800pci.c | 6 +-
2651 drivers/net/wireless/rt2x00/rt2800usb.c | 83 +-
2652 drivers/net/wireless/rt2x00/rt2x00.h | 1 +
2653 drivers/net/wireless/rt2x00/rt2x00queue.c | 5 +-
2654 drivers/net/wireless/rtl818x/rtl8180/dev.c | 1 +
2655 drivers/net/wireless/rtlwifi/base.c | 4 -
2656 drivers/net/wireless/rtlwifi/efuse.c | 6 +-
2657 drivers/net/wireless/rtlwifi/pci.c | 39 +-
2658 drivers/net/wireless/rtlwifi/ps.c | 48 +-
2659 drivers/net/wireless/rtlwifi/regd.c | 18 -
2660 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 2 -
2661 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 12 +-
2662 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 9 +-
2663 drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 14 +-
2664 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 4 +-
2665 drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 2 -
2666 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 2 -
2667 drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 5 -
2668 drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 2 -
2669 drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 12 +-
2670 drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 18 +-
2671 drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 6 +-
2672 drivers/net/wireless/rtlwifi/wifi.h | 2 +-
2673 drivers/net/wireless/wl1251/sdio.c | 1 +
2674 drivers/net/wireless/wl1251/spi.c | 1 +
2675 drivers/net/wireless/wl12xx/boot.c | 3 +-
2676 drivers/net/wireless/wl12xx/event.c | 23 +
2677 drivers/net/wireless/wl12xx/event.h | 17 +-
2678 drivers/net/wireless/wl12xx/init.c | 1 +
2679 drivers/net/wireless/wl12xx/io.h | 1 +
2680 drivers/net/wireless/wl12xx/main.c | 5 +-
2681 drivers/net/wireless/wl12xx/spi.c | 1 +
2682 drivers/net/wireless/wl12xx/wl12xx.h | 1 +
2683 drivers/net/xen-netfront.c | 69 +-
2684 drivers/net/xilinx_emaclite.c | 14 +-
2685 drivers/net/yellowfin.c | 6 +-
2686 drivers/net/znet.c | 2 +-
2687 drivers/s390/net/ctcm_mpc.h | 1 +
2688 drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 1162 ++--
2689 drivers/scsi/bnx2fc/bnx2fc.h | 10 +-
2690 drivers/scsi/bnx2fc/bnx2fc_constants.h | 139 +-
2691 drivers/scsi/bnx2fc/bnx2fc_els.c | 7 +-
2692 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +-
2693 drivers/scsi/bnx2fc/bnx2fc_hwi.c | 442 +-
2694 drivers/scsi/bnx2fc/bnx2fc_io.c | 23 +-
2695 drivers/scsi/bnx2fc/bnx2fc_tgt.c | 24 +-
2696 drivers/scsi/bnx2i/57xx_iscsi_constants.h | 2 +-
2697 drivers/scsi/bnx2i/57xx_iscsi_hsi.h | 12 +-
2698 drivers/scsi/bnx2i/bnx2i.h | 2 +-
2699 drivers/scsi/bnx2i/bnx2i_init.c | 21 +-
2700 drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 +
2701 drivers/staging/brcm80211/brcmfmac/wl_iw.c | 1 +
2702 drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 1 +
2703 drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 2 +
2704 drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1 +
2705 .../rtl8187se/ieee80211/ieee80211_softmac.c | 1 +
2706 drivers/staging/rtl8187se/r8180.h | 1 +
2707 drivers/staging/rtl8187se/r8180_core.c | 1 +
2708 drivers/staging/rtl8192e/ieee80211/ieee80211.h | 1 +
2709 drivers/staging/rtl8192e/r8192E.h | 1 +
2710 drivers/staging/rtl8192e/r8192E_core.c | 2 +
2711 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 1 +
2712 include/linux/arcdevice.h | 1 +
2713 include/linux/bcma/bcma.h | 25 +
2714 include/linux/bcma/bcma_driver_chipcommon.h | 1 +
2715 include/linux/cordic.h | 48 +
2716 include/linux/crc8.h | 101 +
2717 include/linux/dcbnl.h | 2 +
2718 include/linux/dccp.h | 1 +
2719 include/linux/ethtool.h | 19 +-
2720 include/linux/mii.h | 2 +
2721 include/linux/netdevice.h | 4 -
2722 include/linux/netfilter/ipset/ip_set.h | 50 +-
2723 include/linux/netfilter/ipset/ip_set_ahash.h | 48 +-
2724 include/linux/netfilter/ipset/ip_set_hash.h | 4 +
2725 include/linux/netfilter/ipset/ip_set_timeout.h | 5 +-
2726 include/linux/netfilter/ipset/pfxlen.h | 11 +-
2727 include/linux/netfilter/xt_set.h | 15 +-
2728 include/linux/netlink.h | 6 +-
2729 include/linux/pci_ids.h | 9 +
2730 include/linux/rtnetlink.h | 2 +
2731 include/linux/skbuff.h | 3 +-
2732 include/linux/tcp.h | 1 +
2733 include/linux/virtio_net.h | 1 +
2734 include/net/bluetooth/hci_core.h | 1 +
2735 include/net/caif/caif_hsi.h | 145 +
2736 include/net/cfg80211.h | 11 +
2737 include/net/dcbnl.h | 8 +-
2738 include/net/inetpeer.h | 26 +-
2739 include/net/ip.h | 2 -
2740 include/net/ip_vs.h | 34 +-
2741 include/net/mac80211.h | 21 +
2742 include/net/rtnetlink.h | 7 +-
2743 include/net/sctp/sctp.h | 15 +-
2744 include/net/sctp/structs.h | 17 +
2745 include/net/sctp/user.h | 1 +
2746 include/net/snmp.h | 86 +-
2747 include/net/sock.h | 1 +
2748 include/net/tcp.h | 11 +-
2749 include/trace/events/sock.h | 68 +
2750 include/trace/events/udp.h | 32 +
2753 lib/cordic.c | 101 +
2755 net/8021q/vlan.c | 15 +-
2756 net/8021q/vlan_dev.c | 4 +-
2757 net/8021q/vlanproc.c | 6 +-
2758 net/atm/mpc.c | 2 +-
2759 net/atm/pppoatm.c | 1 +
2760 net/batman-adv/Kconfig | 1 +
2761 net/batman-adv/aggregation.c | 48 +-
2762 net/batman-adv/aggregation.h | 13 +-
2763 net/batman-adv/bat_debugfs.c | 11 +-
2764 net/batman-adv/bat_sysfs.c | 102 +-
2765 net/batman-adv/bat_sysfs.h | 2 +
2766 net/batman-adv/bitarray.c | 12 +-
2767 net/batman-adv/bitarray.h | 10 +-
2768 net/batman-adv/gateway_client.c | 263 +-
2769 net/batman-adv/gateway_client.h | 3 +-
2770 net/batman-adv/gateway_common.c | 25 +-
2771 net/batman-adv/hard-interface.c | 46 +-
2772 net/batman-adv/hard-interface.h | 20 +-
2773 net/batman-adv/hash.c | 7 +-
2774 net/batman-adv/hash.h | 6 +-
2775 net/batman-adv/icmp_socket.c | 4 +-
2776 net/batman-adv/main.c | 22 +-
2777 net/batman-adv/main.h | 74 +-
2778 net/batman-adv/originator.c | 29 +-
2779 net/batman-adv/originator.h | 18 +-
2780 net/batman-adv/packet.h | 137 +-
2781 net/batman-adv/ring_buffer.c | 4 +-
2782 net/batman-adv/ring_buffer.h | 2 +-
2783 net/batman-adv/routing.c | 362 +-
2784 net/batman-adv/routing.h | 15 +-
2785 net/batman-adv/send.c | 130 +-
2786 net/batman-adv/send.h | 14 +-
2787 net/batman-adv/soft-interface.c | 48 +-
2788 net/batman-adv/soft-interface.h | 5 +-
2789 net/batman-adv/translation-table.c | 1452 ++++-
2790 net/batman-adv/translation-table.h | 47 +-
2791 net/batman-adv/types.h | 72 +-
2792 net/batman-adv/unicast.c | 33 +-
2793 net/batman-adv/unicast.h | 8 +-
2794 net/batman-adv/vis.c | 104 +-
2795 net/bluetooth/hci_core.c | 4 +-
2796 net/bridge/br_netlink.c | 15 +-
2797 net/caif/caif_dev.c | 1 -
2798 net/caif/chnl_net.c | 2 +-
2799 net/can/af_can.c | 5 +-
2801 net/ceph/crypto.c | 2 +-
2802 net/core/dev.c | 5 -
2803 net/core/ethtool.c | 309 +-
2804 net/core/fib_rules.c | 6 +-
2805 net/core/neighbour.c | 11 +-
2806 net/core/net-traces.c | 2 +
2807 net/core/rtnetlink.c | 60 +-
2808 net/core/sock.c | 5 +
2809 net/core/timestamping.c | 2 +
2810 net/dcb/dcbnl.c | 419 +-
2811 net/decnet/dn_dev.c | 8 +-
2812 net/decnet/dn_fib.c | 4 +-
2813 net/decnet/dn_route.c | 5 +-
2814 net/ipv4/af_inet.c | 52 +-
2815 net/ipv4/devinet.c | 6 +-
2816 net/ipv4/fib_frontend.c | 6 +-
2817 net/ipv4/gre.c | 1 -
2818 net/ipv4/inet_diag.c | 2 +-
2819 net/ipv4/inetpeer.c | 280 +-
2820 net/ipv4/ipmr.c | 3 +-
2821 net/ipv4/route.c | 2 +-
2822 net/ipv4/syncookies.c | 1 +
2823 net/ipv4/sysctl_net_ipv4.c | 14 -
2824 net/ipv4/tcp_input.c | 46 +-
2825 net/ipv4/tcp_ipv4.c | 11 +-
2826 net/ipv4/tcp_minisocks.c | 6 +-
2827 net/ipv4/udp.c | 2 +
2828 net/ipv6/addrconf.c | 51 +-
2829 net/ipv6/addrlabel.c | 9 +-
2830 net/ipv6/ip6_fib.c | 3 +-
2831 net/ipv6/ip6mr.c | 3 +-
2832 net/ipv6/route.c | 6 +-
2833 net/ipv6/syncookies.c | 1 +
2834 net/ipv6/tcp_ipv6.c | 5 +
2835 net/irda/af_irda.c | 4 +-
2836 net/irda/ircomm/ircomm_tty_attach.c | 2 +-
2837 net/irda/irda_device.c | 2 +-
2838 net/irda/iriap.c | 8 +-
2839 net/irda/irlan/irlan_client.c | 10 +-
2840 net/irda/irlan/irlan_common.c | 10 +-
2841 net/irda/irlan/irlan_eth.c | 2 +-
2842 net/irda/irlan/irlan_provider.c | 10 +-
2843 net/irda/irqueue.c | 4 +-
2844 net/irda/irttp.c | 18 +-
2845 net/key/af_key.c | 20 +-
2846 net/l2tp/l2tp_ip.c | 19 +-
2847 net/mac80211/agg-rx.c | 15 +
2848 net/mac80211/cfg.c | 14 +
2849 net/mac80211/ht.c | 6 +
2850 net/mac80211/rc80211_minstrel.c | 9 +
2851 net/mac80211/rc80211_minstrel.h | 12 +
2852 net/mac80211/rc80211_minstrel_ht.c | 7 +
2853 net/mac80211/sta_info.h | 3 +
2854 net/netfilter/ipset/Kconfig | 10 +
2855 net/netfilter/ipset/Makefile | 1 +
2856 net/netfilter/ipset/ip_set_bitmap_ip.c | 35 +-
2857 net/netfilter/ipset/ip_set_bitmap_ipmac.c | 38 +-
2858 net/netfilter/ipset/ip_set_bitmap_port.c | 31 +-
2859 net/netfilter/ipset/ip_set_core.c | 166 +-
2860 net/netfilter/ipset/ip_set_hash_ip.c | 43 +-
2861 net/netfilter/ipset/ip_set_hash_ipport.c | 63 +-
2862 net/netfilter/ipset/ip_set_hash_ipportip.c | 67 +-
2863 net/netfilter/ipset/ip_set_hash_ipportnet.c | 131 +-
2864 net/netfilter/ipset/ip_set_hash_net.c | 82 +-
2865 net/netfilter/ipset/ip_set_hash_netiface.c | 762 +++
2866 net/netfilter/ipset/ip_set_hash_netport.c | 113 +-
2867 net/netfilter/ipset/ip_set_list_set.c | 106 +-
2868 net/netfilter/ipset/pfxlen.c | 23 +-
2869 net/netfilter/ipvs/ip_vs_app.c | 14 +-
2870 net/netfilter/ipvs/ip_vs_conn.c | 4 +-
2871 net/netfilter/ipvs/ip_vs_core.c | 71 +-
2872 net/netfilter/ipvs/ip_vs_ctl.c | 28 +-
2873 net/netfilter/ipvs/ip_vs_est.c | 13 +-
2874 net/netfilter/ipvs/ip_vs_ftp.c | 52 +-
2875 net/netfilter/ipvs/ip_vs_proto.c | 4 +-
2876 net/netfilter/ipvs/ip_vs_sync.c | 13 +-
2877 net/netfilter/nf_conntrack_netlink.c | 4 +-
2878 net/netfilter/xt_CT.c | 11 +-
2879 net/netfilter/xt_set.c | 153 +-
2880 net/netlabel/netlabel_unlabeled.c | 10 +-
2881 net/netlink/af_netlink.c | 18 +-
2882 net/netlink/genetlink.c | 2 +-
2883 net/packet/af_packet.c | 43 +-
2884 net/phonet/pn_netlink.c | 13 +-
2885 net/rds/bind.c | 4 +-
2887 net/rds/ib_cm.c | 6 +-
2888 net/rds/ib_send.c | 4 +-
2890 net/rds/iw_cm.c | 9 +-
2891 net/rds/iw_rdma.c | 9 +-
2892 net/rds/iw_send.c | 4 +-
2893 net/rds/send.c | 7 +-
2894 net/sched/act_api.c | 7 +-
2895 net/sched/cls_api.c | 6 +-
2896 net/sched/sch_api.c | 12 +-
2897 net/sched/sch_atm.c | 1 +
2898 net/sctp/associola.c | 6 +
2899 net/sctp/bind_addr.c | 17 +-
2900 net/sctp/input.c | 3 +-
2901 net/sctp/ipv6.c | 2 +
2902 net/sctp/outqueue.c | 13 +
2903 net/sctp/protocol.c | 152 +-
2904 net/sctp/sm_make_chunk.c | 55 +-
2905 net/sctp/sm_sideeffect.c | 2 +-
2906 net/sctp/socket.c | 190 +-
2907 net/sctp/sysctl.c | 7 +
2908 net/sunrpc/auth.c | 2 +-
2909 net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 +
2910 net/sunrpc/xprtrdma/verbs.c | 1 +
2911 net/wireless/nl80211.c | 107 +-
2912 net/xfrm/xfrm_user.c | 3 +-
2913 642 files changed, 44182 insertions(+), 19401 deletions(-)
2914 create mode 100644 drivers/bcma/sprom.c
2915 create mode 100644 drivers/net/bnx2x/bnx2x_sp.c
2916 create mode 100644 drivers/net/bnx2x/bnx2x_sp.h
2917 create mode 100644 drivers/net/caif/caif_hsi.c
2918 create mode 100644 drivers/net/ftgmac100.c
2919 create mode 100644 drivers/net/ftgmac100.h
2920 delete mode 100644 drivers/net/myri_sbus.c
2921 delete mode 100644 drivers/net/myri_sbus.h
2922 create mode 100644 drivers/net/wireless/b43/bus.c
2923 create mode 100644 drivers/net/wireless/b43/bus.h
2924 create mode 100644 drivers/net/wireless/mac80211_hwsim.h
2925 create mode 100644 include/linux/cordic.h
2926 create mode 100644 include/linux/crc8.h
2927 create mode 100644 include/net/caif/caif_hsi.h
2928 create mode 100644 include/trace/events/sock.h
2929 create mode 100644 include/trace/events/udp.h
2930 create mode 100644 lib/cordic.c
2931 create mode 100644 lib/crc8.c
2932 create mode 100644 net/netfilter/ipset/ip_set_hash_netiface.c
2933 Merging wireless/master
2934 $ git merge wireless/master
2935 Resolved 'drivers/net/wireless/rtlwifi/pci.c' using previous resolution.
2936 Resolved 'net/bluetooth/l2cap_core.c' using previous resolution.
2937 Auto-merging drivers/bcma/host_pci.c
2938 Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h
2939 Auto-merging drivers/net/wireless/b43/main.c
2940 Auto-merging drivers/net/wireless/iwlegacy/iwl-dev.h
2941 Auto-merging drivers/net/wireless/iwlwifi/iwl-dev.h
2942 Auto-merging drivers/net/wireless/libertas/if_spi.c
2943 Auto-merging drivers/net/wireless/rtlwifi/pci.c
2944 CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c
2945 Auto-merging include/net/bluetooth/hci_core.h
2946 Auto-merging net/bluetooth/hci_conn.c
2947 Auto-merging net/bluetooth/hci_core.c
2948 Auto-merging net/bluetooth/hci_event.c
2949 Auto-merging net/bluetooth/l2cap_core.c
2950 CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
2951 Automatic merge failed; fix conflicts and then commit the result.
2953 [master 905e622] Merge remote-tracking branch 'wireless/master'
2954 $ git diff -M --stat --summary HEAD^..
2955 drivers/bcma/bcma_private.h | 4 +-
2956 drivers/bcma/core.c | 3 +-
2957 drivers/bcma/driver_chipcommon_pmu.c | 6 +-
2958 drivers/bcma/driver_pci.c | 1 +
2959 drivers/bcma/host_pci.c | 1 +
2960 drivers/bcma/main.c | 2 -
2961 drivers/net/wireless/ath/ath5k/ahb.c | 1 +
2962 drivers/net/wireless/ath/ath5k/ath5k.h | 7 +-
2963 drivers/net/wireless/ath/ath5k/base.c | 15 +-
2964 drivers/net/wireless/ath/ath5k/mac80211-ops.c | 6 +-
2965 drivers/net/wireless/ath/ath5k/reset.c | 6 +-
2966 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +-
2967 drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 21 +-
2968 drivers/net/wireless/ath/ath9k/ath9k.h | 4 +-
2969 drivers/net/wireless/ath/ath9k/hw.h | 5 +-
2970 drivers/net/wireless/ath/ath9k/main.c | 16 +-
2971 drivers/net/wireless/ath/ath9k/rc.c | 6 +-
2972 drivers/net/wireless/b43/Kconfig | 13 +
2973 drivers/net/wireless/b43/Makefile | 1 +
2974 drivers/net/wireless/b43/b43.h | 6 +
2975 drivers/net/wireless/b43/bus.c | 9 +-
2976 drivers/net/wireless/b43/main.c | 37 +-
2977 drivers/net/wireless/b43/phy_common.c | 6 +
2978 drivers/net/wireless/b43/phy_common.h | 3 +
2979 drivers/net/wireless/b43/phy_ht.c | 156 ++++++
2980 drivers/net/wireless/b43/phy_ht.h | 26 +
2981 drivers/net/wireless/iwlegacy/iwl-3945.c | 4 -
2982 drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 79 +---
2983 drivers/net/wireless/iwlegacy/iwl-4965-rx.c | 78 +---
2984 drivers/net/wireless/iwlegacy/iwl-4965.c | 4 -
2985 drivers/net/wireless/iwlegacy/iwl-commands.h | 7 -
2986 drivers/net/wireless/iwlegacy/iwl-core.c | 91 ++---
2987 drivers/net/wireless/iwlegacy/iwl-core.h | 15 +-
2988 drivers/net/wireless/iwlegacy/iwl-debugfs.c | 192 +-------
2989 drivers/net/wireless/iwlegacy/iwl-dev.h | 60 +---
2990 drivers/net/wireless/iwlegacy/iwl-devtrace.c | 3 -
2991 drivers/net/wireless/iwlegacy/iwl-devtrace.h | 60 ---
2992 drivers/net/wireless/iwlegacy/iwl-helpers.h | 9 +
2993 drivers/net/wireless/iwlegacy/iwl-rx.c | 21 -
2994 drivers/net/wireless/iwlegacy/iwl-scan.c | 92 +---
2995 drivers/net/wireless/iwlegacy/iwl3945-base.c | 301 +-----------
2996 drivers/net/wireless/iwlegacy/iwl4965-base.c | 463 ++---------------
2997 drivers/net/wireless/iwlwifi/Makefile | 1 +
2998 drivers/net/wireless/iwlwifi/iwl-1000.c | 4 -
2999 drivers/net/wireless/iwlwifi/iwl-2000.c | 20 +-
3000 drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 2 +-
3001 drivers/net/wireless/iwlwifi/iwl-5000.c | 23 +-
3002 drivers/net/wireless/iwlwifi/iwl-6000.c | 22 +-
3003 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 14 +-
3004 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 12 +-
3005 drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 7 -
3006 drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 4 +-
3007 drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 75 ++--
3008 drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 38 +-
3009 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 30 +-
3010 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 45 +-
3011 drivers/net/wireless/iwlwifi/iwl-agn.c | 541 ++++++--------------
3012 drivers/net/wireless/iwlwifi/iwl-agn.h | 26 +-
3013 drivers/net/wireless/iwlwifi/iwl-commands.h | 35 +-
3014 drivers/net/wireless/iwlwifi/iwl-core.c | 85 +---
3015 drivers/net/wireless/iwlwifi/iwl-core.h | 47 +--
3016 drivers/net/wireless/iwlwifi/iwl-debug.h | 18 +-
3017 drivers/net/wireless/iwlwifi/iwl-debugfs.c | 7 +-
3018 drivers/net/wireless/iwlwifi/iwl-dev.h | 60 ++-
3019 drivers/net/wireless/iwlwifi/iwl-eeprom.c | 25 +
3020 drivers/net/wireless/iwlwifi/iwl-eeprom.h | 25 +-
3021 drivers/net/wireless/iwlwifi/iwl-hcmd.c | 11 +-
3022 drivers/net/wireless/iwlwifi/iwl-helpers.h | 9 +
3023 drivers/net/wireless/iwlwifi/iwl-io.h | 6 +-
3024 drivers/net/wireless/iwlwifi/iwl-led.c | 14 +-
3025 drivers/net/wireless/iwlwifi/iwl-pci.c | 571 +++++++++++++++++++++
3026 drivers/net/wireless/iwlwifi/iwl-pci.h | 69 +++
3027 drivers/net/wireless/iwlwifi/iwl-power.c | 33 +-
3028 drivers/net/wireless/iwlwifi/iwl-power.h | 2 +-
3029 drivers/net/wireless/iwlwifi/iwl-rx.c | 4 +-
3030 drivers/net/wireless/iwlwifi/iwl-sv-open.c | 139 ++++--
3031 drivers/net/wireless/iwlwifi/iwl-testmode.h | 9 +-
3032 drivers/net/wireless/iwlwifi/iwl-tx.c | 33 +-
3033 drivers/net/wireless/libertas/if_sdio.c | 34 ++
3034 drivers/net/wireless/libertas/if_spi.c | 6 +-
3035 drivers/net/wireless/mwifiex/main.c | 16 +-
3036 drivers/net/wireless/mwifiex/main.h | 1 -
3037 drivers/net/wireless/mwifiex/sdio.c | 81 ++--
3038 drivers/net/wireless/rtlwifi/base.c | 2 +-
3039 drivers/net/wireless/rtlwifi/core.c | 12 +-
3040 drivers/net/wireless/rtlwifi/core.h | 2 +
3041 drivers/net/wireless/rtlwifi/efuse.c | 8 +-
3042 drivers/net/wireless/rtlwifi/pci.c | 206 ++++----
3043 drivers/net/wireless/rtlwifi/ps.c | 65 +---
3044 drivers/net/wireless/rtlwifi/ps.h | 3 +-
3045 drivers/net/wireless/rtlwifi/rc.c | 2 +-
3046 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 4 +-
3047 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 10 +-
3048 drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 2 +-
3049 drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 2 +-
3050 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 8 +-
3051 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 8 +-
3052 drivers/net/wireless/rtlwifi/rtl8192cu/led.c | 2 +-
3053 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 +-
3054 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +-
3055 drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 2 +-
3056 drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 11 +-
3057 drivers/net/wireless/rtlwifi/rtl8192se/led.c | 2 +-
3058 drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 4 +-
3059 drivers/net/wireless/rtlwifi/rtl8192se/reg.h | 6 +-
3060 drivers/net/wireless/rtlwifi/rtl8192se/rf.c | 2 +-
3061 drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 6 +-
3062 drivers/net/wireless/rtlwifi/wifi.h | 4 +-
3063 drivers/net/wireless/zd1211rw/zd_chip.h | 2 +
3064 drivers/ssb/driver_chipcommon_pmu.c | 4 +-
3065 include/linux/bcma/bcma.h | 1 +
3066 include/linux/bcma/bcma_driver_pci.h | 2 +
3067 include/net/bluetooth/bluetooth.h | 15 +-
3068 include/net/bluetooth/hci.h | 25 +
3069 include/net/bluetooth/hci_core.h | 55 ++-
3070 include/net/bluetooth/l2cap.h | 24 +-
3071 include/net/bluetooth/rfcomm.h | 9 +-
3072 include/net/mac80211.h | 20 +
3073 net/bluetooth/cmtp/capi.c | 3 +-
3074 net/bluetooth/hci_conn.c | 29 +-
3075 net/bluetooth/hci_core.c | 82 +++-
3076 net/bluetooth/hci_event.c | 137 ++++--
3077 net/bluetooth/l2cap_core.c | 307 +++++++++--
3078 net/bluetooth/l2cap_sock.c | 280 +++--------
3079 net/bluetooth/mgmt.c | 61 ++-
3080 net/bluetooth/rfcomm/sock.c | 6 +-
3081 net/mac80211/driver-ops.h | 10 +
3082 net/mac80211/driver-trace.h | 6 +
3083 net/mac80211/mlme.c | 8 +
3084 net/mac80211/pm.c | 43 +-
3085 net/mac80211/scan.c | 37 +-
3086 net/mac80211/util.c | 2 +
3087 net/wireless/mlme.c | 4 +-
3088 133 files changed, 2714 insertions(+), 2883 deletions(-)
3089 create mode 100644 drivers/net/wireless/b43/phy_ht.c
3090 create mode 100644 drivers/net/wireless/b43/phy_ht.h
3091 create mode 100644 drivers/net/wireless/iwlwifi/iwl-pci.c
3092 create mode 100644 drivers/net/wireless/iwlwifi/iwl-pci.h
3093 Merging bluetooth/master
3094 $ git merge bluetooth/master
3095 Recorded preimage for 'net/bluetooth/l2cap_core.c'
3096 Auto-merging include/net/bluetooth/hci_core.h
3097 Auto-merging net/bluetooth/hci_core.c
3098 Auto-merging net/bluetooth/l2cap_core.c
3099 CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
3100 Automatic merge failed; fix conflicts and then commit the result.
3102 Recorded resolution for 'net/bluetooth/l2cap_core.c'.
3103 [master ce61b5c] Merge remote-tracking branch 'bluetooth/master'
3104 $ git diff -M --stat --summary HEAD^..
3105 include/net/bluetooth/hci.h | 34 ++
3106 include/net/bluetooth/hci_core.h | 13 +
3107 include/net/bluetooth/l2cap.h | 95 ++++--
3108 include/net/bluetooth/mgmt.h | 10 +
3109 include/net/bluetooth/smp.h | 46 +++
3110 net/bluetooth/Kconfig | 8 +
3111 net/bluetooth/Makefile | 2 +-
3112 net/bluetooth/hci_conn.c | 50 +++
3113 net/bluetooth/hci_core.c | 113 +++++++
3114 net/bluetooth/hci_event.c | 69 ++++
3115 net/bluetooth/hci_sock.c | 70 +----
3116 net/bluetooth/l2cap_core.c | 681 +++++++++++++++++++-------------------
3117 net/bluetooth/l2cap_sock.c | 97 +++++-
3118 net/bluetooth/mgmt.c | 72 ++++-
3119 net/bluetooth/smp.c | 533 +++++++++++++++++++++++++++++
3120 15 files changed, 1443 insertions(+), 450 deletions(-)
3121 create mode 100644 net/bluetooth/smp.c
3123 $ git merge mtd/master
3125 Merging l2-mtd/master
3126 $ git merge l2-mtd/master
3127 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
3128 Auto-merging arch/arm/mach-at91/board-cam60.c
3129 Auto-merging arch/arm/mach-at91/board-cap9adk.c
3130 Auto-merging arch/arm/mach-at91/board-kb9202.c
3131 Auto-merging arch/arm/mach-at91/board-neocore926.c
3132 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
3133 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
3134 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
3135 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
3136 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
3137 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
3138 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
3139 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
3140 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
3141 Auto-merging arch/arm/mach-at91/board-snapper9260.c
3142 Auto-merging arch/arm/mach-at91/board-usb-a9260.c
3143 Auto-merging arch/arm/mach-at91/board-usb-a9263.c
3144 Auto-merging arch/arm/mach-at91/board-yl-9200.c
3145 Removing drivers/mtd/maps/ceiva.c
3146 Merge made by recursive.
3147 Documentation/DocBook/mtdnand.tmpl | 5 +-
3148 arch/arm/mach-at91/board-afeb-9260v1.c | 9 +-
3149 arch/arm/mach-at91/board-cam60.c | 9 +-
3150 arch/arm/mach-at91/board-cap9adk.c | 9 +-
3151 arch/arm/mach-at91/board-kb9202.c | 9 +-
3152 arch/arm/mach-at91/board-neocore926.c | 9 +-
3153 arch/arm/mach-at91/board-qil-a9260.c | 9 +-
3154 arch/arm/mach-at91/board-rm9200dk.c | 9 +-
3155 arch/arm/mach-at91/board-sam9-l9260.c | 9 +-
3156 arch/arm/mach-at91/board-sam9260ek.c | 9 +-
3157 arch/arm/mach-at91/board-sam9261ek.c | 9 +-
3158 arch/arm/mach-at91/board-sam9263ek.c | 9 +-
3159 arch/arm/mach-at91/board-sam9g20ek.c | 9 +-
3160 arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +-
3161 arch/arm/mach-at91/board-sam9rlek.c | 9 +-
3162 arch/arm/mach-at91/board-snapper9260.c | 10 +-
3163 arch/arm/mach-at91/board-usb-a9260.c | 9 +-
3164 arch/arm/mach-at91/board-usb-a9263.c | 9 +-
3165 arch/arm/mach-at91/board-yl-9200.c | 9 +-
3166 arch/arm/mach-at91/include/mach/board.h | 3 +-
3167 arch/arm/mach-davinci/board-da830-evm.c | 2 +-
3168 arch/arm/mach-davinci/board-da850-evm.c | 2 +-
3169 arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
3170 arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
3171 arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
3172 arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
3173 arch/arm/mach-davinci/board-mityomapl138.c | 3 +-
3174 arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
3175 arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +-
3176 arch/arm/mach-davinci/include/mach/nand.h | 4 +-
3177 arch/arm/mach-ep93xx/ts72xx.c | 23 +-
3178 arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
3179 arch/avr32/boards/atngw100/setup.c | 8 +-
3180 arch/avr32/boards/atstk1000/atstk1002.c | 9 +-
3181 arch/avr32/mach-at32ap/include/mach/board.h | 3 +-
3182 arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +-
3183 arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +-
3184 drivers/mtd/cmdlinepart.c | 3 -
3185 drivers/mtd/devices/lart.c | 18 +-
3186 drivers/mtd/devices/m25p80.c | 8 +-
3187 drivers/mtd/devices/mtd_dataflash.c | 26 +-
3188 drivers/mtd/devices/sst25l.c | 39 +--
3189 drivers/mtd/inftlcore.c | 4 +-
3190 drivers/mtd/maps/Kconfig | 14 -
3191 drivers/mtd/maps/Makefile | 1 -
3192 drivers/mtd/maps/bfin-async-flash.c | 16 +-
3193 drivers/mtd/maps/ceiva.c | 341 -----------
3194 drivers/mtd/maps/dc21285.c | 9 +-
3195 drivers/mtd/maps/edb7312.c | 3 +-
3196 drivers/mtd/maps/gpio-addr-flash.c | 16 +-
3197 drivers/mtd/maps/h720x-flash.c | 23 +-
3198 drivers/mtd/maps/impa7.c | 28 +-
3199 drivers/mtd/maps/intel_vr_nor.c | 7 +-
3200 drivers/mtd/maps/ixp2000.c | 11 +-
3201 drivers/mtd/maps/ixp4xx.c | 29 +-
3202 drivers/mtd/maps/lantiq-flash.c | 17 +-
3203 drivers/mtd/maps/latch-addr-flash.c | 24 +-
3204 drivers/mtd/maps/physmap.c | 38 +--
3205 drivers/mtd/maps/plat-ram.c | 23 +-
3206 drivers/mtd/maps/pxa2xx-flash.c | 20 +-
3207 drivers/mtd/maps/rbtx4939-flash.c | 24 +-
3208 drivers/mtd/maps/sa1100-flash.c | 30 +-
3209 drivers/mtd/maps/solutionengine.c | 30 +-
3210 drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +-
3211 drivers/mtd/mtdblock.c | 4 +-
3212 drivers/mtd/mtdchar.c | 1 +
3213 drivers/mtd/mtdcore.c | 58 ++
3214 drivers/mtd/mtdpart.c | 40 ++
3215 drivers/mtd/mtdswap.c | 3 +-
3216 drivers/mtd/nand/atmel_nand.c | 27 +-
3217 drivers/mtd/nand/autcpu12.c | 4 +-
3218 drivers/mtd/nand/bcm_umi_nand.c | 24 +-
3219 drivers/mtd/nand/cafe_nand.c | 16 +-
3220 drivers/mtd/nand/cmx270_nand.c | 23 +-
3221 drivers/mtd/nand/cs553x_nand.c | 15 +-
3222 drivers/mtd/nand/davinci_nand.c | 39 +--
3223 drivers/mtd/nand/denali.c | 6 +-
3224 drivers/mtd/nand/diskonchip.c | 2 +-
3225 drivers/mtd/nand/edb7312.c | 19 +-
3226 drivers/mtd/nand/fsl_elbc_nand.c | 4 +-
3227 drivers/mtd/nand/fsl_upm.c | 3 +-
3228 drivers/mtd/nand/fsmc_nand.c | 77 +---
3229 drivers/mtd/nand/h1910.c | 19 +-
3230 drivers/mtd/nand/jz4740_nand.c | 18 +-
3231 drivers/mtd/nand/mpc5121_nfc.c | 7 +-
3232 drivers/mtd/nand/mxc_nand.c | 17 +-
3233 drivers/mtd/nand/nand_base.c | 747 +++++++++++------------
3234 drivers/mtd/nand/nand_bbt.c | 437 ++++++--------
3235 drivers/mtd/nand/nandsim.c | 4 +-
3236 drivers/mtd/nand/ndfc.c | 8 +-
3237 drivers/mtd/nand/nomadik_nand.c | 1 +
3238 drivers/mtd/nand/nuc900_nand.c | 1 +
3239 drivers/mtd/nand/omap2.c | 12 +-
3240 drivers/mtd/nand/orion_nand.c | 16 +-
3241 drivers/mtd/nand/pasemi_nand.c | 3 +-
3242 drivers/mtd/nand/plat_nand.c | 24 +-
3243 drivers/mtd/nand/ppchameleonevb.c | 47 +--
3244 drivers/mtd/nand/pxa3xx_nand.c | 32 +-
3245 drivers/mtd/nand/rtc_from4.c | 1 -
3246 drivers/mtd/nand/s3c2410.c | 25 +-
3247 drivers/mtd/nand/sharpsl.c | 13 +-
3248 drivers/mtd/nand/socrates_nand.c | 7 +-
3249 drivers/mtd/nand/tmio_nand.c | 17 +-
3250 drivers/mtd/nand/txx9ndfmc.c | 8 +-
3251 drivers/mtd/nftlcore.c | 4 +-
3252 drivers/mtd/onenand/generic.c | 13 +-
3253 drivers/mtd/onenand/omap2.c | 16 +-
3254 drivers/mtd/onenand/onenand_bbt.c | 4 +-
3255 drivers/mtd/onenand/samsung.c | 13 +-
3256 drivers/mtd/ssfdc.c | 10 +-
3257 include/linux/mtd/bbm.h | 39 +-
3258 include/linux/mtd/mtd.h | 5 +
3259 include/linux/mtd/nand.h | 24 +-
3260 include/linux/mtd/partitions.h | 11 +-
3261 include/linux/mtd/physmap.h | 17 -
3262 115 files changed, 945 insertions(+), 2118 deletions(-)
3263 delete mode 100644 drivers/mtd/maps/ceiva.c
3264 Merging crypto/master
3265 $ git merge crypto/master
3266 Merge made by recursive.
3267 arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 +-
3268 crypto/Kconfig | 4 +-
3269 crypto/arc4.c | 15 +-
3270 crypto/crc32c.c | 10 +-
3271 crypto/testmgr.h | 293 +++++++++++++++++++++++++++-
3272 drivers/char/hw_random/nomadik-rng.c | 3 +-
3273 drivers/char/hw_random/omap-rng.c | 6 +-
3274 drivers/char/hw_random/timeriomem-rng.c | 3 +-
3275 drivers/crypto/caam/caamalg.c | 6 +-
3276 drivers/crypto/caam/ctrl.c | 4 +-
3277 drivers/crypto/omap-sham.c | 180 +++++++++---------
3278 11 files changed, 409 insertions(+), 117 deletions(-)
3279 Merging sound/for-next
3280 $ git merge sound/for-next
3281 Auto-merging include/linux/pci_ids.h
3282 Auto-merging sound/soc/ep93xx/ep93xx-pcm.c
3283 Merge made by recursive.
3284 Documentation/DocBook/writing-an-alsa-driver.tmpl | 10 +-
3285 include/linux/pci_ids.h | 1 +
3286 include/sound/rawmidi.h | 4 +-
3287 include/sound/soc-dai.h | 4 +
3288 include/sound/soc-dapm.h | 2 +-
3289 include/sound/soc.h | 39 +-
3290 sound/core/rawmidi.c | 37 +-
3291 sound/firewire/speakers.c | 2 +-
3292 sound/pci/ad1889.c | 4 +-
3293 sound/pci/ali5451/ali5451.c | 4 +-
3294 sound/pci/als300.c | 4 +-
3295 sound/pci/als4000.c | 2 +-
3296 sound/pci/asihpi/asihpi.c | 2 +-
3297 sound/pci/atiixp.c | 4 +-
3298 sound/pci/atiixp_modem.c | 4 +-
3299 sound/pci/au88x0/au88x0.c | 4 +-
3300 sound/pci/aw2/aw2-alsa.c | 4 +-
3301 sound/pci/azt3328.c | 4 +-
3302 sound/pci/bt87x.c | 4 +-
3303 sound/pci/ca0106/ca0106_main.c | 4 +-
3304 sound/pci/cmipci.c | 4 +-
3305 sound/pci/cs4281.c | 4 +-
3306 sound/pci/cs46xx/cs46xx.c | 2 +-
3307 sound/pci/cs46xx/cs46xx_lib.c | 2 +-
3308 sound/pci/cs5530.c | 2 +-
3309 sound/pci/cs5535audio/cs5535audio.c | 4 +-
3310 sound/pci/ctxfi/ct20k2reg.h | 1 +
3311 sound/pci/ctxfi/ctatc.c | 107 ++-
3312 sound/pci/ctxfi/ctatc.h | 8 +-
3313 sound/pci/ctxfi/ctdaio.c | 23 +-
3314 sound/pci/ctxfi/ctdaio.h | 1 +
3315 sound/pci/ctxfi/cthardware.h | 14 +-
3316 sound/pci/ctxfi/cthw20k1.c | 15 +-
3317 sound/pci/ctxfi/cthw20k2.c | 337 +++++--
3318 sound/pci/ctxfi/ctmixer.c | 145 +++-
3319 sound/pci/ctxfi/xfi.c | 6 +-
3320 sound/pci/echoaudio/echoaudio.c | 6 +-
3321 sound/pci/emu10k1/emu10k1.c | 2 +-
3322 sound/pci/emu10k1/emu10k1_main.c | 2 +-
3323 sound/pci/emu10k1/emu10k1x.c | 4 +-
3324 sound/pci/ens1370.c | 4 +-
3325 sound/pci/es1938.c | 6 +-
3326 sound/pci/es1968.c | 68 +-
3327 sound/pci/fm801.c | 4 +-
3328 sound/pci/hda/Kconfig | 13 +
3329 sound/pci/hda/Makefile | 4 +
3330 sound/pci/hda/hda_codec.c | 142 ++-
3331 sound/pci/hda/hda_codec.h | 16 +-
3332 sound/pci/hda/hda_eld.c | 46 +-
3333 sound/pci/hda/hda_intel.c | 72 +-
3334 sound/pci/hda/hda_local.h | 8 +-
3335 sound/pci/hda/patch_analog.c | 7 +-
3336 sound/pci/hda/patch_ca0110.c | 3 +-
3337 sound/pci/hda/patch_ca0132.c | 1097 +++++++++++++++++++++
3338 sound/pci/hda/patch_cirrus.c | 3 +-
3339 sound/pci/hda/patch_cmedia.c | 4 +-
3340 sound/pci/hda/patch_conexant.c | 1 +
3341 sound/pci/hda/patch_hdmi.c | 704 ++++++++------
3342 sound/pci/hda/patch_realtek.c | 3 +-
3343 sound/pci/hda/patch_sigmatel.c | 4 +-
3344 sound/pci/hda/patch_via.c | 75 +-
3345 sound/pci/ice1712/ice1712.c | 4 +-
3346 sound/pci/ice1712/ice1724.c | 4 +-
3347 sound/pci/intel8x0.c | 6 +-
3348 sound/pci/intel8x0m.c | 6 +-
3349 sound/pci/korg1212/korg1212.c | 4 +-
3350 sound/pci/lola/lola.c | 4 +-
3351 sound/pci/lx6464es/lx6464es.c | 4 +-
3352 sound/pci/maestro3.c | 75 +--
3353 sound/pci/mixart/mixart.c | 4 +-
3354 sound/pci/nm256/nm256.c | 4 +-
3355 sound/pci/oxygen/oxygen.c | 2 +-
3356 sound/pci/oxygen/oxygen_lib.c | 2 +-
3357 sound/pci/oxygen/oxygen_pcm.c | 6 -
3358 sound/pci/oxygen/virtuoso.c | 2 +-
3359 sound/pci/pcxhr/pcxhr.c | 4 +-
3360 sound/pci/riptide/riptide.c | 6 +-
3361 sound/pci/rme32.c | 4 +-
3362 sound/pci/rme96.c | 4 +-
3363 sound/pci/rme9652/hdsp.c | 4 +-
3364 sound/pci/rme9652/hdspm.c | 4 +-
3365 sound/pci/rme9652/rme9652.c | 4 +-
3366 sound/pci/sis7019.c | 6 +-
3367 sound/pci/sonicvibes.c | 4 +-
3368 sound/pci/trident/trident.c | 2 +-
3369 sound/pci/trident/trident_main.c | 2 +-
3370 sound/pci/via82xx.c | 4 +-
3371 sound/pci/via82xx_modem.c | 4 +-
3372 sound/pci/vx222/vx222.c | 4 +-
3373 sound/pci/ymfpci/ymfpci.c | 2 +-
3374 sound/pci/ymfpci/ymfpci_main.c | 2 +-
3375 sound/soc/Makefile | 2 +-
3376 sound/soc/atmel/atmel-pcm.c | 8 +-
3377 sound/soc/atmel/atmel-pcm.h | 2 +-
3378 sound/soc/atmel/atmel_ssc_dai.c | 6 +-
3379 sound/soc/atmel/sam9g20_wm8731.c | 1 +
3380 sound/soc/au1x/dbdma2.c | 7 +-
3381 sound/soc/blackfin/bf5xx-ac97-pcm.c | 6 +-
3382 sound/soc/blackfin/bf5xx-i2s-pcm.c | 6 +-
3383 sound/soc/blackfin/bf5xx-tdm-pcm.c | 6 +-
3384 sound/soc/codecs/ad1836.c | 251 +++--
3385 sound/soc/codecs/ad1836.h | 23 +-
3386 sound/soc/codecs/ak4641.c | 2 +-
3387 sound/soc/codecs/cs4270.c | 5 +-
3388 sound/soc/codecs/max98088.c | 2 -
3389 sound/soc/codecs/max98095.c | 2 -
3390 sound/soc/codecs/wm8915.c | 156 ++-
3391 sound/soc/codecs/wm8940.c | 7 -
3392 sound/soc/codecs/wm8962.c | 132 ++-
3393 sound/soc/davinci/davinci-pcm.c | 154 ++--
3394 sound/soc/ep93xx/ep93xx-pcm.c | 6 +-
3395 sound/soc/fsl/fsl_dma.c | 8 +-
3396 sound/soc/fsl/fsl_ssi.c | 9 +-
3397 sound/soc/fsl/mpc5200_dma.c | 7 +-
3398 sound/soc/fsl/mpc8610_hpcd.c | 10 +-
3399 sound/soc/fsl/p1022_ds.c | 10 +-
3400 sound/soc/imx/imx-pcm-fiq.c | 8 +-
3401 sound/soc/imx/imx-ssi.c | 7 +-
3402 sound/soc/imx/imx-ssi.h | 3 +-
3403 sound/soc/jz4740/jz4740-pcm.c | 6 +-
3404 sound/soc/kirkwood/kirkwood-dma.c | 6 +-
3405 sound/soc/mid-x86/sst_platform.c | 5 +-
3406 sound/soc/nuc900/nuc900-ac97.c | 2 +-
3407 sound/soc/nuc900/nuc900-pcm.c | 7 +-
3408 sound/soc/omap/ams-delta.c | 3 +-
3409 sound/soc/omap/omap-pcm.c | 6 +-
3410 sound/soc/pxa/pxa2xx-pcm.c | 6 +-
3411 sound/soc/s6000/s6000-pcm.c | 7 +-
3412 sound/soc/samsung/Kconfig | 8 +-
3413 sound/soc/samsung/Makefile | 2 +
3414 sound/soc/samsung/dma.c | 6 +-
3415 sound/soc/samsung/speyside.c | 61 +-
3416 sound/soc/samsung/speyside_wm8962.c | 260 +++++
3417 sound/soc/sh/dma-sh7760.c | 6 +-
3418 sound/soc/sh/fsi.c | 582 ++++++------
3419 sound/soc/sh/siu_pcm.c | 5 +-
3420 sound/soc/soc-cache.c | 301 +++++--
3421 sound/soc/soc-core.c | 693 +------------
3422 sound/soc/soc-dapm.c | 122 ++-
3423 sound/soc/soc-pcm.c | 639 ++++++++++++
3424 sound/soc/tegra/tegra_pcm.c | 6 +-
3425 sound/soc/tegra/tegra_wm8903.c | 2 +-
3426 sound/soc/txx9/txx9aclc.c | 5 +-
3427 sound/usb/misc/ua101.c | 2 +-
3428 144 files changed, 4625 insertions(+), 2272 deletions(-)
3429 create mode 100644 sound/pci/hda/patch_ca0132.c
3430 create mode 100644 sound/soc/samsung/speyside_wm8962.c
3431 create mode 100644 sound/soc/soc-pcm.c
3432 Merging sound-asoc/for-next
3433 $ git merge sound-asoc/for-next
3434 Auto-merging MAINTAINERS
3435 Merge made by recursive.
3437 include/sound/soc-dapm.h | 3 +
3438 include/sound/soc.h | 3 +-
3439 sound/soc/Makefile | 3 +-
3440 sound/soc/blackfin/Kconfig | 14 +-
3441 sound/soc/blackfin/Makefile | 2 +
3442 sound/soc/blackfin/bf5xx-i2s-pcm.c | 6 +-
3443 sound/soc/blackfin/bfin-eval-adau1701.c | 139 ++++++++
3444 sound/soc/codecs/Kconfig | 6 +-
3445 sound/soc/codecs/Makefile | 2 +
3446 sound/soc/codecs/ad1836.c | 78 ++---
3447 sound/soc/codecs/ad1836.h | 21 +-
3448 sound/soc/codecs/adau1701.c | 549 +++++++++++++++++++++++++++++++
3449 sound/soc/codecs/adau1701.h | 17 +
3450 sound/soc/codecs/max98095.c | 8 +-
3451 sound/soc/soc-cache.c | 416 -----------------------
3452 sound/soc/soc-dapm.c | 142 ++++++++-
3453 sound/soc/soc-io.c | 396 ++++++++++++++++++++++
3454 18 files changed, 1308 insertions(+), 498 deletions(-)
3455 create mode 100644 sound/soc/blackfin/bfin-eval-adau1701.c
3456 create mode 100644 sound/soc/codecs/adau1701.c
3457 create mode 100644 sound/soc/codecs/adau1701.h
3458 create mode 100644 sound/soc/soc-io.c
3459 Merging cpufreq/next
3460 $ git merge cpufreq/next
3461 Auto-merging arch/arm/Kconfig
3462 Auto-merging arch/arm/mach-s3c64xx/Makefile
3463 Auto-merging drivers/cpufreq/exynos4210-cpufreq.c
3464 Auto-merging drivers/cpufreq/s3c64xx-cpufreq.c
3465 Auto-merging drivers/cpufreq/s5pv210-cpufreq.c
3466 Merge made by recursive.
3467 arch/arm/Kconfig | 4 --
3468 arch/arm/mach-exynos4/Makefile | 1 -
3469 arch/arm/mach-s3c64xx/Makefile | 4 --
3470 arch/arm/mach-s5pv210/Makefile | 1 -
3471 drivers/cpufreq/Kconfig | 5 +++
3472 drivers/cpufreq/Kconfig.arm | 32 ++++++++++++++++++++
3473 drivers/cpufreq/Makefile | 8 +++--
3474 .../cpufreq/exynos4210-cpufreq.c | 3 +-
3475 .../cpufreq.c => drivers/cpufreq/s3c64xx-cpufreq.c | 5 ++-
3476 .../cpufreq.c => drivers/cpufreq/s5pv210-cpufreq.c | 28 +++++++++++------
3477 10 files changed, 64 insertions(+), 27 deletions(-)
3478 create mode 100644 drivers/cpufreq/Kconfig.arm
3479 rename arch/arm/mach-exynos4/cpufreq.c => drivers/cpufreq/exynos4210-cpufreq.c (99%)
3480 rename arch/arm/mach-s3c64xx/cpufreq.c => drivers/cpufreq/s3c64xx-cpufreq.c (99%)
3481 rename arch/arm/mach-s5pv210/cpufreq.c => drivers/cpufreq/s5pv210-cpufreq.c (97%)
3483 $ git merge quilt/rr
3484 Merge made by recursive.
3485 kernel/params.c | 4 ++--
3486 1 files changed, 2 insertions(+), 2 deletions(-)
3488 $ git merge input/next
3489 Merge made by recursive.
3490 drivers/input/joystick/xpad.c | 6 +++++-
3491 drivers/input/keyboard/gpio_keys.c | 4 ++--
3492 drivers/input/keyboard/lm8323.c | 23 ++++-------------------
3493 drivers/input/keyboard/qt1070.c | 2 --
3494 4 files changed, 11 insertions(+), 24 deletions(-)
3495 Merging input-mt/next
3496 $ git merge input-mt/next
3498 Merging lsm/for-next
3499 $ git merge lsm/for-next
3501 Merging block/for-next
3502 $ git merge block/for-next
3503 Merge made by recursive.
3504 block/blk-ioc.c | 40 ++++++++++++++++++++--------------------
3505 block/blk-throttle.c | 10 +++++-----
3506 block/bsg.c | 18 +++++++++---------
3507 block/cfq-iosched.c | 31 +++++++++++++++----------------
3508 block/deadline-iosched.c | 4 +---
3509 block/elevator.c | 7 ++-----
3510 block/genhd.c | 6 +++---
3511 fs/partitions/check.c | 12 ++++++------
3512 include/linux/blkdev.h | 2 +-
3513 include/linux/blktrace_api.h | 3 ++-
3514 include/linux/elevator.h | 2 +-
3515 11 files changed, 65 insertions(+), 70 deletions(-)
3516 Merging quilt/device-mapper
3517 $ git merge quilt/device-mapper
3519 Merging embedded/master
3520 $ git merge embedded/master
3522 Merging firmware/master
3523 $ git merge firmware/master
3525 Merging pcmcia/master
3526 $ git merge pcmcia/master
3528 Merging battery/master
3529 $ git merge battery/master
3532 $ git merge leds/for-mm
3533 Resolved 'drivers/leds/Kconfig' using previous resolution.
3534 Auto-merging drivers/leds/Kconfig
3535 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
3536 Automatic merge failed; fix conflicts and then commit the result.
3538 [master 34480c4] Merge remote-tracking branch 'leds/for-mm'
3539 $ git diff -M --stat --summary HEAD^..
3540 Merging backlight/for-mm
3541 $ git merge backlight/for-mm
3543 Merging mmc/mmc-next
3544 $ git merge mmc/mmc-next
3545 Removing arch/arm/plat-pxa/include/plat/sdhci.h
3546 Auto-merging drivers/mmc/host/omap_hsmmc.c
3547 CONFLICT (delete/modify): drivers/mmc/host/sdhci-of-core.c deleted in mmc/mmc-next and modified in HEAD. Version HEAD of drivers/mmc/host/sdhci-of-core.c left in tree.
3548 Removing drivers/mmc/host/sdhci-of.h
3549 Removing drivers/mmc/host/sdhci-pxa.c
3550 Auto-merging drivers/pci/quirks.c
3551 Auto-merging include/linux/mmc/host.h
3552 Removing include/linux/mmc/sdhci-pltfm.h
3553 Auto-merging include/linux/pci_ids.h
3554 Automatic merge failed; fix conflicts and then commit the result.
3555 $ git rm -f drivers/mmc/host/sdhci-of-core.c
3556 drivers/mmc/host/sdhci-of-core.c: needs merge
3557 rm 'drivers/mmc/host/sdhci-of-core.c'
3559 [master 5e9be0e] Merge remote-tracking branch 'mmc/mmc-next'
3560 $ git diff -M --stat --summary HEAD^..
3561 arch/arm/configs/mmp2_defconfig | 9 +-
3562 arch/arm/mach-mmp/brownstone.c | 10 +-
3563 arch/arm/mach-mmp/include/mach/mmp2.h | 2 +-
3564 arch/arm/mach-mmp/jasper.c | 2 +-
3565 arch/arm/mach-mmp/mmp2.c | 16 +-
3566 arch/arm/plat-pxa/include/plat/sdhci.h | 35 ----
3567 drivers/misc/cb710/sgbuf2.c | 2 +-
3568 drivers/mmc/card/block.c | 279 +++++++++++++++++++++-------
3569 drivers/mmc/core/sdio.c | 15 ++
3570 drivers/mmc/core/sdio_bus.c | 2 +-
3571 drivers/mmc/host/Kconfig | 77 +++++---
3572 drivers/mmc/host/Makefile | 21 +--
3573 drivers/mmc/host/dw_mmc.c | 7 +-
3574 drivers/mmc/host/of_mmc_spi.c | 5 +
3575 drivers/mmc/host/omap_hsmmc.c | 6 +-
3576 drivers/mmc/host/sdhci-cns3xxx.c | 44 ++++-
3577 drivers/mmc/host/sdhci-dove.c | 43 ++++-
3578 drivers/mmc/host/sdhci-esdhc-imx.c | 131 ++++++++++----
3579 drivers/mmc/host/sdhci-esdhc.h | 3 +-
3580 drivers/mmc/host/sdhci-of-core.c | 253 --------------------------
3581 drivers/mmc/host/sdhci-of-esdhc.c | 93 ++++++++--
3582 drivers/mmc/host/sdhci-of-hlwd.c | 67 ++++++-
3583 drivers/mmc/host/sdhci-of.h | 42 -----
3584 drivers/mmc/host/sdhci-pltfm.c | 216 +++++++++++------------
3585 drivers/mmc/host/sdhci-pltfm.h | 90 +++++++++-
3586 drivers/mmc/host/sdhci-pxa.c | 303 -------------------------------
3587 drivers/mmc/host/sdhci-pxav2.c | 244 +++++++++++++++++++++++++
3588 drivers/mmc/host/sdhci-pxav3.c | 289 +++++++++++++++++++++++++++++
3589 drivers/mmc/host/sdhci-tegra.c | 117 ++++++++----
3590 drivers/mmc/host/sdhci.c | 9 +-
3591 drivers/mmc/host/sdhci.h | 2 +
3592 drivers/mmc/host/sh_mobile_sdhi.c | 41 ++++-
3593 drivers/mmc/host/tmio_mmc.h | 40 ++++
3594 drivers/mmc/host/tmio_mmc_dma.c | 2 +-
3595 drivers/mmc/host/tmio_mmc_pio.c | 38 +----
3596 drivers/mmc/host/vub300.c | 11 +-
3597 drivers/pci/quirks.c | 2 +
3598 include/linux/mfd/tmio.h | 8 +
3599 include/linux/mmc/boot.h | 6 +-
3600 include/linux/mmc/card.h | 2 +-
3601 include/linux/mmc/core.h | 2 +-
3602 include/linux/mmc/dw_mmc.h | 6 +-
3603 include/linux/mmc/host.h | 3 +-
3604 include/linux/mmc/ioctl.h | 2 +-
3605 include/linux/mmc/mmc.h | 17 ++-
3606 include/linux/mmc/pm.h | 2 +-
3607 include/linux/mmc/sd.h | 7 +-
3608 include/linux/mmc/sdhci-pltfm.h | 35 ----
3609 include/linux/mmc/sdhci-spear.h | 6 +-
3610 include/linux/mmc/sdhci.h | 14 +-
3611 include/linux/mmc/sdio.h | 7 +-
3612 include/linux/mmc/sdio_func.h | 7 +-
3613 include/linux/mmc/sdio_ids.h | 6 +-
3614 include/linux/mmc/sh_mmcif.h | 6 +-
3615 include/linux/mmc/sh_mobile_sdhi.h | 6 +-
3616 include/linux/mmc/tmio.h | 8 +-
3617 include/linux/pci_ids.h | 1 +
3618 include/linux/platform_data/pxa_sdhci.h | 60 ++++++
3619 58 files changed, 1658 insertions(+), 1121 deletions(-)
3620 delete mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h
3621 delete mode 100644 drivers/mmc/host/sdhci-of-core.c
3622 delete mode 100644 drivers/mmc/host/sdhci-of.h
3623 delete mode 100644 drivers/mmc/host/sdhci-pxa.c
3624 create mode 100644 drivers/mmc/host/sdhci-pxav2.c
3625 create mode 100644 drivers/mmc/host/sdhci-pxav3.c
3626 delete mode 100644 include/linux/mmc/sdhci-pltfm.h
3627 create mode 100644 include/linux/platform_data/pxa_sdhci.h
3628 Merging kgdb/kgdb-next
3629 $ git merge kgdb/kgdb-next
3631 Merging slab/for-next
3632 $ git merge slab/for-next
3633 Merge made by recursive.
3634 include/linux/slab.h | 10 ++++++++++
3635 include/linux/slab_def.h | 26 --------------------------
3636 include/linux/slob_def.h | 10 ----------
3637 include/linux/slub_def.h | 10 ----------
3638 mm/slob.c | 6 ++++++
3639 5 files changed, 16 insertions(+), 46 deletions(-)
3640 Merging uclinux/for-next
3641 $ git merge uclinux/for-next
3644 $ git merge md/for-next
3646 Merging mfd/for-next
3647 $ git merge mfd/for-next
3648 Auto-merging drivers/gpio/Kconfig
3649 Auto-merging drivers/gpio/Makefile
3650 Merge made by recursive.
3651 drivers/gpio/Kconfig | 6 +
3652 drivers/gpio/Makefile | 1 +
3653 drivers/gpio/gpio-tps65912.c | 156 ++++++
3654 drivers/input/keyboard/pmic8xxx-keypad.c | 3 +-
3655 drivers/input/misc/pmic8xxx-pwrkey.c | 3 +-
3656 drivers/mfd/Kconfig | 25 +-
3657 drivers/mfd/Makefile | 5 +
3658 drivers/mfd/ab3550-core.c | 41 +--
3659 drivers/mfd/ab8500-core.c | 231 +++++++---
3660 drivers/mfd/ab8500-debugfs.c | 41 +--
3661 drivers/mfd/jz4740-adc.c | 90 +---
3662 drivers/mfd/lpc_sch.c | 49 ++-
3663 drivers/mfd/omap-usb-host.c | 131 +++++-
3664 drivers/mfd/tps65910.c | 1 +
3665 drivers/mfd/tps65912-core.c | 177 +++++++
3666 drivers/mfd/tps65912-i2c.c | 139 ++++++
3667 drivers/mfd/tps65912-irq.c | 224 +++++++++
3668 drivers/mfd/tps65912-spi.c | 142 ++++++
3669 drivers/mfd/wm831x-auxadc.c | 299 +++++++++++
3670 drivers/mfd/wm831x-core.c | 247 +++-------
3671 drivers/mfd/wm831x-irq.c | 42 ++-
3672 drivers/mfd/wm8350-irq.c | 18 +-
3673 drivers/mfd/wm8994-core.c | 33 +-
3674 drivers/regulator/Kconfig | 6 +
3675 drivers/regulator/Makefile | 1 +
3676 drivers/regulator/tps65912-regulator.c | 800 ++++++++++++++++++++++++++++++
3677 include/linux/mfd/ab8500.h | 8 +-
3678 include/linux/mfd/tps65910.h | 1 +
3679 include/linux/mfd/tps65912.h | 327 ++++++++++++
3680 include/linux/mfd/wm831x/core.h | 119 +++++-
3681 include/linux/mfd/wm831x/pdata.h | 3 +
3682 31 files changed, 2952 insertions(+), 417 deletions(-)
3683 create mode 100644 drivers/gpio/gpio-tps65912.c
3684 create mode 100644 drivers/mfd/tps65912-core.c
3685 create mode 100644 drivers/mfd/tps65912-i2c.c
3686 create mode 100644 drivers/mfd/tps65912-irq.c
3687 create mode 100644 drivers/mfd/tps65912-spi.c
3688 create mode 100644 drivers/mfd/wm831x-auxadc.c
3689 create mode 100644 drivers/regulator/tps65912-regulator.c
3690 create mode 100644 include/linux/mfd/tps65912.h
3691 Merging hdlc/hdlc-next
3692 $ git merge hdlc/hdlc-next
3694 Merging drm/drm-next
3695 $ git merge drm/drm-next
3697 Merging fbdev/master
3698 $ git merge fbdev/master
3699 Merge made by recursive.
3700 drivers/staging/xgifb/XGI_main_26.c | 22 +--
3701 drivers/video/68328fb.c | 4 +-
3702 drivers/video/Kconfig | 7 +-
3703 drivers/video/acornfb.c | 5 +-
3704 drivers/video/arkfb.c | 9 +-
3705 drivers/video/atmel_lcdfb.c | 15 +-
3706 drivers/video/aty/radeon_base.c | 10 +-
3707 drivers/video/au1200fb.c | 297 ++++++++++++++------------------
3708 drivers/video/da8xx-fb.c | 4 +-
3709 drivers/video/fb-puv3.c | 4 +-
3710 drivers/video/fb_defio.c | 3 +-
3711 drivers/video/g364fb.c | 5 +-
3712 drivers/video/gxt4500.c | 4 +-
3713 drivers/video/hgafb.c | 4 +-
3714 drivers/video/imsttfb.c | 2 +-
3715 drivers/video/intelfb/intelfbhw.c | 6 +-
3716 drivers/video/mb862xx/mb862xxfbdrv.c | 2 +-
3717 drivers/video/mx3fb.c | 6 +-
3718 drivers/video/neofb.c | 4 +-
3719 drivers/video/pm2fb.c | 4 +-
3720 drivers/video/pm3fb.c | 4 +-
3721 drivers/video/s3c-fb.c | 2 +-
3722 drivers/video/s3fb.c | 7 +-
3723 drivers/video/savage/savagefb_driver.c | 16 +-
3724 drivers/video/sis/sis_main.c | 30 +--
3725 drivers/video/sm501fb.c | 6 +-
3726 drivers/video/tridentfb.c | 4 +-
3727 drivers/video/vfb.c | 4 +-
3728 drivers/video/vga16fb.c | 2 +-
3729 drivers/video/vt8500lcdfb.c | 4 +-
3730 drivers/video/vt8623fb.c | 9 +-
3731 31 files changed, 228 insertions(+), 277 deletions(-)
3732 Merging viafb/viafb-next
3733 $ git merge viafb/viafb-next
3734 Auto-merging drivers/video/via/viafbdev.c
3735 Merge made by recursive.
3736 drivers/video/via/viafbdev.c | 5 +++--
3737 1 files changed, 3 insertions(+), 2 deletions(-)
3738 Merging omap_dss2/for-next
3739 $ git merge omap_dss2/for-next
3741 Merging voltage/for-next
3742 $ git merge voltage/for-next
3743 Merge made by recursive.
3744 drivers/regulator/core.c | 142 ++++++++++++++++------------------
3745 drivers/regulator/dummy.c | 32 ++++++--
3746 drivers/regulator/twl-regulator.c | 2 +-
3747 drivers/regulator/wm8994-regulator.c | 4 +-
3748 include/linux/regulator/consumer.h | 3 +
3749 include/linux/regulator/driver.h | 4 +-
3750 6 files changed, 101 insertions(+), 86 deletions(-)
3751 Merging security-testing/next
3752 $ git merge security-testing/next
3753 Auto-merging kernel/cgroup.c
3754 Merge made by recursive.
3755 kernel/cgroup.c | 5 +++++
3756 security/keys/request_key_auth.c | 2 ++
3757 2 files changed, 7 insertions(+), 0 deletions(-)
3758 Merging selinux/master
3759 $ git merge selinux/master
3761 Merging lblnet/master
3762 $ git merge lblnet/master
3764 Merging agp/agp-next
3765 $ git merge agp/agp-next
3766 Merge made by recursive.
3767 Merging watchdog/master
3768 $ git merge watchdog/master
3769 Merge made by recursive.
3770 arch/x86/include/asm/apb_timer.h | 2 +-
3771 drivers/watchdog/Kconfig | 15 +-
3772 drivers/watchdog/Makefile | 1 +
3773 drivers/watchdog/dw_wdt.c | 376 ++++++++++++++++++++++++++++++
3774 drivers/watchdog/iTCO_wdt.c | 407 +++++++++++----------------------
3775 drivers/watchdog/intel_scu_watchdog.c | 1 -
3776 drivers/watchdog/it8712f_wdt.c | 61 ++++--
3777 drivers/watchdog/it87_wdt.c | 168 ++++++++-------
3778 drivers/watchdog/mpcore_wdt.c | 23 ++
3779 drivers/watchdog/mtx-1_wdt.c | 33 ++--
3780 drivers/watchdog/pc87413_wdt.c | 96 ++++----
3781 drivers/watchdog/wm831x_wdt.c | 5 +
3782 12 files changed, 759 insertions(+), 429 deletions(-)
3783 create mode 100644 drivers/watchdog/dw_wdt.c
3785 $ git merge bdev/master
3787 Merging dwmw2-iommu/master
3788 $ git merge dwmw2-iommu/master
3790 Merging cputime/cputime
3791 $ git merge cputime/cputime
3793 Merging osd/linux-next
3794 $ git merge osd/linux-next
3796 Merging jc_docs/docs-next
3797 $ git merge jc_docs/docs-next
3799 Merging nommu/master
3800 $ git merge nommu/master
3802 Merging trivial/for-next
3803 $ git merge trivial/for-next
3804 Resolved 'drivers/mtd/maps/pxa2xx-flash.c' using previous resolution.
3805 Auto-merging MAINTAINERS
3806 Auto-merging arch/arm/mach-at91/board-snapper9260.c
3807 CONFLICT (delete/modify): arch/arm/mach-ep93xx/dma-m2p.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-ep93xx/dma-m2p.c left in tree.
3808 Auto-merging arch/avr32/mach-at32ap/intc.c
3809 Auto-merging arch/microblaze/pci/pci-common.c
3810 Auto-merging arch/powerpc/kernel/pci-common.c
3811 Auto-merging arch/powerpc/platforms/powermac/pci.c
3812 Auto-merging arch/powerpc/platforms/pseries/smp.c
3813 CONFLICT (delete/modify): arch/s390/kvm/sie64a.S deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/s390/kvm/sie64a.S left in tree.
3814 Auto-merging arch/s390/oprofile/init.c
3815 Auto-merging arch/sparc/kernel/ioport.c
3816 Auto-merging arch/sparc/kernel/pci.c
3817 Auto-merging arch/x86/kvm/mmu.c
3818 Auto-merging drivers/media/video/videobuf2-memops.c
3819 Auto-merging drivers/mmc/host/dw_mmc.c
3820 Auto-merging drivers/mtd/devices/sst25l.c
3821 Auto-merging drivers/mtd/maps/bfin-async-flash.c
3822 Auto-merging drivers/mtd/maps/ixp2000.c
3823 Auto-merging drivers/mtd/maps/pxa2xx-flash.c
3824 CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c
3825 Auto-merging drivers/mtd/nand/atmel_nand.c
3826 Auto-merging drivers/mtd/nand/bcm_umi_nand.c
3827 Auto-merging drivers/mtd/nand/mpc5121_nfc.c
3828 Auto-merging drivers/net/bcm63xx_enet.c
3829 Auto-merging drivers/net/davinci_emac.c
3830 Auto-merging drivers/net/ethoc.c
3831 Auto-merging drivers/net/fec_mpc52xx.c
3832 Auto-merging drivers/net/macb.c
3833 Auto-merging drivers/net/mv643xx_eth.c
3834 Auto-merging drivers/net/pxa168_eth.c
3835 Auto-merging drivers/net/sungem.c
3836 Auto-merging drivers/net/wireless/ath/ath5k/ahb.c
3837 Auto-merging drivers/staging/brcm80211/brcmfmac/wl_iw.c
3838 Auto-merging drivers/video/atmel_lcdfb.c
3839 Auto-merging drivers/video/aty/atyfb_base.c
3840 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
3841 Auto-merging fs/ocfs2/move_extents.c
3842 Auto-merging include/linux/fs.h
3843 Auto-merging sound/soc/ep93xx/ep93xx-i2s.c
3844 Auto-merging sound/soc/ep93xx/ep93xx-pcm.c
3845 Auto-merging sound/soc/fsl/mpc5200_dma.c
3846 Automatic merge failed; fix conflicts and then commit the result.
3847 $ git rm -f arch/arm/mach-ep93xx/dma-m2p.c
3848 arch/arm/mach-ep93xx/dma-m2p.c: needs merge
3849 arch/s390/kvm/sie64a.S: needs merge
3850 drivers/mtd/maps/pxa2xx-flash.c: needs merge
3851 rm 'arch/arm/mach-ep93xx/dma-m2p.c'
3852 $ git rm -f arch/s390/kvm/sie64a.S
3853 arch/s390/kvm/sie64a.S: needs merge
3854 drivers/mtd/maps/pxa2xx-flash.c: needs merge
3855 rm 'arch/s390/kvm/sie64a.S'
3857 [master 86e6e6d] Merge remote-tracking branch 'trivial/for-next'
3858 $ git diff -M --stat --summary HEAD^..
3859 Documentation/RCU/NMI-RCU.txt | 4 +-
3860 Documentation/blockdev/README.DAC960 | 2 +-
3861 Documentation/blockdev/ramdisk.txt | 8 ++--
3862 Documentation/cpu-freq/cpu-drivers.txt | 2 +-
3863 Documentation/filesystems/nfs/nfsroot.txt | 2 +-
3864 Documentation/i2o/ioctl | 2 +-
3865 Documentation/isdn/README.HiSax | 2 +-
3866 Documentation/kbuild/makefiles.txt | 38 ++++++++++----------
3867 Documentation/magic-number.txt | 2 +-
3868 Documentation/mca.txt | 4 +-
3869 Documentation/scheduler/sched-arch.txt | 2 +-
3870 Documentation/scsi/BusLogic.txt | 2 +-
3871 Documentation/serial/computone.txt | 2 +-
3872 Documentation/zh_CN/magic-number.txt | 2 +-
3874 arch/arm/common/scoop.c | 2 +-
3875 arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
3876 arch/arm/mach-at91/board-snapper9260.c | 2 +-
3877 arch/arm/mach-dove/common.c | 2 -
3878 arch/arm/mach-ep93xx/gpio.c | 2 +-
3879 arch/arm/mach-ep93xx/simone.c | 4 +-
3880 arch/arm/mach-ep93xx/snappercl15.c | 4 +-
3881 arch/arm/mach-mv78xx0/pcie.c | 8 ++--
3882 arch/arm/mach-s3c2410/h1940-bluetooth.c | 1 -
3883 arch/arm/mach-u300/core.c | 2 +-
3884 arch/arm/plat-s5p/sysmmu.c | 6 ++--
3885 arch/arm/plat-samsung/pm-check.c | 2 +-
3886 arch/avr32/kernel/setup.c | 10 +++---
3887 arch/avr32/mach-at32ap/extint.c | 2 +-
3888 arch/avr32/mach-at32ap/hsmc.c | 2 +-
3889 arch/avr32/mach-at32ap/intc.c | 2 +-
3890 arch/avr32/mach-at32ap/pio.c | 2 +-
3891 arch/microblaze/pci/pci-common.c | 2 +-
3892 arch/mips/lantiq/devices.c | 2 -
3893 arch/mips/lantiq/xway/devices.c | 2 -
3894 arch/mips/pci/pci-rc32434.c | 2 +-
3895 arch/mips/pci/pci-vr41xx.c | 2 +-
3896 arch/mips/powertv/asic/asic_devices.c | 10 ++---
3897 arch/powerpc/include/asm/macio.h | 2 +-
3898 arch/powerpc/kernel/machine_kexec.c | 4 +-
3899 arch/powerpc/kernel/pci-common.c | 2 +-
3900 arch/powerpc/platforms/52xx/mpc52xx_pci.c | 8 ++--
3901 arch/powerpc/platforms/83xx/km83xx.c | 2 +-
3902 arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +-
3903 arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 +-
3904 arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +-
3905 arch/powerpc/platforms/83xx/usb.c | 2 +-
3906 arch/powerpc/platforms/85xx/sbc8560.c | 2 +-
3907 arch/powerpc/platforms/85xx/xes_mpc85xx.c | 2 +-
3908 arch/powerpc/platforms/cell/celleb_scc_epci.c | 8 ++--
3909 arch/powerpc/platforms/cell/celleb_scc_pciex.c | 2 +-
3910 arch/powerpc/platforms/cell/spu_manage.c | 2 +-
3911 arch/powerpc/platforms/chrp/pci.c | 2 +-
3912 arch/powerpc/platforms/pasemi/dma_lib.c | 2 +-
3913 arch/powerpc/platforms/powermac/nvram.c | 4 +-
3914 arch/powerpc/platforms/powermac/pci.c | 6 +--
3915 arch/powerpc/platforms/powermac/time.c | 2 +-
3916 arch/powerpc/platforms/pseries/smp.c | 1 -
3917 arch/powerpc/sysdev/axonram.c | 2 +-
3918 arch/powerpc/sysdev/cpm1.c | 2 +-
3919 arch/powerpc/sysdev/cpm_common.c | 2 +-
3920 arch/powerpc/sysdev/dart_iommu.c | 2 +-
3921 arch/powerpc/sysdev/fsl_msi.c | 2 +-
3922 arch/powerpc/sysdev/fsl_pci.c | 12 +++---
3923 arch/powerpc/sysdev/fsl_rio.c | 2 +-
3924 arch/powerpc/sysdev/ipic.c | 2 +-
3925 arch/powerpc/sysdev/mmio_nvram.c | 2 +-
3926 arch/powerpc/sysdev/mpc8xx_pic.c | 2 +-
3927 arch/powerpc/sysdev/mv64x60_udbg.c | 4 +-
3928 arch/powerpc/sysdev/ppc4xx_pci.c | 16 ++++----
3929 arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +-
3930 arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +-
3931 arch/powerpc/sysdev/xics/icp-native.c | 2 +-
3932 arch/s390/oprofile/init.c | 2 -
3933 arch/sh/kernel/io_trapped.c | 8 ++--
3934 arch/sh/kernel/machine_kexec.c | 2 +-
3935 arch/sparc/kernel/ioport.c | 12 +++---
3936 arch/sparc/kernel/pci.c | 6 +--
3937 arch/tile/kernel/setup.c | 3 +-
3938 arch/x86/kernel/pci-calgary_64.c | 2 +-
3939 arch/x86/kernel/probe_roms.c | 2 +-
3940 arch/x86/kvm/mmu.c | 1 -
3941 arch/xtensa/include/asm/uaccess.h | 3 +-
3942 drivers/char/bsr.c | 2 +-
3943 drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +-
3944 drivers/dma/mv_xor.c | 5 +--
3945 drivers/edac/cell_edac.c | 2 +-
3946 drivers/edac/mpc85xx_edac.c | 12 +++---
3947 drivers/gpio/ab8500-gpio.c | 1 -
3948 drivers/gpio/gpio-u300.c | 8 ++--
3949 drivers/gpu/drm/nouveau/nv50_graph.c | 1 -
3950 drivers/ide/palm_bk3710.c | 2 +-
3951 drivers/ide/tx4939ide.c | 4 +-
3952 drivers/input/serio/sa1111ps2.c | 6 +--
3953 drivers/media/rc/ite-cir.c | 1 -
3954 drivers/media/video/davinci/vpif.c | 2 +-
3955 drivers/media/video/m5mols/m5mols_capture.c | 1 -
3956 drivers/media/video/omap24xxcam.c | 5 +--
3957 drivers/media/video/videobuf2-memops.c | 1 -
3958 drivers/message/i2o/iop.c | 8 ++--
3959 drivers/mfd/tc6387xb.c | 2 +-
3960 drivers/misc/atmel-ssc.c | 2 +-
3961 drivers/misc/atmel_pwm.c | 2 +-
3962 drivers/mmc/host/dw_mmc.c | 2 +-
3963 drivers/mtd/devices/sst25l.c | 4 +-
3964 drivers/mtd/maps/bfin-async-flash.c | 2 +-
3965 drivers/mtd/maps/ixp2000.c | 11 +++---
3966 drivers/mtd/nand/atmel_nand.c | 4 +-
3967 drivers/mtd/nand/bcm_umi_nand.c | 2 +-
3968 drivers/mtd/nand/mpc5121_nfc.c | 2 +-
3969 drivers/net/bcm63xx_enet.c | 8 ++--
3970 drivers/net/can/c_can/c_can.c | 1 -
3971 drivers/net/can/c_can/c_can_platform.c | 1 -
3972 drivers/net/can/softing/softing_main.c | 2 +-
3973 drivers/net/davinci_emac.c | 6 ++--
3974 drivers/net/ethoc.c | 2 +-
3975 drivers/net/fec_mpc52xx.c | 7 ++--
3976 drivers/net/fs_enet/mii-bitbang.c | 4 +-
3977 drivers/net/fs_enet/mii-fec.c | 2 +-
3978 drivers/net/gianfar_ptp.c | 2 +-
3979 drivers/net/ibm_newemac/core.c | 2 +-
3980 drivers/net/macb.c | 2 +-
3981 drivers/net/mv643xx_eth.c | 2 +-
3982 drivers/net/pxa168_eth.c | 2 +-
3983 drivers/net/sb1250-mac.c | 2 +-
3984 drivers/net/sungem.c | 3 +-
3985 drivers/net/wireless/ath/ath5k/ahb.c | 1 -
3986 drivers/parport/parport_ax88796.c | 2 +-
3987 drivers/pci/hotplug/shpchp_sysfs.c | 21 +++++------
3988 drivers/pcmcia/at91_cf.c | 7 ++--
3989 drivers/pcmcia/electra_cf.c | 4 +-
3990 drivers/pcmcia/rsrc_iodyn.c | 6 ++--
3991 drivers/pcmcia/rsrc_nonstatic.c | 6 ++--
3992 drivers/pnp/pnpacpi/rsparser.c | 10 +++---
3993 drivers/pnp/pnpbios/rsparser.c | 12 +++---
3994 drivers/power/ds2782_battery.c | 4 +-
3995 drivers/rtc/rtc-at32ap700x.c | 2 +-
3996 drivers/rtc/rtc-cmos.c | 6 ++--
3997 drivers/rtc/rtc-ds1286.c | 2 +-
3998 drivers/rtc/rtc-ds1511.c | 2 +-
3999 drivers/rtc/rtc-ds1742.c | 2 +-
4000 drivers/rtc/rtc-m48t35.c | 2 +-
4001 drivers/rtc/rtc-m48t59.c | 2 +-
4002 drivers/rtc/rtc-mrst.c | 5 +--
4003 drivers/rtc/rtc-puv3.c | 5 +--
4004 drivers/rtc/rtc-s3c.c | 5 +--
4005 .../staging/ath6kl/os/linux/include/ar6000_drv.h | 1 -
4006 drivers/staging/bcm/headers.h | 7 +---
4007 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 -
4008 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 1 -
4009 drivers/staging/brcm80211/brcmfmac/wl_iw.c | 9 +----
4010 drivers/staging/generic_serial/ser_a2232.c | 3 +-
4011 drivers/staging/gma500/psb_2d.c | 1 -
4012 drivers/staging/gma500/psb_gtt.c | 8 ++--
4013 drivers/staging/hv/hv_mouse.c | 1 -
4014 drivers/staging/hv/tools/hv_kvp_daemon.c | 1 -
4015 drivers/staging/nvec/nvec.c | 1 -
4016 drivers/staging/rtl8712/drv_types.h | 1 -
4017 drivers/staging/rtl8712/osdep_service.h | 1 -
4018 drivers/staging/sep/sep_driver.c | 1 -
4019 drivers/staging/usbip/userspace/src/utils.h | 1 -
4020 .../cyashalomap_kernel.h | 2 +-
4021 .../staging/westbridge/astoria/gadget/cyasgadget.h | 8 +---
4022 drivers/target/loopback/tcm_loop.c | 1 -
4023 drivers/target/tcm_fc/tfc_cmd.c | 1 -
4024 drivers/target/tcm_fc/tfc_conf.c | 1 -
4025 drivers/target/tcm_fc/tfc_io.c | 1 -
4026 drivers/target/tcm_fc/tfc_sess.c | 2 -
4027 drivers/tty/serial/bfin_5xx.c | 5 +--
4028 drivers/tty/serial/imx.c | 5 +--
4029 drivers/tty/serial/m32r_sio.c | 2 +-
4030 drivers/tty/serial/omap-serial.c | 6 ++--
4031 drivers/tty/serial/pxa.c | 2 +-
4032 drivers/tty/serial/sunsu.c | 2 +-
4033 drivers/tty/serial/vt8500_serial.c | 3 +-
4034 drivers/uio/uio_pdrv.c | 2 +-
4035 drivers/uio/uio_pdrv_genirq.c | 2 +-
4036 drivers/usb/gadget/atmel_usba_udc.c | 2 +-
4037 drivers/usb/gadget/fsl_udc_core.c | 6 ++--
4038 drivers/usb/host/ehci-ath79.c | 2 +-
4039 drivers/usb/host/ehci-cns3xxx.c | 2 +-
4040 drivers/usb/host/ehci-fsl.c | 2 +-
4041 drivers/usb/host/ehci-grlib.c | 2 +-
4042 drivers/usb/host/ehci-ixp4xx.c | 2 +-
4043 drivers/usb/host/ehci-octeon.c | 2 +-
4044 drivers/usb/host/ehci-pmcmsp.c | 10 +++---
4045 drivers/usb/host/ehci-ppc-of.c | 2 +-
4046 drivers/usb/host/ehci-w90x900.c | 2 +-
4047 drivers/usb/host/ehci-xilinx-of.c | 2 +-
4048 drivers/usb/host/fhci-hcd.c | 2 +-
4049 drivers/usb/host/ohci-ath79.c | 4 +-
4050 drivers/usb/host/ohci-cns3xxx.c | 2 +-
4051 drivers/usb/host/ohci-da8xx.c | 2 +-
4052 drivers/usb/host/ohci-octeon.c | 2 +-
4053 drivers/usb/host/ohci-ppc-of.c | 2 +-
4054 drivers/usb/host/ohci-ppc-soc.c | 2 +-
4055 drivers/usb/host/ohci-sa1111.c | 2 +-
4056 drivers/usb/host/ohci-sm501.c | 11 +++---
4057 drivers/usb/host/ohci-tmio.c | 6 ++--
4058 drivers/usb/host/oxu210hp-hcd.c | 2 +-
4059 drivers/usb/host/uhci-grlib.c | 2 +-
4060 drivers/usb/host/whci/init.c | 2 +-
4061 drivers/usb/otg/otg_fsm.c | 1 -
4062 drivers/uwb/whc-rc.c | 2 +-
4063 drivers/video/atmel_lcdfb.c | 4 +-
4064 drivers/video/aty/atyfb_base.c | 7 ++--
4065 drivers/video/au1100fb.c | 2 +-
4066 drivers/video/cobalt_lcdfb.c | 2 +-
4067 drivers/video/controlfb.c | 4 +-
4068 drivers/video/ep93xx-fb.c | 4 +-
4069 drivers/video/mb862xx/mb862xxfbdrv.c | 4 +-
4070 drivers/video/msm/mdp.c | 3 +-
4071 drivers/video/msm/msm_fb.c | 7 ++--
4072 drivers/video/nuc900fb.c | 2 +-
4073 drivers/video/platinumfb.c | 5 +--
4074 drivers/video/pxa168fb.c | 2 +-
4075 drivers/video/udlfb.c | 1 -
4076 fs/nfs/idmap.c | 7 +---
4077 fs/ocfs2/move_extents.c | 1 -
4078 include/linux/dio.h | 2 +-
4079 include/linux/fs.h | 1 -
4080 include/linux/hw_random.h | 2 +-
4081 include/linux/pnp.h | 2 +-
4082 include/linux/stop_machine.h | 2 +-
4083 include/linux/zorro.h | 2 +-
4084 kernel/kexec.c | 2 +-
4086 scripts/bootgraph.pl | 2 +-
4087 scripts/docproc.c | 17 +++------
4088 scripts/gcc-goto.sh | 2 +-
4089 sound/aoa/soundbus/i2sbus/core.c | 9 ++---
4090 sound/atmel/abdac.c | 2 +-
4091 sound/atmel/ac97c.c | 2 +-
4092 sound/ppc/pmac.c | 9 ++---
4093 sound/soc/ep93xx/ep93xx-i2s.c | 4 +-
4094 sound/soc/ep93xx/ep93xx-pcm.c | 4 +-
4095 sound/soc/ep93xx/snappercl15.c | 4 +-
4096 sound/soc/fsl/mpc5200_dma.c | 2 +-
4097 238 files changed, 379 insertions(+), 468 deletions(-)
4098 Merging audit/for-next
4099 $ git merge audit/for-next
4101 Merging suspend/linux-next
4102 $ git merge suspend/linux-next
4103 Auto-merging drivers/usb/core/driver.c
4104 Merge made by recursive.
4105 Documentation/power/devices.txt | 67 +++++++----------------------------
4106 Documentation/power/opp.txt | 2 +
4107 Documentation/power/runtime_pm.txt | 5 ---
4108 drivers/base/power/clock_ops.c | 4 +-
4109 drivers/base/power/main.c | 28 +++++++++++----
4110 drivers/base/power/opp.c | 17 +++++++++
4111 drivers/base/power/trace.c | 2 +-
4112 drivers/pci/pci-driver.c | 4 ++-
4113 drivers/usb/core/driver.c | 6 ++--
4114 include/linux/device.h | 4 +-
4115 include/linux/opp.h | 8 ++++
4116 include/linux/pm.h | 3 +-
4117 include/linux/suspend.h | 8 ++++
4118 kernel/power/suspend.c | 20 +++++++---
4119 kernel/power/user.c | 4 ++-
4120 15 files changed, 100 insertions(+), 82 deletions(-)
4121 Merging apm/for-next
4122 $ git merge apm/for-next
4124 Merging fsnotify/for-next
4125 $ git merge fsnotify/for-next
4126 Auto-merging fs/cachefiles/namei.c
4127 Auto-merging fs/nfsd/vfs.c
4128 Auto-merging fs/notify/fanotify/fanotify_user.c
4129 Auto-merging fs/notify/mark.c
4130 Auto-merging include/linux/fsnotify_backend.h
4131 Merge made by recursive.
4132 fs/cachefiles/namei.c | 1 -
4133 fs/cachefiles/xattr.c | 1 -
4135 fs/notify/dnotify/dnotify.c | 15 +++---
4136 fs/notify/fanotify/fanotify.c | 24 +++++----
4137 fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++-----------
4138 fs/notify/group.c | 1 +
4139 fs/notify/mark.c | 36 +++++--------
4140 include/linux/fanotify.h | 5 ++-
4141 include/linux/fsnotify_backend.h | 14 ++++-
4142 10 files changed, 121 insertions(+), 80 deletions(-)
4143 Merging irda/for-next
4144 $ git merge irda/for-next
4146 Merging i7core_edac/linux_next
4147 $ git merge i7core_edac/linux_next
4148 Auto-merging drivers/edac/i7core_edac.c
4149 Merge made by recursive.
4150 drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++---
4151 1 files changed, 20 insertions(+), 3 deletions(-)
4152 Merging i7300_edac/linux_next
4153 $ git merge i7300_edac/linux_next
4155 Merge made by recursive.
4156 Merging devicetree/devicetree/next
4157 $ git merge devicetree/devicetree/next
4158 Merge made by recursive.
4159 arch/powerpc/platforms/52xx/mpc52xx_common.c | 10 ++---
4160 drivers/of/address.c | 2 +-
4161 drivers/of/platform.c | 54 ++++++++++++++++++++++++--
4162 include/linux/of_platform.h | 3 +
4163 4 files changed, 58 insertions(+), 11 deletions(-)
4164 Merging spi/spi/next
4165 $ git merge spi/spi/next
4166 Removing drivers/spi/atmel_spi.h
4167 Auto-merging drivers/spi/spi-ath79.c
4168 Auto-merging drivers/spi/spi-atmel.c
4169 Auto-merging drivers/spi/spi-au1550.c
4170 Auto-merging drivers/spi/spi-bfin5xx.c
4171 Auto-merging drivers/spi/spi-bitbang.c
4172 Auto-merging drivers/spi/spi-butterfly.c
4173 Auto-merging drivers/spi/spi-dw-mid.c
4174 Auto-merging drivers/spi/spi-dw-mmio.c
4175 Auto-merging drivers/spi/spi-dw-pci.c
4176 Auto-merging drivers/spi/spi-dw.c
4177 Auto-merging drivers/spi/spi-fsl-espi.c
4178 Auto-merging drivers/spi/spi-fsl-lib.c
4179 Auto-merging drivers/spi/spi-fsl-spi.c
4180 Auto-merging drivers/spi/spi-gpio.c
4181 Auto-merging drivers/spi/spi-lm70llp.c
4182 Auto-merging drivers/spi/spi-nuc900.c
4183 Auto-merging drivers/spi/spi-omap-uwire.c
4184 Auto-merging drivers/spi/spi-omap2-mcspi.c
4185 Auto-merging drivers/spi/spi-orion.c
4186 Auto-merging drivers/spi/spi-pl022.c
4187 Auto-merging drivers/spi/spi-ppc4xx.c
4188 Auto-merging drivers/spi/spi-s3c24xx-fiq.S
4189 Auto-merging drivers/spi/spi-s3c24xx-gpio.c
4190 Auto-merging drivers/spi/spi-s3c24xx.c
4191 Auto-merging drivers/spi/spi-s3c64xx.c
4192 Auto-merging drivers/spi/spi-sh-sci.c
4193 Auto-merging drivers/spi/spi-tegra.c
4194 Auto-merging drivers/spi/spi-tle62x0.c
4195 Auto-merging drivers/spi/spi-topcliff-pch.c
4196 Auto-merging drivers/spi/spi-txx9.c
4197 Merge made by recursive.
4198 .../devicetree/bindings/spi/spi_nvidia.txt | 5 +
4199 Documentation/spi/pxa2xx | 5 -
4200 drivers/spi/Kconfig | 23 +-
4201 drivers/spi/Makefile | 112 +--
4202 drivers/spi/atmel_spi.h | 167 ---
4203 drivers/spi/{spi_altera.c => spi-altera.c} | 0
4204 drivers/spi/{ath79_spi.c => spi-ath79.c} | 2 +-
4205 drivers/spi/{atmel_spi.c => spi-atmel.c} | 155 +++-
4206 drivers/spi/{au1550_spi.c => spi-au1550.c} | 2 +-
4207 drivers/spi/{spi_bfin_sport.c => spi-bfin-sport.c} | 0
4208 drivers/spi/{spi_bfin5xx.c => spi-bfin5xx.c} | 218 ++---
4209 .../spi/{spi_bitbang_txrx.h => spi-bitbang-txrx.h} | 0
4210 drivers/spi/{spi_bitbang.c => spi-bitbang.c} | 8 +-
4211 drivers/spi/{spi_butterfly.c => spi-butterfly.c} | 4 +-
4212 .../spi/{coldfire_qspi.c => spi-coldfire-qspi.c} | 0
4213 drivers/spi/{davinci_spi.c => spi-davinci.c} | 0
4214 drivers/spi/{dw_spi_mid.c => spi-dw-mid.c} | 4 +-
4215 drivers/spi/{dw_spi_mmio.c => spi-dw-mmio.c} | 4 +-
4216 drivers/spi/{dw_spi_pci.c => spi-dw-pci.c} | 4 +-
4217 drivers/spi/{dw_spi.c => spi-dw.c} | 4 +-
4218 drivers/spi/{dw_spi.h => spi-dw.h} | 0
4219 drivers/spi/{ep93xx_spi.c => spi-ep93xx.c} | 0
4220 drivers/spi/{spi_fsl_espi.c => spi-fsl-espi.c} | 2 +-
4221 drivers/spi/{spi_fsl_lib.c => spi-fsl-lib.c} | 2 +-
4222 drivers/spi/{spi_fsl_lib.h => spi-fsl-lib.h} | 0
4223 drivers/spi/{spi_fsl_spi.c => spi-fsl-spi.c} | 2 +-
4224 drivers/spi/{spi_gpio.c => spi-gpio.c} | 6 +-
4225 drivers/spi/{spi_imx.c => spi-imx.c} | 0
4226 drivers/spi/{spi_lm70llp.c => spi-lm70llp.c} | 4 +-
4227 .../spi/{mpc512x_psc_spi.c => spi-mpc512x-psc.c} | 0
4228 .../spi/{mpc52xx_psc_spi.c => spi-mpc52xx-psc.c} | 0
4229 drivers/spi/{mpc52xx_spi.c => spi-mpc52xx.c} | 0
4230 drivers/spi/{spi_nuc900.c => spi-nuc900.c} | 5 +-
4231 drivers/spi/{spi_oc_tiny.c => spi-oc-tiny.c} | 0
4232 drivers/spi/{omap_spi_100k.c => spi-omap-100k.c} | 0
4233 drivers/spi/{omap_uwire.c => spi-omap-uwire.c} | 2 +-
4234 drivers/spi/{omap2_mcspi.c => spi-omap2-mcspi.c} | 10 +-
4235 drivers/spi/{orion_spi.c => spi-orion.c} | 8 +-
4236 drivers/spi/{amba-pl022.c => spi-pl022.c} | 111 ++-
4237 drivers/spi/{spi_ppc4xx.c => spi-ppc4xx.c} | 2 +-
4238 drivers/spi/{pxa2xx_spi_pci.c => spi-pxa2xx-pci.c} | 0
4239 drivers/spi/{pxa2xx_spi.c => spi-pxa2xx.c} | 0
4240 .../spi/{spi_s3c24xx_fiq.S => spi-s3c24xx-fiq.S} | 2 +-
4241 .../spi/{spi_s3c24xx_fiq.h => spi-s3c24xx-fiq.h} | 0
4242 .../spi/{spi_s3c24xx_gpio.c => spi-s3c24xx-gpio.c} | 5 +-
4243 drivers/spi/{spi_s3c24xx.c => spi-s3c24xx.c} | 5 +-
4244 drivers/spi/{spi_s3c64xx.c => spi-s3c64xx.c} | 3 +-
4245 drivers/spi/{spi_sh_msiof.c => spi-sh-msiof.c} | 0
4246 drivers/spi/{spi_sh_sci.c => spi-sh-sci.c} | 2 +-
4247 drivers/spi/{spi_sh.c => spi-sh.c} | 0
4248 drivers/spi/{spi_stmp.c => spi-stmp.c} | 0
4249 drivers/spi/{spi_tegra.c => spi-tegra.c} | 20 +-
4250 drivers/spi/{ti-ssp-spi.c => spi-ti-ssp.c} | 0
4251 drivers/spi/{tle62x0.c => spi-tle62x0.c} | 2 +-
4252 .../spi/{spi_topcliff_pch.c => spi-topcliff-pch.c} | 1158 +++++++++++++-------
4253 drivers/spi/{spi_txx9.c => spi-txx9.c} | 2 +-
4254 drivers/spi/{xilinx_spi.c => spi-xilinx.c} | 0
4255 drivers/spi/spi.c | 2 +-
4256 drivers/spi/spidev.c | 2 +-
4257 59 files changed, 1255 insertions(+), 819 deletions(-)
4258 create mode 100644 Documentation/devicetree/bindings/spi/spi_nvidia.txt
4259 delete mode 100644 drivers/spi/atmel_spi.h
4260 rename drivers/spi/{spi_altera.c => spi-altera.c} (100%)
4261 rename drivers/spi/{ath79_spi.c => spi-ath79.c} (99%)
4262 rename drivers/spi/{atmel_spi.c => spi-atmel.c} (85%)
4263 rename drivers/spi/{au1550_spi.c => spi-au1550.c} (99%)
4264 rename drivers/spi/{spi_bfin_sport.c => spi-bfin-sport.c} (100%)
4265 rename drivers/spi/{spi_bfin5xx.c => spi-bfin5xx.c} (88%)
4266 rename drivers/spi/{spi_bitbang_txrx.h => spi-bitbang-txrx.h} (100%)
4267 rename drivers/spi/{spi_bitbang.c => spi-bitbang.c} (98%)
4268 rename drivers/spi/{spi_butterfly.c => spi-butterfly.c} (99%)
4269 rename drivers/spi/{coldfire_qspi.c => spi-coldfire-qspi.c} (100%)
4270 rename drivers/spi/{davinci_spi.c => spi-davinci.c} (100%)
4271 rename drivers/spi/{dw_spi_mid.c => spi-dw-mid.c} (98%)
4272 rename drivers/spi/{dw_spi_mmio.c => spi-dw-mmio.c} (97%)
4273 rename drivers/spi/{dw_spi_pci.c => spi-dw-pci.c} (98%)
4274 rename drivers/spi/{dw_spi.c => spi-dw.c} (99%)
4275 rename drivers/spi/{dw_spi.h => spi-dw.h} (100%)
4276 rename drivers/spi/{ep93xx_spi.c => spi-ep93xx.c} (100%)
4277 rename drivers/spi/{spi_fsl_espi.c => spi-fsl-espi.c} (99%)
4278 rename drivers/spi/{spi_fsl_lib.c => spi-fsl-lib.c} (99%)
4279 rename drivers/spi/{spi_fsl_lib.h => spi-fsl-lib.h} (100%)
4280 rename drivers/spi/{spi_fsl_spi.c => spi-fsl-spi.c} (99%)
4281 rename drivers/spi/{spi_gpio.c => spi-gpio.c} (99%)
4282 rename drivers/spi/{spi_imx.c => spi-imx.c} (100%)
4283 rename drivers/spi/{spi_lm70llp.c => spi-lm70llp.c} (98%)
4284 rename drivers/spi/{mpc512x_psc_spi.c => spi-mpc512x-psc.c} (100%)
4285 rename drivers/spi/{mpc52xx_psc_spi.c => spi-mpc52xx-psc.c} (100%)
4286 rename drivers/spi/{mpc52xx_spi.c => spi-mpc52xx.c} (100%)
4287 rename drivers/spi/{spi_nuc900.c => spi-nuc900.c} (99%)
4288 rename drivers/spi/{spi_oc_tiny.c => spi-oc-tiny.c} (100%)
4289 rename drivers/spi/{omap_spi_100k.c => spi-omap-100k.c} (100%)
4290 rename drivers/spi/{omap_uwire.c => spi-omap-uwire.c} (99%)
4291 rename drivers/spi/{omap2_mcspi.c => spi-omap2-mcspi.c} (99%)
4292 rename drivers/spi/{orion_spi.c => spi-orion.c} (98%)
4293 rename drivers/spi/{amba-pl022.c => spi-pl022.c} (96%)
4294 rename drivers/spi/{spi_ppc4xx.c => spi-ppc4xx.c} (99%)
4295 rename drivers/spi/{pxa2xx_spi_pci.c => spi-pxa2xx-pci.c} (100%)
4296 rename drivers/spi/{pxa2xx_spi.c => spi-pxa2xx.c} (100%)
4297 rename drivers/spi/{spi_s3c24xx_fiq.S => spi-s3c24xx-fiq.S} (99%)
4298 rename drivers/spi/{spi_s3c24xx_fiq.h => spi-s3c24xx-fiq.h} (100%)
4299 rename drivers/spi/{spi_s3c24xx_gpio.c => spi-s3c24xx-gpio.c} (98%)
4300 rename drivers/spi/{spi_s3c24xx.c => spi-s3c24xx.c} (99%)
4301 rename drivers/spi/{spi_s3c64xx.c => spi-s3c64xx.c} (99%)
4302 rename drivers/spi/{spi_sh_msiof.c => spi-sh-msiof.c} (100%)
4303 rename drivers/spi/{spi_sh_sci.c => spi-sh-sci.c} (99%)
4304 rename drivers/spi/{spi_sh.c => spi-sh.c} (100%)
4305 rename drivers/spi/{spi_stmp.c => spi-stmp.c} (100%)
4306 rename drivers/spi/{spi_tegra.c => spi-tegra.c} (96%)
4307 rename drivers/spi/{ti-ssp-spi.c => spi-ti-ssp.c} (100%)
4308 rename drivers/spi/{tle62x0.c => spi-tle62x0.c} (99%)
4309 rename drivers/spi/{spi_topcliff_pch.c => spi-topcliff-pch.c} (53%)
4310 rename drivers/spi/{spi_txx9.c => spi-txx9.c} (99%)
4311 rename drivers/spi/{xilinx_spi.c => spi-xilinx.c} (100%)
4312 Merging gpio/gpio/next
4313 $ git merge gpio/gpio/next
4314 Recorded preimage for 'drivers/gpio/Makefile'
4315 Resolved 'arch/arm/mach-ep93xx/Makefile' using previous resolution.
4316 Resolved 'drivers/gpio/gpio-ep93xx.c' using previous resolution.
4317 Auto-merging arch/arm/mach-ep93xx/Makefile
4318 CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile
4319 Auto-merging arch/arm/mach-ep93xx/core.c
4320 Auto-merging drivers/gpio/Kconfig
4321 Auto-merging drivers/gpio/Makefile
4322 CONFLICT (content): Merge conflict in drivers/gpio/Makefile
4323 Auto-merging drivers/gpio/gpio-74x164.c
4324 Auto-merging drivers/gpio/gpio-ep93xx.c
4325 CONFLICT (content): Merge conflict in drivers/gpio/gpio-ep93xx.c
4326 Auto-merging drivers/gpio/gpio-generic.c
4327 Auto-merging drivers/gpio/gpio-it8761e.c
4328 Auto-merging drivers/gpio/gpio-langwell.c
4329 Auto-merging drivers/gpio/gpio-max7300.c
4330 Auto-merging drivers/gpio/gpio-max7301.c
4331 Auto-merging drivers/gpio/gpio-max730x.c
4332 Auto-merging drivers/gpio/gpio-max732x.c
4333 Auto-merging drivers/gpio/gpio-mc33880.c
4334 Auto-merging drivers/gpio/gpio-mcp23s08.c
4335 Auto-merging drivers/gpio/gpio-ml-ioh.c
4336 Auto-merging drivers/gpio/gpio-omap.c
4337 Auto-merging drivers/gpio/gpio-pca953x.c
4338 Auto-merging drivers/gpio/gpio-pcf857x.c
4339 Auto-merging drivers/gpio/gpio-pl061.c
4340 Auto-merging drivers/gpio/gpio-sch.c
4341 Auto-merging drivers/gpio/gpio-tegra.c
4342 Auto-merging drivers/gpio/gpio-timberdale.c
4343 Auto-merging drivers/gpio/gpio-tps65910.c
4344 Auto-merging drivers/gpio/gpio-twl4030.c
4345 Auto-merging drivers/gpio/gpio-u300.c
4346 Auto-merging drivers/gpio/gpio-vr41xx.c
4347 Auto-merging drivers/gpio/gpio-wm831x.c
4348 Auto-merging drivers/gpio/gpio-wm8350.c
4349 Auto-merging drivers/gpio/gpio-wm8994.c
4350 Auto-merging drivers/leds/Kconfig
4351 Automatic merge failed; fix conflicts and then commit the result.
4353 Recorded resolution for 'drivers/gpio/Makefile'.
4354 [master 622af76] Merge remote-tracking branch 'gpio/gpio/next'
4355 $ git diff -M --stat --summary HEAD^..
4356 .../devicetree/bindings/gpio/gpio_nvidia.txt | 7 +
4357 arch/arm/mach-ep93xx/Makefile | 2 +-
4358 arch/arm/mach-ep93xx/core.c | 27 +-
4359 arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 1 +
4360 arch/arm/mach-omap1/gpio15xx.c | 22 +
4361 arch/arm/mach-omap1/gpio16xx.c | 28 +
4362 arch/arm/mach-omap1/gpio7xx.c | 27 +
4363 arch/arm/mach-omap2/gpio.c | 32 +
4364 arch/arm/mach-tegra/Makefile | 1 -
4365 arch/arm/plat-omap/include/plat/gpio.h | 20 +
4366 drivers/gpio/Kconfig | 50 +-
4367 drivers/gpio/Makefile | 83 ++--
4368 drivers/gpio/{74x164.c => gpio-74x164.c} | 33 +-
4369 drivers/gpio/{ab8500-gpio.c => gpio-ab8500.c} | 0
4370 drivers/gpio/{adp5520-gpio.c => gpio-adp5520.c} | 0
4371 drivers/gpio/{adp5588-gpio.c => gpio-adp5588.c} | 0
4372 drivers/gpio/{bt8xxgpio.c => gpio-bt8xx.c} | 0
4373 drivers/gpio/{cs5535-gpio.c => gpio-cs5535.c} | 0
4374 .../gpio.c => drivers/gpio/gpio-ep93xx.c | 243 ++++----
4375 drivers/gpio/gpio-exynos4.c | 5 +-
4376 drivers/gpio/{basic_mmio_gpio.c => gpio-generic.c} | 6 +-
4377 drivers/gpio/{it8761e_gpio.c => gpio-it8761e.c} | 2 +-
4378 drivers/gpio/{janz-ttl.c => gpio-janz-ttl.c} | 0
4379 drivers/gpio/{langwell_gpio.c => gpio-langwell.c} | 4 +-
4380 drivers/gpio/{max7300.c => gpio-max7300.c} | 2 -
4381 drivers/gpio/{max7301.c => gpio-max7301.c} | 2 -
4382 drivers/gpio/{max730x.c => gpio-max730x.c} | 2 -
4383 drivers/gpio/{max732x.c => gpio-max732x.c} | 2 +-
4384 drivers/gpio/{mc33880.c => gpio-mc33880.c} | 2 +-
4385 drivers/gpio/{mcp23s08.c => gpio-mcp23s08.c} | 2 +-
4386 drivers/gpio/{ml_ioh_gpio.c => gpio-ml-ioh.c} | 2 +-
4387 drivers/gpio/gpio-mxc.c | 92 +--
4388 drivers/gpio/gpio-mxs.c | 189 ++----
4389 drivers/gpio/gpio-omap.c | 723 +++++---------------
4390 drivers/gpio/{pca953x.c => gpio-pca953x.c} | 105 ++--
4391 drivers/gpio/{pcf857x.c => gpio-pcf857x.c} | 2 +-
4392 drivers/gpio/{pch_gpio.c => gpio-pch.c} | 0
4393 drivers/gpio/{pl061.c => gpio-pl061.c} | 4 +-
4394 drivers/gpio/gpio-plat-samsung.c | 3 +-
4395 drivers/gpio/{rdc321x-gpio.c => gpio-rdc321x.c} | 0
4396 drivers/gpio/gpio-s5pc100.c | 5 +-
4397 drivers/gpio/gpio-s5pv210.c | 5 +-
4398 drivers/gpio/{sch_gpio.c => gpio-sch.c} | 2 +-
4399 drivers/gpio/{stmpe-gpio.c => gpio-stmpe.c} | 0
4400 drivers/gpio/{sx150x.c => gpio-sx150x.c} | 0
4401 drivers/gpio/{tc3589x-gpio.c => gpio-tc3589x.c} | 0
4402 .../mach-tegra/gpio.c => drivers/gpio/gpio-tegra.c | 10 +
4403 drivers/gpio/{timbgpio.c => gpio-timberdale.c} | 2 +-
4404 drivers/gpio/{tps65910-gpio.c => gpio-tps65910.c} | 2 +-
4405 drivers/gpio/{twl4030-gpio.c => gpio-twl4030.c} | 2 +-
4406 drivers/gpio/gpio-u300.c | 5 +-
4407 drivers/gpio/{ucb1400_gpio.c => gpio-ucb1400.c} | 0
4408 drivers/gpio/{vr41xx_giu.c => gpio-vr41xx.c} | 2 +-
4409 drivers/gpio/{vx855_gpio.c => gpio-vx855.c} | 0
4410 drivers/gpio/{wm831x-gpio.c => gpio-wm831x.c} | 2 +-
4411 drivers/gpio/{wm8350-gpiolib.c => gpio-wm8350.c} | 2 +-
4412 drivers/gpio/{wm8994-gpio.c => gpio-wm8994.c} | 2 +-
4413 drivers/gpio/{xilinx_gpio.c => gpio-xilinx.c} | 0
4414 drivers/leds/Kconfig | 19 +-
4415 drivers/leds/leds-gpio.c | 6 +-
4416 include/linux/spi/74x164.h | 2 -
4417 61 files changed, 684 insertions(+), 1109 deletions(-)
4418 create mode 100644 Documentation/devicetree/bindings/gpio/gpio_nvidia.txt
4419 rename drivers/gpio/{74x164.c => gpio-74x164.c} (88%)
4420 rename drivers/gpio/{ab8500-gpio.c => gpio-ab8500.c} (100%)
4421 rename drivers/gpio/{adp5520-gpio.c => gpio-adp5520.c} (100%)
4422 rename drivers/gpio/{adp5588-gpio.c => gpio-adp5588.c} (100%)
4423 rename drivers/gpio/{bt8xxgpio.c => gpio-bt8xx.c} (100%)
4424 rename drivers/gpio/{cs5535-gpio.c => gpio-cs5535.c} (100%)
4425 rename arch/arm/mach-ep93xx/gpio.c => drivers/gpio/gpio-ep93xx.c (69%)
4426 rename drivers/gpio/{basic_mmio_gpio.c => gpio-generic.c} (99%)
4427 rename drivers/gpio/{it8761e_gpio.c => gpio-it8761e.c} (98%)
4428 rename drivers/gpio/{janz-ttl.c => gpio-janz-ttl.c} (100%)
4429 rename drivers/gpio/{langwell_gpio.c => gpio-langwell.c} (99%)
4430 rename drivers/gpio/{max7300.c => gpio-max7300.c} (98%)
4431 rename drivers/gpio/{max7301.c => gpio-max7301.c} (98%)
4432 rename drivers/gpio/{max730x.c => gpio-max730x.c} (99%)
4433 rename drivers/gpio/{max732x.c => gpio-max732x.c} (99%)
4434 rename drivers/gpio/{mc33880.c => gpio-mc33880.c} (98%)
4435 rename drivers/gpio/{mcp23s08.c => gpio-mcp23s08.c} (99%)
4436 rename drivers/gpio/{ml_ioh_gpio.c => gpio-ml-ioh.c} (99%)
4437 rename drivers/gpio/{pca953x.c => gpio-pca953x.c} (89%)
4438 rename drivers/gpio/{pcf857x.c => gpio-pcf857x.c} (99%)
4439 rename drivers/gpio/{pch_gpio.c => gpio-pch.c} (100%)
4440 rename drivers/gpio/{pl061.c => gpio-pl061.c} (99%)
4441 rename drivers/gpio/{rdc321x-gpio.c => gpio-rdc321x.c} (100%)
4442 rename drivers/gpio/{sch_gpio.c => gpio-sch.c} (99%)
4443 rename drivers/gpio/{stmpe-gpio.c => gpio-stmpe.c} (100%)
4444 rename drivers/gpio/{sx150x.c => gpio-sx150x.c} (100%)
4445 rename drivers/gpio/{tc3589x-gpio.c => gpio-tc3589x.c} (100%)
4446 rename arch/arm/mach-tegra/gpio.c => drivers/gpio/gpio-tegra.c (97%)
4447 rename drivers/gpio/{timbgpio.c => gpio-timberdale.c} (99%)
4448 rename drivers/gpio/{tps65910-gpio.c => gpio-tps65910.c} (98%)
4449 rename drivers/gpio/{twl4030-gpio.c => gpio-twl4030.c} (99%)
4450 rename drivers/gpio/{ucb1400_gpio.c => gpio-ucb1400.c} (100%)
4451 rename drivers/gpio/{vr41xx_giu.c => gpio-vr41xx.c} (99%)
4452 rename drivers/gpio/{vx855_gpio.c => gpio-vx855.c} (100%)
4453 rename drivers/gpio/{wm831x-gpio.c => gpio-wm831x.c} (99%)
4454 rename drivers/gpio/{wm8350-gpiolib.c => gpio-wm8350.c} (98%)
4455 rename drivers/gpio/{wm8994-gpio.c => gpio-wm8994.c} (99%)
4456 rename drivers/gpio/{xilinx_gpio.c => gpio-xilinx.c} (100%)
4457 Merging tip/auto-latest
4458 $ git merge tip/auto-latest
4459 Auto-merging Makefile
4460 Removing arch/alpha/include/asm/8253pit.h
4461 Removing arch/arm/include/asm/i8253.h
4462 Removing arch/mips/include/asm/i8253.h
4463 Removing arch/powerpc/include/asm/8253pit.h
4464 Auto-merging arch/x86/Kconfig
4465 Auto-merging arch/x86/include/asm/apb_timer.h
4466 Removing arch/x86/include/asm/i8253.h
4467 Merge made by recursive.
4468 Documentation/x86/entry_64.txt | 98 +
4470 arch/alpha/Kconfig | 1 +
4471 arch/alpha/include/asm/8253pit.h | 3 -
4472 arch/alpha/kernel/sys_ruffian.c | 1 -
4473 arch/alpha/kernel/time.c | 1 -
4474 arch/arm/include/asm/i8253.h | 15 -
4475 arch/arm/mach-footbridge/isa-timer.c | 4 +-
4476 arch/mips/Kconfig | 3 +
4477 arch/mips/cobalt/time.c | 2 +-
4478 arch/mips/include/asm/i8253.h | 24 -
4479 arch/mips/jazz/irq.c | 2 +-
4480 arch/mips/kernel/i8253.c | 5 +-
4481 arch/mips/mti-malta/malta-time.c | 2 +-
4482 arch/mips/sgi-ip22/ip22-time.c | 2 +-
4483 arch/mips/sni/time.c | 2 +-
4484 arch/powerpc/include/asm/8253pit.h | 3 -
4485 arch/powerpc/platforms/amigaone/Kconfig | 2 +-
4486 arch/powerpc/platforms/chrp/Kconfig | 1 +
4487 arch/powerpc/platforms/prep/Kconfig | 1 +
4488 arch/powerpc/platforms/pseries/Kconfig | 1 +
4489 arch/x86/Kconfig | 2 +
4490 arch/x86/boot/Makefile | 9 +-
4491 arch/x86/boot/tools/build.c | 33 +-
4492 arch/x86/ia32/ia32entry.S | 10 +-
4493 arch/x86/include/asm/apb_timer.h | 1 -
4494 arch/x86/include/asm/calling.h | 130 +-
4495 arch/x86/include/asm/entry_arch.h | 4 -
4496 arch/x86/include/asm/fixmap.h | 1 +
4497 arch/x86/include/asm/hw_irq.h | 1 -
4498 arch/x86/include/asm/i8253.h | 20 -
4499 arch/x86/include/asm/irq_vectors.h | 11 +-
4500 arch/x86/include/asm/mce.h | 19 +-
4501 arch/x86/include/asm/pgtable_types.h | 6 +-
4502 arch/x86/include/asm/segment.h | 2 +-
4503 arch/x86/include/asm/time.h | 6 +-
4504 arch/x86/include/asm/traps.h | 4 +
4505 arch/x86/include/asm/uv/uv_mmrs.h | 2889 ++++++++++++++++-------------
4506 arch/x86/include/asm/vgtod.h | 1 -
4507 arch/x86/include/asm/vsyscall.h | 12 +
4508 arch/x86/include/asm/vvar.h | 24 +-
4509 arch/x86/kernel/Makefile | 1 +
4510 arch/x86/kernel/apb_timer.c | 1 +
4511 arch/x86/kernel/apic/apic.c | 3 +-
4512 arch/x86/kernel/apm_32.c | 2 +-
4513 arch/x86/kernel/cpu/mcheck/mce-severity.c | 152 +-
4514 arch/x86/kernel/cpu/mcheck/mce.c | 288 ++--
4515 arch/x86/kernel/cpu/mcheck/mce_amd.c | 10 +-
4516 arch/x86/kernel/entry_64.S | 15 +-
4517 arch/x86/kernel/hpet.c | 5 +-
4518 arch/x86/kernel/i8253.c | 6 +-
4519 arch/x86/kernel/irqinit.c | 3 -
4520 arch/x86/kernel/microcode_amd.c | 21 +-
4521 arch/x86/kernel/time.c | 2 +-
4522 arch/x86/kernel/traps.c | 6 +
4523 arch/x86/kernel/vmlinux.lds.S | 48 +-
4524 arch/x86/kernel/vsyscall_64.c | 297 ++--
4525 arch/x86/kernel/vsyscall_emu_64.S | 27 +
4526 arch/x86/lib/thunk_64.S | 46 +-
4527 arch/x86/mm/pageattr-test.c | 3 +-
4528 arch/x86/pci/mmconfig-shared.c | 3 +-
4529 arch/x86/platform/efi/efi.c | 39 +-
4530 arch/x86/vdso/vclock_gettime.c | 55 +-
4531 drivers/block/hd.c | 2 +-
4532 drivers/clocksource/Kconfig | 6 +
4533 drivers/clocksource/Makefile | 2 +-
4534 drivers/clocksource/i8253.c | 13 +-
4535 drivers/input/gameport/gameport.c | 2 +-
4536 drivers/input/joystick/analog.c | 2 +-
4537 drivers/input/misc/pcspkr.c | 9 +-
4538 include/linux/efi.h | 34 +-
4539 include/linux/i8253.h | 30 +
4540 include/linux/perf_event.h | 33 +-
4541 include/linux/seccomp.h | 10 +
4543 kernel/events/Makefile | 2 +-
4544 kernel/events/core.c | 788 ++------
4545 kernel/events/internal.h | 97 +
4546 kernel/events/ring_buffer.c | 399 ++++
4547 kernel/printk.c | 8 +-
4548 kernel/sched.c | 4 +-
4549 kernel/sched_rt.c | 4 +-
4550 sound/drivers/pcsp/pcsp.h | 8 +-
4551 tools/perf/Documentation/perf-script.txt | 12 +-
4552 tools/perf/builtin-script.c | 108 +-
4553 tools/perf/builtin-stat.c | 9 +-
4554 tools/perf/util/evsel.c | 1 +
4555 tools/perf/util/evsel.h | 1 +
4556 tools/perf/util/python.c | 17 +-
4557 tools/perf/util/session.c | 61 +-
4558 tools/perf/util/session.h | 5 +-
4559 91 files changed, 3325 insertions(+), 2743 deletions(-)
4560 create mode 100644 Documentation/x86/entry_64.txt
4561 delete mode 100644 arch/alpha/include/asm/8253pit.h
4562 delete mode 100644 arch/arm/include/asm/i8253.h
4563 delete mode 100644 arch/mips/include/asm/i8253.h
4564 delete mode 100644 arch/powerpc/include/asm/8253pit.h
4565 delete mode 100644 arch/x86/include/asm/i8253.h
4566 create mode 100644 arch/x86/kernel/vsyscall_emu_64.S
4567 create mode 100644 include/linux/i8253.h
4568 create mode 100644 kernel/events/internal.h
4569 create mode 100644 kernel/events/ring_buffer.c
4570 Merging rcu/rcu/next
4571 $ git merge rcu/rcu/next
4572 Auto-merging Documentation/RCU/NMI-RCU.txt
4573 Auto-merging fs/jbd2/journal.c
4574 Auto-merging init/Kconfig
4575 Auto-merging kernel/lockdep.c
4576 Auto-merging kernel/sched.c
4577 Auto-merging security/device_cgroup.c
4578 Merge made by recursive.
4579 Documentation/RCU/NMI-RCU.txt | 2 +-
4580 Documentation/RCU/torture.txt | 137 +++++++++++++++++++-------
4581 Documentation/RCU/trace.txt | 13 ++-
4582 drivers/md/linear.c | 8 +--
4583 fs/jbd2/journal.c | 7 +-
4584 include/linux/lockdep.h | 2 +-
4585 include/linux/rcupdate.h | 215 ++++++++++++++++++-----------------------
4586 include/linux/rcutiny.h | 16 +++-
4587 include/linux/rcutree.h | 2 +
4588 include/linux/types.h | 10 ++
4589 include/trace/events/rcu.h | 98 +++++++++++++++++++
4591 kernel/lockdep.c | 84 +++++++++-------
4593 kernel/rcu.h | 79 +++++++++++++++
4594 kernel/rcupdate.c | 26 +++++-
4595 kernel/rcutiny.c | 54 +++++------
4596 kernel/rcutiny_plugin.h | 14 ---
4597 kernel/rcutorture.c | 60 +++++-------
4598 kernel/rcutree.c | 92 +++++++++++++-----
4599 kernel/rcutree.h | 4 +
4600 kernel/rcutree_plugin.h | 36 +++----
4601 kernel/rcutree_trace.c | 8 +-
4602 kernel/sched.c | 2 +
4603 security/device_cgroup.c | 10 +--
4604 25 files changed, 638 insertions(+), 351 deletions(-)
4605 create mode 100644 include/trace/events/rcu.h
4606 create mode 100644 kernel/rcu.h
4607 Merging kvm/linux-next
4608 $ git merge kvm/linux-next
4609 Auto-merging arch/x86/kvm/mmu.c
4610 Merge made by recursive.
4611 Documentation/virtual/kvm/api.txt | 69 +-
4612 Documentation/virtual/kvm/nested-vmx.txt | 251 +++
4613 arch/x86/include/asm/kvm_emulate.h | 52 +-
4614 arch/x86/include/asm/kvm_host.h | 20 +-
4615 arch/x86/include/asm/msr-index.h | 12 +
4616 arch/x86/include/asm/vmx.h | 43 +
4617 arch/x86/kvm/emulate.c | 1745 ++++++++----------
4618 arch/x86/kvm/mmu.c | 533 +++----
4619 arch/x86/kvm/paging_tmpl.h | 9 +-
4620 arch/x86/kvm/svm.c | 6 +-
4621 arch/x86/kvm/trace.h | 8 +-
4622 arch/x86/kvm/vmx.c | 2979 +++++++++++++++++++++++++++---
4623 arch/x86/kvm/x86.c | 198 ++-
4624 arch/x86/kvm/x86.h | 8 +
4625 include/linux/kvm.h | 8 +-
4626 virt/kvm/kvm_main.c | 15 +-
4627 16 files changed, 4302 insertions(+), 1654 deletions(-)
4628 create mode 100644 Documentation/virtual/kvm/nested-vmx.txt
4629 Merging oprofile/for-next
4630 $ git merge oprofile/for-next
4631 Merge made by recursive.
4632 arch/mips/include/asm/stacktrace.h | 4 +
4633 arch/mips/kernel/process.c | 19 +++-
4634 arch/mips/oprofile/Makefile | 2 +-
4635 arch/mips/oprofile/backtrace.c | 175 ++++++++++++++++++++++++++++++++++++
4636 arch/mips/oprofile/common.c | 1 +
4637 arch/mips/oprofile/op_impl.h | 2 +
4638 arch/x86/oprofile/backtrace.c | 56 ++++++++++--
4639 arch/x86/oprofile/nmi_int.c | 14 ++-
4640 8 files changed, 254 insertions(+), 19 deletions(-)
4641 create mode 100644 arch/mips/oprofile/backtrace.c
4642 Merging ptrace/ptrace
4643 $ git merge ptrace/ptrace
4644 Auto-merging fs/exec.c
4645 Auto-merging include/linux/sched.h
4646 Auto-merging kernel/exit.c
4647 Auto-merging kernel/signal.c
4648 Merge made by recursive.
4650 include/linux/ptrace.h | 11 ++-
4651 include/linux/sched.h | 37 ++++-
4652 include/linux/tracehook.h | 52 -------
4653 kernel/exit.c | 3 +-
4654 kernel/ptrace.c | 160 +++++++++++++++++----
4655 kernel/signal.c | 356 ++++++++++++++++++++++++++++++---------------
4656 7 files changed, 411 insertions(+), 210 deletions(-)
4657 Merging xen/upstream/xen
4658 $ git merge xen/upstream/xen
4660 Merging xen-two/linux-next
4661 $ git merge xen-two/linux-next
4662 Auto-merging arch/x86/include/asm/pgtable_types.h
4663 Merge made by recursive.
4664 arch/x86/include/asm/pgtable_types.h | 1 -
4665 arch/x86/include/asm/x86_init.h | 12 -
4666 arch/x86/include/asm/xen/pci.h | 5 +-
4667 arch/x86/kernel/x86_init.c | 4 -
4668 arch/x86/mm/init.c | 87 +++++----
4669 arch/x86/pci/xen.c | 370 +++++++++++++++-------------------
4670 arch/x86/xen/Makefile | 2 +-
4671 arch/x86/xen/enlighten.c | 8 +
4672 arch/x86/xen/mmu.c | 15 --
4673 arch/x86/xen/vga.c | 67 ++++++
4674 arch/x86/xen/xen-ops.h | 11 +
4675 drivers/xen/Kconfig | 7 +
4676 drivers/xen/Makefile | 2 +-
4677 drivers/xen/events.c | 2 +-
4678 drivers/xen/tmem.c | 170 +++++++++++++++-
4679 include/xen/interface/xen.h | 39 ++++
4680 16 files changed, 511 insertions(+), 291 deletions(-)
4681 create mode 100644 arch/x86/xen/vga.c
4682 Merging xen-pvhvm/linux-next
4683 $ git merge xen-pvhvm/linux-next
4685 Merging edac-amd/for-next
4686 $ git merge edac-amd/for-next
4688 Merging percpu/for-next
4689 $ git merge percpu/for-next
4690 Merge made by recursive.
4691 Merging workqueues/for-next
4692 $ git merge workqueues/for-next
4693 Auto-merging Documentation/feature-removal-schedule.txt
4694 Auto-merging kernel/workqueue.c
4695 Merge made by recursive.
4696 Documentation/feature-removal-schedule.txt | 10 ----
4697 include/linux/workqueue.h | 18 +------
4698 kernel/workqueue.c | 81 ++++++++++++++++++----------
4699 3 files changed, 55 insertions(+), 54 deletions(-)
4700 Merging sfi/sfi-test
4701 $ git merge sfi/sfi-test
4703 Merging asm-generic/next
4704 $ git merge asm-generic/next
4706 Merging drivers-x86/linux-next
4707 $ git merge drivers-x86/linux-next
4709 Merging hwpoison/hwpoison
4710 $ git merge hwpoison/hwpoison
4712 Merging sysctl/master
4713 $ git merge sysctl/master
4714 Auto-merging fs/proc/proc_sysctl.c
4715 Merge made by recursive.
4716 fs/proc/proc_sysctl.c | 14 ++------------
4717 1 files changed, 2 insertions(+), 12 deletions(-)
4718 Merging namespace/master
4719 $ git merge namespace/master
4720 Merge made by recursive.
4721 fs/proc/inode.c | 6 +-
4722 fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++-------
4723 2 files changed, 142 insertions(+), 24 deletions(-)
4724 Merging driver-core/driver-core-next
4725 $ git merge driver-core/driver-core-next
4726 Auto-merging drivers/misc/pti.c
4727 Merge made by recursive.
4728 Documentation/driver-model/device.txt | 2 +-
4729 Documentation/driver-model/overview.txt | 52 ++++++++++++++++++++-----------
4730 drivers/misc/pti.c | 6 ++--
4731 3 files changed, 38 insertions(+), 22 deletions(-)
4732 Merging tty/tty-next
4733 $ git merge tty/tty-next
4734 Auto-merging drivers/tty/serial/8250.c
4735 Auto-merging drivers/tty/serial/8250_pci.c
4736 Auto-merging drivers/tty/serial/pch_uart.c
4737 Auto-merging include/linux/pci_ids.h
4738 Merge made by recursive.
4739 drivers/parport/parport_pc.c | 54 ---------
4740 drivers/parport/parport_serial.c | 229 +++++++++++++++++++++++++++++++++++---
4741 drivers/tty/serial/8250.c | 2 +-
4742 drivers/tty/serial/8250_pci.c | 183 ++++++++++++++++++++++++++++++-
4743 drivers/tty/serial/pch_uart.c | 5 +-
4744 include/linux/pci_ids.h | 4 +
4745 include/linux/tty.h | 37 +++---
4746 7 files changed, 421 insertions(+), 93 deletions(-)
4747 Merging usb/usb-next
4748 $ git merge usb/usb-next
4749 Auto-merging Documentation/feature-removal-schedule.txt
4750 Auto-merging Documentation/kernel-parameters.txt
4751 Auto-merging drivers/usb/host/ehci-hcd.c
4752 Merge made by recursive.
4753 Documentation/feature-removal-schedule.txt | 7 +
4754 Documentation/kernel-parameters.txt | 5 +
4755 drivers/usb/core/hcd.c | 17 +-
4756 drivers/usb/gadget/Kconfig | 43 +-
4757 drivers/usb/gadget/Makefile | 1 +
4758 drivers/usb/gadget/file_storage.c | 2 +
4759 drivers/usb/gadget/fusb300_udc.c | 5 -
4760 drivers/usb/gadget/gadget_chips.h | 8 +
4761 drivers/usb/gadget/net2272.c | 2718 ++++++++++++++++++++++++++++
4762 drivers/usb/gadget/net2272.h | 601 ++++++
4763 drivers/usb/host/ehci-hcd.c | 2 +-
4764 drivers/usb/host/ehci-s5p.c | 95 +
4765 drivers/usb/host/xhci-dbg.c | 22 +-
4766 drivers/usb/host/xhci-mem.c | 26 +-
4767 drivers/usb/host/xhci-ring.c | 42 +-
4768 drivers/usb/host/xhci.c | 10 +-
4769 drivers/usb/host/xhci.h | 7 +
4770 drivers/usb/renesas_usbhs/Makefile | 2 +-
4771 drivers/usb/renesas_usbhs/common.c | 11 +-
4772 drivers/usb/renesas_usbhs/common.h | 44 +
4773 drivers/usb/renesas_usbhs/fifo.c | 994 ++++++++++
4774 drivers/usb/renesas_usbhs/fifo.h | 104 ++
4775 drivers/usb/renesas_usbhs/mod_gadget.c | 759 ++-------
4776 drivers/usb/renesas_usbhs/pipe.c | 298 +---
4777 drivers/usb/renesas_usbhs/pipe.h | 47 +-
4778 drivers/usb/wusbcore/cbaf.c | 4 +-
4779 include/linux/usb/gadget.h | 1 +
4780 include/linux/usb/renesas_usbhs.h | 17 +
4781 28 files changed, 4965 insertions(+), 927 deletions(-)
4782 create mode 100644 drivers/usb/gadget/net2272.c
4783 create mode 100644 drivers/usb/gadget/net2272.h
4784 create mode 100644 drivers/usb/renesas_usbhs/fifo.c
4785 create mode 100644 drivers/usb/renesas_usbhs/fifo.h
4786 Merging staging/staging-next
4787 $ git merge staging/staging-next
4788 Auto-merging MAINTAINERS
4789 Removing drivers/staging/brcm80211/brcmfmac/bcmcdc.h
4790 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c
4791 CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_linux.c
4792 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
4793 CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
4794 Removing drivers/staging/brcm80211/brcmfmac/dhdioctl.h
4795 Removing drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h
4796 Removing drivers/staging/brcm80211/brcmfmac/hndrte_cons.h
4797 Removing drivers/staging/brcm80211/brcmfmac/msgtrace.h
4798 Auto-merging drivers/staging/brcm80211/brcmfmac/pcicfg.h
4799 Auto-merging drivers/staging/brcm80211/brcmfmac/sdio_host.h
4800 Removing drivers/staging/brcm80211/brcmfmac/sdioh.h
4801 Auto-merging drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
4802 CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
4803 Auto-merging drivers/staging/brcm80211/brcmfmac/wl_iw.c
4804 CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_iw.c
4805 Auto-merging drivers/staging/brcm80211/brcmsmac/alloc.c
4806 Auto-merging drivers/staging/brcm80211/brcmsmac/ampdu.c
4807 Auto-merging drivers/staging/brcm80211/brcmsmac/ampdu.h
4808 Auto-merging drivers/staging/brcm80211/brcmsmac/antsel.c
4809 Auto-merging drivers/staging/brcm80211/brcmsmac/antsel.h
4810 Removing drivers/staging/brcm80211/brcmsmac/bcmsrom.c
4811 Auto-merging drivers/staging/brcm80211/brcmsmac/bmac.c
4812 Auto-merging drivers/staging/brcm80211/brcmsmac/bmac.h
4813 Auto-merging drivers/staging/brcm80211/brcmsmac/channel.c
4814 Auto-merging drivers/staging/brcm80211/brcmsmac/channel.h
4815 Auto-merging drivers/staging/brcm80211/brcmsmac/dma.c
4816 Auto-merging drivers/staging/brcm80211/brcmsmac/dma.h
4817 Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.c
4818 Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.h
4819 Auto-merging drivers/staging/brcm80211/brcmsmac/main.c
4820 Auto-merging drivers/staging/brcm80211/brcmsmac/main.h
4821 Removing drivers/staging/brcm80211/brcmsmac/nvram.c
4822 Auto-merging drivers/staging/brcm80211/brcmsmac/otp.c
4823 Auto-merging drivers/staging/brcm80211/brcmsmac/otp.h
4824 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
4825 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h
4826 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
4827 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c
4828 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.h
4829 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
4830 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c
4831 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.h
4832 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_radio.h
4833 Removing drivers/staging/brcm80211/brcmsmac/phy/phy_version.h
4834 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c
4835 Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c
4836 Auto-merging drivers/staging/brcm80211/brcmsmac/phy_shim.c
4837 Auto-merging drivers/staging/brcm80211/brcmsmac/phy_shim.h
4838 Auto-merging drivers/staging/brcm80211/brcmsmac/pmu.c
4839 Auto-merging drivers/staging/brcm80211/brcmsmac/pmu.h
4840 Auto-merging drivers/staging/brcm80211/brcmsmac/pub.h
4841 Auto-merging drivers/staging/brcm80211/brcmsmac/rate.c
4842 Auto-merging drivers/staging/brcm80211/brcmsmac/scb.h
4843 Auto-merging drivers/staging/brcm80211/brcmsmac/srom.c
4844 Auto-merging drivers/staging/brcm80211/brcmsmac/srom.h
4845 Auto-merging drivers/staging/brcm80211/brcmsmac/stf.c
4846 Auto-merging drivers/staging/brcm80211/brcmsmac/stf.h
4847 Auto-merging drivers/staging/brcm80211/brcmsmac/types.h
4848 Auto-merging drivers/staging/brcm80211/brcmsmac/ucode_loader.c
4849 Auto-merging drivers/staging/brcm80211/brcmsmac/ucode_loader.h
4850 Removing drivers/staging/brcm80211/brcmsmac/wl_dbg.h
4851 Removing drivers/staging/brcm80211/brcmsmac/wl_export.h
4852 Removing drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
4853 Removing drivers/staging/brcm80211/brcmsmac/wlc_key.h
4854 Removing drivers/staging/brcm80211/brcmsmac/wlc_types.h
4855 Auto-merging drivers/staging/brcm80211/brcmutil/Makefile
4856 Auto-merging drivers/staging/brcm80211/brcmutil/utils.c
4857 Auto-merging drivers/staging/brcm80211/brcmutil/wifiResolved 'drivers/staging/brcm80211/brcmfmac/dhd_linux.c' using previous resolution.
4858 Resolved 'drivers/staging/brcm80211/brcmfmac/dhd_sdio.c' using previous resolution.
4859 Resolved 'drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h' using previous resolution.
4860 Resolved 'drivers/staging/brcm80211/brcmfmac/wl_iw.c' using previous resolution.
4861 Resolved 'drivers/staging/usbip/userspace/src/utils.h' using previous resolution.
4863 Removing drivers/staging/brcm80211/include/aidmp.h
4864 Removing drivers/staging/brcm80211/include/bcmdefs.h
4865 Removing drivers/staging/brcm80211/include/bcmdevs.h
4866 Removing drivers/staging/brcm80211/include/bcmnvram.h
4867 Removing drivers/staging/brcm80211/include/bcmsdpcm.h
4868 Removing drivers/staging/brcm80211/include/bcmsrom_fmt.h
4869 Auto-merging drivers/staging/brcm80211/include/brcmu_utils.h
4870 Auto-merging drivers/staging/brcm80211/include/brcmu_wifi.h
4871 Removing drivers/staging/brcm80211/include/hndsoc.h
4872 Removing drivers/staging/brcm80211/include/nicpci.h
4873 Removing drivers/staging/brcm80211/include/pci_core.h
4874 Removing drivers/staging/brcm80211/include/pcie_core.h
4875 Removing drivers/staging/brcm80211/include/proto/802.11.h
4876 Removing drivers/staging/brcm80211/include/proto/bcmeth.h
4877 Removing drivers/staging/brcm80211/include/proto/bcmevent.h
4878 Removing drivers/staging/brcm80211/include/sbchipc.h
4879 Removing drivers/staging/brcm80211/include/sbconfig.h
4880 Removing drivers/staging/brcm80211/include/sbhnddma.h
4881 Removing drivers/staging/brcm80211/include/sbsdio.h
4882 Removing drivers/staging/brcm80211/include/sbsdpcmdev.h
4883 Removing drivers/staging/brcm80211/include/sdio.h
4884 Removing drivers/staging/brcm80211/include/wlioctl.h
4885 Auto-merging drivers/staging/hv/hv_mouse.c
4886 Removing drivers/staging/usbip/userspace/src/bind-driver.c
4887 Auto-merging drivers/staging/usbip/userspace/src/utils.h
4888 CONFLICT (content): Merge conflict in drivers/staging/usbip/userspace/src/utils.h
4889 Automatic merge failed; fix conflicts and then commit the result.
4891 [master f0b92ae] Merge remote-tracking branch 'staging/staging-next'
4892 $ git diff -M --stat --summary HEAD^..
4894 drivers/staging/brcm80211/Kconfig | 2 +
4895 drivers/staging/brcm80211/Makefile | 2 +-
4896 drivers/staging/brcm80211/README | 65 +-
4897 drivers/staging/brcm80211/TODO | 14 +-
4898 drivers/staging/brcm80211/brcmfmac/bcmcdc.h | 98 -
4899 drivers/staging/brcm80211/brcmfmac/bcmchip.h | 6 -
4900 drivers/staging/brcm80211/brcmfmac/bcmsdbus.h | 2 +
4901 drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 13 +-
4902 drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 29 +-
4903 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 196 +--
4904 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h | 2 -
4905 .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 8 +-
4906 drivers/staging/brcm80211/brcmfmac/dhd.h | 920 +++++++-
4907 drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 2 +-
4908 drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 85 +-
4909 drivers/staging/brcm80211/brcmfmac/dhd_common.c | 152 +-
4910 .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 8 +-
4911 drivers/staging/brcm80211/brcmfmac/dhd_dbg.h | 3 -
4912 drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 24 +-
4913 drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 5 +-
4914 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 906 ++++----
4915 drivers/staging/brcm80211/brcmfmac/dhdioctl.h | 100 -
4916 .../staging/brcm80211/brcmfmac/hndrte_armtrap.h | 75 -
4917 drivers/staging/brcm80211/brcmfmac/hndrte_cons.h | 62 -
4918 drivers/staging/brcm80211/brcmfmac/msgtrace.h | 61 -
4919 .../brcm80211/{include => brcmfmac}/pcicfg.h | 2 +-
4920 drivers/staging/brcm80211/brcmfmac/sbsdio.h | 373 ++++
4921 .../{include/bcmsdh.h => brcmfmac/sdio_host.h} | 27 +-
4922 drivers/staging/brcm80211/brcmfmac/sdioh.h | 63 -
4923 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 48 +-
4924 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 14 +-
4925 drivers/staging/brcm80211/brcmfmac/wl_iw.c | 68 +-
4926 drivers/staging/brcm80211/brcmfmac/wl_iw.h | 4 -
4927 drivers/staging/brcm80211/brcmsmac/Makefile | 45 +-
4928 drivers/staging/brcm80211/brcmsmac/aiutils.c | 508 ++++-
4929 drivers/staging/brcm80211/brcmsmac/aiutils.h | 218 ++-
4930 .../brcm80211/brcmsmac/{wlc_alloc.c => alloc.c} | 38 +-
4931 .../brcm80211/brcmsmac/{wlc_alloc.h => alloc.h} | 0
4932 .../brcm80211/brcmsmac/{wlc_ampdu.c => ampdu.c} | 48 +-
4933 .../brcm80211/brcmsmac/{wlc_ampdu.h => ampdu.h} | 6 +-
4934 .../brcm80211/brcmsmac/{wlc_antsel.c => antsel.c} | 39 +-
4935 .../brcm80211/brcmsmac/{wlc_antsel.h => antsel.h} | 6 +-
4936 drivers/staging/brcm80211/brcmsmac/bcmsrom.c | 714 ------
4937 .../brcm80211/brcmsmac/{wlc_bmac.c => bmac.c} | 110 +-
4938 .../brcm80211/brcmsmac/{wlc_bmac.h => bmac.h} | 17 +-
4939 .../brcmsmac/{wlc_channel.c => channel.c} | 31 +-
4940 .../brcmsmac/{wlc_channel.h => channel.h} | 11 +-
4941 drivers/staging/brcm80211/brcmsmac/d11.h | 49 +-
4942 .../staging/brcm80211/brcmsmac/{hnddma.c => dma.c} | 293 ++-
4943 .../brcm80211/{include/hnddma.h => brcmsmac/dma.h} | 139 +-
4944 .../brcmsmac/{wl_mac80211.c => mac80211_if.c} | 704 +++---
4945 .../brcmsmac/{wl_mac80211.h => mac80211_if.h} | 74 +-
4946 .../brcm80211/brcmsmac/{wlc_main.c => main.c} | 2278 ++++----------------
4947 .../brcm80211/brcmsmac/{wlc_main.h => main.h} | 322 ++--
4948 drivers/staging/brcm80211/brcmsmac/nicpci.c | 393 ++--
4949 drivers/staging/brcm80211/brcmsmac/nicpci.h | 85 +
4950 drivers/staging/brcm80211/brcmsmac/nvram.c | 215 --
4951 .../staging/brcm80211/brcmsmac/{bcmotp.c => otp.c} | 464 +----
4952 .../brcm80211/{include/bcmotp.h => brcmsmac/otp.h} | 11 +-
4953 .../brcmsmac/phy/{wlc_phy_cmn.c => phy_cmn.c} | 106 +-
4954 .../brcmsmac/phy/{wlc_phy_hal.h => phy_hal.h} | 51 +-
4955 .../brcmsmac/phy/{wlc_phy_int.h => phy_int.h} | 31 +-
4956 .../brcmsmac/phy/{wlc_phy_lcn.c => phy_lcn.c} | 21 +-
4957 .../brcmsmac/phy/{wlc_phy_lcn.h => phy_lcn.h} | 6 +-
4958 .../brcmsmac/phy/{wlc_phy_n.c => phy_n.c} | 24 +-
4959 .../brcmsmac/phy/{wlc_phy_qmath.c => phy_qmath.c} | 2 +-
4960 .../brcmsmac/phy/{wlc_phy_qmath.h => phy_qmath.h} | 6 +-
4961 .../brcmsmac/phy/{wlc_phy_radio.h => phy_radio.h} | 6 +-
4962 .../staging/brcm80211/brcmsmac/phy/phy_version.h | 36 -
4963 .../brcmsmac/phy/{wlc_phyreg_n.h => phyreg_n.h} | 0
4964 .../phy/{wlc_phytbl_lcn.c => phytbl_lcn.c} | 6 +-
4965 .../phy/{wlc_phytbl_lcn.h => phytbl_lcn.h} | 0
4966 .../brcmsmac/phy/{wlc_phytbl_n.c => phytbl_n.c} | 6 +-
4967 .../brcmsmac/phy/{wlc_phytbl_n.h => phytbl_n.h} | 0
4968 .../brcmsmac/{wlc_phy_shim.c => phy_shim.c} | 62 +-
4969 .../brcmsmac/{wlc_phy_shim.h => phy_shim.h} | 61 +-
4970 .../brcm80211/brcmsmac/{wlc_pmu.c => pmu.c} | 552 +++++-
4971 .../brcm80211/brcmsmac/{wlc_pmu.h => pmu.h} | 42 +-
4972 .../brcm80211/brcmsmac/{wlc_pub.h => pub.h} | 160 ++-
4973 .../brcm80211/brcmsmac/{wlc_rate.c => rate.c} | 18 +-
4974 .../brcm80211/brcmsmac/{wlc_rate.h => rate.h} | 0
4975 .../brcm80211/brcmsmac/{wlc_scb.h => scb.h} | 9 +-
4976 .../brcm80211/brcmsmac/{bcmsrom_tbl.h => srom.c} | 983 ++++++++-
4977 .../{include/bcmsrom.h => brcmsmac/srom.h} | 12 +-
4978 .../brcm80211/brcmsmac/{wlc_stf.c => stf.c} | 67 +-
4979 .../brcm80211/brcmsmac/{wlc_stf.h => stf.h} | 8 +-
4980 .../brcm80211/brcmsmac/{wlc_cfg.h => types.h} | 284 ++-
4981 .../brcmsmac/{wl_ucode_loader.c => ucode_loader.c} | 78 +-
4982 .../brcmsmac/{wl_ucode.h => ucode_loader.h} | 15 +-
4983 drivers/staging/brcm80211/brcmsmac/wl_dbg.h | 92 -
4984 drivers/staging/brcm80211/brcmsmac/wl_export.h | 47 -
4985 drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h | 135 --
4986 drivers/staging/brcm80211/brcmsmac/wlc_key.h | 140 --
4987 drivers/staging/brcm80211/brcmsmac/wlc_types.h | 37 -
4988 .../staging/brcm80211/{util => brcmutil}/Makefile | 6 +-
4989 .../{util/bcmutils.c => brcmutil/utils.c} | 143 +-
4990 .../brcm80211/{util/bcmwifi.c => brcmutil/wifi.c} | 18 +-
4991 drivers/staging/brcm80211/include/aidmp.h | 374 ----
4992 drivers/staging/brcm80211/include/bcmdefs.h | 150 --
4993 drivers/staging/brcm80211/include/bcmdevs.h | 124 --
4994 drivers/staging/brcm80211/include/bcmnvram.h | 153 --
4995 drivers/staging/brcm80211/include/bcmsdpcm.h | 208 --
4996 drivers/staging/brcm80211/include/bcmsrom_fmt.h | 367 ----
4997 drivers/staging/brcm80211/include/brcm_hw_ids.h | 59 +
4998 .../include/{bcmutils.h => brcmu_utils.h} | 269 +--
4999 .../brcm80211/include/{bcmwifi.h => brcmu_wifi.h} | 89 +-
5000 drivers/staging/brcm80211/include/chipcommon.h | 281 +++
5001 drivers/staging/brcm80211/include/defs.h | 110 +
5002 drivers/staging/brcm80211/include/hndsoc.h | 199 --
5003 drivers/staging/brcm80211/include/nicpci.h | 79 -
5004 drivers/staging/brcm80211/include/pci_core.h | 122 --
5005 drivers/staging/brcm80211/include/pcie_core.h | 299 ---
5006 drivers/staging/brcm80211/include/proto/802.11.h | 200 --
5007 drivers/staging/brcm80211/include/proto/bcmeth.h | 44 -
5008 drivers/staging/brcm80211/include/proto/bcmevent.h | 207 --
5009 drivers/staging/brcm80211/include/sbchipc.h | 1588 --------------
5010 drivers/staging/brcm80211/include/sbconfig.h | 272 ---
5011 drivers/staging/brcm80211/include/sbhnddma.h | 315 ---
5012 drivers/staging/brcm80211/include/sbsdio.h | 152 --
5013 drivers/staging/brcm80211/include/sbsdpcmdev.h | 281 ---
5014 drivers/staging/brcm80211/include/sdio.h | 552 -----
5015 drivers/staging/brcm80211/include/soc.h | 95 +
5016 drivers/staging/brcm80211/include/wlioctl.h | 1365 ------------
5017 drivers/staging/comedi/drivers.c | 4 +
5018 .../staging/comedi/drivers/addi-data/addi_common.c | 2 +-
5019 drivers/staging/comedi/drivers/adl_pci9118.c | 1 +
5020 drivers/staging/comedi/drivers/das1800.c | 1 +
5021 drivers/staging/comedi/drivers/dt282x.c | 1 +
5022 drivers/staging/comedi/drivers/ni_at_a2150.c | 1 +
5023 drivers/staging/comedi/drivers/ni_labpc.c | 1 +
5024 drivers/staging/comedi/drivers/pcl812.c | 1 +
5025 drivers/staging/comedi/drivers/pcl816.c | 1 +
5026 drivers/staging/comedi/drivers/pcl818.c | 1 +
5027 drivers/staging/hv/blkvsc_drv.c | 42 +-
5028 drivers/staging/hv/channel.c | 111 +-
5029 drivers/staging/hv/channel_mgmt.c | 6 -
5030 drivers/staging/hv/connection.c | 50 +-
5031 drivers/staging/hv/hv.c | 4 +-
5032 drivers/staging/hv/hv_mouse.c | 1 -
5033 drivers/staging/hv/hyperv.h | 86 +-
5034 drivers/staging/hv/hyperv_net.h | 14 +-
5035 drivers/staging/hv/hyperv_vmbus.h | 2 -
5036 drivers/staging/hv/netvsc.c | 161 --
5037 drivers/staging/hv/netvsc_drv.c | 42 +-
5038 drivers/staging/hv/ring_buffer.c | 6 +-
5039 drivers/staging/hv/rndis_filter.c | 53 +-
5040 drivers/staging/hv/storvsc_drv.c | 86 +-
5041 drivers/staging/hv/vmbus_drv.c | 135 +-
5042 drivers/staging/usbip/README | 1 +
5043 drivers/staging/usbip/stub.h | 4 +-
5044 drivers/staging/usbip/stub_dev.c | 68 +-
5045 drivers/staging/usbip/stub_main.c | 193 +-
5046 drivers/staging/usbip/stub_rx.c | 6 +-
5047 drivers/staging/usbip/stub_tx.c | 13 +-
5048 drivers/staging/usbip/usbip_common.c | 35 +-
5049 drivers/staging/usbip/usbip_common.h | 238 ++-
5050 drivers/staging/usbip/userspace/configure.ac | 8 +-
5051 .../staging/usbip/userspace/libsrc/stub_driver.c | 17 +-
5052 .../staging/usbip/userspace/libsrc/stub_driver.h | 4 +-
5053 .../staging/usbip/userspace/libsrc/usbip_common.c | 9 +-
5054 .../staging/usbip/userspace/libsrc/usbip_common.h | 20 +-
5055 .../staging/usbip/userspace/libsrc/vhci_driver.c | 78 +-
5056 .../staging/usbip/userspace/libsrc/vhci_driver.h | 21 +-
5057 drivers/staging/usbip/userspace/src/Makefile.am | 11 +-
5058 drivers/staging/usbip/userspace/src/bind-driver.c | 643 ------
5059 drivers/staging/usbip/userspace/src/usbip.c | 813 ++------
5060 drivers/staging/usbip/userspace/src/usbip.h | 39 +
5061 drivers/staging/usbip/userspace/src/usbip_attach.c | 228 ++
5062 drivers/staging/usbip/userspace/src/usbip_bind.c | 264 +++
5063 drivers/staging/usbip/userspace/src/usbip_detach.c | 103 +
5064 drivers/staging/usbip/userspace/src/usbip_list.c | 286 +++
5065 .../staging/usbip/userspace/src/usbip_network.c | 91 +-
5066 .../staging/usbip/userspace/src/usbip_network.h | 57 +-
5067 drivers/staging/usbip/userspace/src/usbip_unbind.c | 95 +
5068 drivers/staging/usbip/userspace/src/usbipd.c | 28 +-
5069 drivers/staging/usbip/userspace/src/utils.c | 66 +-
5070 drivers/staging/usbip/userspace/src/utils.h | 28 +-
5071 drivers/staging/usbip/vhci.h | 11 +-
5072 drivers/staging/usbip/vhci_hcd.c | 17 +-
5073 drivers/staging/usbip/vhci_rx.c | 2 -
5074 drivers/staging/usbip/vhci_sysfs.c | 6 +-
5075 182 files changed, 9039 insertions(+), 16761 deletions(-)
5076 delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmcdc.h
5077 delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhdioctl.h
5078 delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h
5079 delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndrte_cons.h
5080 delete mode 100644 drivers/staging/brcm80211/brcmfmac/msgtrace.h
5081 rename drivers/staging/brcm80211/{include => brcmfmac}/pcicfg.h (98%)
5082 create mode 100644 drivers/staging/brcm80211/brcmfmac/sbsdio.h
5083 rename drivers/staging/brcm80211/{include/bcmsdh.h => brcmfmac/sdio_host.h} (94%)
5084 delete mode 100644 drivers/staging/brcm80211/brcmfmac/sdioh.h
5085 rename drivers/staging/brcm80211/brcmsmac/{wlc_alloc.c => alloc.c} (91%)
5086 rename drivers/staging/brcm80211/brcmsmac/{wlc_alloc.h => alloc.h} (100%)
5087 rename drivers/staging/brcm80211/brcmsmac/{wlc_ampdu.c => ampdu.c} (97%)
5088 rename drivers/staging/brcm80211/brcmsmac/{wlc_ampdu.h => ampdu.h} (94%)
5089 rename drivers/staging/brcm80211/brcmsmac/{wlc_antsel.c => antsel.c} (93%)
5090 rename drivers/staging/brcm80211/brcmsmac/{wlc_antsel.h => antsel.h} (93%)
5091 delete mode 100644 drivers/staging/brcm80211/brcmsmac/bcmsrom.c
5092 rename drivers/staging/brcm80211/brcmsmac/{wlc_bmac.c => bmac.c} (98%)
5093 rename drivers/staging/brcm80211/brcmsmac/{wlc_bmac.h => bmac.h} (93%)
5094 rename drivers/staging/brcm80211/brcmsmac/{wlc_channel.c => channel.c} (99%)
5095 rename drivers/staging/brcm80211/brcmsmac/{wlc_channel.h => channel.h} (95%)
5096 rename drivers/staging/brcm80211/brcmsmac/{hnddma.c => dma.c} (82%)
5097 rename drivers/staging/brcm80211/{include/hnddma.h => brcmsmac/dma.h} (62%)
5098 rename drivers/staging/brcm80211/brcmsmac/{wl_mac80211.c => mac80211_if.c} (72%)
5099 rename drivers/staging/brcm80211/brcmsmac/{wl_mac80211.h => mac80211_if.h} (52%)
5100 rename drivers/staging/brcm80211/brcmsmac/{wlc_main.c => main.c} (78%)
5101 rename drivers/staging/brcm80211/brcmsmac/{wlc_main.h => main.h} (83%)
5102 create mode 100644 drivers/staging/brcm80211/brcmsmac/nicpci.h
5103 delete mode 100644 drivers/staging/brcm80211/brcmsmac/nvram.c
5104 rename drivers/staging/brcm80211/brcmsmac/{bcmotp.c => otp.c} (54%)
5105 rename drivers/staging/brcm80211/{include/bcmotp.h => brcmsmac/otp.h} (87%)
5106 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_cmn.c => phy_cmn.c} (97%)
5107 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_hal.h => phy_hal.h} (83%)
5108 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_int.h => phy_int.h} (97%)
5109 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_lcn.c => phy_lcn.c} (99%)
5110 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_lcn.h => phy_lcn.h} (97%)
5111 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_n.c => phy_n.c} (99%)
5112 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_qmath.c => phy_qmath.c} (99%)
5113 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_qmath.h => phy_qmath.h} (93%)
5114 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_radio.h => phy_radio.h} (99%)
5115 delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/phy_version.h
5116 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phyreg_n.h => phyreg_n.h} (100%)
5117 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_lcn.c => phytbl_lcn.c} (99%)
5118 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_lcn.h => phytbl_lcn.h} (100%)
5119 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_n.c => phytbl_n.c} (99%)
5120 rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_n.h => phytbl_n.h} (100%)
5121 rename drivers/staging/brcm80211/brcmsmac/{wlc_phy_shim.c => phy_shim.c} (84%)
5122 rename drivers/staging/brcm80211/brcmsmac/{wlc_phy_shim.h => phy_shim.h} (67%)
5123 rename drivers/staging/brcm80211/brcmsmac/{wlc_pmu.c => pmu.c} (73%)
5124 rename drivers/staging/brcm80211/brcmsmac/{wlc_pmu.h => pmu.h} (51%)
5125 rename drivers/staging/brcm80211/brcmsmac/{wlc_pub.h => pub.h} (83%)
5126 rename drivers/staging/brcm80211/brcmsmac/{wlc_rate.c => rate.c} (98%)
5127 rename drivers/staging/brcm80211/brcmsmac/{wlc_rate.h => rate.h} (100%)
5128 rename drivers/staging/brcm80211/brcmsmac/{wlc_scb.h => scb.h} (95%)
5129 rename drivers/staging/brcm80211/brcmsmac/{bcmsrom_tbl.h => srom.c} (52%)
5130 rename drivers/staging/brcm80211/{include/bcmsrom.h => brcmsmac/srom.h} (83%)
5131 rename drivers/staging/brcm80211/brcmsmac/{wlc_stf.c => stf.c} (93%)
5132 rename drivers/staging/brcm80211/brcmsmac/{wlc_stf.h => stf.h} (92%)
5133 rename drivers/staging/brcm80211/brcmsmac/{wlc_cfg.h => types.h} (56%)
5134 rename drivers/staging/brcm80211/brcmsmac/{wl_ucode_loader.c => ucode_loader.c} (50%)
5135 rename drivers/staging/brcm80211/brcmsmac/{wl_ucode.h => ucode_loader.h} (78%)
5136 delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_dbg.h
5137 delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_export.h
5138 delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
5139 delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_key.h
5140 delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_types.h
5141 rename drivers/staging/brcm80211/{util => brcmutil}/Makefile (94%)
5142 rename drivers/staging/brcm80211/{util/bcmutils.c => brcmutil/utils.c} (82%)
5143 rename drivers/staging/brcm80211/{util/bcmwifi.c => brcmutil/wifi.c} (92%)
5144 delete mode 100644 drivers/staging/brcm80211/include/aidmp.h
5145 delete mode 100644 drivers/staging/brcm80211/include/bcmdefs.h
5146 delete mode 100644 drivers/staging/brcm80211/include/bcmdevs.h
5147 delete mode 100644 drivers/staging/brcm80211/include/bcmnvram.h
5148 delete mode 100644 drivers/staging/brcm80211/include/bcmsdpcm.h
5149 delete mode 100644 drivers/staging/brcm80211/include/bcmsrom_fmt.h
5150 create mode 100644 drivers/staging/brcm80211/include/brcm_hw_ids.h
5151 rename drivers/staging/brcm80211/include/{bcmutils.h => brcmu_utils.h} (60%)
5152 rename drivers/staging/brcm80211/include/{bcmwifi.h => brcmu_wifi.h} (75%)
5153 create mode 100644 drivers/staging/brcm80211/include/chipcommon.h
5154 create mode 100644 drivers/staging/brcm80211/include/defs.h
5155 delete mode 100644 drivers/staging/brcm80211/include/hndsoc.h
5156 delete mode 100644 drivers/staging/brcm80211/include/nicpci.h
5157 delete mode 100644 drivers/staging/brcm80211/include/pci_core.h
5158 delete mode 100644 drivers/staging/brcm80211/include/pcie_core.h
5159 delete mode 100644 drivers/staging/brcm80211/include/proto/802.11.h
5160 delete mode 100644 drivers/staging/brcm80211/include/proto/bcmeth.h
5161 delete mode 100644 drivers/staging/brcm80211/include/proto/bcmevent.h
5162 delete mode 100644 drivers/staging/brcm80211/include/sbchipc.h
5163 delete mode 100644 drivers/staging/brcm80211/include/sbconfig.h
5164 delete mode 100644 drivers/staging/brcm80211/include/sbhnddma.h
5165 delete mode 100644 drivers/staging/brcm80211/include/sbsdio.h
5166 delete mode 100644 drivers/staging/brcm80211/include/sbsdpcmdev.h
5167 delete mode 100644 drivers/staging/brcm80211/include/sdio.h
5168 create mode 100644 drivers/staging/brcm80211/include/soc.h
5169 delete mode 100644 drivers/staging/brcm80211/include/wlioctl.h
5170 delete mode 100644 drivers/staging/usbip/userspace/src/bind-driver.c
5171 create mode 100644 drivers/staging/usbip/userspace/src/usbip.h
5172 create mode 100644 drivers/staging/usbip/userspace/src/usbip_attach.c
5173 create mode 100644 drivers/staging/usbip/userspace/src/usbip_bind.c
5174 create mode 100644 drivers/staging/usbip/userspace/src/usbip_detach.c
5175 create mode 100644 drivers/staging/usbip/userspace/src/usbip_list.c
5176 create mode 100644 drivers/staging/usbip/userspace/src/usbip_unbind.c
5177 Merging bkl-config/config
5178 $ git merge bkl-config/config
5180 Merging tmem/linux-next
5181 $ git merge tmem/linux-next
5182 Recorded preimage for 'drivers/xen/Kconfig'
5183 Recorded preimage for 'drivers/xen/tmem.c'
5184 Auto-merging drivers/xen/Kconfig
5185 CONFLICT (content): Merge conflict in drivers/xen/Kconfig
5186 Auto-merging drivers/xen/tmem.c
5187 CONFLICT (content): Merge conflict in drivers/xen/tmem.c
5188 Auto-merging include/linux/swap.h
5189 Auto-merging mm/Kconfig
5190 Automatic merge failed; fix conflicts and then commit the result.
5192 Recorded resolution for 'drivers/xen/Kconfig'.
5193 Recorded resolution for 'drivers/xen/tmem.c'.
5194 [master bc04adf] Merge remote-tracking branch 'tmem/linux-next'
5195 $ git diff -M --stat --summary HEAD^..
5196 .../ABI/testing/sysfs-kernel-mm-frontswap | 16 +
5197 Documentation/vm/frontswap.txt | 210 ++++++++++++
5198 include/linux/frontswap.h | 92 ++++++
5199 include/linux/swap.h | 2 +
5200 include/linux/swapfile.h | 13 +
5203 mm/frontswap.c | 335 ++++++++++++++++++++
5205 mm/swapfile.c | 65 +++-
5206 10 files changed, 751 insertions(+), 12 deletions(-)
5207 create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
5208 create mode 100644 Documentation/vm/frontswap.txt
5209 create mode 100644 include/linux/frontswap.h
5210 create mode 100644 include/linux/swapfile.h
5211 create mode 100644 mm/frontswap.c
5212 Merging writeback/next
5213 $ git merge writeback/next
5214 Auto-merging fs/ext4/inode.c
5215 Auto-merging fs/nfs/write.c
5216 Auto-merging include/trace/events/ext4.h
5217 Auto-merging mm/filemap.c
5218 Auto-merging mm/rmap.c
5219 Merge made by recursive.
5220 fs/block_dev.c | 16 ++-
5221 fs/ext4/inode.c | 4 +-
5222 fs/fs-writeback.c | 219 ++++++++++++++++++++------------------
5224 fs/nfs/write.c | 3 +-
5225 fs/xfs/linux-2.6/xfs_aops.c | 2 +-
5226 include/linux/backing-dev.h | 2 +
5227 include/linux/writeback.h | 10 +--
5228 include/trace/events/btrfs.h | 6 +-
5229 include/trace/events/ext4.h | 6 +-
5230 include/trace/events/writeback.h | 100 +++++++++++++++++-
5231 mm/backing-dev.c | 21 +++-
5233 mm/page-writeback.c | 25 +++--
5235 15 files changed, 270 insertions(+), 159 deletions(-)
5236 Merging arm-dt/devicetree/arm-next
5237 $ git merge arm-dt/devicetree/arm-next
5239 Merging scsi-post-merge/merge-base:master
5241 Wed Jun 22 14:52:54 EST 2011