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