2 Thu Dec 1 11:04:15 EST 2011
5 $ git reset --hard stable
6 HEAD is now at 883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
7 Merging origin/master (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
8 $ git merge origin/master
10 Merging fixes/master (aaa0b4f iio: iio_event_getfd -- fix ev_int build failure)
11 $ git merge fixes/master
13 Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.)
14 $ git merge kbuild-current/rc-fixes
16 Merging arm-current/fixes (fe41db7 ARM: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculation)
17 $ git merge arm-current/fixes
18 Merge made by the 'recursive' strategy.
19 arch/arm/Kconfig | 20 ++++++--
20 arch/arm/common/gic.c | 16 ++++--
21 arch/arm/common/pl330.c | 12 +++-
22 arch/arm/include/asm/pmu.h | 10 ----
23 arch/arm/kernel/entry-armv.S | 2 +-
24 arch/arm/kernel/kprobes-test-thumb.c | 16 +++---
25 arch/arm/kernel/kprobes-test.h | 100 ++++++++++++++++++++++++----------
26 arch/arm/kernel/perf_event.c | 11 ++++-
27 arch/arm/kernel/pmu.c | 1 +
28 arch/arm/kernel/process.c | 3 +
29 arch/arm/lib/bitops.h | 26 ++++++++--
30 arch/arm/lib/changebit.S | 4 +-
31 arch/arm/lib/clearbit.S | 4 +-
32 arch/arm/lib/setbit.S | 4 +-
33 arch/arm/lib/testchangebit.S | 4 +-
34 arch/arm/lib/testclearbit.S | 4 +-
35 arch/arm/lib/testsetbit.S | 4 +-
36 arch/arm/mm/cache-l2x0.c | 2 +-
37 arch/arm/mm/dma-mapping.c | 11 ++++-
38 arch/arm/mm/mmap.c | 23 ++------
39 drivers/i2c/busses/i2c-nuc900.c | 2 +-
40 drivers/spi/spi-nuc900.c | 2 +-
41 sound/soc/nuc900/nuc900-ac97.c | 3 +-
42 23 files changed, 177 insertions(+), 107 deletions(-)
43 Merging m68k-current/for-linus (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
44 $ git merge m68k-current/for-linus
46 Merging powerpc-merge/merge (49e4406 powerpc/44x: Add mtd ndfc to the ppx44x defconfig)
47 $ git merge powerpc-merge/merge
49 Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
50 $ git merge 52xx-and-virtex-current/powerpc/merge
52 Merging sparc/master (0b64120 sparc64: Patch sun4v code sequences properly on module load.)
53 $ git merge sparc/master
55 Merging scsi-rc-fixes/master (e5a44df [SCSI] hpsa: Disable ASPM)
56 $ git merge scsi-rc-fixes/master
58 Merging net/master (218fa90 ipv4: fix lockdep splat in rt_cache_seq_show)
59 $ git merge net/master
60 Merge made by the 'recursive' strategy.
61 drivers/isdn/divert/divert_procfs.c | 6 +
62 drivers/isdn/i4l/isdn_net.c | 3 +
63 drivers/net/arcnet/Kconfig | 2 +-
64 drivers/net/can/sja1000/peak_pci.c | 1 -
65 drivers/net/ethernet/broadcom/b44.c | 2 +-
66 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 39 +++++++-
67 drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 1 +
68 drivers/net/ethernet/davicom/dm9000.c | 2 +-
69 drivers/net/ethernet/freescale/Kconfig | 1 +
70 drivers/net/ethernet/ibm/ehea/ehea.h | 4 +-
71 drivers/net/ethernet/ibm/ehea/ehea_main.c | 6 +-
72 drivers/net/ethernet/ibm/iseries_veth.c | 2 +-
73 drivers/net/ethernet/jme.c | 113 ++++++++++++++++++++-
74 drivers/net/ethernet/jme.h | 19 ++++
75 drivers/net/ethernet/qlogic/qlge/qlge.h | 8 +-
76 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 ++-
77 drivers/net/phy/Kconfig | 2 +-
78 drivers/net/wireless/p54/p54spi.c | 5 +-
79 drivers/net/wireless/prism54/isl_ioctl.c | 2 +-
80 drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
81 drivers/net/wireless/rtlwifi/ps.c | 17 ++--
82 drivers/net/xen-netback/netback.c | 2 +-
83 include/linux/netdevice.h | 2 +
84 include/linux/pkt_sched.h | 6 +-
85 include/net/dst.h | 7 +-
86 include/net/dst_ops.h | 2 +-
87 include/net/inet_sock.h | 2 +
88 include/net/inetpeer.h | 1 +
89 include/net/netfilter/nf_conntrack_ecache.h | 19 ++--
90 include/net/netns/conntrack.h | 2 +
91 include/net/route.h | 4 +-
92 net/caif/cffrml.c | 11 +-
94 net/core/dev_addr_lists.c | 3 +-
95 net/core/neighbour.c | 5 +-
96 net/core/skbuff.c | 2 +-
98 net/decnet/dn_route.c | 10 +-
99 net/decnet/dn_timer.c | 17 +--
100 net/ipv4/igmp.c | 3 +-
101 net/ipv4/inet_diag.c | 14 ++-
102 net/ipv4/ip_forward.c | 2 +-
103 net/ipv4/ip_options.c | 5 +-
104 net/ipv4/netfilter.c | 3 +-
105 net/ipv4/netfilter/Kconfig | 1 -
106 net/ipv4/route.c | 41 ++++++--
107 net/ipv6/inet6_connection_sock.c | 2 +-
108 net/ipv6/ipv6_sockglue.c | 2 +-
109 net/ipv6/ndisc.c | 2 +-
110 net/ipv6/netfilter/Kconfig | 1 -
111 net/ipv6/route.c | 21 +++--
112 net/ipv6/tcp_ipv6.c | 13 ++-
113 net/l2tp/l2tp_core.c | 2 +-
114 net/mac80211/agg-tx.c | 42 +++++++-
115 net/mac80211/debugfs_sta.c | 4 +-
116 net/mac80211/status.c | 8 +-
117 net/netfilter/Kconfig | 1 -
118 net/netfilter/ipset/ip_set_hash_ipport.c | 2 +-
119 net/netfilter/ipset/ip_set_hash_ipportip.c | 2 +-
120 net/netfilter/ipset/ip_set_hash_ipportnet.c | 2 +-
121 net/netfilter/nf_conntrack_ecache.c | 37 ++++----
122 net/netfilter/nf_conntrack_netlink.c | 73 ++++++++++----
123 net/netlabel/netlabel_kapi.c | 26 +++--
124 net/sched/sch_teql.c | 31 ++++--
125 net/sctp/auth.c | 2 +-
126 net/unix/af_unix.c | 4 +
127 net/wireless/nl80211.c | 4 +-
128 net/wireless/reg.c | 4 +
129 net/xfrm/xfrm_policy.c | 10 +-
130 69 files changed, 513 insertions(+), 204 deletions(-)
131 Merging sound-current/for-linus (ae7cc70 ALSA: usb-audio - Support for Roland GAIA SH-01 Synthesizer)
132 $ git merge sound-current/for-linus
133 Merge made by the 'recursive' strategy.
134 sound/usb/quirks-table.h | 31 +++++++++++++++++++++++++++++++
135 1 files changed, 31 insertions(+), 0 deletions(-)
136 Merging pci-current/for-linus (4cac2eb PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs)
137 $ git merge pci-current/for-linus
139 Merging wireless/master (c72e8d3 mac80211: fill rate filter for internal scan requests)
140 $ git merge wireless/master
141 Auto-merging net/wireless/reg.c
142 Merge made by the 'recursive' strategy.
143 net/mac80211/main.c | 6 ++++++
144 net/wireless/reg.c | 49 +++++++++++++++++++++++++++++++------------------
145 2 files changed, 37 insertions(+), 18 deletions(-)
146 Merging driver-core.current/driver-core-linus (caca6a0 Linux 3.2-rc3)
147 $ git merge driver-core.current/driver-core-linus
149 Merging tty.current/tty-linus (caca6a0 Linux 3.2-rc3)
150 $ git merge tty.current/tty-linus
152 Merging usb.current/usb-linus (6414e94 usb: gadget: fsl_udc: fix dequeuing a request in progress)
153 $ git merge usb.current/usb-linus
154 Merge made by the 'recursive' strategy.
155 Documentation/usb/linux-cdc-acm.inf | 4 +-
156 drivers/usb/gadget/amd5536udc.c | 2 +-
157 drivers/usb/gadget/f_serial.c | 4 +-
158 drivers/usb/gadget/fsl_mxc_udc.c | 3 +-
159 drivers/usb/gadget/fsl_qe_udc.c | 3 +-
160 drivers/usb/gadget/fsl_udc_core.c | 75 +++++++++++++++-----------------
161 drivers/usb/gadget/fsl_usb2_udc.h | 10 ++++
162 drivers/usb/gadget/m66592-udc.c | 2 +-
163 drivers/usb/gadget/net2280.c | 2 +-
164 drivers/usb/gadget/r8a66597-udc.c | 2 +-
165 drivers/usb/gadget/s3c-hsotg.c | 4 +-
166 drivers/usb/gadget/s3c-hsudc.c | 3 +-
167 drivers/usb/host/ehci-sched.c | 9 ++--
168 drivers/usb/host/whci/qset.c | 2 +-
169 drivers/usb/host/xhci-pci.c | 7 +++-
170 drivers/usb/musb/musb_core.c | 6 ---
171 drivers/usb/musb/musb_gadget.c | 2 +-
172 drivers/usb/renesas_usbhs/mod_gadget.c | 47 ++++++++-----------
173 drivers/usb/serial/option.c | 4 ++
174 drivers/usb/storage/unusual_devs.h | 7 +++
175 20 files changed, 101 insertions(+), 97 deletions(-)
176 Merging staging.current/staging-linus (dfd8ee9 Staging: comedi: fix integer overflow in do_insnlist_ioctl())
177 $ git merge staging.current/staging-linus
178 Merge made by the 'recursive' strategy.
179 drivers/staging/comedi/comedi_fops.c | 96 +++++++++++++++++++------
180 drivers/staging/comedi/drivers/usbduxsigma.c | 7 +-
181 drivers/staging/rts_pstor/rtsx.c | 1 +
182 drivers/staging/usbip/vhci_rx.c | 10 ++-
183 4 files changed, 84 insertions(+), 30 deletions(-)
184 Merging char-misc.current/char-misc-linus (caca6a0 Linux 3.2-rc3)
185 $ git merge char-misc.current/char-misc-linus
187 Merging cpufreq-current/fixes (eb0b38a [CPUFREQ] db8500: fix build error due to undeclared i variable)
188 $ git merge cpufreq-current/fixes
190 Merging input-current/for-linus (77f6ca5 Input: ams_delta_serio - include linux/module.h)
191 $ git merge input-current/for-linus
193 Merging md-current/for-linus (257a4b4 md/raid5: STRIPE_ACTIVE has lock semantics, add barriers)
194 $ git merge md-current/for-linus
196 Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
197 $ git merge audit-current/for-linus
199 Merging crypto-current/master (2742528 crypto: mv_cesa - fix hashing of chunks > 1920 bytes)
200 $ git merge crypto-current/master
202 Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
203 $ git merge ide/master
205 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
206 $ git merge dwmw2/master
208 Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c)
209 $ git merge sh-current/sh-fixes-for-linus
211 Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
212 $ git merge rmobile-current/rmobile-fixes-for-linus
214 Merging devicetree-current/devicetree/merge (50e07f8 dt: add empty of_machine_is_compatible)
215 $ git merge devicetree-current/devicetree/merge
217 Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
218 $ git merge spi-current/spi/merge
220 Merging arm/for-next (7c4fba6 Merge branch 'devel' into for-next)
221 $ git merge arm/for-next
222 Removing arch/arm/plat-tcc/include/mach/vmalloc.h
223 Removing arch/arm/plat-spear/include/plat/vmalloc.h
224 Removing arch/arm/plat-omap/io.c
225 Removing arch/arm/plat-mxc/include/mach/vmalloc.h
226 Removing arch/arm/plat-mxc/gic.c
227 Removing arch/arm/plat-iop/io.c
228 Removing arch/arm/mach-zynq/include/mach/vmalloc.h
229 Removing arch/arm/mach-w90x900/include/mach/vmalloc.h
230 Removing arch/arm/mach-vt8500/include/mach/vmalloc.h
231 Removing arch/arm/mach-vexpress/include/mach/vmalloc.h
232 Removing arch/arm/mach-versatile/include/mach/vmalloc.h
233 Removing arch/arm/mach-ux500/include/mach/vmalloc.h
234 Removing arch/arm/mach-u300/include/mach/vmalloc.h
235 Removing arch/arm/mach-tegra/include/mach/vmalloc.h
236 Removing arch/arm/mach-spear6xx/include/mach/vmalloc.h
237 Removing arch/arm/mach-spear3xx/include/mach/vmalloc.h
238 Removing arch/arm/mach-shmobile/include/mach/vmalloc.h
239 Removing arch/arm/mach-shmobile/entry-gic.S
240 Removing arch/arm/mach-shark/include/mach/vmalloc.h
241 Removing arch/arm/mach-sa1100/include/mach/vmalloc.h
242 Removing arch/arm/mach-s5pv210/include/mach/vmalloc.h
243 Removing arch/arm/mach-s5pc100/include/mach/vmalloc.h
244 Removing arch/arm/mach-s5p64x0/include/mach/vmalloc.h
245 Removing arch/arm/mach-s3c64xx/include/mach/vmalloc.h
246 Removing arch/arm/mach-s3c2410/include/mach/vmalloc.h
247 Removing arch/arm/mach-rpc/include/mach/vmalloc.h
248 Removing arch/arm/mach-realview/include/mach/vmalloc.h
249 Removing arch/arm/mach-pxa/include/mach/vmalloc.h
250 Removing arch/arm/mach-prima2/include/mach/vmalloc.h
251 Removing arch/arm/mach-pnx4008/include/mach/vmalloc.h
252 Removing arch/arm/mach-picoxcell/include/mach/vmalloc.h
253 Removing arch/arm/mach-orion5x/include/mach/vmalloc.h
254 Removing arch/arm/mach-omap2/include/mach/vmalloc.h
255 Removing arch/arm/mach-omap2/include/mach/omap4-common.h
256 Removing arch/arm/mach-omap1/include/mach/vmalloc.h
257 Removing arch/arm/mach-nomadik/include/mach/vmalloc.h
258 Removing arch/arm/mach-netx/include/mach/vmalloc.h
259 Removing arch/arm/mach-mxs/include/mach/vmalloc.h
260 Removing arch/arm/mach-mv78xx0/include/mach/vmalloc.h
261 Removing arch/arm/mach-msm/include/mach/vmalloc.h
262 Removing arch/arm/mach-msm/include/mach/entry-macro-vic.S
263 Removing arch/arm/mach-msm/include/mach/entry-macro-qgic.S
264 Removing arch/arm/mach-mmp/include/mach/vmalloc.h
265 Removing arch/arm/mach-lpc32xx/include/mach/vmalloc.h
266 Removing arch/arm/mach-ks8695/include/mach/vmalloc.h
267 Removing arch/arm/mach-kirkwood/include/mach/vmalloc.h
268 Removing arch/arm/mach-ixp4xx/include/mach/vmalloc.h
269 Removing arch/arm/mach-ixp23xx/include/mach/vmalloc.h
270 Removing arch/arm/mach-ixp2000/include/mach/vmalloc.h
271 Removing arch/arm/mach-iop33x/include/mach/vmalloc.h
272 Removing arch/arm/mach-iop32x/include/mach/vmalloc.h
273 Removing arch/arm/mach-iop13xx/include/mach/vmalloc.h
274 Removing arch/arm/mach-integrator/include/mach/vmalloc.h
275 Removing arch/arm/mach-highbank/include/mach/vmalloc.h
276 Removing arch/arm/mach-h720x/include/mach/vmalloc.h
277 Removing arch/arm/mach-gemini/include/mach/vmalloc.h
278 Removing arch/arm/mach-footbridge/include/mach/vmalloc.h
279 Removing arch/arm/mach-exynos/include/mach/vmalloc.h
280 Removing arch/arm/mach-ep93xx/include/mach/vmalloc.h
281 Removing arch/arm/mach-ebsa110/include/mach/vmalloc.h
282 Removing arch/arm/mach-dove/include/mach/vmalloc.h
283 Removing arch/arm/mach-davinci/io.c
284 Removing arch/arm/mach-davinci/include/mach/vmalloc.h
285 Removing arch/arm/mach-cns3xxx/include/mach/vmalloc.h
286 Removing arch/arm/mach-clps711x/time.c
287 Removing arch/arm/mach-clps711x/mm.c
288 Removing arch/arm/mach-clps711x/include/mach/vmalloc.h
289 Auto-merging arch/arm/mach-clps711x/common.c
290 Removing arch/arm/mach-bcmring/include/mach/vmalloc.h
291 Removing arch/arm/mach-at91/include/mach/vmalloc.h
292 Removing arch/arm/include/asm/hardware/entry-macro-gic.S
293 Removing arch/arm/include/asm/entry-macro-vic2.S
294 Merge made by the 'recursive' strategy.
295 Documentation/arm/memory.txt | 11 +-
296 Documentation/devicetree/bindings/arm/gic.txt | 4 +
297 Documentation/devicetree/bindings/arm/vic.txt | 29 +
298 arch/arm/common/Kconfig | 6 +
299 arch/arm/common/gic.c | 165 +++++-
300 arch/arm/common/vic.c | 143 ++++-
301 arch/arm/include/asm/entry-macro-vic2.S | 57 --
302 arch/arm/include/asm/hardirq.h | 17 -
303 arch/arm/include/asm/hardware/entry-macro-gic.S | 60 --
304 arch/arm/include/asm/hardware/gic.h | 26 +-
305 arch/arm/include/asm/hardware/iop3xx.h | 1 +
306 arch/arm/include/asm/hardware/vic.h | 10 +-
307 arch/arm/include/asm/mach/arch.h | 9 +-
308 arch/arm/include/asm/pgalloc.h | 2 +-
309 arch/arm/include/asm/pgtable.h | 36 +-
310 arch/arm/include/asm/system.h | 2 +-
311 arch/arm/include/asm/tlb.h | 1 +
312 arch/arm/kernel/entry-armv.S | 7 +-
313 arch/arm/kernel/machine_kexec.c | 4 +-
314 arch/arm/kernel/process.c | 31 +-
315 arch/arm/kernel/setup.c | 15 +-
316 arch/arm/mach-at91/at91cap9.c | 4 +-
317 arch/arm/mach-at91/at91rm9200.c | 4 +-
318 arch/arm/mach-at91/at91sam9260.c | 2 +-
319 arch/arm/mach-at91/at91sam9261.c | 2 +-
320 arch/arm/mach-at91/at91sam9263.c | 2 +-
321 arch/arm/mach-at91/at91sam9_alt_reset.S | 9 +-
322 arch/arm/mach-at91/at91sam9g45.c | 4 +-
323 arch/arm/mach-at91/at91sam9rl.c | 2 +-
324 arch/arm/mach-at91/generic.h | 3 +-
325 arch/arm/mach-at91/include/mach/io.h | 8 -
326 arch/arm/mach-at91/include/mach/system.h | 9 -
327 arch/arm/mach-at91/include/mach/vmalloc.h | 28 -
328 arch/arm/mach-at91/setup.c | 18 -
329 arch/arm/mach-bcmring/arch.c | 25 +-
330 arch/arm/mach-bcmring/dma.c | 2 +-
331 arch/arm/mach-bcmring/include/mach/system.h | 26 -
332 arch/arm/mach-bcmring/include/mach/vmalloc.h | 25 -
333 arch/arm/mach-clps711x/Makefile | 2 +-
334 arch/arm/mach-clps711x/autcpu12.c | 1 +
335 arch/arm/mach-clps711x/cdb89712.c | 1 +
336 arch/arm/mach-clps711x/ceiva.c | 1 +
337 arch/arm/mach-clps711x/clep7312.c | 1 +
338 arch/arm/mach-clps711x/{irq.c => common.c} | 100 +++-
339 arch/arm/mach-clps711x/edb7211-arch.c | 1 +
340 arch/arm/mach-clps711x/fortunet.c | 1 +
341 arch/arm/mach-clps711x/include/mach/system.h | 5 -
342 arch/arm/mach-clps711x/include/mach/vmalloc.h | 20 -
343 arch/arm/mach-clps711x/mm.c | 48 --
344 arch/arm/mach-clps711x/p720t.c | 1 +
345 arch/arm/mach-clps711x/time.c | 84 ---
346 arch/arm/mach-cns3xxx/cns3420vb.c | 3 +
347 arch/arm/mach-cns3xxx/core.h | 1 +
348 arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 2 -
349 arch/arm/mach-cns3xxx/include/mach/system.h | 3 -
350 arch/arm/mach-cns3xxx/include/mach/vmalloc.h | 11 -
351 arch/arm/mach-cns3xxx/pm.c | 4 +-
352 arch/arm/mach-davinci/Makefile | 2 +-
353 arch/arm/mach-davinci/include/mach/io.h | 8 -
354 arch/arm/mach-davinci/include/mach/vmalloc.h | 14 -
355 arch/arm/mach-davinci/io.c | 48 --
356 arch/arm/mach-dove/cm-a510.c | 1 +
357 arch/arm/mach-dove/common.c | 16 +
358 arch/arm/mach-dove/common.h | 1 +
359 arch/arm/mach-dove/dove-db-setup.c | 1 +
360 arch/arm/mach-dove/include/mach/dove.h | 2 -
361 arch/arm/mach-dove/include/mach/system.h | 19 -
362 arch/arm/mach-dove/include/mach/vmalloc.h | 5 -
363 arch/arm/mach-ebsa110/core.c | 8 +-
364 arch/arm/mach-ebsa110/include/mach/system.h | 2 -
365 arch/arm/mach-ebsa110/include/mach/vmalloc.h | 10 -
366 arch/arm/mach-ep93xx/adssphere.c | 3 +
367 arch/arm/mach-ep93xx/core.c | 12 +
368 arch/arm/mach-ep93xx/edb93xx.c | 17 +
369 arch/arm/mach-ep93xx/gesbc9312.c | 3 +
370 arch/arm/mach-ep93xx/include/mach/entry-macro.S | 42 --
371 arch/arm/mach-ep93xx/include/mach/platform.h | 2 +
372 arch/arm/mach-ep93xx/include/mach/system.h | 17 -
373 arch/arm/mach-ep93xx/include/mach/vmalloc.h | 5 -
374 arch/arm/mach-ep93xx/micro9.c | 9 +
375 arch/arm/mach-ep93xx/simone.c | 3 +
376 arch/arm/mach-ep93xx/snappercl15.c | 3 +
377 arch/arm/mach-ep93xx/ts72xx.c | 3 +
378 arch/arm/mach-ep93xx/vision_ep9307.c | 1 +
379 arch/arm/mach-exynos/cpu.c | 20 +-
380 arch/arm/mach-exynos/include/mach/entry-macro.S | 75 ---
381 arch/arm/mach-exynos/include/mach/vmalloc.h | 22 -
382 arch/arm/mach-exynos/mach-armlex4210.c | 2 +
383 arch/arm/mach-exynos/mach-nuri.c | 2 +
384 arch/arm/mach-exynos/mach-origen.c | 2 +
385 arch/arm/mach-exynos/mach-smdk4x12.c | 3 +
386 arch/arm/mach-exynos/mach-smdkv310.c | 3 +
387 arch/arm/mach-exynos/mach-universal_c210.c | 4 +-
388 arch/arm/mach-exynos/platsmp.c | 28 +-
389 arch/arm/mach-footbridge/cats-hw.c | 3 +-
390 arch/arm/mach-footbridge/common.c | 27 +
391 arch/arm/mach-footbridge/common.h | 1 +
392 arch/arm/mach-footbridge/ebsa285.c | 1 +
393 arch/arm/mach-footbridge/include/mach/system.h | 56 --
394 arch/arm/mach-footbridge/include/mach/vmalloc.h | 10 -
395 arch/arm/mach-footbridge/netwinder-hw.c | 27 +
396 arch/arm/mach-footbridge/personal.c | 1 +
397 arch/arm/mach-gemini/include/mach/vmalloc.h | 10 -
398 arch/arm/mach-h720x/common.c | 5 +
399 arch/arm/mach-h720x/common.h | 1 +
400 arch/arm/mach-h720x/h7201-eval.c | 1 +
401 arch/arm/mach-h720x/h7202-eval.c | 1 +
402 arch/arm/mach-h720x/include/mach/system.h | 6 -
403 arch/arm/mach-h720x/include/mach/vmalloc.h | 10 -
404 arch/arm/mach-highbank/core.h | 1 +
405 arch/arm/mach-highbank/highbank.c | 2 +
406 arch/arm/mach-highbank/include/mach/entry-macro.S | 2 -
407 arch/arm/mach-highbank/include/mach/system.h | 2 -
408 arch/arm/mach-highbank/include/mach/vmalloc.h | 1 -
409 arch/arm/mach-highbank/system.c | 2 +-
410 arch/arm/mach-imx/mach-apf9328.c | 1 +
411 arch/arm/mach-imx/mach-armadillo5x0.c | 1 +
412 arch/arm/mach-imx/mach-bug.c | 1 +
413 arch/arm/mach-imx/mach-cpuimx27.c | 1 +
414 arch/arm/mach-imx/mach-cpuimx35.c | 1 +
415 arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 +
416 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 +
417 arch/arm/mach-imx/mach-imx27ipcam.c | 1 +
418 arch/arm/mach-imx/mach-imx27lite.c | 1 +
419 arch/arm/mach-imx/mach-imx6q.c | 1 +
420 arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 +
421 arch/arm/mach-imx/mach-mx1ads.c | 2 +
422 arch/arm/mach-imx/mach-mx21ads.c | 1 +
423 arch/arm/mach-imx/mach-mx25_3ds.c | 1 +
424 arch/arm/mach-imx/mach-mx27_3ds.c | 1 +
425 arch/arm/mach-imx/mach-mx27ads.c | 1 +
426 arch/arm/mach-imx/mach-mx31_3ds.c | 1 +
427 arch/arm/mach-imx/mach-mx31ads.c | 1 +
428 arch/arm/mach-imx/mach-mx31lilly.c | 1 +
429 arch/arm/mach-imx/mach-mx31lite.c | 1 +
430 arch/arm/mach-imx/mach-mx31moboard.c | 1 +
431 arch/arm/mach-imx/mach-mx35_3ds.c | 1 +
432 arch/arm/mach-imx/mach-mxt_td60.c | 1 +
433 arch/arm/mach-imx/mach-pca100.c | 1 +
434 arch/arm/mach-imx/mach-pcm037.c | 1 +
435 arch/arm/mach-imx/mach-pcm038.c | 1 +
436 arch/arm/mach-imx/mach-pcm043.c | 1 +
437 arch/arm/mach-imx/mach-qong.c | 1 +
438 arch/arm/mach-imx/mach-scb9328.c | 1 +
439 arch/arm/mach-imx/mach-vpr200.c | 1 +
440 arch/arm/mach-integrator/common.h | 1 +
441 arch/arm/mach-integrator/core.c | 8 +
442 arch/arm/mach-integrator/include/mach/system.h | 11 -
443 arch/arm/mach-integrator/include/mach/vmalloc.h | 20 -
444 arch/arm/mach-integrator/integrator_ap.c | 1 +
445 arch/arm/mach-integrator/integrator_cp.c | 1 +
446 arch/arm/mach-iop13xx/include/mach/iop13xx.h | 1 +
447 arch/arm/mach-iop13xx/include/mach/system.h | 14 -
448 arch/arm/mach-iop13xx/include/mach/vmalloc.h | 4 -
449 arch/arm/mach-iop13xx/iq81340mc.c | 1 +
450 arch/arm/mach-iop13xx/iq81340sc.c | 1 +
451 arch/arm/mach-iop13xx/setup.c | 11 +
452 arch/arm/mach-iop32x/em7210.c | 1 +
453 arch/arm/mach-iop32x/glantank.c | 1 +
454 arch/arm/mach-iop32x/include/mach/io.h | 7 -
455 arch/arm/mach-iop32x/include/mach/system.h | 21 -
456 arch/arm/mach-iop32x/include/mach/vmalloc.h | 5 -
457 arch/arm/mach-iop32x/iq31244.c | 2 +
458 arch/arm/mach-iop32x/iq80321.c | 1 +
459 arch/arm/mach-iop32x/n2100.c | 9 +
460 arch/arm/mach-iop33x/include/mach/io.h | 7 -
461 arch/arm/mach-iop33x/include/mach/system.h | 10 -
462 arch/arm/mach-iop33x/include/mach/vmalloc.h | 5 -
463 arch/arm/mach-iop33x/iq80331.c | 1 +
464 arch/arm/mach-iop33x/iq80332.c | 1 +
465 arch/arm/mach-ixp2000/core.c | 4 +
466 arch/arm/mach-ixp2000/enp2611.c | 1 +
467 arch/arm/mach-ixp2000/include/mach/platform.h | 1 +
468 arch/arm/mach-ixp2000/include/mach/system.h | 35 --
469 arch/arm/mach-ixp2000/include/mach/vmalloc.h | 20 -
470 arch/arm/mach-ixp2000/ixdp2400.c | 1 +
471 arch/arm/mach-ixp2000/ixdp2800.c | 1 +
472 arch/arm/mach-ixp2000/ixdp2x01.c | 32 +
473 arch/arm/mach-ixp23xx/core.c | 6 +
474 arch/arm/mach-ixp23xx/espresso.c | 1 +
475 arch/arm/mach-ixp23xx/include/mach/io.h | 29 -
476 arch/arm/mach-ixp23xx/include/mach/platform.h | 1 +
477 arch/arm/mach-ixp23xx/include/mach/system.h | 17 -
478 arch/arm/mach-ixp23xx/include/mach/vmalloc.h | 10 -
479 arch/arm/mach-ixp23xx/ixdp2351.c | 12 +
480 arch/arm/mach-ixp23xx/roadrunner.c | 1 +
481 arch/arm/mach-ixp4xx/avila-setup.c | 2 +
482 arch/arm/mach-ixp4xx/common.c | 20 +
483 arch/arm/mach-ixp4xx/coyote-setup.c | 2 +
484 arch/arm/mach-ixp4xx/dsmg600-setup.c | 1 +
485 arch/arm/mach-ixp4xx/fsg-setup.c | 1 +
486 arch/arm/mach-ixp4xx/gateway7001-setup.c | 1 +
487 arch/arm/mach-ixp4xx/goramo_mlr.c | 1 +
488 arch/arm/mach-ixp4xx/gtwx5715-setup.c | 1 +
489 arch/arm/mach-ixp4xx/include/mach/platform.h | 1 +
490 arch/arm/mach-ixp4xx/include/mach/system.h | 25 -
491 arch/arm/mach-ixp4xx/include/mach/vmalloc.h | 5 -
492 arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 +
493 arch/arm/mach-ixp4xx/nas100d-setup.c | 1 +
494 arch/arm/mach-ixp4xx/nslu2-setup.c | 1 +
495 arch/arm/mach-ixp4xx/omixp-setup.c | 3 +
496 arch/arm/mach-ixp4xx/vulcan-setup.c | 1 +
497 arch/arm/mach-ixp4xx/wg302v2-setup.c | 1 +
498 arch/arm/mach-kirkwood/common.c | 16 +
499 arch/arm/mach-kirkwood/common.h | 1 +
500 arch/arm/mach-kirkwood/d2net_v2-setup.c | 1 +
501 arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 1 +
502 arch/arm/mach-kirkwood/dockstar-setup.c | 1 +
503 arch/arm/mach-kirkwood/guruplug-setup.c | 1 +
504 arch/arm/mach-kirkwood/include/mach/io.h | 25 -
505 arch/arm/mach-kirkwood/include/mach/system.h | 19 -
506 arch/arm/mach-kirkwood/include/mach/vmalloc.h | 5 -
507 arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 1 +
508 arch/arm/mach-kirkwood/netspace_v2-setup.c | 3 +
509 arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +
510 arch/arm/mach-kirkwood/openrd-setup.c | 3 +
511 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 1 +
512 arch/arm/mach-kirkwood/rd88f6281-setup.c | 1 +
513 arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 +
514 arch/arm/mach-kirkwood/t5325-setup.c | 1 +
515 arch/arm/mach-kirkwood/ts219-setup.c | 1 +
516 arch/arm/mach-kirkwood/ts41x-setup.c | 1 +
517 arch/arm/mach-ks8695/board-acs5k.c | 1 +
518 arch/arm/mach-ks8695/board-dsm320.c | 1 +
519 arch/arm/mach-ks8695/board-micrel.c | 1 +
520 arch/arm/mach-ks8695/generic.h | 1 +
521 arch/arm/mach-ks8695/include/mach/system.h | 21 -
522 arch/arm/mach-ks8695/include/mach/vmalloc.h | 19 -
523 arch/arm/mach-ks8695/time.c | 18 +
524 arch/arm/mach-lpc32xx/common.c | 20 +-
525 arch/arm/mach-lpc32xx/common.h | 2 +
526 arch/arm/mach-lpc32xx/include/mach/system.h | 25 -
527 arch/arm/mach-lpc32xx/include/mach/vmalloc.h | 24 -
528 arch/arm/mach-lpc32xx/phy3250.c | 1 +
529 arch/arm/mach-mmp/aspenite.c | 2 +
530 arch/arm/mach-mmp/avengers_lite.c | 1 +
531 arch/arm/mach-mmp/brownstone.c | 1 +
532 arch/arm/mach-mmp/common.c | 5 +
533 arch/arm/mach-mmp/common.h | 1 +
534 arch/arm/mach-mmp/flint.c | 1 +
535 arch/arm/mach-mmp/gplugd.c | 1 +
536 arch/arm/mach-mmp/include/mach/pxa168.h | 1 +
537 arch/arm/mach-mmp/include/mach/system.h | 10 -
538 arch/arm/mach-mmp/include/mach/vmalloc.h | 5 -
539 arch/arm/mach-mmp/jasper.c | 1 +
540 arch/arm/mach-mmp/pxa168.c | 5 +
541 arch/arm/mach-mmp/tavorevb.c | 1 +
542 arch/arm/mach-mmp/teton_bga.c | 1 +
543 arch/arm/mach-mmp/ttc_dkb.c | 1 +
544 arch/arm/mach-msm/board-msm8960.c | 2 +
545 arch/arm/mach-msm/board-msm8x60.c | 4 +
546 arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 17 -
547 arch/arm/mach-msm/include/mach/entry-macro-vic.S | 37 --
548 arch/arm/mach-msm/include/mach/entry-macro.S | 27 +-
549 arch/arm/mach-msm/include/mach/system.h | 8 -
550 arch/arm/mach-msm/include/mach/vmalloc.h | 22 -
551 arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 1 +
552 arch/arm/mach-mv78xx0/common.c | 16 +
553 arch/arm/mach-mv78xx0/common.h | 1 +
554 arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 1 +
555 arch/arm/mach-mv78xx0/include/mach/system.h | 19 -
556 arch/arm/mach-mv78xx0/include/mach/vmalloc.h | 5 -
557 arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 1 +
558 arch/arm/mach-mx5/board-cpuimx51.c | 1 +
559 arch/arm/mach-mx5/board-cpuimx51sd.c | 1 +
560 arch/arm/mach-mx5/board-mx50_rdp.c | 1 +
561 arch/arm/mach-mx5/board-mx51_3ds.c | 1 +
562 arch/arm/mach-mx5/board-mx51_babbage.c | 1 +
563 arch/arm/mach-mx5/board-mx51_efikamx.c | 3 +-
564 arch/arm/mach-mx5/board-mx51_efikasb.c | 1 +
565 arch/arm/mach-mx5/board-mx53_ard.c | 1 +
566 arch/arm/mach-mx5/board-mx53_evk.c | 1 +
567 arch/arm/mach-mx5/board-mx53_loco.c | 1 +
568 arch/arm/mach-mx5/board-mx53_smd.c | 1 +
569 arch/arm/mach-mx5/imx51-dt.c | 1 +
570 arch/arm/mach-mx5/imx53-dt.c | 1 +
571 arch/arm/mach-mxs/include/mach/common.h | 1 +
572 arch/arm/mach-mxs/include/mach/system.h | 2 -
573 arch/arm/mach-mxs/include/mach/vmalloc.h | 22 -
574 arch/arm/mach-mxs/mach-m28evk.c | 1 +
575 arch/arm/mach-mxs/mach-mx23evk.c | 1 +
576 arch/arm/mach-mxs/mach-mx28evk.c | 1 +
577 arch/arm/mach-mxs/mach-stmp378x_devb.c | 1 +
578 arch/arm/mach-mxs/mach-tx28.c | 1 +
579 arch/arm/mach-mxs/system.c | 4 +-
580 arch/arm/mach-netx/generic.c | 5 +
581 arch/arm/mach-netx/generic.h | 1 +
582 arch/arm/mach-netx/include/mach/entry-macro.S | 13 -
583 arch/arm/mach-netx/include/mach/system.h | 10 -
584 arch/arm/mach-netx/include/mach/vmalloc.h | 19 -
585 arch/arm/mach-netx/nxdb500.c | 3 +
586 arch/arm/mach-netx/nxdkn.c | 3 +
587 arch/arm/mach-netx/nxeb500hmi.c | 3 +
588 arch/arm/mach-nomadik/board-nhk8815.c | 2 +
589 arch/arm/mach-nomadik/include/mach/entry-macro.S | 30 -
590 arch/arm/mach-nomadik/include/mach/vmalloc.h | 2 -
591 arch/arm/mach-omap1/board-ams-delta.c | 3 +-
592 arch/arm/mach-omap1/board-fsample.c | 3 +-
593 arch/arm/mach-omap1/board-generic.c | 3 +-
594 arch/arm/mach-omap1/board-h2.c | 3 +-
595 arch/arm/mach-omap1/board-h3.c | 3 +-
596 arch/arm/mach-omap1/board-htcherald.c | 3 +-
597 arch/arm/mach-omap1/board-innovator.c | 3 +-
598 arch/arm/mach-omap1/board-nokia770.c | 3 +-
599 arch/arm/mach-omap1/board-osk.c | 3 +-
600 arch/arm/mach-omap1/board-palmte.c | 3 +-
601 arch/arm/mach-omap1/board-palmtt.c | 3 +-
602 arch/arm/mach-omap1/board-palmz71.c | 3 +-
603 arch/arm/mach-omap1/board-perseus2.c | 3 +-
604 arch/arm/mach-omap1/board-sx1.c | 3 +-
605 arch/arm/mach-omap1/board-voiceblue.c | 8 +-
606 arch/arm/mach-omap1/common.h | 62 ++
607 arch/arm/mach-omap1/devices.c | 2 +-
608 arch/arm/mach-omap1/include/mach/vmalloc.h | 20 -
609 arch/arm/mach-omap1/io.c | 1 -
610 arch/arm/mach-omap1/reset.c | 5 +-
611 arch/arm/mach-omap1/time.c | 2 +-
612 arch/arm/mach-omap1/timer32k.c | 2 +-
613 arch/arm/mach-omap2/Kconfig | 2 +
614 arch/arm/mach-omap2/board-2430sdp.c | 4 +-
615 arch/arm/mach-omap2/board-3430sdp.c | 4 +-
616 arch/arm/mach-omap2/board-3630sdp.c | 4 +-
617 arch/arm/mach-omap2/board-4430sdp.c | 6 +-
618 arch/arm/mach-omap2/board-am3517crane.c | 4 +-
619 arch/arm/mach-omap2/board-am3517evm.c | 4 +-
620 arch/arm/mach-omap2/board-apollon.c | 4 +-
621 arch/arm/mach-omap2/board-cm-t35.c | 6 +-
622 arch/arm/mach-omap2/board-cm-t3517.c | 4 +-
623 arch/arm/mach-omap2/board-devkit8000.c | 4 +-
624 arch/arm/mach-omap2/board-generic.c | 8 +-
625 arch/arm/mach-omap2/board-h4.c | 4 +-
626 arch/arm/mach-omap2/board-igep0020.c | 6 +-
627 arch/arm/mach-omap2/board-ldp.c | 4 +-
628 arch/arm/mach-omap2/board-n8x0.c | 8 +-
629 arch/arm/mach-omap2/board-omap3beagle.c | 4 +-
630 arch/arm/mach-omap2/board-omap3evm.c | 4 +-
631 arch/arm/mach-omap2/board-omap3logic.c | 6 +-
632 arch/arm/mach-omap2/board-omap3pandora.c | 4 +-
633 arch/arm/mach-omap2/board-omap3stalker.c | 4 +-
634 arch/arm/mach-omap2/board-omap3touchbook.c | 4 +-
635 arch/arm/mach-omap2/board-omap4panda.c | 6 +-
636 arch/arm/mach-omap2/board-overo.c | 4 +-
637 arch/arm/mach-omap2/board-rm680.c | 4 +-
638 arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
639 arch/arm/mach-omap2/board-rx51.c | 4 +-
640 arch/arm/mach-omap2/board-ti8168evm.c | 3 +-
641 arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
642 arch/arm/mach-omap2/board-zoom.c | 6 +-
643 arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 +-
644 arch/arm/mach-omap2/cm44xx.c | 2 +-
645 arch/arm/mach-omap2/cminst44xx.c | 2 +-
646 arch/arm/mach-omap2/common.c | 2 +-
647 arch/arm/mach-omap2/common.h | 184 ++++++
648 arch/arm/mach-omap2/control.c | 2 +-
649 arch/arm/mach-omap2/i2c.c | 2 +-
650 arch/arm/mach-omap2/id.c | 2 +-
651 arch/arm/mach-omap2/include/mach/entry-macro.S | 137 -----
652 arch/arm/mach-omap2/include/mach/omap4-common.h | 43 --
653 arch/arm/mach-omap2/include/mach/vmalloc.h | 20 -
654 arch/arm/mach-omap2/io.c | 8 +-
655 arch/arm/mach-omap2/irq.c | 51 ++
656 arch/arm/mach-omap2/omap-hotplug.c | 3 +-
657 arch/arm/mach-omap2/omap-smp.c | 3 +-
658 arch/arm/mach-omap2/omap4-common.c | 9 +-
659 arch/arm/mach-omap2/omap_hwmod.c | 2 +-
660 arch/arm/mach-omap2/pm.c | 2 +-
661 arch/arm/mach-omap2/pm24xx.c | 1 +
662 arch/arm/mach-omap2/pm34xx.c | 1 +
663 arch/arm/mach-omap2/pm44xx.c | 2 +-
664 arch/arm/mach-omap2/prcm.c | 7 +-
665 arch/arm/mach-omap2/prcm_mpu44xx.c | 2 +-
666 arch/arm/mach-omap2/prm2xxx_3xxx.c | 2 +-
667 arch/arm/mach-omap2/prm44xx.c | 2 +-
668 arch/arm/mach-omap2/prminst44xx.c | 2 +-
669 arch/arm/mach-omap2/sdram-nokia.c | 2 +-
670 arch/arm/mach-omap2/sdrc.c | 2 +-
671 arch/arm/mach-omap2/sdrc2xxx.c | 2 +-
672 arch/arm/mach-omap2/serial.c | 2 +-
673 arch/arm/mach-omap2/smartreflex.c | 2 +-
674 arch/arm/mach-omap2/timer.c | 2 +-
675 arch/arm/mach-omap2/vc3xxx_data.c | 2 +-
676 arch/arm/mach-omap2/vc44xx_data.c | 2 +-
677 arch/arm/mach-omap2/voltage.c | 2 +-
678 arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +-
679 arch/arm/mach-omap2/voltagedomains44xx_data.c | 2 +-
680 arch/arm/mach-omap2/vp.c | 2 +-
681 arch/arm/mach-omap2/vp3xxx_data.c | 2 +-
682 arch/arm/mach-omap2/vp44xx_data.c | 2 +-
683 arch/arm/mach-orion5x/common.c | 12 +
684 arch/arm/mach-orion5x/common.h | 1 +
685 arch/arm/mach-orion5x/d2net-setup.c | 2 +
686 arch/arm/mach-orion5x/db88f5281-setup.c | 1 +
687 arch/arm/mach-orion5x/dns323-setup.c | 1 +
688 arch/arm/mach-orion5x/edmini_v2-setup.c | 1 +
689 arch/arm/mach-orion5x/include/mach/io.h | 25 -
690 arch/arm/mach-orion5x/include/mach/system.h | 14 -
691 arch/arm/mach-orion5x/include/mach/vmalloc.h | 5 -
692 arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +
693 arch/arm/mach-orion5x/ls-chl-setup.c | 3 +-
694 arch/arm/mach-orion5x/ls_hgl-setup.c | 3 +-
695 arch/arm/mach-orion5x/lsmini-setup.c | 3 +-
696 arch/arm/mach-orion5x/mss2-setup.c | 3 +-
697 arch/arm/mach-orion5x/mv2120-setup.c | 3 +-
698 arch/arm/mach-orion5x/net2big-setup.c | 1 +
699 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 1 +
700 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 1 +
701 arch/arm/mach-orion5x/rd88f5182-setup.c | 1 +
702 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 +
703 arch/arm/mach-orion5x/terastation_pro2-setup.c | 1 +
704 arch/arm/mach-orion5x/ts209-setup.c | 1 +
705 arch/arm/mach-orion5x/ts409-setup.c | 1 +
706 arch/arm/mach-orion5x/ts78xx-setup.c | 1 +
707 arch/arm/mach-orion5x/wnr854t-setup.c | 1 +
708 arch/arm/mach-orion5x/wrt350n-v2-setup.c | 1 +
709 arch/arm/mach-picoxcell/common.c | 9 +-
710 arch/arm/mach-picoxcell/include/mach/entry-macro.S | 11 +-
711 arch/arm/mach-picoxcell/include/mach/system.h | 5 -
712 arch/arm/mach-picoxcell/include/mach/vmalloc.h | 14 -
713 arch/arm/mach-pnx4008/core.c | 6 +
714 arch/arm/mach-pnx4008/include/mach/system.h | 9 -
715 arch/arm/mach-pnx4008/include/mach/vmalloc.h | 20 -
716 arch/arm/mach-prima2/common.h | 1 +
717 arch/arm/mach-prima2/include/mach/map.h | 6 +-
718 arch/arm/mach-prima2/include/mach/system.h | 12 -
719 arch/arm/mach-prima2/include/mach/vmalloc.h | 16 -
720 arch/arm/mach-prima2/prima2.c | 1 +
721 arch/arm/mach-prima2/rstc.c | 7 +
722 arch/arm/mach-pxa/balloon3.c | 1 +
723 arch/arm/mach-pxa/capc7117.c | 3 +-
724 arch/arm/mach-pxa/cm-x2xx.c | 1 +
725 arch/arm/mach-pxa/cm-x300.c | 1 +
726 arch/arm/mach-pxa/colibri-pxa270.c | 2 +
727 arch/arm/mach-pxa/colibri-pxa300.c | 1 +
728 arch/arm/mach-pxa/colibri-pxa320.c | 1 +
729 arch/arm/mach-pxa/corgi.c | 8 +-
730 arch/arm/mach-pxa/csb726.c | 1 +
731 arch/arm/mach-pxa/em-x270.c | 2 +
732 arch/arm/mach-pxa/eseries.c | 6 +
733 arch/arm/mach-pxa/ezx.c | 6 +
734 arch/arm/mach-pxa/generic.h | 2 +
735 arch/arm/mach-pxa/gumstix.c | 1 +
736 arch/arm/mach-pxa/h5000.c | 1 +
737 arch/arm/mach-pxa/himalaya.c | 1 +
738 arch/arm/mach-pxa/hx4700.c | 1 +
739 arch/arm/mach-pxa/icontrol.c | 3 +-
740 arch/arm/mach-pxa/idp.c | 1 +
741 arch/arm/mach-pxa/include/mach/entry-macro.S | 36 --
742 arch/arm/mach-pxa/include/mach/system.h | 8 -
743 arch/arm/mach-pxa/include/mach/vmalloc.h | 11 -
744 arch/arm/mach-pxa/littleton.c | 1 +
745 arch/arm/mach-pxa/lpd270.c | 1 +
746 arch/arm/mach-pxa/lubbock.c | 1 +
747 arch/arm/mach-pxa/magician.c | 1 +
748 arch/arm/mach-pxa/mainstone.c | 1 +
749 arch/arm/mach-pxa/mioa701.c | 7 +-
750 arch/arm/mach-pxa/mp900.c | 1 +
751 arch/arm/mach-pxa/palmld.c | 3 +-
752 arch/arm/mach-pxa/palmt5.c | 3 +-
753 arch/arm/mach-pxa/palmtc.c | 3 +-
754 arch/arm/mach-pxa/palmte2.c | 3 +-
755 arch/arm/mach-pxa/palmtreo.c | 2 +
756 arch/arm/mach-pxa/palmtx.c | 3 +-
757 arch/arm/mach-pxa/palmz72.c | 3 +-
758 arch/arm/mach-pxa/pcm027.c | 1 +
759 arch/arm/mach-pxa/poodle.c | 9 +-
760 arch/arm/mach-pxa/raumfeld.c | 3 +
761 arch/arm/mach-pxa/reset.c | 7 +-
762 arch/arm/mach-pxa/saar.c | 1 +
763 arch/arm/mach-pxa/saarb.c | 1 +
764 arch/arm/mach-pxa/spitz.c | 9 +-
765 arch/arm/mach-pxa/stargate2.c | 2 +
766 arch/arm/mach-pxa/tavorevb.c | 1 +
767 arch/arm/mach-pxa/tavorevb3.c | 1 +
768 arch/arm/mach-pxa/tosa.c | 5 +-
769 arch/arm/mach-pxa/trizeps4.c | 2 +
770 arch/arm/mach-pxa/viper.c | 1 +
771 arch/arm/mach-pxa/vpac270.c | 3 +-
772 arch/arm/mach-pxa/xcep.c | 1 +
773 arch/arm/mach-pxa/z2.c | 1 +
774 arch/arm/mach-pxa/zeus.c | 1 +
775 arch/arm/mach-pxa/zylonite.c | 1 +
776 arch/arm/mach-realview/core.h | 1 -
777 arch/arm/mach-realview/include/mach/entry-macro.S | 2 -
778 arch/arm/mach-realview/include/mach/system.h | 17 -
779 arch/arm/mach-realview/include/mach/vmalloc.h | 21 -
780 arch/arm/mach-realview/realview_eb.c | 10 +-
781 arch/arm/mach-realview/realview_pb1176.c | 6 +-
782 arch/arm/mach-realview/realview_pb11mp.c | 6 +-
783 arch/arm/mach-realview/realview_pba8.c | 6 +-
784 arch/arm/mach-realview/realview_pbx.c | 10 +-
785 arch/arm/mach-rpc/include/mach/system.h | 14 -
786 arch/arm/mach-rpc/include/mach/vmalloc.h | 10 -
787 arch/arm/mach-rpc/riscpc.c | 12 +
788 arch/arm/mach-s3c2410/include/mach/system-reset.h | 4 +-
789 arch/arm/mach-s3c2410/include/mach/vmalloc.h | 20 -
790 arch/arm/mach-s3c64xx/include/mach/entry-macro.S | 7 +-
791 arch/arm/mach-s3c64xx/include/mach/system.h | 2 +-
792 arch/arm/mach-s3c64xx/include/mach/vmalloc.h | 20 -
793 arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +
794 arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +
795 arch/arm/mach-s3c64xx/mach-hmt.c | 2 +
796 arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +
797 arch/arm/mach-s3c64xx/mach-ncp.c | 2 +
798 arch/arm/mach-s3c64xx/mach-real6410.c | 2 +
799 arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +
800 arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +
801 arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +
802 arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +
803 arch/arm/mach-s5p64x0/include/mach/entry-macro.S | 7 +-
804 arch/arm/mach-s5p64x0/include/mach/vmalloc.h | 20 -
805 arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +
806 arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +
807 arch/arm/mach-s5pc100/include/mach/entry-macro.S | 25 -
808 arch/arm/mach-s5pc100/include/mach/vmalloc.h | 17 -
809 arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +
810 arch/arm/mach-s5pv210/include/mach/entry-macro.S | 37 --
811 arch/arm/mach-s5pv210/include/mach/vmalloc.h | 22 -
812 arch/arm/mach-s5pv210/mach-aquila.c | 2 +
813 arch/arm/mach-s5pv210/mach-goni.c | 2 +
814 arch/arm/mach-s5pv210/mach-smdkc110.c | 2 +
815 arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +
816 arch/arm/mach-s5pv210/mach-torbreck.c | 2 +
817 arch/arm/mach-sa1100/assabet.c | 1 +
818 arch/arm/mach-sa1100/badge4.c | 1 +
819 arch/arm/mach-sa1100/cerf.c | 1 +
820 arch/arm/mach-sa1100/collie.c | 1 +
821 arch/arm/mach-sa1100/generic.c | 11 +
822 arch/arm/mach-sa1100/generic.h | 1 +
823 arch/arm/mach-sa1100/h3100.c | 1 +
824 arch/arm/mach-sa1100/h3600.c | 1 +
825 arch/arm/mach-sa1100/hackkit.c | 1 +
826 arch/arm/mach-sa1100/include/mach/system.h | 13 -
827 arch/arm/mach-sa1100/include/mach/vmalloc.h | 4 -
828 arch/arm/mach-sa1100/jornada720.c | 1 +
829 arch/arm/mach-sa1100/lart.c | 1 +
830 arch/arm/mach-sa1100/nanoengine.c | 1 +
831 arch/arm/mach-sa1100/pleb.c | 1 +
832 arch/arm/mach-sa1100/shannon.c | 1 +
833 arch/arm/mach-sa1100/simpad.c | 1 +
834 arch/arm/mach-shark/core.c | 4 +-
835 arch/arm/mach-shark/include/mach/system.h | 3 -
836 arch/arm/mach-shark/include/mach/vmalloc.h | 4 -
837 arch/arm/mach-shmobile/Makefile | 1 -
838 arch/arm/mach-shmobile/board-ag5evm.c | 2 +-
839 arch/arm/mach-shmobile/board-kota2.c | 2 +-
840 arch/arm/mach-shmobile/entry-gic.S | 18 -
841 arch/arm/mach-shmobile/include/mach/common.h | 1 -
842 arch/arm/mach-shmobile/include/mach/entry-macro.S | 9 -
843 arch/arm/mach-shmobile/include/mach/system.h | 2 +-
844 arch/arm/mach-shmobile/include/mach/vmalloc.h | 7 -
845 arch/arm/mach-spear3xx/include/mach/entry-macro.S | 27 -
846 arch/arm/mach-spear3xx/include/mach/generic.h | 2 +
847 arch/arm/mach-spear3xx/include/mach/vmalloc.h | 19 -
848 arch/arm/mach-spear3xx/spear300_evb.c | 3 +
849 arch/arm/mach-spear3xx/spear310_evb.c | 3 +
850 arch/arm/mach-spear3xx/spear320_evb.c | 3 +
851 arch/arm/mach-spear6xx/include/mach/entry-macro.S | 36 --
852 arch/arm/mach-spear6xx/include/mach/generic.h | 2 +
853 arch/arm/mach-spear6xx/include/mach/vmalloc.h | 19 -
854 arch/arm/mach-spear6xx/spear600_evb.c | 3 +
855 arch/arm/mach-tegra/board-dt.c | 3 +
856 arch/arm/mach-tegra/board-harmony.c | 3 +
857 arch/arm/mach-tegra/board-paz00.c | 3 +
858 arch/arm/mach-tegra/board-seaboard.c | 7 +
859 arch/arm/mach-tegra/board-trimslice.c | 3 +
860 arch/arm/mach-tegra/common.c | 2 -
861 arch/arm/mach-tegra/include/mach/entry-macro.S | 22 +-
862 arch/arm/mach-tegra/include/mach/io.h | 6 -
863 arch/arm/mach-tegra/include/mach/system.h | 4 -
864 arch/arm/mach-tegra/include/mach/vmalloc.h | 28 -
865 arch/arm/mach-tegra/io.c | 21 -
866 arch/arm/mach-u300/core.c | 20 +
867 arch/arm/mach-u300/include/mach/entry-macro.S | 24 -
868 arch/arm/mach-u300/include/mach/platform.h | 1 +
869 arch/arm/mach-u300/include/mach/system.h | 28 -
870 arch/arm/mach-u300/include/mach/vmalloc.h | 12 -
871 arch/arm/mach-u300/u300.c | 3 +
872 arch/arm/mach-ux500/board-mop500.c | 4 +
873 arch/arm/mach-ux500/board-u5500.c | 2 +
874 arch/arm/mach-ux500/include/mach/entry-macro.S | 2 -
875 arch/arm/mach-ux500/include/mach/system.h | 5 -
876 arch/arm/mach-ux500/include/mach/vmalloc.h | 18 -
877 arch/arm/mach-versatile/core.c | 18 +-
878 arch/arm/mach-versatile/core.h | 1 +
879 arch/arm/mach-versatile/include/mach/entry-macro.S | 30 -
880 arch/arm/mach-versatile/include/mach/system.h | 16 -
881 arch/arm/mach-versatile/include/mach/vmalloc.h | 21 -
882 arch/arm/mach-versatile/versatile_ab.c | 3 +
883 arch/arm/mach-versatile/versatile_dt.c | 3 +
884 arch/arm/mach-versatile/versatile_pb.c | 3 +
885 arch/arm/mach-vexpress/include/mach/entry-macro.S | 2 -
886 arch/arm/mach-vexpress/include/mach/system.h | 4 -
887 arch/arm/mach-vexpress/include/mach/vmalloc.h | 21 -
888 arch/arm/mach-vexpress/v2m.c | 4 +-
889 arch/arm/mach-vt8500/include/mach/vmalloc.h | 20 -
890 arch/arm/mach-w90x900/cpu.c | 16 +
891 arch/arm/mach-w90x900/include/mach/system.h | 22 -
892 arch/arm/mach-w90x900/include/mach/vmalloc.h | 23 -
893 arch/arm/mach-w90x900/irq.c | 2 +
894 arch/arm/mach-w90x900/mach-nuc910evb.c | 1 +
895 arch/arm/mach-w90x900/mach-nuc950evb.c | 1 +
896 arch/arm/mach-w90x900/mach-nuc960evb.c | 1 +
897 arch/arm/mach-w90x900/nuc910.h | 9 +-
898 arch/arm/mach-w90x900/nuc950.h | 9 +-
899 arch/arm/mach-w90x900/nuc960.h | 9 +-
900 arch/arm/mach-w90x900/nuc9xx.h | 24 +
901 arch/arm/mach-w90x900/time.c | 2 +
902 arch/arm/mach-zynq/common.c | 1 +
903 arch/arm/mach-zynq/include/mach/entry-macro.S | 3 -
904 arch/arm/mach-zynq/include/mach/system.h | 5 -
905 arch/arm/mach-zynq/include/mach/vmalloc.h | 20 -
906 arch/arm/mm/idmap.c | 2 +-
907 arch/arm/mm/init.c | 40 +-
908 arch/arm/mm/ioremap.c | 82 ++-
909 arch/arm/mm/mm.h | 14 +
910 arch/arm/mm/mmu.c | 50 ++-
911 arch/arm/mm/nommu.c | 4 +-
912 arch/arm/plat-iop/Makefile | 4 +-
913 arch/arm/plat-iop/io.c | 59 --
914 arch/arm/plat-iop/restart.c | 19 +
915 arch/arm/plat-mxc/Makefile | 1 -
916 arch/arm/plat-mxc/gic.c | 41 --
917 arch/arm/plat-mxc/include/mach/common.h | 3 +-
918 arch/arm/plat-mxc/include/mach/entry-macro.S | 11 -
919 arch/arm/plat-mxc/include/mach/mx1.h | 2 -
920 arch/arm/plat-mxc/include/mach/system.h | 2 -
921 arch/arm/plat-mxc/include/mach/vmalloc.h | 22 -
922 arch/arm/plat-mxc/system.c | 11 +-
923 arch/arm/plat-omap/Makefile | 2 +-
924 arch/arm/plat-omap/common.c | 7 +
925 arch/arm/plat-omap/include/plat/common.h | 82 ---
926 arch/arm/plat-omap/include/plat/io.h | 76 ---
927 arch/arm/plat-omap/include/plat/irqs.h | 14 -
928 arch/arm/plat-omap/include/plat/system.h | 2 -
929 arch/arm/plat-omap/io.c | 159 -----
930 arch/arm/plat-s3c24xx/cpu.c | 23 -
931 arch/arm/plat-s5p/Kconfig | 1 +
932 arch/arm/plat-spear/Makefile | 2 +-
933 arch/arm/plat-spear/include/plat/system.h | 15 -
934 arch/arm/plat-spear/include/plat/vmalloc.h | 19 -
935 arch/arm/plat-spear/restart.c | 27 +
936 arch/arm/plat-tcc/include/mach/vmalloc.h | 10 -
937 arch/arm/tools/mach-types | 632 +++++++++++---------
938 include/linux/vmalloc.h | 1 +
940 645 files changed, 2505 insertions(+), 3871 deletions(-)
941 create mode 100644 Documentation/devicetree/bindings/arm/vic.txt
942 delete mode 100644 arch/arm/include/asm/entry-macro-vic2.S
943 delete mode 100644 arch/arm/include/asm/hardware/entry-macro-gic.S
944 delete mode 100644 arch/arm/mach-at91/include/mach/vmalloc.h
945 delete mode 100644 arch/arm/mach-bcmring/include/mach/vmalloc.h
946 rename arch/arm/mach-clps711x/{irq.c => common.c} (58%)
947 delete mode 100644 arch/arm/mach-clps711x/include/mach/vmalloc.h
948 delete mode 100644 arch/arm/mach-clps711x/mm.c
949 delete mode 100644 arch/arm/mach-clps711x/time.c
950 delete mode 100644 arch/arm/mach-cns3xxx/include/mach/vmalloc.h
951 delete mode 100644 arch/arm/mach-davinci/include/mach/vmalloc.h
952 delete mode 100644 arch/arm/mach-davinci/io.c
953 delete mode 100644 arch/arm/mach-dove/include/mach/vmalloc.h
954 delete mode 100644 arch/arm/mach-ebsa110/include/mach/vmalloc.h
955 delete mode 100644 arch/arm/mach-ep93xx/include/mach/vmalloc.h
956 delete mode 100644 arch/arm/mach-exynos/include/mach/vmalloc.h
957 delete mode 100644 arch/arm/mach-footbridge/include/mach/vmalloc.h
958 delete mode 100644 arch/arm/mach-gemini/include/mach/vmalloc.h
959 delete mode 100644 arch/arm/mach-h720x/include/mach/vmalloc.h
960 delete mode 100644 arch/arm/mach-highbank/include/mach/vmalloc.h
961 delete mode 100644 arch/arm/mach-integrator/include/mach/vmalloc.h
962 delete mode 100644 arch/arm/mach-iop13xx/include/mach/vmalloc.h
963 delete mode 100644 arch/arm/mach-iop32x/include/mach/vmalloc.h
964 delete mode 100644 arch/arm/mach-iop33x/include/mach/vmalloc.h
965 delete mode 100644 arch/arm/mach-ixp2000/include/mach/vmalloc.h
966 delete mode 100644 arch/arm/mach-ixp23xx/include/mach/vmalloc.h
967 delete mode 100644 arch/arm/mach-ixp4xx/include/mach/vmalloc.h
968 delete mode 100644 arch/arm/mach-kirkwood/include/mach/vmalloc.h
969 delete mode 100644 arch/arm/mach-ks8695/include/mach/vmalloc.h
970 delete mode 100644 arch/arm/mach-lpc32xx/include/mach/vmalloc.h
971 delete mode 100644 arch/arm/mach-mmp/include/mach/vmalloc.h
972 delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro-qgic.S
973 delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro-vic.S
974 delete mode 100644 arch/arm/mach-msm/include/mach/vmalloc.h
975 delete mode 100644 arch/arm/mach-mv78xx0/include/mach/vmalloc.h
976 delete mode 100644 arch/arm/mach-mxs/include/mach/vmalloc.h
977 delete mode 100644 arch/arm/mach-netx/include/mach/vmalloc.h
978 delete mode 100644 arch/arm/mach-nomadik/include/mach/vmalloc.h
979 create mode 100644 arch/arm/mach-omap1/common.h
980 delete mode 100644 arch/arm/mach-omap1/include/mach/vmalloc.h
981 create mode 100644 arch/arm/mach-omap2/common.h
982 delete mode 100644 arch/arm/mach-omap2/include/mach/omap4-common.h
983 delete mode 100644 arch/arm/mach-omap2/include/mach/vmalloc.h
984 delete mode 100644 arch/arm/mach-orion5x/include/mach/vmalloc.h
985 delete mode 100644 arch/arm/mach-picoxcell/include/mach/vmalloc.h
986 delete mode 100644 arch/arm/mach-pnx4008/include/mach/vmalloc.h
987 delete mode 100644 arch/arm/mach-prima2/include/mach/vmalloc.h
988 delete mode 100644 arch/arm/mach-pxa/include/mach/vmalloc.h
989 delete mode 100644 arch/arm/mach-realview/include/mach/vmalloc.h
990 delete mode 100644 arch/arm/mach-rpc/include/mach/vmalloc.h
991 delete mode 100644 arch/arm/mach-s3c2410/include/mach/vmalloc.h
992 delete mode 100644 arch/arm/mach-s3c64xx/include/mach/vmalloc.h
993 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/vmalloc.h
994 delete mode 100644 arch/arm/mach-s5pc100/include/mach/vmalloc.h
995 delete mode 100644 arch/arm/mach-s5pv210/include/mach/vmalloc.h
996 delete mode 100644 arch/arm/mach-sa1100/include/mach/vmalloc.h
997 delete mode 100644 arch/arm/mach-shark/include/mach/vmalloc.h
998 delete mode 100644 arch/arm/mach-shmobile/entry-gic.S
999 delete mode 100644 arch/arm/mach-shmobile/include/mach/vmalloc.h
1000 delete mode 100644 arch/arm/mach-spear3xx/include/mach/vmalloc.h
1001 delete mode 100644 arch/arm/mach-spear6xx/include/mach/vmalloc.h
1002 delete mode 100644 arch/arm/mach-tegra/include/mach/vmalloc.h
1003 delete mode 100644 arch/arm/mach-u300/include/mach/vmalloc.h
1004 delete mode 100644 arch/arm/mach-ux500/include/mach/vmalloc.h
1005 delete mode 100644 arch/arm/mach-versatile/include/mach/vmalloc.h
1006 delete mode 100644 arch/arm/mach-vexpress/include/mach/vmalloc.h
1007 delete mode 100644 arch/arm/mach-vt8500/include/mach/vmalloc.h
1008 delete mode 100644 arch/arm/mach-w90x900/include/mach/vmalloc.h
1009 create mode 100644 arch/arm/mach-w90x900/nuc9xx.h
1010 delete mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h
1011 delete mode 100644 arch/arm/plat-iop/io.c
1012 create mode 100644 arch/arm/plat-iop/restart.c
1013 delete mode 100644 arch/arm/plat-mxc/gic.c
1014 delete mode 100644 arch/arm/plat-mxc/include/mach/vmalloc.h
1015 delete mode 100644 arch/arm/plat-omap/io.c
1016 delete mode 100644 arch/arm/plat-spear/include/plat/vmalloc.h
1017 create mode 100644 arch/arm/plat-spear/restart.c
1018 delete mode 100644 arch/arm/plat-tcc/include/mach/vmalloc.h
1019 Merging arm-lpae/for-next (b0d153e ARM: LPAE: Add the Kconfig entries)
1020 $ git merge arm-lpae/for-next
1021 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
1022 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
1023 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
1024 Resolved 'arch/arm/mm/ioremap.c' using previous resolution.
1025 Auto-merging arch/arm/mm/mmu.c
1026 Auto-merging arch/arm/mm/ioremap.c
1027 CONFLICT (content): Merge conflict in arch/arm/mm/ioremap.c
1028 Auto-merging arch/arm/mm/idmap.c
1029 Auto-merging arch/arm/kernel/head.S
1030 Auto-merging arch/arm/include/asm/tlb.h
1031 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
1032 Auto-merging arch/arm/include/asm/system.h
1033 Auto-merging arch/arm/include/asm/pgtable.h
1034 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
1035 Auto-merging arch/arm/include/asm/pgalloc.h
1036 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
1037 Auto-merging arch/arm/Kconfig
1038 Automatic merge failed; fix conflicts and then commit the result.
1040 [master 9bd7a14] Merge remote-tracking branch 'arm-lpae/for-next'
1041 $ git diff -M --stat --summary HEAD^..
1042 arch/arm/Kconfig | 2 +-
1043 arch/arm/boot/compressed/head.S | 1 +
1044 arch/arm/include/asm/assembler.h | 11 ++
1045 arch/arm/include/asm/page.h | 4 +
1046 arch/arm/include/asm/pgalloc.h | 24 ++++
1047 arch/arm/include/asm/pgtable-2level.h | 41 ++++++
1048 arch/arm/include/asm/pgtable-3level-hwdef.h | 77 ++++++++++++
1049 arch/arm/include/asm/pgtable-3level-types.h | 70 +++++++++++
1050 arch/arm/include/asm/pgtable-3level.h | 155 +++++++++++++++++++++++
1051 arch/arm/include/asm/pgtable-hwdef.h | 4 +
1052 arch/arm/include/asm/pgtable.h | 42 +------
1053 arch/arm/include/asm/proc-fns.h | 21 +++
1054 arch/arm/include/asm/system.h | 8 ++
1055 arch/arm/include/asm/tlb.h | 11 ++-
1056 arch/arm/kernel/head.S | 47 +++++++-
1057 arch/arm/kernel/hw_breakpoint.c | 8 +-
1058 arch/arm/kernel/sleep.S | 2 +
1059 arch/arm/mm/Kconfig | 17 +++
1060 arch/arm/mm/alignment.c | 2 +-
1061 arch/arm/mm/context.c | 19 +++-
1062 arch/arm/mm/fault.c | 111 +++--------------
1063 arch/arm/mm/fault.h | 27 ++++-
1064 arch/arm/mm/fsr-2level.c | 78 ++++++++++++
1065 arch/arm/mm/fsr-3level.c | 68 ++++++++++
1066 arch/arm/mm/idmap.c | 34 +++++-
1067 arch/arm/mm/ioremap.c | 39 ++++---
1068 arch/arm/mm/mmu.c | 46 +++++++-
1069 arch/arm/mm/pgd.c | 51 +++++++-
1070 arch/arm/mm/proc-macros.S | 5 +-
1071 arch/arm/mm/proc-v7-2level.S | 171 ++++++++++++++++++++++++++
1072 arch/arm/mm/proc-v7-3level.S | 151 +++++++++++++++++++++++
1073 arch/arm/mm/proc-v7.S | 177 +++------------------------
1074 32 files changed, 1201 insertions(+), 323 deletions(-)
1075 create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
1076 create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
1077 create mode 100644 arch/arm/include/asm/pgtable-3level.h
1078 create mode 100644 arch/arm/mm/fsr-2level.c
1079 create mode 100644 arch/arm/mm/fsr-3level.c
1080 create mode 100644 arch/arm/mm/proc-v7-2level.S
1081 create mode 100644 arch/arm/mm/proc-v7-3level.S
1082 Merging arm-soc/for-next (7958e98 Merge branch 'next/timer' into for-next)
1083 $ git merge arm-soc/for-next
1084 Auto-merging arch/arm/tools/mach-types
1085 CONFLICT (content): Merge conflict in arch/arm/tools/mach-types
1086 Removing arch/arm/plat-pxa/include/plat/gpio.h
1087 Removing arch/arm/plat-pxa/include/plat/gpio-pxa.h
1088 Auto-merging arch/arm/plat-omap/include/plat/common.h
1089 CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/plat/common.h
1090 Auto-merging arch/arm/plat-mxc/system.c
1091 Auto-merging arch/arm/plat-mxc/include/mach/system.h
1092 Auto-merging arch/arm/plat-mxc/include/mach/common.h
1093 Auto-merging arch/arm/mach-pxa/zylonite.c
1094 Auto-merging arch/arm/mach-pxa/zeus.c
1095 Auto-merging arch/arm/mach-pxa/z2.c
1096 Auto-merging arch/arm/mach-pxa/vpac270.c
1097 Auto-merging arch/arm/mach-pxa/viper.c
1098 Auto-merging arch/arm/mach-pxa/tosa.c
1099 Auto-merging arch/arm/mach-pxa/tavorevb3.c
1100 Auto-merging arch/arm/mach-pxa/tavorevb.c
1101 Auto-merging arch/arm/mach-pxa/stargate2.c
1102 Auto-merging arch/arm/mach-pxa/spitz.c
1103 Auto-merging arch/arm/mach-pxa/saarb.c
1104 Auto-merging arch/arm/mach-pxa/saar.c
1105 Auto-merging arch/arm/mach-pxa/raumfeld.c
1106 Auto-merging arch/arm/mach-pxa/poodle.c
1107 Auto-merging arch/arm/mach-pxa/palmtc.c
1108 Auto-merging arch/arm/mach-pxa/mioa701.c
1109 Auto-merging arch/arm/mach-pxa/mainstone.c
1110 Auto-merging arch/arm/mach-pxa/magician.c
1111 Auto-merging arch/arm/mach-pxa/lubbock.c
1112 Auto-merging arch/arm/mach-pxa/lpd270.c
1113 Auto-merging arch/arm/mach-pxa/littleton.c
1114 Removing arch/arm/mach-pxa/include/mach/gpio-pxa.h
1115 Auto-merging arch/arm/mach-pxa/idp.c
1116 Auto-merging arch/arm/mach-pxa/icontrol.c
1117 Auto-merging arch/arm/mach-pxa/hx4700.c
1118 Auto-merging arch/arm/mach-pxa/gumstix.c
1119 Auto-merging arch/arm/mach-pxa/eseries.c
1120 Auto-merging arch/arm/mach-pxa/em-x270.c
1121 Auto-merging arch/arm/mach-pxa/corgi.c
1122 Auto-merging arch/arm/mach-pxa/colibri-pxa320.c
1123 Auto-merging arch/arm/mach-pxa/colibri-pxa300.c
1124 Auto-merging arch/arm/mach-pxa/colibri-pxa270.c
1125 Auto-merging arch/arm/mach-pxa/cm-x300.c
1126 Auto-merging arch/arm/mach-pxa/cm-x2xx.c
1127 Auto-merging arch/arm/mach-pxa/capc7117.c
1128 Auto-merging arch/arm/mach-pxa/balloon3.c
1129 Auto-merging arch/arm/mach-omap2/smartreflex.c
1130 Auto-merging arch/arm/mach-omap2/pm.c
1131 Auto-merging arch/arm/mach-omap2/omap_hwmod.c
1132 Removing arch/arm/mach-omap2/io.h
1133 Auto-merging arch/arm/mach-omap2/Kconfig
1134 Auto-merging arch/arm/mach-omap1/devices.c
1135 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
1136 Removing arch/arm/mach-mx5/pm-imx5.c
1137 Removing arch/arm/mach-mx5/Makefile.boot
1138 Removing arch/arm/mach-mx5/Makefile
1139 Removing arch/arm/mach-mx5/Kconfig
1140 Auto-merging arch/arm/mach-mmp/ttc_dkb.c
1141 Auto-merging arch/arm/mach-mmp/teton_bga.c
1142 Auto-merging arch/arm/mach-mmp/tavorevb.c
1143 Auto-merging arch/arm/mach-mmp/pxa168.c
1144 Auto-merging arch/arm/mach-mmp/include/mach/pxa168.h
1145 Auto-merging arch/arm/mach-mmp/gplugd.c
1146 Auto-merging arch/arm/mach-mmp/flint.c
1147 Auto-merging arch/arm/mach-mmp/brownstone.c
1148 Auto-merging arch/arm/mach-mmp/avengers_lite.c
1149 Auto-merging arch/arm/mach-mmp/aspenite.c
1150 Auto-merging arch/arm/mach-imx/pm-imx5.c
1151 Auto-merging arch/arm/mach-imx/mm-imx5.c
1152 Auto-merging arch/arm/mach-imx/mach-mx53_smd.c
1153 Auto-merging arch/arm/mach-imx/mach-mx53_loco.c
1154 Auto-merging arch/arm/mach-imx/mach-mx53_evk.c
1155 Auto-merging arch/arm/mach-imx/mach-mx53_ard.c
1156 Auto-merging arch/arm/mach-imx/mach-imx6q.c
1157 Auto-merging arch/arm/mach-imx/cpu-imx5.c
1158 Auto-merging arch/arm/mach-imx/clock-mx51-mx53.c
1159 Auto-merging arch/arm/mach-highbank/highbank.c
1160 Auto-merging arch/arm/mach-at91/setup.c
1161 CONFLICT (content): Merge conflict in arch/arm/mach-at91/setup.c
1162 Auto-merging arch/arm/mach-at91/generic.h
1163 Auto-merging arch/arm/mach-at91/at91sam9rl.c
1164 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c
1165 Auto-merging arch/arm/mach-at91/at91sam9g45.c
1166 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
1167 Auto-merging arch/arm/mach-at91/at91sam9263.c
1168 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c
1169 Auto-merging arch/arm/mach-at91/at91sam9261.c
1170 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c
1171 Auto-merging arch/arm/mach-at91/at91sam9260.c
1172 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
1173 Auto-merging arch/arm/mach-at91/at91rm9200.c
1174 Auto-merging arcResolved 'arch/arm/mach-at91/at91cap9.c' using previous resolution.
1175 Resolved 'arch/arm/mach-at91/at91sam9260.c' using previous resolution.
1176 Resolved 'arch/arm/mach-at91/at91sam9261.c' using previous resolution.
1177 Resolved 'arch/arm/mach-at91/at91sam9263.c' using previous resolution.
1178 Resolved 'arch/arm/mach-at91/at91sam9g45.c' using previous resolution.
1179 Resolved 'arch/arm/mach-at91/at91sam9rl.c' using previous resolution.
1180 Resolved 'arch/arm/mach-at91/setup.c' using previous resolution.
1181 Resolved 'arch/arm/plat-omap/include/plat/common.h' using previous resolution.
1182 Resolved 'arch/arm/tools/mach-types' using previous resolution.
1183 h/arm/mach-at91/at91cap9.c
1184 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c
1185 Removing arch/arm/configs/mx3_defconfig
1186 Auto-merging arch/arm/configs/imx_v6_v7_defconfig
1187 Auto-merging arch/arm/configs/at91sam9rl_defconfig
1188 Auto-merging arch/arm/configs/at91sam9g20_defconfig
1189 Auto-merging arch/arm/configs/at91sam9260_defconfig
1190 Auto-merging arch/arm/configs/at91cap9_defconfig
1191 Auto-merging arch/arm/Kconfig
1192 Auto-merging MAINTAINERS
1193 Automatic merge failed; fix conflicts and then commit the result.
1195 [master d42ccd7] Merge remote-tracking branch 'arm-soc/for-next'
1196 $ git diff -M --stat --summary HEAD^..
1198 arch/arm/Kconfig | 2 +
1199 arch/arm/Kconfig.debug | 8 +
1200 arch/arm/Makefile | 1 -
1201 arch/arm/arm-soc-for-next-contents.txt | 20 +
1202 .../{at91cap9adk_defconfig => at91cap9_defconfig} | 7 -
1203 arch/arm/configs/at91rm9200_defconfig | 47 +--
1204 ...91sam9260ek_defconfig => at91sam9260_defconfig} | 16 +-
1205 ...91sam9g20ek_defconfig => at91sam9g20_defconfig} | 23 +-
1206 arch/arm/configs/at91sam9g45_defconfig | 7 +-
1207 ...at91sam9rlek_defconfig => at91sam9rl_defconfig} | 5 -
1208 arch/arm/configs/ezx_defconfig | 2 +-
1209 arch/arm/configs/imote2_defconfig | 2 +-
1210 .../configs/{mx5_defconfig => imx_v6_v7_defconfig} | 61 ++--
1211 arch/arm/configs/magician_defconfig | 2 +-
1212 arch/arm/configs/mx3_defconfig | 144 --------
1213 arch/arm/configs/omap1_defconfig | 1 -
1214 arch/arm/configs/zeus_defconfig | 2 +-
1215 arch/arm/mach-at91/Kconfig | 24 ++-
1216 arch/arm/mach-at91/at91cap9.c | 40 ++-
1217 arch/arm/mach-at91/at91cap9_devices.c | 49 ++-
1218 arch/arm/mach-at91/at91rm9200.c | 24 +-
1219 arch/arm/mach-at91/at91rm9200_devices.c | 48 ++-
1220 arch/arm/mach-at91/at91rm9200_time.c | 8 +-
1221 arch/arm/mach-at91/at91sam9260.c | 36 +-
1222 arch/arm/mach-at91/at91sam9260_devices.c | 55 ++--
1223 arch/arm/mach-at91/at91sam9261.c | 32 +-
1224 arch/arm/mach-at91/at91sam9261_devices.c | 33 ++-
1225 arch/arm/mach-at91/at91sam9263.c | 45 ++--
1226 arch/arm/mach-at91/at91sam9263_devices.c | 59 ++--
1227 arch/arm/mach-at91/at91sam926x_time.c | 38 ++-
1228 arch/arm/mach-at91/at91sam9g45.c | 44 ++--
1229 arch/arm/mach-at91/at91sam9g45_devices.c | 69 +++--
1230 arch/arm/mach-at91/at91sam9rl.c | 36 +-
1231 arch/arm/mach-at91/at91sam9rl_devices.c | 43 ++-
1232 arch/arm/mach-at91/board-1arm.c | 4 +-
1233 arch/arm/mach-at91/board-afeb-9260v1.c | 10 +-
1234 arch/arm/mach-at91/board-cam60.c | 8 +-
1235 arch/arm/mach-at91/board-cap9adk.c | 21 +-
1236 arch/arm/mach-at91/board-carmeva.c | 9 +-
1237 arch/arm/mach-at91/board-cpu9krea.c | 14 +-
1238 arch/arm/mach-at91/board-cpuat91.c | 7 +-
1239 arch/arm/mach-at91/board-csb337.c | 7 +-
1240 arch/arm/mach-at91/board-csb637.c | 4 +-
1241 arch/arm/mach-at91/board-dt.c | 3 +-
1242 arch/arm/mach-at91/board-eb9200.c | 11 +-
1243 arch/arm/mach-at91/board-ecbat91.c | 7 +-
1244 arch/arm/mach-at91/board-eco920.c | 7 +-
1245 arch/arm/mach-at91/board-flexibity.c | 5 +-
1246 arch/arm/mach-at91/board-foxg20.c | 9 +-
1247 arch/arm/mach-at91/board-gsia18s.c | 7 +-
1248 arch/arm/mach-at91/board-kafa.c | 4 +-
1249 arch/arm/mach-at91/board-kb9202.c | 8 +-
1250 arch/arm/mach-at91/board-neocore926.c | 9 +-
1251 arch/arm/mach-at91/board-pcontrol-g20.c | 8 +-
1252 arch/arm/mach-at91/board-picotux200.c | 5 +-
1253 arch/arm/mach-at91/board-qil-a9260.c | 18 +-
1254 arch/arm/mach-at91/board-rm9200dk.c | 13 +-
1255 arch/arm/mach-at91/board-rm9200ek.c | 5 +-
1256 arch/arm/mach-at91/board-rsi-ews.c | 4 +-
1257 arch/arm/mach-at91/board-sam9-l9260.c | 12 +-
1258 arch/arm/mach-at91/board-sam9260ek.c | 16 +-
1259 arch/arm/mach-at91/board-sam9261ek.c | 13 +-
1260 arch/arm/mach-at91/board-sam9263ek.c | 12 +-
1261 arch/arm/mach-at91/board-sam9g20ek.c | 13 +-
1262 arch/arm/mach-at91/board-sam9m10g45ek.c | 8 +-
1263 arch/arm/mach-at91/board-sam9rlek.c | 9 +-
1264 arch/arm/mach-at91/board-snapper9260.c | 10 +-
1265 arch/arm/mach-at91/board-stamp9g20.c | 16 +-
1266 arch/arm/mach-at91/board-usb-a926x.c | 14 +-
1267 arch/arm/mach-at91/board-yl-9200.c | 9 +-
1268 arch/arm/mach-at91/generic.h | 7 +-
1269 arch/arm/mach-at91/gpio.c | 85 +++--
1270 arch/arm/mach-at91/include/mach/at91_aic.h | 48 ++-
1271 arch/arm/mach-at91/include/mach/at91_dbgu.h | 2 +-
1272 arch/arm/mach-at91/include/mach/at91_pit.h | 8 +-
1273 arch/arm/mach-at91/include/mach/at91_rtc.h | 24 +-
1274 arch/arm/mach-at91/include/mach/at91_shdwc.h | 16 +-
1275 arch/arm/mach-at91/include/mach/at91cap9.h | 27 +-
1276 arch/arm/mach-at91/include/mach/at91rm9200.h | 14 +-
1277 arch/arm/mach-at91/include/mach/at91sam9260.h | 23 +-
1278 arch/arm/mach-at91/include/mach/at91sam9261.h | 20 +-
1279 arch/arm/mach-at91/include/mach/at91sam9263.h | 33 +-
1280 arch/arm/mach-at91/include/mach/at91sam9_smc.h | 17 +-
1281 arch/arm/mach-at91/include/mach/at91sam9g45.h | 30 +-
1282 arch/arm/mach-at91/include/mach/at91sam9rl.h | 29 +-
1283 arch/arm/mach-at91/include/mach/at91x40.h | 1 -
1284 arch/arm/mach-at91/include/mach/board.h | 42 +--
1285 arch/arm/mach-at91/include/mach/debug-macro.S | 10 +-
1286 arch/arm/mach-at91/include/mach/entry-macro.S | 11 +-
1287 arch/arm/mach-at91/include/mach/gpio.h | 336 +++++++++---------
1288 arch/arm/mach-at91/include/mach/hardware.h | 12 +
1289 arch/arm/mach-at91/include/mach/irqs.h | 2 +-
1290 arch/arm/mach-at91/include/mach/timex.h | 65 +---
1291 arch/arm/mach-at91/include/mach/uncompress.h | 6 +-
1292 arch/arm/mach-at91/irq.c | 38 ++-
1293 arch/arm/mach-at91/pm.c | 11 +-
1294 arch/arm/mach-at91/sam9_smc.c | 62 +++--
1295 arch/arm/mach-at91/sam9_smc.h | 3 +-
1296 arch/arm/mach-at91/setup.c | 26 ++-
1297 arch/arm/mach-at91/soc.h | 1 +
1298 arch/arm/mach-exynos/cpuidle.c | 2 +
1299 arch/arm/mach-highbank/highbank.c | 4 +
1300 arch/arm/mach-imx/Kconfig | 244 ++++++++++++-
1301 arch/arm/mach-imx/Makefile | 21 ++
1302 arch/arm/mach-imx/Makefile.boot | 12 +
1303 arch/arm/mach-imx/clock-imx6q.c | 7 +-
1304 arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c | 2 +-
1305 arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c} | 5 +-
1306 arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c | 0
1307 arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h | 0
1308 .../crm_regs.h => mach-imx/crm-regs-imx5.h} | 0
1309 arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h | 0
1310 arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h | 0
1311 arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h | 0
1312 arch/arm/{mach-mx5 => mach-imx}/efika.h | 0
1313 arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} | 0
1314 .../eukrea_mbimx51-baseboard.c | 0
1315 .../eukrea_mbimxsd-baseboard.c | 0
1316 arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c | 0
1317 arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c | 0
1318 .../board-cpuimx51.c => mach-imx/mach-cpuimx51.c} | 0
1319 .../mach-cpuimx51sd.c} | 0
1320 arch/arm/mach-imx/mach-imx6q.c | 1 +
1321 .../board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c} | 0
1322 .../board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c} | 0
1323 .../mach-mx51_babbage.c} | 0
1324 .../mach-mx51_efikamx.c} | 0
1325 .../mach-mx51_efikasb.c} | 0
1326 .../board-mx53_ard.c => mach-imx/mach-mx53_ard.c} | 1 -
1327 .../board-mx53_evk.c => mach-imx/mach-mx53_evk.c} | 1 -
1328 .../mach-mx53_loco.c} | 1 -
1329 .../board-mx53_smd.c => mach-imx/mach-mx53_smd.c} | 1 -
1330 arch/arm/mach-imx/mm-imx3.c | 109 +++---
1331 arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c} | 6 +-
1332 arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c | 0
1333 arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} | 89 ++++-
1334 arch/arm/mach-imx/src.c | 7 +
1335 arch/arm/mach-mmp/aspenite.c | 5 +-
1336 arch/arm/mach-mmp/avengers_lite.c | 1 +
1337 arch/arm/mach-mmp/brownstone.c | 1 +
1338 arch/arm/mach-mmp/flint.c | 5 +-
1339 arch/arm/mach-mmp/gplugd.c | 3 +-
1340 arch/arm/mach-mmp/include/mach/gpio-pxa.h | 5 +-
1341 arch/arm/mach-mmp/include/mach/gpio.h | 7 +-
1342 arch/arm/mach-mmp/include/mach/irqs.h | 6 +-
1343 arch/arm/mach-mmp/include/mach/mmp2.h | 2 +
1344 arch/arm/mach-mmp/include/mach/pxa168.h | 2 +
1345 arch/arm/mach-mmp/include/mach/pxa910.h | 2 +
1346 arch/arm/mach-mmp/mmp2.c | 39 ++-
1347 arch/arm/mach-mmp/pxa168.c | 40 ++-
1348 arch/arm/mach-mmp/pxa910.c | 40 ++-
1349 arch/arm/mach-mmp/tavorevb.c | 6 +-
1350 arch/arm/mach-mmp/teton_bga.c | 3 +-
1351 arch/arm/mach-mmp/ttc_dkb.c | 8 +-
1352 arch/arm/mach-msm/timer.c | 347 +++++++------------
1353 arch/arm/mach-mx5/Kconfig | 244 -------------
1354 arch/arm/mach-mx5/Makefile | 26 --
1355 arch/arm/mach-mx5/Makefile.boot | 9 -
1356 arch/arm/mach-mx5/pm-imx5.c | 83 -----
1357 arch/arm/mach-mxs/clock-mx28.c | 2 +-
1358 arch/arm/mach-omap1/Kconfig | 8 -
1359 arch/arm/mach-omap1/board-ams-delta.c | 10 +-
1360 arch/arm/mach-omap1/clock.h | 3 +-
1361 arch/arm/mach-omap1/clock_data.c | 53 ++-
1362 arch/arm/mach-omap1/devices.c | 3 +
1363 arch/arm/mach-omap2/Kconfig | 1 +
1364 arch/arm/mach-omap2/Makefile | 5 +-
1365 arch/arm/mach-omap2/cpuidle34xx.c | 1 +
1366 arch/arm/mach-omap2/display.c | 159 ++++++++
1367 arch/arm/mach-omap2/display.h | 29 ++
1368 arch/arm/mach-omap2/omap_hwmod.c | 6 +-
1369 arch/arm/mach-omap2/omap_hwmod_2420_data.c | 17 +-
1370 arch/arm/mach-omap2/omap_hwmod_2430_data.c | 17 +-
1371 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 5 +-
1372 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 37 ++-
1373 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 24 +-
1374 arch/arm/mach-omap2/omap_hwmod_common_data.c | 4 +
1375 arch/arm/mach-omap2/omap_hwmod_common_data.h | 4 +
1376 arch/arm/mach-omap2/omap_l3_noc.c | 2 +-
1377 arch/arm/mach-omap2/pm.c | 6 +-
1378 arch/arm/mach-omap2/smartreflex.c | 2 +-
1379 arch/arm/mach-omap2/twl-common.c | 11 +
1380 arch/arm/mach-omap2/twl-common.h | 3 +
1381 arch/arm/mach-pxa/am200epd.c | 4 +-
1382 arch/arm/mach-pxa/am300epd.c | 4 +-
1383 arch/arm/mach-pxa/balloon3.c | 4 +-
1384 arch/arm/mach-pxa/capc7117.c | 12 +-
1385 arch/arm/mach-pxa/cm-x270.c | 4 +-
1386 arch/arm/mach-pxa/cm-x2xx.c | 4 +-
1387 arch/arm/mach-pxa/cm-x300.c | 6 +-
1388 arch/arm/mach-pxa/colibri-pxa270.c | 6 +-
1389 arch/arm/mach-pxa/colibri-pxa300.c | 4 +-
1390 arch/arm/mach-pxa/colibri-pxa320.c | 6 +-
1391 arch/arm/mach-pxa/corgi.c | 2 +-
1392 arch/arm/mach-pxa/corgi_pm.c | 20 +-
1393 arch/arm/mach-pxa/devices.c | 30 ++
1394 arch/arm/mach-pxa/devices.h | 1 +
1395 arch/arm/mach-pxa/em-x270.c | 6 +-
1396 arch/arm/mach-pxa/eseries.c | 4 +-
1397 arch/arm/mach-pxa/gumstix.c | 2 +-
1398 arch/arm/mach-pxa/hx4700.c | 18 +-
1399 arch/arm/mach-pxa/icontrol.c | 8 +-
1400 arch/arm/mach-pxa/idp.c | 4 +-
1401 arch/arm/mach-pxa/include/mach/balloon3.h | 6 +-
1402 arch/arm/mach-pxa/include/mach/corgi.h | 26 +-
1403 arch/arm/mach-pxa/include/mach/csb726.h | 4 +-
1404 arch/arm/mach-pxa/include/mach/gpio-pxa.h | 133 -------
1405 arch/arm/mach-pxa/include/mach/gpio.h | 20 +-
1406 arch/arm/mach-pxa/include/mach/gumstix.h | 20 +-
1407 arch/arm/mach-pxa/include/mach/hx4700.h | 2 +-
1408 arch/arm/mach-pxa/include/mach/idp.h | 16 +-
1409 arch/arm/mach-pxa/include/mach/irqs.h | 8 +-
1410 arch/arm/mach-pxa/include/mach/littleton.h | 4 +-
1411 arch/arm/mach-pxa/include/mach/magician.h | 2 +-
1412 arch/arm/mach-pxa/include/mach/palm27x.h | 4 +-
1413 arch/arm/mach-pxa/include/mach/palmld.h | 8 +-
1414 arch/arm/mach-pxa/include/mach/palmt5.h | 8 +-
1415 arch/arm/mach-pxa/include/mach/palmtc.h | 4 +-
1416 arch/arm/mach-pxa/include/mach/palmtx.h | 8 +-
1417 arch/arm/mach-pxa/include/mach/pcm027.h | 8 +-
1418 arch/arm/mach-pxa/include/mach/pcm990_baseboard.h | 14 +-
1419 arch/arm/mach-pxa/include/mach/poodle.h | 26 +-
1420 arch/arm/mach-pxa/include/mach/spitz.h | 40 +-
1421 arch/arm/mach-pxa/include/mach/tosa.h | 54 ++--
1422 arch/arm/mach-pxa/include/mach/trizeps4.h | 16 +-
1423 arch/arm/mach-pxa/irq.c | 61 +---
1424 arch/arm/mach-pxa/littleton.c | 6 +-
1425 arch/arm/mach-pxa/lpd270.c | 4 +-
1426 arch/arm/mach-pxa/lubbock.c | 4 +-
1427 arch/arm/mach-pxa/magician.c | 8 +-
1428 arch/arm/mach-pxa/mainstone.c | 4 +-
1429 arch/arm/mach-pxa/mfp-pxa2xx.c | 6 +-
1430 arch/arm/mach-pxa/mioa701.c | 8 +-
1431 arch/arm/mach-pxa/mxm8x10.c | 4 +-
1432 arch/arm/mach-pxa/palm27x.c | 4 +-
1433 arch/arm/mach-pxa/palmtc.c | 2 +-
1434 arch/arm/mach-pxa/pcm990-baseboard.c | 6 +-
1435 arch/arm/mach-pxa/poodle.c | 6 +-
1436 arch/arm/mach-pxa/pxa25x.c | 6 +-
1437 arch/arm/mach-pxa/pxa27x.c | 6 +-
1438 arch/arm/mach-pxa/pxa3xx.c | 8 +-
1439 arch/arm/mach-pxa/pxa95x.c | 5 +-
1440 arch/arm/mach-pxa/raumfeld.c | 8 +-
1441 arch/arm/mach-pxa/saar.c | 6 +-
1442 arch/arm/mach-pxa/saarb.c | 2 +-
1443 arch/arm/mach-pxa/sharpsl_pm.c | 24 +-
1444 arch/arm/mach-pxa/spitz.c | 2 +-
1445 arch/arm/mach-pxa/spitz_pm.c | 10 +-
1446 arch/arm/mach-pxa/stargate2.c | 26 +-
1447 arch/arm/mach-pxa/tavorevb.c | 4 +-
1448 arch/arm/mach-pxa/tavorevb3.c | 2 +-
1449 arch/arm/mach-pxa/tosa.c | 4 +-
1450 arch/arm/mach-pxa/viper.c | 12 +-
1451 arch/arm/mach-pxa/vpac270.c | 12 +-
1452 arch/arm/mach-pxa/z2.c | 2 +-
1453 arch/arm/mach-pxa/zeus.c | 20 +-
1454 arch/arm/mach-pxa/zylonite.c | 4 +-
1455 arch/arm/mach-pxa/zylonite_pxa300.c | 4 +-
1456 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +-
1457 arch/arm/plat-mxc/Kconfig | 15 +-
1458 arch/arm/plat-mxc/include/mach/common.h | 2 +-
1459 arch/arm/plat-mxc/include/mach/mxc.h | 14 -
1460 arch/arm/plat-mxc/include/mach/system.h | 7 +-
1461 arch/arm/plat-mxc/system.c | 3 +-
1462 arch/arm/plat-omap/include/plat/clock.h | 2 +-
1463 arch/arm/plat-omap/include/plat/common.h | 4 +
1464 arch/arm/plat-pxa/include/plat/gpio-pxa.h | 44 ---
1465 arch/arm/plat-pxa/include/plat/gpio.h | 30 --
1466 arch/arm/plat-s3c24xx/cpu-freq-debugfs.c | 2 +-
1467 arch/arm/plat-s5p/sysmmu.c | 1 +
1468 arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 +
1469 arch/arm/plat-samsung/pd.c | 2 +-
1470 arch/arm/plat-samsung/pwm.c | 2 +-
1471 arch/avr32/boards/atngw100/setup.c | 2 +-
1472 arch/avr32/boards/atstk1000/atstk1002.c | 2 +-
1473 arch/avr32/boards/favr-32/setup.c | 2 +-
1474 arch/avr32/boards/hammerhead/setup.c | 2 +-
1475 arch/avr32/boards/merisc/setup.c | 2 +-
1476 arch/avr32/boards/mimc200/setup.c | 2 +-
1477 arch/avr32/mach-at32ap/at32ap700x.c | 8 +-
1478 arch/avr32/mach-at32ap/include/mach/board.h | 7 +-
1479 drivers/ata/pata_at91.c | 6 +-
1480 drivers/gpio/Kconfig | 6 +
1481 drivers/gpio/Makefile | 2 +-
1482 drivers/gpio/gpio-pxa.c | 377 +++++++++++++++++---
1483 drivers/ide/at91_ide.c | 2 +-
1484 drivers/mmc/host/at91_mci.c | 30 +-
1485 drivers/mtd/nand/atmel_nand.c | 8 +-
1486 drivers/net/ethernet/Makefile | 2 +-
1487 drivers/net/ethernet/cadence/Kconfig | 16 +-
1488 drivers/net/ethernet/cadence/at91_ether.c | 3 +-
1489 drivers/net/ethernet/cadence/at91_ether.h | 4 +-
1490 drivers/net/ethernet/cadence/macb.c | 344 ++++++++++++-------
1491 drivers/net/ethernet/cadence/macb.h | 150 ++++++++-
1492 drivers/pcmcia/pxa2xx_cm_x255.c | 16 +-
1493 drivers/pcmcia/pxa2xx_cm_x270.c | 9 +-
1494 drivers/rtc/rtc-at91rm9200.c | 101 ++++--
1495 drivers/usb/gadget/at91_udc.c | 14 +-
1496 drivers/usb/host/ohci-at91.c | 12 +-
1497 drivers/watchdog/at91sam9_wdt.c | 22 +-
1498 drivers/watchdog/at91sam9_wdt.h | 6 +-
1499 include/linux/gpio-pxa.h | 16 +
1500 include/linux/platform_data/macb.h | 17 +
1501 include/video/omapdss.h | 7 -
1502 305 files changed, 3552 insertions(+), 2845 deletions(-)
1503 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
1504 rename arch/arm/configs/{at91cap9adk_defconfig => at91cap9_defconfig} (93%)
1505 rename arch/arm/configs/{at91sam9260ek_defconfig => at91sam9260_defconfig} (86%)
1506 rename arch/arm/configs/{at91sam9g20ek_defconfig => at91sam9g20_defconfig} (90%)
1507 rename arch/arm/configs/{at91sam9rlek_defconfig => at91sam9rl_defconfig} (94%)
1508 rename arch/arm/configs/{mx5_defconfig => imx_v6_v7_defconfig} (80%)
1509 delete mode 100644 arch/arm/configs/mx3_defconfig
1510 rename arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c (99%)
1511 rename arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c} (97%)
1512 rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c (100%)
1513 rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h (100%)
1514 rename arch/arm/{mach-mx5/crm_regs.h => mach-imx/crm-regs-imx5.h} (100%)
1515 rename arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h (100%)
1516 rename arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h (100%)
1517 rename arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h (100%)
1518 rename arch/arm/{mach-mx5 => mach-imx}/efika.h (100%)
1519 rename arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} (100%)
1520 rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimx51-baseboard.c (100%)
1521 rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimxsd-baseboard.c (100%)
1522 rename arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c (100%)
1523 rename arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c (100%)
1524 rename arch/arm/{mach-mx5/board-cpuimx51.c => mach-imx/mach-cpuimx51.c} (100%)
1525 rename arch/arm/{mach-mx5/board-cpuimx51sd.c => mach-imx/mach-cpuimx51sd.c} (100%)
1526 rename arch/arm/{mach-mx5/board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c} (100%)
1527 rename arch/arm/{mach-mx5/board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c} (100%)
1528 rename arch/arm/{mach-mx5/board-mx51_babbage.c => mach-imx/mach-mx51_babbage.c} (100%)
1529 rename arch/arm/{mach-mx5/board-mx51_efikamx.c => mach-imx/mach-mx51_efikamx.c} (100%)
1530 rename arch/arm/{mach-mx5/board-mx51_efikasb.c => mach-imx/mach-mx51_efikasb.c} (100%)
1531 rename arch/arm/{mach-mx5/board-mx53_ard.c => mach-imx/mach-mx53_ard.c} (99%)
1532 rename arch/arm/{mach-mx5/board-mx53_evk.c => mach-imx/mach-mx53_evk.c} (99%)
1533 rename arch/arm/{mach-mx5/board-mx53_loco.c => mach-imx/mach-mx53_loco.c} (99%)
1534 rename arch/arm/{mach-mx5/board-mx53_smd.c => mach-imx/mach-mx53_smd.c} (99%)
1535 rename arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c} (98%)
1536 rename arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c (100%)
1537 rename arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} (58%)
1538 delete mode 100644 arch/arm/mach-mx5/Kconfig
1539 delete mode 100644 arch/arm/mach-mx5/Makefile
1540 delete mode 100644 arch/arm/mach-mx5/Makefile.boot
1541 delete mode 100644 arch/arm/mach-mx5/pm-imx5.c
1542 create mode 100644 arch/arm/mach-omap2/display.h
1543 delete mode 100644 arch/arm/mach-omap2/io.h
1544 delete mode 100644 arch/arm/mach-pxa/include/mach/gpio-pxa.h
1545 delete mode 100644 arch/arm/plat-pxa/include/plat/gpio-pxa.h
1546 delete mode 100644 arch/arm/plat-pxa/include/plat/gpio.h
1547 create mode 100644 include/linux/gpio-pxa.h
1548 create mode 100644 include/linux/platform_data/macb.h
1549 Merging arm-perf/for-next/perf (f2288ad Merge branches 'perf/fixes', 'perf/event-nos', 'perf/omap4' and 'perf/updates' into for-next/perf)
1550 $ git merge arm-perf/for-next/perf
1551 Auto-merging arch/arm/kernel/perf_event.c
1552 Auto-merging arch/arm/include/asm/pmu.h
1553 Merge made by the 'recursive' strategy.
1554 arch/arm/include/asm/cti.h | 179 ++++++++++++++++
1555 arch/arm/include/asm/perf_event.h | 3 -
1556 arch/arm/include/asm/pmu.h | 15 +-
1557 arch/arm/kernel/perf_event.c | 19 +-
1558 arch/arm/kernel/perf_event_v6.c | 32 ++--
1559 arch/arm/kernel/perf_event_v7.c | 401 +++++++++++++----------------------
1560 arch/arm/kernel/perf_event_xscale.c | 16 +-
1561 7 files changed, 379 insertions(+), 286 deletions(-)
1562 create mode 100644 arch/arm/include/asm/cti.h
1563 Merging at91/at91-next (8748dfa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
1564 $ git merge at91/at91-next
1566 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
1567 $ git merge davinci/davinci-next
1569 Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
1570 $ git merge i.MX/for-next
1571 Resolved 'arch/arm/mach-imx/clock-mx51-mx53.c' using previous resolution.
1572 Resolved 'arch/arm/mach-imx/devices-imx53.h' using previous resolution.
1573 Resolved 'arch/arm/mach-imx/mm-imx5.c' using previous resolution.
1574 Resolved 'arch/arm/plat-mxc/include/mach/hardware.h' using previous resolution.
1575 Auto-merging arch/arm/plat-mxc/include/mach/hardware.h
1576 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
1577 Auto-merging arch/arm/mach-mxs/clock-mx28.c
1578 CONFLICT (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree.
1579 CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree.
1580 CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree.
1581 Auto-merging arch/arm/mach-imx/mm-imx5.c
1582 CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx5.c
1583 Auto-merging arch/arm/mach-imx/devices-imx53.h
1584 CONFLICT (content): Merge conflict in arch/arm/mach-imx/devices-imx53.h
1585 Auto-merging arch/arm/mach-imx/clock-mx51-mx53.c
1586 CONFLICT (content): Merge conflict in arch/arm/mach-imx/clock-mx51-mx53.c
1587 Automatic merge failed; fix conflicts and then commit the result.
1588 $ git rm -f arch/arm/mach-mx5/pm-imx5.c arch/arm/mach-mx5/Makefile arch/arm/mach-mx5/Kconfig
1589 arch/arm/mach-imx/clock-mx51-mx53.c: needs merge
1590 arch/arm/mach-imx/devices-imx53.h: needs merge
1591 arch/arm/mach-imx/mm-imx5.c: needs merge
1592 arch/arm/mach-mx5/Kconfig: needs merge
1593 arch/arm/mach-mx5/Makefile: needs merge
1594 arch/arm/mach-mx5/pm-imx5.c: needs merge
1595 arch/arm/plat-mxc/include/mach/hardware.h: needs merge
1596 rm 'arch/arm/mach-mx5/Kconfig'
1597 rm 'arch/arm/mach-mx5/Makefile'
1598 rm 'arch/arm/mach-mx5/pm-imx5.c'
1600 [master f340ed3] Merge remote-tracking branch 'i.MX/for-next'
1601 $ git diff -M --stat --summary HEAD^..
1602 arch/arm/mach-mxs/clock-mx28.c | 4 ++++
1603 1 files changed, 4 insertions(+), 0 deletions(-)
1604 Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
1605 $ git merge linux-spec/for-next
1607 Merging omap/for-next (322a8b0 Linux 3.1-rc1)
1608 $ git merge omap/for-next
1610 Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
1611 $ git merge pxa/for-next
1613 Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
1614 $ git merge samsung/next-samsung
1616 Merging s5p/for-next (a188e1e Merge branch 'next-samsung-devel' into for-next)
1617 $ git merge s5p/for-next
1618 Resolved 'arch/arm/mach-exynos/cpu.c' using previous resolution.
1619 Resolved 'arch/arm/mach-exynos/include/mach/entry-macro.S' using previous resolution.
1620 Removing drivers/tty/serial/s5pv210.c
1621 Removing drivers/tty/serial/s3c6400.c
1622 Removing drivers/tty/serial/s3c2440.c
1623 Removing drivers/tty/serial/s3c2412.c
1624 Removing drivers/tty/serial/s3c2410.c
1625 Auto-merging drivers/tty/serial/Kconfig
1626 Removing arch/arm/mach-s5pv210/setup-sdhci.c
1627 Removing arch/arm/mach-s5pc100/setup-sdhci.c
1628 Removing arch/arm/mach-s3c64xx/setup-sdhci.c
1629 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
1630 Removing arch/arm/mach-s3c2416/setup-sdhci.c
1631 Removing arch/arm/mach-exynos/setup-sdhci.c
1632 Auto-merging arch/arm/mach-exynos/mach-origen.c
1633 Auto-merging arch/arm/mach-exynos/include/mach/entry-macro.S
1634 CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S
1635 Auto-merging arch/arm/mach-exynos/cpu.c
1636 CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpu.c
1637 Automatic merge failed; fix conflicts and then commit the result.
1639 [master 94fff97] Merge remote-tracking branch 's5p/for-next'
1640 $ git diff -M --stat --summary HEAD^..
1641 .../devicetree/bindings/arm/insignal-boards.txt | 8 +
1642 .../devicetree/bindings/arm/samsung-boards.txt | 8 +
1643 .../devicetree/bindings/dma/arm-pl330.txt | 30 +
1644 .../devicetree/bindings/gpio/gpio-samsung.txt | 40 ++
1645 .../devicetree/bindings/input/samsung-keypad.txt | 88 +++
1646 Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 20 +
1647 .../devicetree/bindings/serial/samsung_uart.txt | 14 +
1648 arch/arm/boot/dts/exynos4210-origen.dts | 137 +++++
1649 arch/arm/boot/dts/exynos4210-smdkv310.dts | 182 ++++++
1650 arch/arm/boot/dts/exynos4210.dtsi | 397 ++++++++++++
1651 arch/arm/mach-exynos/Kconfig | 24 +
1652 arch/arm/mach-exynos/Makefile | 6 +-
1653 arch/arm/mach-exynos/clock.c | 229 +++++---
1654 arch/arm/mach-exynos/cpu.c | 38 ++-
1655 arch/arm/mach-exynos/dma.c | 229 ++-----
1656 arch/arm/mach-exynos/include/mach/io.h | 5 +
1657 arch/arm/mach-exynos/include/mach/irqs.h | 8 +-
1658 arch/arm/mach-exynos/init.c | 21 +-
1659 arch/arm/mach-exynos/mach-exynos4-dt.c | 85 +++
1660 arch/arm/mach-exynos/mach-origen.c | 34 +
1661 arch/arm/mach-exynos/pm.c | 24 +-
1662 arch/arm/mach-exynos/setup-sdhci.c | 22 -
1663 arch/arm/mach-s3c2410/mach-bast.c | 22 -
1664 arch/arm/mach-s3c2410/mach-vr1000.c | 24 -
1665 arch/arm/mach-s3c2410/s3c2410.c | 6 +
1666 arch/arm/mach-s3c2412/clock.c | 7 +
1667 arch/arm/mach-s3c2416/Makefile | 1 -
1668 arch/arm/mach-s3c2416/clock.c | 68 ++-
1669 arch/arm/mach-s3c2416/setup-sdhci.c | 24 -
1670 arch/arm/mach-s3c2440/clock.c | 44 ++
1671 arch/arm/mach-s3c2440/mach-anubis.c | 22 +-
1672 arch/arm/mach-s3c2440/mach-at2440evb.c | 22 +-
1673 arch/arm/mach-s3c2440/mach-osiris.c | 24 +-
1674 arch/arm/mach-s3c2440/mach-rx1950.c | 18 +-
1675 arch/arm/mach-s3c2440/mach-rx3715.c | 19 +-
1676 arch/arm/mach-s3c64xx/Kconfig | 6 +-
1677 arch/arm/mach-s3c64xx/Makefile | 1 -
1678 arch/arm/mach-s3c64xx/clock.c | 243 +++++---
1679 arch/arm/mach-s3c64xx/dev-spi.c | 7 -
1680 arch/arm/mach-s3c64xx/include/mach/crag6410.h | 3 +-
1681 arch/arm/mach-s3c64xx/include/mach/gpio.h | 2 +-
1682 arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
1683 arch/arm/mach-s3c64xx/setup-sdhci.c | 24 -
1684 arch/arm/mach-s5p64x0/clock-s5p6440.c | 93 ++--
1685 arch/arm/mach-s5p64x0/clock-s5p6450.c | 81 ++-
1686 arch/arm/mach-s5p64x0/dev-spi.c | 6 -
1687 arch/arm/mach-s5p64x0/dma.c | 227 ++-----
1688 arch/arm/mach-s5p64x0/include/mach/irqs.h | 2 +
1689 arch/arm/mach-s5p64x0/init.c | 31 -
1690 arch/arm/mach-s5pc100/Makefile | 1 -
1691 arch/arm/mach-s5pc100/clock.c | 287 ++++++----
1692 arch/arm/mach-s5pc100/dev-spi.c | 7 -
1693 arch/arm/mach-s5pc100/dma.c | 247 +++------
1694 arch/arm/mach-s5pc100/include/mach/irqs.h | 2 +
1695 arch/arm/mach-s5pc100/setup-sdhci.c | 23 -
1696 arch/arm/mach-s5pv210/Makefile | 1 -
1697 arch/arm/mach-s5pv210/clock.c | 324 ++++++----
1698 arch/arm/mach-s5pv210/dev-spi.c | 6 -
1699 arch/arm/mach-s5pv210/dma.c | 241 +++------
1700 arch/arm/mach-s5pv210/include/mach/irqs.h | 2 +
1701 arch/arm/mach-s5pv210/init.c | 19 -
1702 arch/arm/mach-s5pv210/setup-sdhci.c | 22 -
1703 arch/arm/plat-s3c24xx/s3c2443-clock.c | 39 +-
1704 arch/arm/plat-samsung/Kconfig | 8 +
1705 arch/arm/plat-samsung/dma-ops.c | 15 +-
1706 arch/arm/plat-samsung/include/plat/dma-ops.h | 1 +
1707 arch/arm/plat-samsung/include/plat/dma-pl330.h | 3 +-
1708 arch/arm/plat-samsung/include/plat/irqs.h | 3 +-
1709 arch/arm/plat-samsung/include/plat/regs-serial.h | 45 +-
1710 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 2 -
1711 arch/arm/plat-samsung/include/plat/sdhci.h | 31 -
1712 drivers/dma/pl330.c | 99 ++--
1713 drivers/gpio/gpio-samsung.c | 72 +++
1714 drivers/input/keyboard/samsung-keypad.c | 174 +++++-
1715 drivers/mmc/host/sdhci-s3c.c | 7 +-
1716 drivers/rtc/rtc-s3c.c | 21 +-
1717 drivers/spi/spi-s3c64xx.c | 14 +-
1718 drivers/tty/serial/Kconfig | 45 +--
1719 drivers/tty/serial/Makefile | 5 -
1720 drivers/tty/serial/s3c2410.c | 115 ----
1721 drivers/tty/serial/s3c2412.c | 149 -----
1722 drivers/tty/serial/s3c2440.c | 178 ------
1723 drivers/tty/serial/s3c6400.c | 149 -----
1724 drivers/tty/serial/s5pv210.c | 158 -----
1725 drivers/tty/serial/samsung.c | 639 ++++++++++++--------
1726 drivers/tty/serial/samsung.h | 32 +-
1727 include/linux/amba/pl330.h | 15 +-
1728 87 files changed, 3076 insertions(+), 2803 deletions(-)
1729 create mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt
1730 create mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt
1731 create mode 100644 Documentation/devicetree/bindings/dma/arm-pl330.txt
1732 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-samsung.txt
1733 create mode 100644 Documentation/devicetree/bindings/input/samsung-keypad.txt
1734 create mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.txt
1735 create mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.txt
1736 create mode 100644 arch/arm/boot/dts/exynos4210-origen.dts
1737 create mode 100644 arch/arm/boot/dts/exynos4210-smdkv310.dts
1738 create mode 100644 arch/arm/boot/dts/exynos4210.dtsi
1739 create mode 100644 arch/arm/mach-exynos/mach-exynos4-dt.c
1740 delete mode 100644 arch/arm/mach-exynos/setup-sdhci.c
1741 delete mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c
1742 delete mode 100644 arch/arm/mach-s3c64xx/setup-sdhci.c
1743 delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci.c
1744 delete mode 100644 arch/arm/mach-s5pv210/setup-sdhci.c
1745 delete mode 100644 drivers/tty/serial/s3c2410.c
1746 delete mode 100644 drivers/tty/serial/s3c2412.c
1747 delete mode 100644 drivers/tty/serial/s3c2440.c
1748 delete mode 100644 drivers/tty/serial/s3c6400.c
1749 delete mode 100644 drivers/tty/serial/s5pv210.c
1750 Merging tegra/for-next (b48c54e Merge branch 'for-3.3/boards' into for-next)
1751 $ git merge tegra/for-next
1752 Auto-merging arch/arm/mach-tegra/board-paz00.c
1753 Auto-merging arch/arm/mach-tegra/board-dt.c
1754 Merge made by the 'recursive' strategy.
1755 .../devicetree/bindings/usb/tegra-usb.txt | 13 +++
1756 arch/arm/boot/dts/tegra-paz00.dts | 82 ++++++++++++++++++++
1757 arch/arm/boot/dts/tegra-seaboard.dts | 4 +
1758 arch/arm/boot/dts/tegra-trimslice.dts | 38 +++++++++
1759 arch/arm/boot/dts/tegra20.dtsi | 21 +++++
1760 arch/arm/mach-tegra/Makefile | 28 ++++---
1761 arch/arm/mach-tegra/Makefile.boot | 2 +
1762 arch/arm/mach-tegra/board-dt.c | 15 ++++
1763 arch/arm/mach-tegra/board-paz00-pinmux.c | 2 +-
1764 arch/arm/mach-tegra/board-paz00.c | 27 +++++++
1765 arch/arm/mach-tegra/board-paz00.h | 3 +
1766 arch/arm/mach-tegra/irq.c | 4 -
1767 arch/arm/mach-tegra/timer.c | 12 ++-
1768 drivers/usb/host/ehci-tegra.c | 71 +++++++++++++++++
1769 14 files changed, 300 insertions(+), 22 deletions(-)
1770 create mode 100644 Documentation/devicetree/bindings/usb/tegra-usb.txt
1771 create mode 100644 arch/arm/boot/dts/tegra-paz00.dts
1772 create mode 100644 arch/arm/boot/dts/tegra-trimslice.dts
1773 Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
1774 $ git merge xilinx/arm-next
1776 Merging blackfin/for-linus (9059054 blackfin: Fixup export.h includes)
1777 $ git merge blackfin/for-linus
1779 Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
1780 $ git merge c6x/for-linux-next
1781 Auto-merging include/asm-generic/page.h
1782 Auto-merging MAINTAINERS
1783 Merge made by the 'recursive' strategy.
1784 Documentation/devicetree/bindings/c6x/clocks.txt | 40 +
1785 Documentation/devicetree/bindings/c6x/dscr.txt | 127 +++
1786 Documentation/devicetree/bindings/c6x/emifa.txt | 62 ++
1787 .../devicetree/bindings/c6x/interrupt.txt | 104 +++
1788 Documentation/devicetree/bindings/c6x/soc.txt | 28 +
1789 Documentation/devicetree/bindings/c6x/timer64.txt | 26 +
1791 arch/c6x/Kconfig | 174 +++++
1792 arch/c6x/Makefile | 60 ++
1793 arch/c6x/boot/Makefile | 30 +
1794 arch/c6x/boot/dts/dsk6455.dts | 62 ++
1795 arch/c6x/boot/dts/evmc6457.dts | 48 ++
1796 arch/c6x/boot/dts/evmc6472.dts | 73 ++
1797 arch/c6x/boot/dts/evmc6474.dts | 58 ++
1798 arch/c6x/boot/dts/tms320c6455.dtsi | 96 +++
1799 arch/c6x/boot/dts/tms320c6457.dtsi | 68 ++
1800 arch/c6x/boot/dts/tms320c6472.dtsi | 134 ++++
1801 arch/c6x/boot/dts/tms320c6474.dtsi | 89 +++
1802 arch/c6x/boot/linked_dtb.S | 2 +
1803 arch/c6x/configs/dsk6455_defconfig | 44 ++
1804 arch/c6x/configs/evmc6457_defconfig | 41 +
1805 arch/c6x/configs/evmc6472_defconfig | 42 +
1806 arch/c6x/configs/evmc6474_defconfig | 42 +
1807 arch/c6x/include/asm/Kbuild | 54 ++
1808 arch/c6x/include/asm/asm-offsets.h | 1 +
1809 arch/c6x/include/asm/bitops.h | 105 +++
1810 arch/c6x/include/asm/byteorder.h | 12 +
1811 arch/c6x/include/asm/cache.h | 90 +++
1812 arch/c6x/include/asm/cacheflush.h | 65 ++
1813 arch/c6x/include/asm/checksum.h | 34 +
1814 arch/c6x/include/asm/clkdev.h | 22 +
1815 arch/c6x/include/asm/clock.h | 148 ++++
1816 arch/c6x/include/asm/delay.h | 67 ++
1817 arch/c6x/include/asm/dma-mapping.h | 91 +++
1818 arch/c6x/include/asm/dscr.h | 34 +
1819 arch/c6x/include/asm/elf.h | 113 +++
1820 arch/c6x/include/asm/ftrace.h | 6 +
1821 arch/c6x/include/asm/hardirq.h | 20 +
1822 arch/c6x/include/asm/irq.h | 302 ++++++++
1823 arch/c6x/include/asm/irqflags.h | 72 ++
1824 arch/c6x/include/asm/linkage.h | 30 +
1825 arch/c6x/include/asm/megamod-pic.h | 9 +
1826 arch/c6x/include/asm/memblock.h | 4 +
1827 arch/c6x/include/asm/mmu.h | 18 +
1828 arch/c6x/include/asm/module.h | 33 +
1829 arch/c6x/include/asm/mutex.h | 6 +
1830 arch/c6x/include/asm/page.h | 11 +
1831 arch/c6x/include/asm/pgtable.h | 81 ++
1832 arch/c6x/include/asm/processor.h | 132 ++++
1833 arch/c6x/include/asm/procinfo.h | 28 +
1834 arch/c6x/include/asm/prom.h | 1 +
1835 arch/c6x/include/asm/ptrace.h | 174 +++++
1836 arch/c6x/include/asm/sections.h | 12 +
1837 arch/c6x/include/asm/setup.h | 32 +
1838 arch/c6x/include/asm/sigcontext.h | 80 ++
1839 arch/c6x/include/asm/signal.h | 17 +
1840 arch/c6x/include/asm/soc.h | 35 +
1841 arch/c6x/include/asm/string.h | 21 +
1842 arch/c6x/include/asm/swab.h | 54 ++
1843 arch/c6x/include/asm/syscall.h | 123 +++
1844 arch/c6x/include/asm/syscalls.h | 55 ++
1845 arch/c6x/include/asm/system.h | 168 ++++
1846 arch/c6x/include/asm/thread_info.h | 121 +++
1847 arch/c6x/include/asm/timer64.h | 6 +
1848 arch/c6x/include/asm/timex.h | 33 +
1849 arch/c6x/include/asm/tlb.h | 8 +
1850 arch/c6x/include/asm/traps.h | 36 +
1851 arch/c6x/include/asm/uaccess.h | 107 +++
1852 arch/c6x/include/asm/unaligned.h | 170 +++++
1853 arch/c6x/include/asm/unistd.h | 26 +
1854 arch/c6x/kernel/Makefile | 12 +
1855 arch/c6x/kernel/asm-offsets.c | 123 +++
1856 arch/c6x/kernel/c6x_ksyms.c | 66 ++
1857 arch/c6x/kernel/devicetree.c | 53 ++
1858 arch/c6x/kernel/dma.c | 153 ++++
1859 arch/c6x/kernel/entry.S | 803 ++++++++++++++++++++
1860 arch/c6x/kernel/head.S | 84 ++
1861 arch/c6x/kernel/irq.c | 728 ++++++++++++++++++
1862 arch/c6x/kernel/module.c | 123 +++
1863 arch/c6x/kernel/process.c | 263 +++++++
1864 arch/c6x/kernel/ptrace.c | 187 +++++
1865 arch/c6x/kernel/setup.c | 498 ++++++++++++
1866 arch/c6x/kernel/signal.c | 377 +++++++++
1867 arch/c6x/kernel/soc.c | 91 +++
1868 arch/c6x/kernel/switch_to.S | 74 ++
1869 arch/c6x/kernel/sys_c6x.c | 74 ++
1870 arch/c6x/kernel/time.c | 65 ++
1871 arch/c6x/kernel/traps.c | 423 ++++++++++
1872 arch/c6x/kernel/vectors.S | 81 ++
1873 arch/c6x/kernel/vmlinux.lds.S | 162 ++++
1874 arch/c6x/lib/Makefile | 7 +
1875 arch/c6x/lib/checksum.c | 36 +
1876 arch/c6x/lib/csum_64plus.S | 419 ++++++++++
1877 arch/c6x/lib/divi.S | 53 ++
1878 arch/c6x/lib/divremi.S | 46 ++
1879 arch/c6x/lib/divremu.S | 87 +++
1880 arch/c6x/lib/divu.S | 98 +++
1881 arch/c6x/lib/llshl.S | 37 +
1882 arch/c6x/lib/llshr.S | 38 +
1883 arch/c6x/lib/llshru.S | 38 +
1884 arch/c6x/lib/memcpy_64plus.S | 46 ++
1885 arch/c6x/lib/mpyll.S | 49 ++
1886 arch/c6x/lib/negll.S | 31 +
1887 arch/c6x/lib/pop_rts.S | 32 +
1888 arch/c6x/lib/push_rts.S | 31 +
1889 arch/c6x/lib/remi.S | 64 ++
1890 arch/c6x/lib/remu.S | 82 ++
1891 arch/c6x/lib/strasgi.S | 89 +++
1892 arch/c6x/lib/strasgi_64plus.S | 39 +
1893 arch/c6x/mm/Makefile | 5 +
1894 arch/c6x/mm/dma-coherent.c | 143 ++++
1895 arch/c6x/mm/init.c | 113 +++
1896 arch/c6x/platforms/Kconfig | 16 +
1897 arch/c6x/platforms/Makefile | 12 +
1898 arch/c6x/platforms/cache.c | 445 +++++++++++
1899 arch/c6x/platforms/dscr.c | 598 +++++++++++++++
1900 arch/c6x/platforms/emif.c | 88 +++
1901 arch/c6x/platforms/megamod-pic.c | 349 +++++++++
1902 arch/c6x/platforms/platform.c | 17 +
1903 arch/c6x/platforms/pll.c | 444 +++++++++++
1904 arch/c6x/platforms/plldata.c | 404 ++++++++++
1905 arch/c6x/platforms/timer64.c | 236 ++++++
1906 include/asm-generic/io.h | 2 +-
1907 include/asm-generic/page.h | 10 +-
1908 include/asm-generic/uaccess.h | 7 +-
1909 include/linux/elf-em.h | 1 +
1910 126 files changed, 12972 insertions(+), 5 deletions(-)
1911 create mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt
1912 create mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt
1913 create mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt
1914 create mode 100644 Documentation/devicetree/bindings/c6x/interrupt.txt
1915 create mode 100644 Documentation/devicetree/bindings/c6x/soc.txt
1916 create mode 100644 Documentation/devicetree/bindings/c6x/timer64.txt
1917 create mode 100644 arch/c6x/Kconfig
1918 create mode 100644 arch/c6x/Makefile
1919 create mode 100644 arch/c6x/boot/Makefile
1920 create mode 100644 arch/c6x/boot/dts/dsk6455.dts
1921 create mode 100644 arch/c6x/boot/dts/evmc6457.dts
1922 create mode 100644 arch/c6x/boot/dts/evmc6472.dts
1923 create mode 100644 arch/c6x/boot/dts/evmc6474.dts
1924 create mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi
1925 create mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi
1926 create mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi
1927 create mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi
1928 create mode 100644 arch/c6x/boot/linked_dtb.S
1929 create mode 100644 arch/c6x/configs/dsk6455_defconfig
1930 create mode 100644 arch/c6x/configs/evmc6457_defconfig
1931 create mode 100644 arch/c6x/configs/evmc6472_defconfig
1932 create mode 100644 arch/c6x/configs/evmc6474_defconfig
1933 create mode 100644 arch/c6x/include/asm/Kbuild
1934 create mode 100644 arch/c6x/include/asm/asm-offsets.h
1935 create mode 100644 arch/c6x/include/asm/bitops.h
1936 create mode 100644 arch/c6x/include/asm/byteorder.h
1937 create mode 100644 arch/c6x/include/asm/cache.h
1938 create mode 100644 arch/c6x/include/asm/cacheflush.h
1939 create mode 100644 arch/c6x/include/asm/checksum.h
1940 create mode 100644 arch/c6x/include/asm/clkdev.h
1941 create mode 100644 arch/c6x/include/asm/clock.h
1942 create mode 100644 arch/c6x/include/asm/delay.h
1943 create mode 100644 arch/c6x/include/asm/dma-mapping.h
1944 create mode 100644 arch/c6x/include/asm/dscr.h
1945 create mode 100644 arch/c6x/include/asm/elf.h
1946 create mode 100644 arch/c6x/include/asm/ftrace.h
1947 create mode 100644 arch/c6x/include/asm/hardirq.h
1948 create mode 100644 arch/c6x/include/asm/irq.h
1949 create mode 100644 arch/c6x/include/asm/irqflags.h
1950 create mode 100644 arch/c6x/include/asm/linkage.h
1951 create mode 100644 arch/c6x/include/asm/megamod-pic.h
1952 create mode 100644 arch/c6x/include/asm/memblock.h
1953 create mode 100644 arch/c6x/include/asm/mmu.h
1954 create mode 100644 arch/c6x/include/asm/module.h
1955 create mode 100644 arch/c6x/include/asm/mutex.h
1956 create mode 100644 arch/c6x/include/asm/page.h
1957 create mode 100644 arch/c6x/include/asm/pgtable.h
1958 create mode 100644 arch/c6x/include/asm/processor.h
1959 create mode 100644 arch/c6x/include/asm/procinfo.h
1960 create mode 100644 arch/c6x/include/asm/prom.h
1961 create mode 100644 arch/c6x/include/asm/ptrace.h
1962 create mode 100644 arch/c6x/include/asm/sections.h
1963 create mode 100644 arch/c6x/include/asm/setup.h
1964 create mode 100644 arch/c6x/include/asm/sigcontext.h
1965 create mode 100644 arch/c6x/include/asm/signal.h
1966 create mode 100644 arch/c6x/include/asm/soc.h
1967 create mode 100644 arch/c6x/include/asm/string.h
1968 create mode 100644 arch/c6x/include/asm/swab.h
1969 create mode 100644 arch/c6x/include/asm/syscall.h
1970 create mode 100644 arch/c6x/include/asm/syscalls.h
1971 create mode 100644 arch/c6x/include/asm/system.h
1972 create mode 100644 arch/c6x/include/asm/thread_info.h
1973 create mode 100644 arch/c6x/include/asm/timer64.h
1974 create mode 100644 arch/c6x/include/asm/timex.h
1975 create mode 100644 arch/c6x/include/asm/tlb.h
1976 create mode 100644 arch/c6x/include/asm/traps.h
1977 create mode 100644 arch/c6x/include/asm/uaccess.h
1978 create mode 100644 arch/c6x/include/asm/unaligned.h
1979 create mode 100644 arch/c6x/include/asm/unistd.h
1980 create mode 100644 arch/c6x/kernel/Makefile
1981 create mode 100644 arch/c6x/kernel/asm-offsets.c
1982 create mode 100644 arch/c6x/kernel/c6x_ksyms.c
1983 create mode 100644 arch/c6x/kernel/devicetree.c
1984 create mode 100644 arch/c6x/kernel/dma.c
1985 create mode 100644 arch/c6x/kernel/entry.S
1986 create mode 100644 arch/c6x/kernel/head.S
1987 create mode 100644 arch/c6x/kernel/irq.c
1988 create mode 100644 arch/c6x/kernel/module.c
1989 create mode 100644 arch/c6x/kernel/process.c
1990 create mode 100644 arch/c6x/kernel/ptrace.c
1991 create mode 100644 arch/c6x/kernel/setup.c
1992 create mode 100644 arch/c6x/kernel/signal.c
1993 create mode 100644 arch/c6x/kernel/soc.c
1994 create mode 100644 arch/c6x/kernel/switch_to.S
1995 create mode 100644 arch/c6x/kernel/sys_c6x.c
1996 create mode 100644 arch/c6x/kernel/time.c
1997 create mode 100644 arch/c6x/kernel/traps.c
1998 create mode 100644 arch/c6x/kernel/vectors.S
1999 create mode 100644 arch/c6x/kernel/vmlinux.lds.S
2000 create mode 100644 arch/c6x/lib/Makefile
2001 create mode 100644 arch/c6x/lib/checksum.c
2002 create mode 100644 arch/c6x/lib/csum_64plus.S
2003 create mode 100644 arch/c6x/lib/divi.S
2004 create mode 100644 arch/c6x/lib/divremi.S
2005 create mode 100644 arch/c6x/lib/divremu.S
2006 create mode 100644 arch/c6x/lib/divu.S
2007 create mode 100644 arch/c6x/lib/llshl.S
2008 create mode 100644 arch/c6x/lib/llshr.S
2009 create mode 100644 arch/c6x/lib/llshru.S
2010 create mode 100644 arch/c6x/lib/memcpy_64plus.S
2011 create mode 100644 arch/c6x/lib/mpyll.S
2012 create mode 100644 arch/c6x/lib/negll.S
2013 create mode 100644 arch/c6x/lib/pop_rts.S
2014 create mode 100644 arch/c6x/lib/push_rts.S
2015 create mode 100644 arch/c6x/lib/remi.S
2016 create mode 100644 arch/c6x/lib/remu.S
2017 create mode 100644 arch/c6x/lib/strasgi.S
2018 create mode 100644 arch/c6x/lib/strasgi_64plus.S
2019 create mode 100644 arch/c6x/mm/Makefile
2020 create mode 100644 arch/c6x/mm/dma-coherent.c
2021 create mode 100644 arch/c6x/mm/init.c
2022 create mode 100644 arch/c6x/platforms/Kconfig
2023 create mode 100644 arch/c6x/platforms/Makefile
2024 create mode 100644 arch/c6x/platforms/cache.c
2025 create mode 100644 arch/c6x/platforms/dscr.c
2026 create mode 100644 arch/c6x/platforms/emif.c
2027 create mode 100644 arch/c6x/platforms/megamod-pic.c
2028 create mode 100644 arch/c6x/platforms/platform.c
2029 create mode 100644 arch/c6x/platforms/pll.c
2030 create mode 100644 arch/c6x/platforms/plldata.c
2031 create mode 100644 arch/c6x/platforms/timer64.c
2032 Merging cris/for-next (ea78f5b CRIS: Update documentation)
2033 $ git merge cris/for-next
2034 Auto-merging drivers/net/cris/eth_v10.c
2035 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
2036 Merge made by the 'recursive' strategy.
2037 Documentation/cris/README | 62 +++++++++++++++---------------
2038 arch/cris/arch-v32/drivers/cryptocop.c | 6 +--
2039 arch/cris/arch-v32/kernel/ptrace.c | 2 -
2040 arch/cris/include/arch-v32/arch/cache.h | 2 +-
2041 drivers/net/cris/eth_v10.c | 1 -
2042 5 files changed, 34 insertions(+), 39 deletions(-)
2043 Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
2044 $ git merge quilt/hexagon
2045 Merge made by the 'recursive' strategy.
2046 arch/hexagon/Kconfig | 23 ++++-------------------
2047 arch/hexagon/Makefile | 4 ----
2048 arch/hexagon/include/asm/spinlock_types.h | 2 --
2049 arch/hexagon/kernel/dma.c | 1 +
2050 arch/hexagon/kernel/ptrace.c | 1 +
2051 arch/hexagon/kernel/time.c | 7 +++----
2052 arch/hexagon/kernel/vdso.c | 1 +
2053 7 files changed, 10 insertions(+), 29 deletions(-)
2054 Merging ia64/next (2174f6d pstore: gracefully handle NULL pstore_info functions)
2055 $ git merge ia64/next
2056 Auto-merging drivers/firmware/efivars.c
2057 Merge made by the 'recursive' strategy.
2058 drivers/acpi/apei/erst.c | 6 ++++--
2059 drivers/firmware/efivars.c | 8 +++++---
2060 fs/pstore/inode.c | 3 ++-
2061 fs/pstore/platform.c | 36 ++++--------------------------------
2062 include/linux/pstore.h | 12 +++++-------
2063 5 files changed, 20 insertions(+), 45 deletions(-)
2064 Merging m68k/for-next (2e50d63 m68k: Don't comment out syscalls used by glibc)
2065 $ git merge m68k/for-next
2066 Merge made by the 'recursive' strategy.
2067 arch/m68k/Kconfig.debug | 11 ++
2068 arch/m68k/Kconfig.devices | 2 +-
2069 arch/m68k/atari/ataints.c | 2 -
2070 arch/m68k/atari/debug.c | 1 -
2071 arch/m68k/configs/multi_defconfig | 1 -
2072 arch/m68k/configs/mvme16x_defconfig | 1 -
2073 arch/m68k/emu/nfeth.c | 2 +-
2074 arch/m68k/hp300/config.c | 3 +-
2075 arch/m68k/include/asm/atarihw.h | 2 +
2076 arch/m68k/include/asm/blinken.h | 8 +-
2077 arch/m68k/include/asm/mac_baboon.h | 6 +
2078 arch/m68k/include/asm/mac_iop.h | 2 +
2079 arch/m68k/include/asm/mac_oss.h | 23 +---
2080 arch/m68k/include/asm/mac_psc.h | 4 +
2081 arch/m68k/include/asm/mac_via.h | 9 ++
2082 arch/m68k/include/asm/macintosh.h | 10 +-
2083 arch/m68k/include/asm/macints.h | 6 +-
2084 arch/m68k/include/asm/serial.h | 2 +
2085 arch/m68k/include/asm/unistd.h | 10 +-
2086 arch/m68k/kernel/head.S | 117 ++++++++--------
2087 arch/m68k/mac/baboon.c | 41 +-----
2088 arch/m68k/mac/config.c | 93 +++++++++-----
2089 arch/m68k/mac/iop.c | 8 +-
2090 arch/m68k/mac/macints.c | 197 +++++++--------------------
2091 arch/m68k/mac/oss.c | 157 +++++++--------------
2092 arch/m68k/mac/psc.c | 17 ---
2093 arch/m68k/mac/via.c | 255 +++++++++++++++++------------------
2094 arch/m68k/mvme16x/config.c | 160 ++++++++++++++++++++++
2095 drivers/block/swim.c | 1 -
2096 drivers/scsi/mac_esp.c | 3 +-
2097 30 files changed, 574 insertions(+), 580 deletions(-)
2098 Merging m68knommu/for-next (285aa94 m68knommu: fix broken ColdFire slice timer read_clk() code)
2099 $ git merge m68knommu/for-next
2100 Resolved 'arch/m68k/Kconfig.debug' using previous resolution.
2101 Removing arch/m68k/lib/checksum_no.c
2102 Auto-merging arch/m68k/Kconfig.debug
2103 CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug
2104 Automatic merge failed; fix conflicts and then commit the result.
2106 [master ab433ed] Merge remote-tracking branch 'm68knommu/for-next'
2107 $ git diff -M --stat --summary HEAD^..
2108 arch/m68k/Kconfig | 7 +-
2109 arch/m68k/Kconfig.cpu | 8 ++
2110 arch/m68k/Kconfig.debug | 16 ++--
2111 arch/m68k/include/asm/checksum.h | 31 +-----
2112 arch/m68k/include/asm/div64.h | 8 +-
2113 arch/m68k/include/asm/gpio.h | 3 +-
2114 arch/m68k/include/asm/processor.h | 2 -
2115 arch/m68k/include/asm/sigcontext.h | 4 -
2116 arch/m68k/include/asm/thread_info.h | 30 -----
2117 arch/m68k/include/asm/traps.h | 1 +
2118 arch/m68k/include/asm/ucontext.h | 4 -
2119 arch/m68k/kernel/Makefile | 7 +-
2120 arch/m68k/kernel/asm-offsets.c | 3 +-
2121 arch/m68k/kernel/entry_mm.S | 31 ++++--
2122 arch/m68k/kernel/entry_no.S | 6 -
2123 arch/m68k/kernel/init_task.c | 3 +-
2124 arch/m68k/kernel/m68k_ksyms.c | 2 +-
2125 arch/m68k/kernel/process_mm.c | 16 ---
2126 arch/m68k/kernel/setup_mm.c | 4 +
2127 arch/m68k/kernel/setup_no.c | 1 -
2128 arch/m68k/kernel/time_no.c | 3 +
2129 arch/m68k/kernel/vmlinux-std.lds | 2 +
2130 arch/m68k/kernel/vmlinux-sun3.lds | 2 +
2131 arch/m68k/lib/Makefile | 10 +-
2132 arch/m68k/lib/{checksum_mm.c => checksum.c} | 0
2133 arch/m68k/lib/checksum_no.c | 156 ---------------------------
2134 arch/m68k/mm/init_mm.c | 34 ++++++
2135 arch/m68k/platform/68328/timers.c | 4 +-
2136 arch/m68k/platform/coldfire/dma_timer.c | 5 +-
2137 arch/m68k/platform/coldfire/entry.S | 1 -
2138 arch/m68k/platform/coldfire/head.S | 6 +-
2139 arch/m68k/platform/coldfire/pit.c | 4 +-
2140 arch/m68k/platform/coldfire/sltimers.c | 13 ++-
2141 arch/m68k/platform/coldfire/timers.c | 4 +-
2142 34 files changed, 125 insertions(+), 306 deletions(-)
2143 rename arch/m68k/lib/{checksum_mm.c => checksum.c} (100%)
2144 delete mode 100644 arch/m68k/lib/checksum_no.c
2145 Merging microblaze/next (7f80850 Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh)
2146 $ git merge microblaze/next
2148 Merging mips/mips-for-linux-next (1fc140c Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next)
2149 $ git merge mips/mips-for-linux-next
2150 Auto-merging drivers/tty/serial/Makefile
2151 Auto-merging drivers/tty/serial/Kconfig
2152 Removing drivers/staging/octeon/cvmx-smix-defs.h
2153 Removing drivers/staging/octeon/cvmx-packet.h
2154 Removing drivers/pcmcia/au1000_pb1x00.c
2155 Removing drivers/pcmcia/au1000_generic.h
2156 Removing drivers/pcmcia/au1000_generic.c
2157 Removing drivers/net/irda/au1000_ircc.h
2158 Auto-merging arch/mips/netlogic/xlr/wakeup.c
2159 Removing arch/mips/netlogic/xlr/irq.c
2160 Auto-merging arch/mips/netlogic/common/time.c
2161 Auto-merging arch/mips/netlogic/common/smp.c
2162 Auto-merging arch/mips/include/asm/octeon/cvmx-helper.h
2163 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-xaui.h
2164 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-spi.h
2165 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-sgmii.h
2166 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
2167 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-npi.h
2168 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-loop.h
2169 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-board.h
2170 Auto-merging arch/mips/include/asm/octeon/cvmx-config.h
2171 Auto-merging arch/mips/include/asm/netlogic/xlp-hal/xlp.h
2172 Removing arch/mips/include/asm/mach-pb1x00/pb1550.h
2173 Removing arch/mips/include/asm/mach-pb1x00/pb1200.h
2174 Removing arch/mips/include/asm/mach-pb1x00/pb1000.h
2175 Removing arch/mips/include/asm/mach-pb1x00/mc146818rtc.h
2176 Removing arch/mips/include/asm/mach-db1x00/db1x00.h
2177 Removing arch/mips/configs/pb1200_defconfig
2178 Removing arch/mips/configs/db1500_defconfig
2179 Removing arch/mips/configs/db1100_defconfig
2180 Auto-merging arch/mips/cavium-octeon/executive/cvmx-spi.c
2181 Auto-merging arch/mips/cavium-octeon/executive/cvmx-pko.c
2182 Auto-merging arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c
2183 Auto-merging arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
2184 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper.c
2185 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
2186 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-util.c
2187 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-spi.c
2188 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
2189 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c
2190 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-npi.c
2191 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-loop.c
2192 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-board.c
2193 Auto-merging arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
2194 Auto-merging arch/mips/ath79/dev-usb.h
2195 Removing arch/mips/ath79/dev-ar913x-wmac.c
2196 Removing arch/mips/alchemy/xxs1500/platform.c
2197 Removing arch/mips/alchemy/xxs1500/init.c
2198 Removing arch/mips/alchemy/xxs1500/board_setup.c
2199 Removing arch/mips/alchemy/xxs1500/Makefile
2200 Removing arch/mips/alchemy/mtx-1/init.c
2201 Removing arch/mips/alchemy/mtx-1/board_setup.c
2202 Removing arch/mips/alchemy/mtx-1/Makefile
2203 Removing arch/mips/alchemy/gpr/init.c
2204 Removing arch/mips/alchemy/gpr/board_setup.c
2205 Removing arch/mips/alchemy/gpr/Makefile
2206 Removing arch/mips/alchemy/devboards/pb1550/board_setup.c
2207 Removing arch/mips/alchemy/devboards/pb1550/Makefile
2208 Auto-merging arch/mips/alchemy/devboards/pb1550.c
2209 Removing arch/mips/alchemy/devboards/pb1500/platform.c
2210 Removing arch/mips/alchemy/devboards/pb1500/Makefile
2211 Auto-merging arch/mips/alchemy/devboards/pb1500.c
2212 Removing arch/mips/alchemy/devboards/pb1200/platform.c
2213 Removing arch/mips/alchemy/devboards/pb1200/board_setup.c
2214 Removing arch/mips/alchemy/devboards/pb1200/Makefile
2215 Removing arch/mips/alchemy/devboards/pb1100/platform.c
2216 Removing arch/mips/alchemy/devboards/pb1100/Makefile
2217 Auto-merging arch/mips/alchemy/devboards/pb1100.c
2218 Removing arch/mips/alchemy/devboards/pb1000/board_setup.c
2219 Removing arch/mips/alchemy/devboards/pb1000/Makefile
2220 Removing arch/mips/alchemy/devboards/db1x00/platform.c
2221 Removing arch/mips/alchemy/devboards/db1x00/board_setup.c
2222 Removing arch/mips/alchemy/devboards/db1x00/Makefile
2223 Removing arch/mips/alchemy/devboards/db1200/setup.c
2224 Removing arch/mips/alchemy/devboards/db1200/Makefile
2225 Auto-merging arch/mips/alchemy/devboards/db1200.c
2226 Auto-merging arch/mips/alchemy/board-mtx1.c
2227 Auto-merging arch/mips/alchemy/board-gpr.c
2228 Merge made by the 'recursive' strategy.
2229 arch/mips/Kconfig | 84 +-
2230 arch/mips/Makefile | 1 +
2231 arch/mips/alchemy/Kconfig | 60 +-
2232 arch/mips/alchemy/Makefile | 3 +
2233 arch/mips/alchemy/Platform | 58 +-
2234 arch/mips/alchemy/{gpr/platform.c => board-gpr.c} | 81 +-
2235 .../alchemy/{mtx-1/platform.c => board-mtx1.c} | 93 +-
2236 arch/mips/alchemy/board-xxs1500.c | 154 ++
2237 arch/mips/alchemy/common/Makefile | 4 +-
2238 arch/mips/alchemy/common/dbdma.c | 49 +-
2239 arch/mips/alchemy/common/gpiolib.c | 42 +
2240 arch/mips/alchemy/common/irq.c | 875 ++++++---
2241 arch/mips/alchemy/common/platform.c | 31 +-
2242 arch/mips/alchemy/common/power.c | 3 +
2243 arch/mips/alchemy/common/sleeper.S | 73 +
2244 arch/mips/alchemy/common/time.c | 3 +-
2245 arch/mips/alchemy/common/vss.c | 84 +
2246 arch/mips/alchemy/devboards/Makefile | 19 +-
2247 arch/mips/alchemy/devboards/bcsr.c | 11 +-
2248 arch/mips/alchemy/devboards/db1000.c | 565 +++++
2249 .../devboards/{db1200/platform.c => db1200.c} | 401 +++-
2250 arch/mips/alchemy/devboards/db1200/Makefile | 1 -
2251 arch/mips/alchemy/devboards/db1200/setup.c | 81 -
2252 arch/mips/alchemy/devboards/db1300.c | 785 +++++++
2253 arch/mips/alchemy/devboards/db1550.c | 498 +++++
2254 arch/mips/alchemy/devboards/db1x00/Makefile | 8 -
2255 arch/mips/alchemy/devboards/db1x00/board_setup.c | 229 --
2256 arch/mips/alchemy/devboards/db1x00/platform.c | 316 ---
2257 arch/mips/alchemy/devboards/pb1000/Makefile | 8 -
2258 arch/mips/alchemy/devboards/pb1000/board_setup.c | 209 --
2259 .../devboards/{pb1100/board_setup.c => pb1100.c} | 92 +-
2260 arch/mips/alchemy/devboards/pb1100/Makefile | 8 -
2261 arch/mips/alchemy/devboards/pb1100/platform.c | 77 -
2262 arch/mips/alchemy/devboards/pb1200/Makefile | 5 -
2263 arch/mips/alchemy/devboards/pb1200/board_setup.c | 174 --
2264 arch/mips/alchemy/devboards/pb1200/platform.c | 339 ---
2265 .../devboards/{pb1500/board_setup.c => pb1500.c} | 113 +-
2266 arch/mips/alchemy/devboards/pb1500/Makefile | 8 -
2267 arch/mips/alchemy/devboards/pb1500/platform.c | 94 -
2268 .../devboards/{pb1550/platform.c => pb1550.c} | 112 +-
2269 arch/mips/alchemy/devboards/pb1550/Makefile | 8 -
2270 arch/mips/alchemy/devboards/pb1550/board_setup.c | 80 -
2271 arch/mips/alchemy/devboards/platform.c | 13 +-
2272 arch/mips/alchemy/devboards/prom.c | 11 +-
2273 arch/mips/alchemy/gpr/Makefile | 8 -
2274 arch/mips/alchemy/gpr/board_setup.c | 75 -
2275 arch/mips/alchemy/gpr/init.c | 63 -
2276 arch/mips/alchemy/mtx-1/Makefile | 9 -
2277 arch/mips/alchemy/mtx-1/board_setup.c | 94 -
2278 arch/mips/alchemy/mtx-1/init.c | 66 -
2279 arch/mips/alchemy/xxs1500/Makefile | 8 -
2280 arch/mips/alchemy/xxs1500/board_setup.c | 93 -
2281 arch/mips/alchemy/xxs1500/init.c | 63 -
2282 arch/mips/alchemy/xxs1500/platform.c | 63 -
2283 arch/mips/ar7/gpio.c | 2 +-
2284 arch/mips/ar7/platform.c | 39 +-
2285 arch/mips/ar7/prom.c | 4 +-
2286 arch/mips/ar7/setup.c | 2 +-
2287 arch/mips/ath79/Kconfig | 38 +-
2288 arch/mips/ath79/Makefile | 5 +-
2289 arch/mips/ath79/clock.c | 55 +
2290 arch/mips/ath79/common.c | 5 +
2291 arch/mips/ath79/dev-ar913x-wmac.c | 60 -
2292 arch/mips/ath79/dev-common.c | 38 +-
2293 arch/mips/ath79/dev-usb.c | 197 ++
2294 arch/mips/ath79/{dev-ar913x-wmac.h => dev-usb.h} | 10 +-
2295 arch/mips/ath79/dev-wmac.c | 109 +
2296 arch/mips/ath79/dev-wmac.h | 17 +
2297 arch/mips/ath79/early_printk.c | 76 +-
2298 arch/mips/ath79/gpio.c | 2 +
2299 arch/mips/ath79/irq.c | 17 +-
2300 arch/mips/ath79/mach-ap121.c | 92 +
2301 arch/mips/ath79/mach-ap81.c | 6 +-
2302 arch/mips/ath79/mach-pb44.c | 2 +
2303 arch/mips/ath79/mach-ubnt-xm.c | 119 ++
2304 arch/mips/ath79/machtypes.h | 2 +
2305 arch/mips/ath79/setup.c | 22 +-
2306 arch/mips/bcm47xx/setup.c | 4 +-
2307 arch/mips/bcm63xx/Kconfig | 4 +
2308 arch/mips/bcm63xx/boards/board_bcm963xx.c | 46 +-
2309 arch/mips/bcm63xx/clk.c | 70 +-
2310 arch/mips/bcm63xx/cpu.c | 261 +--
2311 arch/mips/bcm63xx/dev-uart.c | 2 +-
2312 arch/mips/bcm63xx/gpio.c | 41 +-
2313 arch/mips/bcm63xx/irq.c | 403 +++-
2314 arch/mips/bcm63xx/prom.c | 7 +-
2315 arch/mips/bcm63xx/setup.c | 32 +-
2316 arch/mips/boot/compressed/uart-alchemy.c | 5 +-
2317 arch/mips/cavium-octeon/Kconfig | 4 -
2318 arch/mips/cavium-octeon/dma-octeon.c | 23 +-
2319 arch/mips/cavium-octeon/executive/Makefile | 7 +-
2320 .../mips/cavium-octeon/executive}/cvmx-cmd-queue.c | 8 +-
2321 .../mips/cavium-octeon/executive}/cvmx-fpa.c | 0
2322 .../cavium-octeon/executive}/cvmx-helper-board.c | 38 +-
2323 .../cavium-octeon/executive}/cvmx-helper-fpa.c | 0
2324 .../cavium-octeon/executive}/cvmx-helper-loop.c | 6 +-
2325 .../cavium-octeon/executive}/cvmx-helper-npi.c | 6 +-
2326 .../cavium-octeon/executive}/cvmx-helper-rgmii.c | 17 +-
2327 .../cavium-octeon/executive}/cvmx-helper-sgmii.c | 18 +-
2328 .../cavium-octeon/executive}/cvmx-helper-spi.c | 20 +-
2329 .../cavium-octeon/executive}/cvmx-helper-util.c | 16 +-
2330 .../cavium-octeon/executive}/cvmx-helper-xaui.c | 32 +-
2331 .../mips/cavium-octeon/executive}/cvmx-helper.c | 120 +-
2332 .../executive}/cvmx-interrupt-decodes.c | 10 +-
2333 .../cavium-octeon/executive}/cvmx-interrupt-rsl.c | 4 +-
2334 .../mips/cavium-octeon/executive}/cvmx-pko.c | 8 +-
2335 .../mips/cavium-octeon/executive}/cvmx-spi.c | 12 +-
2336 arch/mips/cavium-octeon/executive/octeon-model.c | 119 +-
2337 arch/mips/cavium-octeon/setup.c | 14 +-
2338 arch/mips/cavium-octeon/smp.c | 2 +-
2339 arch/mips/configs/db1000_defconfig | 369 +++-
2340 arch/mips/configs/db1100_defconfig | 122 --
2341 arch/mips/configs/db1300_defconfig | 391 ++++
2342 arch/mips/configs/db1500_defconfig | 128 --
2343 arch/mips/configs/db1550_defconfig | 288 ++-
2344 arch/mips/configs/nlm_xlp_defconfig | 570 +++++
2345 arch/mips/configs/nlm_xlr_defconfig | 16 +-
2346 arch/mips/configs/pb1200_defconfig | 170 --
2347 arch/mips/dec/setup.c | 1 -
2348 arch/mips/include/asm/bmips.h | 110 +
2349 arch/mips/include/asm/bootinfo.h | 1 +
2350 arch/mips/include/asm/branch.h | 5 +
2351 arch/mips/include/asm/cpu.h | 6 +-
2352 arch/mips/include/asm/gio_device.h | 56 +
2353 arch/mips/include/asm/hazards.h | 7 +-
2354 arch/mips/include/asm/hugetlb.h | 2 +-
2355 arch/mips/include/asm/kprobes.h | 5 +
2356 arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 81 +-
2357 arch/mips/include/asm/mach-ath79/ar933x_uart.h | 67 +
2358 .../include/asm/mach-ath79/ar933x_uart_platform.h | 18 +
2359 arch/mips/include/asm/mach-ath79/ath79.h | 11 +-
2360 arch/mips/include/asm/mach-ath79/irq.h | 8 +-
2361 arch/mips/include/asm/mach-ath79/pci-ath724x.h | 21 +
2362 arch/mips/include/asm/mach-au1x00/au1000.h | 273 ++-
2363 arch/mips/include/asm/mach-au1x00/au1100_mmc.h | 2 +
2364 arch/mips/include/asm/mach-au1x00/au1200fb.h | 14 +
2365 arch/mips/include/asm/mach-au1x00/au1550nd.h | 16 +
2366 arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 31 +
2367 .../asm/mach-au1x00/cpu-feature-overrides.h | 3 +
2368 arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 241 +++
2369 arch/mips/include/asm/mach-au1x00/gpio.h | 3 +
2370 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 597 ++++--
2371 arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 2 +
2372 arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h | 2 +
2373 arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h | 12 +-
2374 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 231 ++-
2375 arch/mips/include/asm/mach-bcm63xx/ioremap.h | 42 +
2376 arch/mips/include/asm/mach-bcm63xx/irq.h | 7 +
2377 arch/mips/include/asm/mach-db1x00/bcsr.h | 36 +-
2378 arch/mips/include/asm/mach-db1x00/db1200.h | 11 +-
2379 arch/mips/include/asm/mach-db1x00/db1300.h | 40 +
2380 arch/mips/include/asm/mach-db1x00/db1x00.h | 79 -
2381 arch/mips/include/asm/mach-db1x00/irq.h | 23 +
2382 arch/mips/include/asm/mach-generic/floppy.h | 2 +-
2383 arch/mips/include/asm/mach-jazz/floppy.h | 2 +-
2384 .../asm/mach-netlogic/cpu-feature-overrides.h | 23 +-
2385 arch/mips/include/asm/mach-pb1x00/mc146818rtc.h | 34 -
2386 arch/mips/include/asm/mach-pb1x00/pb1000.h | 87 -
2387 arch/mips/include/asm/mach-pb1x00/pb1200.h | 139 --
2388 arch/mips/include/asm/mach-pb1x00/pb1550.h | 73 -
2389 arch/mips/include/asm/mipsregs.h | 9 +-
2390 arch/mips/include/asm/module.h | 6 +-
2391 arch/mips/include/asm/netlogic/common.h | 76 +
2392 arch/mips/include/asm/netlogic/haldefs.h | 163 ++
2393 arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 187 ++
2394 .../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 83 +
2395 arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 153 ++
2396 arch/mips/include/asm/netlogic/xlp-hal/pic.h | 411 ++++
2397 arch/mips/include/asm/netlogic/xlp-hal/sys.h | 129 ++
2398 arch/mips/include/asm/netlogic/xlp-hal/uart.h | 191 ++
2399 .../asm/netlogic/xlp-hal/xlp.h} | 25 +-
2400 arch/mips/include/asm/netlogic/xlr/iomap.h | 22 -
2401 arch/mips/include/asm/netlogic/xlr/msidef.h | 84 +
2402 arch/mips/include/asm/netlogic/xlr/pic.h | 69 +-
2403 arch/mips/include/asm/netlogic/xlr/xlr.h | 13 +-
2404 .../mips/include/asm}/octeon/cvmx-address.h | 0
2405 .../mips/include/asm}/octeon/cvmx-asxx-defs.h | 0
2406 arch/mips/include/asm/octeon/cvmx-bootinfo.h | 82 +-
2407 .../mips/include/asm}/octeon/cvmx-cmd-queue.h | 0
2408 .../mips/include/asm}/octeon/cvmx-config.h | 1 -
2409 .../mips/include/asm}/octeon/cvmx-dbg-defs.h | 0
2410 arch/mips/include/asm/octeon/cvmx-dpi-defs.h | 643 ++++++
2411 .../mips/include/asm}/octeon/cvmx-fau.h | 0
2412 .../mips/include/asm}/octeon/cvmx-fpa-defs.h | 0
2413 .../mips/include/asm}/octeon/cvmx-fpa.h | 0
2414 .../mips/include/asm}/octeon/cvmx-gmxx-defs.h | 0
2415 .../mips/include/asm}/octeon/cvmx-helper-board.h | 6 +
2416 .../mips/include/asm}/octeon/cvmx-helper-fpa.h | 0
2417 .../mips/include/asm}/octeon/cvmx-helper-loop.h | 1 +
2418 .../mips/include/asm}/octeon/cvmx-helper-npi.h | 1 +
2419 .../mips/include/asm}/octeon/cvmx-helper-rgmii.h | 1 +
2420 .../mips/include/asm}/octeon/cvmx-helper-sgmii.h | 1 +
2421 .../mips/include/asm}/octeon/cvmx-helper-spi.h | 1 +
2422 .../mips/include/asm}/octeon/cvmx-helper-util.h | 0
2423 .../mips/include/asm}/octeon/cvmx-helper-xaui.h | 1 +
2424 .../mips/include/asm}/octeon/cvmx-helper.h | 1 +
2425 .../mips/include/asm}/octeon/cvmx-ipd.h | 0
2426 .../mips/include/asm}/octeon/cvmx-mdio.h | 0
2427 arch/mips/include/asm/octeon/cvmx-mio-defs.h | 1033 +++++++++-
2428 arch/mips/include/asm/octeon/cvmx-npei-defs.h | 4 +-
2429 arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 609 +++++-
2430 .../mips/include/asm}/octeon/cvmx-pcsx-defs.h | 0
2431 .../mips/include/asm}/octeon/cvmx-pcsxx-defs.h | 0
2432 arch/mips/include/asm/octeon/cvmx-pemx-defs.h | 509 +++++
2433 arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 19 +-
2434 .../mips/include/asm}/octeon/cvmx-pip-defs.h | 0
2435 .../mips/include/asm}/octeon/cvmx-pip.h | 0
2436 .../mips/include/asm}/octeon/cvmx-pko-defs.h | 0
2437 .../mips/include/asm}/octeon/cvmx-pko.h | 0
2438 .../mips/include/asm}/octeon/cvmx-pow.h | 0
2439 .../mips/include/asm}/octeon/cvmx-scratch.h | 0
2440 arch/mips/include/asm/octeon/cvmx-sli-defs.h | 2172 ++++++++++++++++++++
2441 .../mips/include/asm}/octeon/cvmx-spi.h | 0
2442 .../mips/include/asm}/octeon/cvmx-spxx-defs.h | 0
2443 arch/mips/include/asm/octeon/cvmx-sriox-defs.h | 1036 ++++++++++
2444 .../mips/include/asm}/octeon/cvmx-srxx-defs.h | 0
2445 .../mips/include/asm}/octeon/cvmx-stxx-defs.h | 0
2446 .../mips/include/asm}/octeon/cvmx-wqe.h | 0
2447 arch/mips/include/asm/octeon/cvmx.h | 42 +-
2448 arch/mips/include/asm/octeon/octeon-feature.h | 114 +-
2449 arch/mips/include/asm/octeon/octeon-model.h | 215 +--
2450 arch/mips/include/asm/octeon/pci-octeon.h | 3 +-
2451 arch/mips/include/asm/pgtable-32.h | 18 +-
2452 arch/mips/include/asm/tlbmisc.h | 10 +
2453 arch/mips/include/asm/traps.h | 13 +
2454 arch/mips/jazz/irq.c | 3 +-
2455 arch/mips/jazz/setup.c | 1 +
2456 arch/mips/jz4740/board-qi_lb60.c | 2 +-
2457 arch/mips/kernel/Makefile | 2 +
2458 arch/mips/kernel/bmips_vec.S | 255 +++
2459 arch/mips/kernel/branch.c | 128 +-
2460 arch/mips/kernel/cevt-bcm1480.c | 2 +-
2461 arch/mips/kernel/cevt-ds1287.c | 2 +-
2462 arch/mips/kernel/cevt-gt641xx.c | 2 +-
2463 arch/mips/kernel/cevt-r4k.c | 2 +-
2464 arch/mips/kernel/cevt-sb1250.c | 2 +-
2465 arch/mips/kernel/cevt-txx9.c | 2 +-
2466 arch/mips/kernel/cpu-probe.c | 28 +-
2467 arch/mips/kernel/i8253.c | 2 +-
2468 arch/mips/kernel/kprobes.c | 177 ++-
2469 arch/mips/kernel/perf_event_mipsxx.c | 72 +-
2470 arch/mips/kernel/rtlx.c | 1 -
2471 arch/mips/kernel/setup.c | 43 +-
2472 arch/mips/kernel/smp-bmips.c | 458 ++++
2473 arch/mips/kernel/smtc.c | 6 +-
2474 arch/mips/kernel/traps.c | 16 +-
2475 arch/mips/lantiq/clk.c | 4 +-
2476 arch/mips/lantiq/irq.c | 13 +-
2477 arch/mips/lantiq/xway/dma.c | 6 +-
2478 arch/mips/lantiq/xway/ebu.c | 6 +-
2479 arch/mips/lantiq/xway/pmu.c | 8 +-
2480 arch/mips/lantiq/xway/reset.c | 6 +-
2481 arch/mips/lib/Makefile | 1 +
2482 arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 2 +-
2483 arch/mips/math-emu/cp1emu.c | 2 +-
2484 arch/mips/mm/Makefile | 5 +-
2485 arch/mips/mm/c-octeon.c | 2 +-
2486 arch/mips/mm/c-r4k.c | 3 +
2487 arch/mips/mm/gup.c | 315 +++
2488 arch/mips/mm/init.c | 9 +-
2489 arch/mips/mm/tlb-r3k.c | 1 +
2490 arch/mips/mm/tlb-r4k.c | 68 +-
2491 arch/mips/mti-malta/malta-int.c | 4 +-
2492 arch/mips/netlogic/Kconfig | 3 -
2493 arch/mips/netlogic/Makefile | 3 +
2494 arch/mips/netlogic/Platform | 13 +-
2495 arch/mips/netlogic/common/Makefile | 3 +
2496 arch/mips/netlogic/common/earlycons.c | 60 +
2497 arch/mips/netlogic/common/irq.c | 238 +++
2498 arch/mips/netlogic/{xlr => common}/smp.c | 152 +-
2499 arch/mips/netlogic/common/smpboot.S | 272 +++
2500 arch/mips/netlogic/{xlr => common}/time.c | 6 +-
2501 arch/mips/netlogic/xlp/Makefile | 2 +
2502 arch/mips/netlogic/xlp/nlm_hal.c | 111 +
2503 arch/mips/netlogic/xlp/platform.c | 108 +
2504 arch/mips/netlogic/xlp/setup.c | 105 +
2505 arch/mips/netlogic/xlp/wakeup.c | 102 +
2506 arch/mips/netlogic/xlr/Makefile | 7 +-
2507 arch/mips/netlogic/xlr/irq.c | 300 ---
2508 arch/mips/netlogic/xlr/platform.c | 31 +-
2509 arch/mips/netlogic/xlr/setup.c | 31 +-
2510 arch/mips/netlogic/xlr/{smpboot.S => wakeup.c} | 80 +-
2511 arch/mips/pci/Makefile | 3 +-
2512 arch/mips/pci/msi-octeon.c | 2 +-
2513 arch/mips/pci/ops-pmcmsp.c | 2 +-
2514 arch/mips/pci/ops-tx3927.c | 2 +-
2515 arch/mips/pci/pci-alchemy.c | 138 +-
2516 arch/mips/pci/pci-ath724x.c | 174 ++
2517 arch/mips/pci/pci-bcm63xx.c | 4 +-
2518 arch/mips/pci/pci-octeon.c | 26 +-
2519 arch/mips/pci/pci-tx4927.c | 2 +-
2520 arch/mips/pci/pci-tx4938.c | 2 +-
2521 arch/mips/pci/pci-tx4939.c | 2 +-
2522 arch/mips/pci/pci-xlr.c | 128 ++-
2523 arch/mips/pci/pci.c | 29 +-
2524 arch/mips/pci/pcie-octeon.c | 1349 +++++++++---
2525 arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 2 +-
2526 arch/mips/pmc-sierra/msp71xx/msp_setup.c | 2 +-
2527 arch/mips/pmc-sierra/msp71xx/msp_smp.c | 4 +-
2528 arch/mips/pnx8550/common/int.c | 4 +-
2529 arch/mips/pnx8550/common/time.c | 4 +-
2530 arch/mips/sgi-ip22/Makefile | 2 +-
2531 arch/mips/sgi-ip22/ip22-gio.c | 428 ++++
2532 arch/mips/sgi-ip22/ip22-int.c | 10 +-
2533 arch/mips/sgi-ip22/ip22-mc.c | 10 +-
2534 arch/mips/sgi-ip22/ip22-setup.c | 21 -
2535 arch/mips/sgi-ip27/ip27-irq.c | 6 +-
2536 arch/mips/sgi-ip27/ip27-timer.c | 2 +-
2537 arch/mips/sgi-ip32/ip32-irq.c | 2 -
2538 arch/mips/sni/irq.c | 2 +-
2539 arch/mips/sni/time.c | 2 +-
2540 arch/mips/txx9/generic/pci.c | 2 +-
2541 drivers/i2c/busses/Kconfig | 4 +-
2542 drivers/mmc/host/au1xmmc.c | 45 +-
2543 drivers/mtd/nand/au1550nd.c | 308 ++--
2544 drivers/net/irda/Kconfig | 6 +-
2545 drivers/net/irda/au1000_ircc.h | 125 --
2546 drivers/net/irda/au1k_ir.c | 1229 ++++++-----
2547 drivers/pcmcia/Kconfig | 8 +-
2548 drivers/pcmcia/Makefile | 4 -
2549 drivers/pcmcia/au1000_generic.c | 545 -----
2550 drivers/pcmcia/au1000_generic.h | 135 --
2551 drivers/pcmcia/au1000_pb1x00.c | 294 ---
2552 drivers/pcmcia/db1xxx_ss.c | 26 +-
2553 drivers/spi/Kconfig | 4 +-
2554 drivers/staging/octeon/Makefile | 5 -
2555 drivers/staging/octeon/cvmx-packet.h | 65 -
2556 drivers/staging/octeon/cvmx-smix-defs.h | 178 --
2557 drivers/staging/octeon/ethernet-defines.h | 2 +-
2558 drivers/staging/octeon/ethernet-mdio.c | 4 +-
2559 drivers/staging/octeon/ethernet-mem.c | 2 +-
2560 drivers/staging/octeon/ethernet-rgmii.c | 4 +-
2561 drivers/staging/octeon/ethernet-rx.c | 16 +-
2562 drivers/staging/octeon/ethernet-rx.h | 2 +-
2563 drivers/staging/octeon/ethernet-sgmii.c | 4 +-
2564 drivers/staging/octeon/ethernet-spi.c | 6 +-
2565 drivers/staging/octeon/ethernet-tx.c | 12 +-
2566 drivers/staging/octeon/ethernet-xaui.c | 4 +-
2567 drivers/staging/octeon/ethernet.c | 16 +-
2568 drivers/tty/serial/Kconfig | 23 +
2569 drivers/tty/serial/Makefile | 1 +
2570 drivers/tty/serial/ar933x_uart.c | 688 +++++++
2571 drivers/usb/host/Kconfig | 2 +-
2572 drivers/usb/host/alchemy-common.c | 277 +++
2573 drivers/usb/host/ehci-ath79.c | 4 +
2574 drivers/usb/host/ohci-au1xxx.c | 13 +-
2575 drivers/video/Kconfig | 8 +-
2576 drivers/video/au1100fb.c | 12 -
2577 drivers/video/au1200fb.c | 273 ++--
2578 drivers/video/console/newport_con.c | 63 +-
2579 include/linux/serial_core.h | 4 +
2580 sound/soc/au1x/Kconfig | 14 +-
2581 sound/soc/au1x/db1200.c | 73 +-
2582 353 files changed, 23184 insertions(+), 8396 deletions(-)
2583 create mode 100644 arch/mips/alchemy/Makefile
2584 rename arch/mips/alchemy/{gpr/platform.c => board-gpr.c} (75%)
2585 rename arch/mips/alchemy/{mtx-1/platform.c => board-mtx1.c} (71%)
2586 create mode 100644 arch/mips/alchemy/board-xxs1500.c
2587 create mode 100644 arch/mips/alchemy/common/vss.c
2588 create mode 100644 arch/mips/alchemy/devboards/db1000.c
2589 rename arch/mips/alchemy/devboards/{db1200/platform.c => db1200.c} (62%)
2590 delete mode 100644 arch/mips/alchemy/devboards/db1200/Makefile
2591 delete mode 100644 arch/mips/alchemy/devboards/db1200/setup.c
2592 create mode 100644 arch/mips/alchemy/devboards/db1300.c
2593 create mode 100644 arch/mips/alchemy/devboards/db1550.c
2594 delete mode 100644 arch/mips/alchemy/devboards/db1x00/Makefile
2595 delete mode 100644 arch/mips/alchemy/devboards/db1x00/board_setup.c
2596 delete mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c
2597 delete mode 100644 arch/mips/alchemy/devboards/pb1000/Makefile
2598 delete mode 100644 arch/mips/alchemy/devboards/pb1000/board_setup.c
2599 rename arch/mips/alchemy/devboards/{pb1100/board_setup.c => pb1100.c} (55%)
2600 delete mode 100644 arch/mips/alchemy/devboards/pb1100/Makefile
2601 delete mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c
2602 delete mode 100644 arch/mips/alchemy/devboards/pb1200/Makefile
2603 delete mode 100644 arch/mips/alchemy/devboards/pb1200/board_setup.c
2604 delete mode 100644 arch/mips/alchemy/devboards/pb1200/platform.c
2605 rename arch/mips/alchemy/devboards/{pb1500/board_setup.c => pb1500.c} (51%)
2606 delete mode 100644 arch/mips/alchemy/devboards/pb1500/Makefile
2607 delete mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c
2608 rename arch/mips/alchemy/devboards/{pb1550/platform.c => pb1550.c} (61%)
2609 delete mode 100644 arch/mips/alchemy/devboards/pb1550/Makefile
2610 delete mode 100644 arch/mips/alchemy/devboards/pb1550/board_setup.c
2611 delete mode 100644 arch/mips/alchemy/gpr/Makefile
2612 delete mode 100644 arch/mips/alchemy/gpr/board_setup.c
2613 delete mode 100644 arch/mips/alchemy/gpr/init.c
2614 delete mode 100644 arch/mips/alchemy/mtx-1/Makefile
2615 delete mode 100644 arch/mips/alchemy/mtx-1/board_setup.c
2616 delete mode 100644 arch/mips/alchemy/mtx-1/init.c
2617 delete mode 100644 arch/mips/alchemy/xxs1500/Makefile
2618 delete mode 100644 arch/mips/alchemy/xxs1500/board_setup.c
2619 delete mode 100644 arch/mips/alchemy/xxs1500/init.c
2620 delete mode 100644 arch/mips/alchemy/xxs1500/platform.c
2621 delete mode 100644 arch/mips/ath79/dev-ar913x-wmac.c
2622 create mode 100644 arch/mips/ath79/dev-usb.c
2623 rename arch/mips/ath79/{dev-ar913x-wmac.h => dev-usb.h} (61%)
2624 create mode 100644 arch/mips/ath79/dev-wmac.c
2625 create mode 100644 arch/mips/ath79/dev-wmac.h
2626 create mode 100644 arch/mips/ath79/mach-ap121.c
2627 create mode 100644 arch/mips/ath79/mach-ubnt-xm.c
2628 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-cmd-queue.c (98%)
2629 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-fpa.c (100%)
2630 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-board.c (96%)
2631 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-fpa.c (100%)
2632 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-loop.c (95%)
2633 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-npi.c (96%)
2634 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-rgmii.c (97%)
2635 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-sgmii.c (98%)
2636 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-spi.c (94%)
2637 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-util.c (97%)
2638 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-xaui.c (97%)
2639 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper.c (93%)
2640 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-interrupt-decodes.c (98%)
2641 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-interrupt-rsl.c (97%)
2642 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-pko.c (98%)
2643 rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-spi.c (99%)
2644 delete mode 100644 arch/mips/configs/db1100_defconfig
2645 create mode 100644 arch/mips/configs/db1300_defconfig
2646 delete mode 100644 arch/mips/configs/db1500_defconfig
2647 create mode 100644 arch/mips/configs/nlm_xlp_defconfig
2648 delete mode 100644 arch/mips/configs/pb1200_defconfig
2649 create mode 100644 arch/mips/include/asm/bmips.h
2650 create mode 100644 arch/mips/include/asm/gio_device.h
2651 create mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart.h
2652 create mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h
2653 create mode 100644 arch/mips/include/asm/mach-ath79/pci-ath724x.h
2654 create mode 100644 arch/mips/include/asm/mach-au1x00/au1200fb.h
2655 create mode 100644 arch/mips/include/asm/mach-au1x00/au1550nd.h
2656 create mode 100644 arch/mips/include/asm/mach-au1x00/gpio-au1300.h
2657 create mode 100644 arch/mips/include/asm/mach-bcm63xx/ioremap.h
2658 create mode 100644 arch/mips/include/asm/mach-bcm63xx/irq.h
2659 create mode 100644 arch/mips/include/asm/mach-db1x00/db1300.h
2660 delete mode 100644 arch/mips/include/asm/mach-db1x00/db1x00.h
2661 create mode 100644 arch/mips/include/asm/mach-db1x00/irq.h
2662 delete mode 100644 arch/mips/include/asm/mach-pb1x00/mc146818rtc.h
2663 delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1000.h
2664 delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1200.h
2665 delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1550.h
2666 create mode 100644 arch/mips/include/asm/netlogic/common.h
2667 create mode 100644 arch/mips/include/asm/netlogic/haldefs.h
2668 create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/bridge.h
2669 create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h
2670 create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/iomap.h
2671 create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/pic.h
2672 create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/sys.h
2673 create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/uart.h
2674 rename arch/mips/{netlogic/xlr/xlr_console.c => include/asm/netlogic/xlp-hal/xlp.h} (82%)
2675 create mode 100644 arch/mips/include/asm/netlogic/xlr/msidef.h
2676 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-address.h (100%)
2677 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-asxx-defs.h (100%)
2678 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-cmd-queue.h (100%)
2679 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-config.h (99%)
2680 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-dbg-defs.h (100%)
2681 create mode 100644 arch/mips/include/asm/octeon/cvmx-dpi-defs.h
2682 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fau.h (100%)
2683 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fpa-defs.h (100%)
2684 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fpa.h (100%)
2685 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-gmxx-defs.h (100%)
2686 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-board.h (96%)
2687 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-fpa.h (100%)
2688 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-loop.h (96%)
2689 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-npi.h (96%)
2690 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-rgmii.h (98%)
2691 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-sgmii.h (98%)
2692 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-spi.h (98%)
2693 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-util.h (100%)
2694 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-xaui.h (98%)
2695 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper.h (99%)
2696 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-ipd.h (100%)
2697 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-mdio.h (100%)
2698 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pcsx-defs.h (100%)
2699 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pcsxx-defs.h (100%)
2700 create mode 100644 arch/mips/include/asm/octeon/cvmx-pemx-defs.h
2701 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pip-defs.h (100%)
2702 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pip.h (100%)
2703 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pko-defs.h (100%)
2704 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pko.h (100%)
2705 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pow.h (100%)
2706 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-scratch.h (100%)
2707 create mode 100644 arch/mips/include/asm/octeon/cvmx-sli-defs.h
2708 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-spi.h (100%)
2709 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-spxx-defs.h (100%)
2710 create mode 100644 arch/mips/include/asm/octeon/cvmx-sriox-defs.h
2711 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-srxx-defs.h (100%)
2712 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-stxx-defs.h (100%)
2713 rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-wqe.h (100%)
2714 create mode 100644 arch/mips/include/asm/tlbmisc.h
2715 create mode 100644 arch/mips/kernel/bmips_vec.S
2716 create mode 100644 arch/mips/kernel/smp-bmips.c
2717 create mode 100644 arch/mips/mm/gup.c
2718 create mode 100644 arch/mips/netlogic/Makefile
2719 create mode 100644 arch/mips/netlogic/common/Makefile
2720 create mode 100644 arch/mips/netlogic/common/earlycons.c
2721 create mode 100644 arch/mips/netlogic/common/irq.c
2722 rename arch/mips/netlogic/{xlr => common}/smp.c (65%)
2723 create mode 100644 arch/mips/netlogic/common/smpboot.S
2724 rename arch/mips/netlogic/{xlr => common}/time.c (93%)
2725 create mode 100644 arch/mips/netlogic/xlp/Makefile
2726 create mode 100644 arch/mips/netlogic/xlp/nlm_hal.c
2727 create mode 100644 arch/mips/netlogic/xlp/platform.c
2728 create mode 100644 arch/mips/netlogic/xlp/setup.c
2729 create mode 100644 arch/mips/netlogic/xlp/wakeup.c
2730 delete mode 100644 arch/mips/netlogic/xlr/irq.c
2731 rename arch/mips/netlogic/xlr/{smpboot.S => wakeup.c} (60%)
2732 create mode 100644 arch/mips/pci/pci-ath724x.c
2733 create mode 100644 arch/mips/sgi-ip22/ip22-gio.c
2734 delete mode 100644 drivers/net/irda/au1000_ircc.h
2735 delete mode 100644 drivers/pcmcia/au1000_generic.c
2736 delete mode 100644 drivers/pcmcia/au1000_generic.h
2737 delete mode 100644 drivers/pcmcia/au1000_pb1x00.c
2738 delete mode 100644 drivers/staging/octeon/cvmx-packet.h
2739 delete mode 100644 drivers/staging/octeon/cvmx-smix-defs.h
2740 create mode 100644 drivers/tty/serial/ar933x_uart.c
2741 Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
2742 $ git merge openrisc/for-upstream
2744 Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
2745 $ git merge parisc/for-next
2746 Merge made by the 'recursive' strategy.
2747 arch/parisc/include/asm/futex.h | 31 +++++++++++++++++++++++++++----
2748 1 files changed, 27 insertions(+), 4 deletions(-)
2749 Merging powerpc/next (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout)
2750 $ git merge powerpc/next
2751 Removing arch/powerpc/boot/dts/p5020si.dtsi
2752 Removing arch/powerpc/boot/dts/p4080si.dtsi
2753 Removing arch/powerpc/boot/dts/p3060si.dtsi
2754 Removing arch/powerpc/boot/dts/p3041si.dtsi
2755 Removing arch/powerpc/boot/dts/p2041si.dtsi
2756 Removing arch/powerpc/boot/dts/p2020si.dtsi
2757 Removing arch/powerpc/boot/dts/p1020si.dtsi
2758 Removing arch/powerpc/boot/dts/p1010si.dtsi
2759 Merge made by the 'recursive' strategy.
2760 .../devicetree/bindings/powerpc/fsl/srio-rmu.txt | 163 +++
2761 .../devicetree/bindings/powerpc/fsl/srio.txt | 103 ++
2762 arch/powerpc/Kconfig | 1 +
2763 arch/powerpc/Kconfig.debug | 12 +
2764 arch/powerpc/Makefile | 3 +-
2765 arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi | 248 ++++
2766 arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi | 63 +
2767 arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi | 191 +++
2768 arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi | 63 +
2769 arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi | 143 ++
2770 arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi | 62 +
2771 arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi | 270 ++++
2772 arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi | 65 +
2773 arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi | 304 ++++
2774 arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi | 64 +
2775 arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi | 196 +++
2776 arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi | 70 +
2777 arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 198 +++
2778 arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi | 64 +
2779 arch/powerpc/boot/dts/fsl/p1020si-post.dtsi | 174 +++
2780 arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi | 68 +
2781 arch/powerpc/boot/dts/fsl/p1021si-post.dtsi | 225 +++
2782 arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi | 68 +
2783 arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | 235 +++
2784 arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi | 68 +
2785 arch/powerpc/boot/dts/fsl/p1023si-post.dtsi | 224 +++
2786 arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi | 76 +
2787 arch/powerpc/boot/dts/fsl/p2020si-post.dtsi | 194 +++
2788 arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi | 69 +
2789 arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 325 +++++
2790 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi | 111 ++
2791 arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 352 +++++
2792 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi | 112 ++
2793 arch/powerpc/boot/dts/fsl/p3060si-post.dtsi | 296 ++++
2794 arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi | 125 ++
2795 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 350 +++++
2796 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | 143 ++
2797 arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 355 +++++
2798 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 96 ++
2799 arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi | 66 +
2800 arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi | 66 +
2801 arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi | 51 +
2802 arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi | 41 +
2803 arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi | 41 +
2804 arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi | 53 +
2805 arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi | 53 +
2806 arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi | 53 +
2807 arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi | 53 +
2808 arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi | 39 +
2809 arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi | 60 +
2810 arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi | 60 +
2811 arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi | 59 +
2812 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi | 42 +
2813 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi | 42 +
2814 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi | 42 +
2815 arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi | 41 +
2816 arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi | 43 +
2817 arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi | 43 +
2818 arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi | 42 +
2819 arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi | 66 +
2820 arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi | 68 +
2821 arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi | 40 +
2822 arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi | 40 +
2823 arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi | 43 +
2824 arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi | 45 +
2825 arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi | 45 +
2826 arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi | 45 +
2827 arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi | 65 +
2828 arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi | 41 +
2829 arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi | 41 +
2830 arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi | 66 +
2831 arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi | 66 +
2832 arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi | 51 +
2833 arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi | 51 +
2834 arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi | 40 +
2835 arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi | 41 +
2836 arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi | 41 +
2837 arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi | 53 +
2838 arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi | 53 +
2839 arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi | 106 ++
2840 arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi | 68 +
2841 arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi | 39 +
2842 arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi | 39 +
2843 arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi | 100 ++
2844 arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi | 109 ++
2845 arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi | 109 ++
2846 arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi | 41 +
2847 arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi | 41 +
2848 arch/powerpc/boot/dts/mpc8536ds.dts | 456 +------
2849 arch/powerpc/boot/dts/mpc8536ds.dtsi | 141 ++
2850 arch/powerpc/boot/dts/mpc8536ds_36b.dts | 410 +-----
2851 arch/powerpc/boot/dts/mpc8544ds.dts | 473 +------
2852 arch/powerpc/boot/dts/mpc8544ds.dtsi | 161 +++
2853 arch/powerpc/boot/dts/mpc8548cds.dts | 505 ++-----
2854 arch/powerpc/boot/dts/mpc8568mds.dts | 482 +------
2855 arch/powerpc/boot/dts/mpc8569mds.dts | 414 +-----
2856 arch/powerpc/boot/dts/mpc8572ds.dts | 757 +----------
2857 arch/powerpc/boot/dts/mpc8572ds.dtsi | 397 +++++
2858 arch/powerpc/boot/dts/mpc8572ds_36b.dts | 746 +----------
2859 arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 487 +------
2860 arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 245 +---
2861 arch/powerpc/boot/dts/mpc8641_hpcn.dts | 69 +-
2862 arch/powerpc/boot/dts/p1010rdb.dts | 228 +---
2863 arch/powerpc/boot/dts/p1010rdb.dtsi | 229 +++
2864 arch/powerpc/boot/dts/p1010rdb_36b.dts | 89 ++
2865 arch/powerpc/boot/dts/p1010si.dtsi | 374 -----
2866 arch/powerpc/boot/dts/p1020rdb.dts | 262 +----
2867 arch/powerpc/boot/dts/p1020rdb.dtsi | 242 ++++
2868 arch/powerpc/boot/dts/p1020rdb_36b.dts | 66 +
2869 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts | 154 +--
2870 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | 11 +-
2871 arch/powerpc/boot/dts/p1020si.dtsi | 377 -----
2872 arch/powerpc/boot/dts/p1021mds.dts | 421 +-----
2873 arch/powerpc/boot/dts/p1022ds.dts | 449 +------
2874 arch/powerpc/boot/dts/p1023rds.dts | 380 +-----
2875 arch/powerpc/boot/dts/p2020ds.dts | 353 +-----
2876 arch/powerpc/boot/dts/p2020ds.dtsi | 316 ++++
2877 arch/powerpc/boot/dts/p2020rdb.dts | 63 +-
2878 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 141 +--
2879 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 107 +--
2880 arch/powerpc/boot/dts/p2020si.dtsi | 382 -----
2881 arch/powerpc/boot/dts/p2041rdb.dts | 22 +-
2882 arch/powerpc/boot/dts/p2041si.dtsi | 692 ---------
2883 arch/powerpc/boot/dts/p3041ds.dts | 23 +-
2884 arch/powerpc/boot/dts/p3041si.dtsi | 729 ----------
2885 arch/powerpc/boot/dts/p3060qds.dts | 12 +-
2886 arch/powerpc/boot/dts/p3060si.dtsi | 719 ---------
2887 arch/powerpc/boot/dts/p4080ds.dts | 24 +-
2888 arch/powerpc/boot/dts/p4080si.dtsi | 755 ----------
2889 arch/powerpc/boot/dts/p5020ds.dts | 24 +-
2890 arch/powerpc/boot/dts/p5020si.dtsi | 716 ---------
2891 arch/powerpc/configs/chroma_defconfig | 307 ++++
2892 arch/powerpc/include/asm/cputable.h | 2 +-
2893 arch/powerpc/include/asm/fsl_lbc.h | 7 +-
2894 arch/powerpc/include/asm/machdep.h | 3 +
2895 arch/powerpc/include/asm/mmu-book3e.h | 4 +
2896 arch/powerpc/include/asm/page.h | 1 +
2897 arch/powerpc/include/asm/pci-bridge.h | 6 +-
2898 arch/powerpc/include/asm/pgtable.h | 3 +
2899 arch/powerpc/include/asm/reg_booke.h | 4 +
2900 arch/powerpc/include/asm/rtas.h | 6 +
2901 arch/powerpc/include/asm/tce.h | 10 +-
2902 arch/powerpc/include/asm/time.h | 2 +
2903 arch/powerpc/kernel/cpu_setup_a2.S | 10 +-
2904 arch/powerpc/kernel/irq.c | 24 +-
2905 arch/powerpc/kernel/pci-common.c | 75 +-
2906 arch/powerpc/kernel/pci_dn.c | 3 +
2907 arch/powerpc/kernel/process.c | 22 +-
2908 arch/powerpc/kernel/rtas_flash.c | 6 +
2909 arch/powerpc/kernel/rtasd.c | 7 +
2910 arch/powerpc/kernel/smp.c | 3 +-
2911 arch/powerpc/kernel/sysfs.c | 8 +
2912 arch/powerpc/kernel/time.c | 95 +-
2913 arch/powerpc/mm/Makefile | 2 +
2914 arch/powerpc/mm/fault.c | 17 +
2915 arch/powerpc/mm/icswx.c | 273 ++++
2916 arch/powerpc/mm/icswx.h | 62 +
2917 arch/powerpc/mm/icswx_pid.c | 87 ++
2918 arch/powerpc/mm/mem.c | 18 +
2919 arch/powerpc/mm/mmap_64.c | 14 +-
2920 arch/powerpc/mm/mmu_context_hash64.c | 195 +---
2921 arch/powerpc/platforms/83xx/asp834x.c | 35 +-
2922 arch/powerpc/platforms/83xx/km83xx.c | 58 +-
2923 arch/powerpc/platforms/83xx/misc.c | 77 +
2924 arch/powerpc/platforms/83xx/mpc830x_rdb.c | 40 +-
2925 arch/powerpc/platforms/83xx/mpc831x_rdb.c | 43 +-
2926 arch/powerpc/platforms/83xx/mpc832x_mds.c | 53 +-
2927 arch/powerpc/platforms/83xx/mpc832x_rdb.c | 56 +-
2928 arch/powerpc/platforms/83xx/mpc834x_itx.c | 30 +-
2929 arch/powerpc/platforms/83xx/mpc834x_mds.c | 42 +-
2930 arch/powerpc/platforms/83xx/mpc836x_mds.c | 53 +-
2931 arch/powerpc/platforms/83xx/mpc836x_rdk.c | 48 +-
2932 arch/powerpc/platforms/83xx/mpc837x_mds.c | 46 +-
2933 arch/powerpc/platforms/83xx/mpc837x_rdb.c | 47 +-
2934 arch/powerpc/platforms/83xx/mpc83xx.h | 16 +
2935 arch/powerpc/platforms/83xx/sbc834x.c | 45 +-
2936 arch/powerpc/platforms/85xx/Makefile | 2 +
2937 arch/powerpc/platforms/85xx/common.c | 66 +
2938 arch/powerpc/platforms/85xx/corenet_ds.c | 2 +-
2939 arch/powerpc/platforms/85xx/ksi8560.c | 46 +-
2940 arch/powerpc/platforms/85xx/mpc8536_ds.c | 16 +-
2941 arch/powerpc/platforms/85xx/mpc85xx.h | 11 +
2942 arch/powerpc/platforms/85xx/mpc85xx_ads.c | 52 +-
2943 arch/powerpc/platforms/85xx/mpc85xx_cds.c | 18 +-
2944 arch/powerpc/platforms/85xx/mpc85xx_ds.c | 20 +-
2945 arch/powerpc/platforms/85xx/mpc85xx_mds.c | 47 +-
2946 arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 18 +-
2947 arch/powerpc/platforms/85xx/p1010rdb.c | 15 +-
2948 arch/powerpc/platforms/85xx/p1022_ds.c | 7 +-
2949 arch/powerpc/platforms/85xx/p1023_rds.c | 19 +-
2950 arch/powerpc/platforms/85xx/sbc8548.c | 18 +-
2951 arch/powerpc/platforms/85xx/sbc8560.c | 52 +-
2952 arch/powerpc/platforms/85xx/socrates.c | 13 +-
2953 arch/powerpc/platforms/85xx/stx_gp3.c | 51 +-
2954 arch/powerpc/platforms/85xx/tqm85xx.c | 51 +-
2955 arch/powerpc/platforms/85xx/xes_mpc85xx.c | 20 +-
2956 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 +-
2957 arch/powerpc/platforms/Kconfig.cputype | 21 +-
2958 arch/powerpc/platforms/cell/iommu.c | 2 +
2959 arch/powerpc/platforms/maple/pci.c | 55 +
2960 arch/powerpc/platforms/powermac/setup.c | 8 +-
2961 arch/powerpc/platforms/powermac/smp.c | 4 +-
2962 arch/powerpc/platforms/powernv/Makefile | 2 +-
2963 arch/powerpc/platforms/powernv/pci-ioda.c | 1325 +++++++++++++++++
2964 arch/powerpc/platforms/powernv/pci.c | 111 ++-
2965 arch/powerpc/platforms/powernv/pci.h | 84 ++
2966 arch/powerpc/platforms/pseries/iommu.c | 61 +-
2967 arch/powerpc/platforms/wsp/Kconfig | 12 +-
2968 arch/powerpc/platforms/wsp/Makefile | 8 +-
2969 arch/powerpc/platforms/wsp/chroma.c | 56 +
2970 arch/powerpc/platforms/wsp/h8.c | 134 ++
2971 arch/powerpc/platforms/wsp/opb_pic.c | 3 +-
2972 arch/powerpc/platforms/wsp/psr2.c | 56 +-
2973 arch/powerpc/platforms/wsp/wsp.c | 115 ++
2974 arch/powerpc/platforms/wsp/wsp.h | 16 +-
2975 arch/powerpc/sysdev/Makefile | 2 +-
2976 arch/powerpc/sysdev/fsl_lbc.c | 36 +
2977 arch/powerpc/sysdev/fsl_msi.c | 39 +
2978 arch/powerpc/sysdev/fsl_msi.h | 3 +
2979 arch/powerpc/sysdev/fsl_rio.c | 1519 ++++----------------
2980 arch/powerpc/sysdev/fsl_rio.h | 135 ++
2981 arch/powerpc/sysdev/fsl_rmu.c | 1103 ++++++++++++++
2982 arch/powerpc/sysdev/mpic.c | 2 +-
2983 arch/powerpc/sysdev/xics/icp-hv.c | 38 +-
2984 arch/powerpc/sysdev/xics/xics-common.c | 2 +-
2985 arch/powerpc/xmon/xmon.c | 16 +-
2986 arch/sparc/kernel/sys_sparc_64.c | 6 +-
2987 drivers/tty/serial/ucc_uart.c | 3 +
2988 tools/perf/arch/powerpc/util/dwarf-regs.c | 3 +
2989 229 files changed, 15786 insertions(+), 14400 deletions(-)
2990 create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt
2991 create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/srio.txt
2992 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi
2993 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi
2994 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi
2995 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi
2996 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
2997 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
2998 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi
2999 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi
3000 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi
3001 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi
3002 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi
3003 create mode 100644 arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi
3004 create mode 100644 arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
3005 create mode 100644 arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi
3006 create mode 100644 arch/powerpc/boot/dts/fsl/p1020si-post.dtsi
3007 create mode 100644 arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi
3008 create mode 100644 arch/powerpc/boot/dts/fsl/p1021si-post.dtsi
3009 create mode 100644 arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi
3010 create mode 100644 arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
3011 create mode 100644 arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
3012 create mode 100644 arch/powerpc/boot/dts/fsl/p1023si-post.dtsi
3013 create mode 100644 arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi
3014 create mode 100644 arch/powerpc/boot/dts/fsl/p2020si-post.dtsi
3015 create mode 100644 arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi
3016 create mode 100644 arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
3017 create mode 100644 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi
3018 create mode 100644 arch/powerpc/boot/dts/fsl/p3041si-post.dtsi
3019 create mode 100644 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi
3020 create mode 100644 arch/powerpc/boot/dts/fsl/p3060si-post.dtsi
3021 create mode 100644 arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi
3022 create mode 100644 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
3023 create mode 100644 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi
3024 create mode 100644 arch/powerpc/boot/dts/fsl/p5020si-post.dtsi
3025 create mode 100644 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi
3026 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi
3027 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi
3028 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi
3029 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi
3030 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi
3031 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi
3032 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi
3033 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi
3034 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi
3035 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi
3036 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi
3037 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi
3038 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi
3039 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi
3040 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi
3041 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi
3042 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi
3043 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi
3044 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi
3045 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi
3046 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi
3047 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi
3048 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi
3049 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi
3050 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi
3051 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi
3052 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi
3053 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi
3054 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi
3055 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi
3056 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi
3057 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi
3058 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi
3059 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi
3060 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi
3061 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi
3062 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi
3063 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi
3064 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi
3065 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi
3066 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi
3067 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi
3068 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi
3069 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi
3070 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi
3071 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi
3072 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi
3073 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi
3074 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi
3075 create mode 100644 arch/powerpc/boot/dts/mpc8536ds.dtsi
3076 create mode 100644 arch/powerpc/boot/dts/mpc8544ds.dtsi
3077 create mode 100644 arch/powerpc/boot/dts/mpc8572ds.dtsi
3078 create mode 100644 arch/powerpc/boot/dts/p1010rdb.dtsi
3079 create mode 100644 arch/powerpc/boot/dts/p1010rdb_36b.dts
3080 delete mode 100644 arch/powerpc/boot/dts/p1010si.dtsi
3081 create mode 100644 arch/powerpc/boot/dts/p1020rdb.dtsi
3082 create mode 100644 arch/powerpc/boot/dts/p1020rdb_36b.dts
3083 delete mode 100644 arch/powerpc/boot/dts/p1020si.dtsi
3084 create mode 100644 arch/powerpc/boot/dts/p2020ds.dtsi
3085 delete mode 100644 arch/powerpc/boot/dts/p2020si.dtsi
3086 delete mode 100644 arch/powerpc/boot/dts/p2041si.dtsi
3087 delete mode 100644 arch/powerpc/boot/dts/p3041si.dtsi
3088 delete mode 100644 arch/powerpc/boot/dts/p3060si.dtsi
3089 delete mode 100644 arch/powerpc/boot/dts/p4080si.dtsi
3090 delete mode 100644 arch/powerpc/boot/dts/p5020si.dtsi
3091 create mode 100644 arch/powerpc/configs/chroma_defconfig
3092 create mode 100644 arch/powerpc/mm/icswx.c
3093 create mode 100644 arch/powerpc/mm/icswx.h
3094 create mode 100644 arch/powerpc/mm/icswx_pid.c
3095 create mode 100644 arch/powerpc/platforms/85xx/common.c
3096 create mode 100644 arch/powerpc/platforms/85xx/mpc85xx.h
3097 create mode 100644 arch/powerpc/platforms/powernv/pci-ioda.c
3098 create mode 100644 arch/powerpc/platforms/wsp/chroma.c
3099 create mode 100644 arch/powerpc/platforms/wsp/h8.c
3100 create mode 100644 arch/powerpc/platforms/wsp/wsp.c
3101 create mode 100644 arch/powerpc/sysdev/fsl_rio.h
3102 create mode 100644 arch/powerpc/sysdev/fsl_rmu.c
3103 Merging 4xx/next (f1ab937 MAINTAINERS: Update PowerPC 4xx git tree)
3104 $ git merge 4xx/next
3105 Auto-merging MAINTAINERS
3106 Merge made by the 'recursive' strategy.
3108 arch/powerpc/boot/dts/klondike.dts | 227 +++++++++++++++++++++++++++
3109 arch/powerpc/configs/40x/klondike_defconfig | 55 +++++++
3110 arch/powerpc/kernel/cputable.c | 13 ++
3111 arch/powerpc/platforms/40x/Kconfig | 11 ++
3112 arch/powerpc/platforms/40x/ppc40x_simple.c | 1 +
3113 6 files changed, 308 insertions(+), 1 deletions(-)
3114 create mode 100644 arch/powerpc/boot/dts/klondike.dts
3115 create mode 100644 arch/powerpc/configs/40x/klondike_defconfig
3116 Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
3117 $ git merge 52xx-and-virtex/powerpc/next
3118 Merge made by the 'recursive' strategy.
3119 Merging galak/next (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout)
3120 $ git merge galak/next
3122 Merging s390/features (4a6f04b [S390] topology: increase poll frequency if change is anticipated)
3123 $ git merge s390/features
3124 Merge made by the 'recursive' strategy.
3125 arch/s390/Kbuild | 13 +-
3126 arch/s390/Kconfig | 11 +-
3127 arch/s390/Makefile | 1 -
3128 arch/s390/include/asm/lowcore.h | 142 +++---
3129 arch/s390/include/asm/pgtable.h | 31 +-
3130 arch/s390/include/asm/smp.h | 1 -
3131 arch/s390/include/asm/sparsemem.h | 4 +-
3132 arch/s390/include/asm/topology.h | 40 ++-
3133 arch/s390/kernel/Makefile | 3 +-
3134 arch/s390/kernel/asm-offsets.c | 5 +-
3135 arch/s390/kernel/base.S | 16 +-
3136 arch/s390/kernel/entry.S | 1099 ++++++++++++++++---------------------
3137 arch/s390/kernel/entry64.S | 973 +++++++++++++++------------------
3138 arch/s390/kernel/head.S | 4 +-
3139 arch/s390/kernel/mem_detect.c | 122 +++--
3140 arch/s390/kernel/ptrace.c | 18 +
3141 arch/s390/kernel/reipl64.S | 4 +-
3142 arch/s390/kernel/setup.c | 71 ++-
3143 arch/s390/kernel/signal.c | 8 +-
3144 arch/s390/kernel/smp.c | 121 +----
3145 arch/s390/kernel/topology.c | 275 +++++++---
3146 arch/s390/mm/fault.c | 6 +-
3147 arch/s390/mm/init.c | 16 +-
3148 arch/s390/mm/pgtable.c | 11 -
3149 drivers/s390/cio/cio.h | 5 +
3150 drivers/s390/cio/css.c | 104 ++--
3151 drivers/s390/cio/device.c | 4 +-
3152 drivers/s390/cio/qdio_setup.c | 7 +-
3153 28 files changed, 1496 insertions(+), 1619 deletions(-)
3154 Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
3155 $ git merge sh/sh-latest
3157 Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
3158 $ git merge rmobile/rmobile-latest
3160 Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
3161 $ git merge sparc-next/master
3163 Merging tile/master (1583171 Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile)
3164 $ git merge tile/master
3166 Merging unicore32/unicore32 (ed96dfb unicore32, exec: remove redundant set_fs(USER_DS))
3167 $ git merge unicore32/unicore32
3169 Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
3170 $ git merge xtensa/master
3171 Merge made by the 'recursive' strategy.
3172 arch/xtensa/include/asm/irqflags.h | 1 +
3173 arch/xtensa/include/asm/regs.h | 91 ++++++++++++++++++---------------
3174 arch/xtensa/include/asm/timex.h | 4 +-
3175 arch/xtensa/include/asm/uaccess.h | 2 +-
3176 arch/xtensa/kernel/align.S | 14 +++---
3177 arch/xtensa/kernel/coprocessor.S | 10 ++--
3178 arch/xtensa/kernel/entry.S | 98 ++++++++++++++++++------------------
3179 arch/xtensa/kernel/head.S | 12 ++--
3180 arch/xtensa/kernel/irq.c | 5 ++
3181 arch/xtensa/kernel/traps.c | 4 +-
3182 arch/xtensa/kernel/vectors.S | 22 ++++----
3183 arch/xtensa/kernel/vmlinux.lds.S | 1 +
3184 12 files changed, 139 insertions(+), 125 deletions(-)
3185 Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
3186 $ git merge ceph/for-next
3188 Merging cifs/master (9c32c63 cifs: Fix sparse warning when calling cifs_strtoUCS)
3189 $ git merge cifs/master
3190 Merge made by the 'recursive' strategy.
3191 fs/cifs/file.c | 26 ++++++++++++++++++++++++++
3192 fs/cifs/smbencrypt.c | 6 +++---
3193 2 files changed, 29 insertions(+), 3 deletions(-)
3194 Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
3195 $ git merge configfs/linux-next
3197 Merging ecryptfs/next (aaef29d eCryptfs: Flush file in vma close)
3198 $ git merge ecryptfs/next
3199 Merge made by the 'recursive' strategy.
3200 Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
3201 $ git merge ext3/for_next
3203 Merging ext4/dev (4c81f04 ext4: fix racy use-after-free in ext4_end_io_dio())
3204 $ git merge ext4/dev
3206 Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
3207 $ git merge fatfs/master
3209 Merging fuse/for-next (cfcfc9e Linux 3.2-rc2)
3210 $ git merge fuse/for-next
3212 Merging gfs2/master (018a01c GFS2: We only need one ACL getting function)
3213 $ git merge gfs2/master
3214 Merge made by the 'recursive' strategy.
3215 fs/gfs2/acl.c | 14 +--
3216 fs/gfs2/aops.c | 18 ++--
3217 fs/gfs2/bmap.c | 26 ++---
3218 fs/gfs2/dir.c | 64 ++++++++++-
3219 fs/gfs2/dir.h | 2 +-
3220 fs/gfs2/export.c | 3 +-
3221 fs/gfs2/file.c | 34 +++---
3222 fs/gfs2/incore.h | 20 ++--
3223 fs/gfs2/inode.c | 70 ++++++------
3224 fs/gfs2/log.c | 2 +-
3225 fs/gfs2/main.c | 3 +-
3226 fs/gfs2/meta_io.c | 4 +-
3227 fs/gfs2/ops_fstype.c | 2 +-
3228 fs/gfs2/quota.c | 87 ++++++---------
3229 fs/gfs2/rgrp.c | 293 +++++++++++++++++++++++++++----------------------
3230 fs/gfs2/rgrp.h | 16 ++--
3231 fs/gfs2/super.c | 14 ++--
3232 fs/gfs2/trans.h | 6 +-
3233 fs/gfs2/xattr.c | 48 ++++-----
3234 19 files changed, 393 insertions(+), 333 deletions(-)
3235 Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
3236 $ git merge hfsplus/for-next
3238 Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
3239 $ git merge jfs/next
3241 Merging logfs/master (21f3eb8 logfs: update page reference count for pined pages)
3242 $ git merge logfs/master
3243 Resolved 'fs/logfs/file.c' using previous resolution.
3244 Auto-merging fs/logfs/super.c
3245 Auto-merging fs/logfs/readwrite.c
3246 Auto-merging fs/logfs/logfs.h
3247 Auto-merging fs/logfs/inode.c
3248 Auto-merging fs/logfs/file.c
3249 CONFLICT (content): Merge conflict in fs/logfs/file.c
3250 Auto-merging fs/logfs/dir.c
3251 Auto-merging MAINTAINERS
3252 Automatic merge failed; fix conflicts and then commit the result.
3254 [master 7b2d286] Merge remote-tracking branch 'logfs/master'
3255 $ git diff -M --stat --summary HEAD^..
3257 fs/logfs/dev_mtd.c | 26 +++++++++++-------------
3258 fs/logfs/dir.c | 2 +-
3259 fs/logfs/file.c | 2 +
3260 fs/logfs/gc.c | 2 +-
3261 fs/logfs/inode.c | 4 ++-
3262 fs/logfs/journal.c | 1 -
3263 fs/logfs/logfs.h | 5 +++-
3264 fs/logfs/readwrite.c | 51 +++++++++++++++++++++++++++++++++----------------
3265 fs/logfs/segment.c | 51 ++++++++++++++++++++++++++++++++++++++-----------
3266 fs/logfs/super.c | 3 +-
3267 11 files changed, 99 insertions(+), 49 deletions(-)
3268 Merging nfs/linux-next (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
3269 $ git merge nfs/linux-next
3271 Merging nfsd/nfsd-next (353de31 nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error)
3272 $ git merge nfsd/nfsd-next
3273 Auto-merging MAINTAINERS
3274 Merge made by the 'recursive' strategy.
3276 Documentation/filesystems/nfs/00-INDEX | 2 +
3277 Documentation/filesystems/nfs/fault_injection.txt | 69 +++++
3279 fs/nfsd/Kconfig | 10 +
3280 fs/nfsd/Makefile | 1 +
3281 fs/nfsd/fault_inject.c | 91 +++++++
3282 fs/nfsd/fault_inject.h | 28 ++
3283 fs/nfsd/nfs4state.c | 297 +++++++++++++++------
3284 fs/nfsd/nfsctl.c | 10 +-
3285 fs/nfsd/nfsd.h | 20 +-
3286 tools/nfsd/inject_fault.sh | 49 ++++
3287 12 files changed, 486 insertions(+), 97 deletions(-)
3288 create mode 100644 Documentation/filesystems/nfs/fault_injection.txt
3289 create mode 100644 fs/nfsd/fault_inject.c
3290 create mode 100644 fs/nfsd/fault_inject.h
3291 create mode 100755 tools/nfsd/inject_fault.sh
3292 Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
3293 $ git merge nilfs2/for-next
3295 Merging ocfs2/linux-next (249ec93 ocfs2: Use filemap_write_and_wait() instead of write_inode_now())
3296 $ git merge ocfs2/linux-next
3297 Auto-merging fs/ocfs2/xattr.c
3298 Auto-merging fs/ocfs2/move_extents.c
3299 Auto-merging fs/ocfs2/inode.c
3300 Auto-merging fs/ocfs2/file.c
3301 Auto-merging fs/ocfs2/dlmglue.c
3302 Auto-merging fs/ocfs2/dir.c
3303 Auto-merging fs/ocfs2/cluster/tcp.c
3304 Merge made by the 'recursive' strategy.
3305 fs/ocfs2/alloc.c | 2 +-
3306 fs/ocfs2/aops.c | 69 +++++++++++++--
3307 fs/ocfs2/aops.h | 14 +++
3308 fs/ocfs2/cluster/heartbeat.c | 194 ++++++++++++++++++++++++++----------------
3309 fs/ocfs2/cluster/netdebug.c | 102 +++++++++++++++-------
3310 fs/ocfs2/cluster/tcp.c | 138 ++++++++++++++++--------------
3311 fs/ocfs2/cluster/tcp.h | 2 +
3312 fs/ocfs2/dir.c | 3 +-
3313 fs/ocfs2/dlm/dlmcommon.h | 56 +++----------
3314 fs/ocfs2/dlm/dlmdomain.c | 44 +++++-----
3315 fs/ocfs2/dlm/dlmlock.c | 54 ++++++------
3316 fs/ocfs2/dlm/dlmmaster.c | 175 +++++++++++++++++++-------------------
3317 fs/ocfs2/dlm/dlmrecovery.c | 164 ++++++++++++++++++------------------
3318 fs/ocfs2/dlm/dlmthread.c | 16 ++--
3319 fs/ocfs2/dlmglue.c | 21 +++--
3320 fs/ocfs2/extent_map.c | 96 +++++++++++++++++++++
3321 fs/ocfs2/extent_map.h | 2 +
3322 fs/ocfs2/file.c | 96 ++++++++++++++++++++-
3323 fs/ocfs2/inode.c | 2 +-
3324 fs/ocfs2/inode.h | 3 +
3325 fs/ocfs2/ioctl.c | 11 ++-
3326 fs/ocfs2/journal.c | 23 +++++-
3327 fs/ocfs2/journal.h | 5 +-
3328 fs/ocfs2/mmap.c | 53 +++++------
3329 fs/ocfs2/move_extents.c | 2 +-
3330 fs/ocfs2/ocfs2.h | 4 +-
3331 fs/ocfs2/quota_local.c | 13 ++-
3332 fs/ocfs2/slot_map.c | 4 +-
3333 fs/ocfs2/stack_o2cb.c | 71 ++++++++++++++--
3334 fs/ocfs2/super.c | 25 ++++--
3335 fs/ocfs2/xattr.c | 10 ++-
3336 31 files changed, 943 insertions(+), 531 deletions(-)
3337 Merging omfs/for-next (976d167 Linux 3.1-rc9)
3338 $ git merge omfs/for-next
3340 Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
3341 $ git merge squashfs/master
3343 Merging v9fs/for-next (be9e4aa 9p: Reduce object size with CONFIG_NET_9P_DEBUG)
3344 $ git merge v9fs/for-next
3345 Merge made by the 'recursive' strategy.
3346 fs/9p/cache.c | 64 +++++++-------
3348 fs/9p/v9fs.c | 83 +++++++++++------
3349 fs/9p/vfs_addr.c | 13 +--
3350 fs/9p/vfs_dentry.c | 12 +-
3351 fs/9p/vfs_dir.c | 13 +--
3352 fs/9p/vfs_file.c | 31 +++---
3353 fs/9p/vfs_inode.c | 86 +++++++++---------
3354 fs/9p/vfs_inode_dotl.c | 85 ++++++++---------
3355 fs/9p/vfs_super.c | 12 +-
3356 fs/9p/xattr.c | 16 ++--
3357 include/net/9p/9p.h | 28 ++----
3358 net/9p/client.c | 242 ++++++++++++++++++++++++------------------------
3359 net/9p/error.c | 6 +-
3361 net/9p/protocol.c | 8 +-
3362 net/9p/trans_fd.c | 113 ++++++++++++-----------
3363 net/9p/trans_rdma.c | 26 +++---
3364 net/9p/trans_virtio.c | 34 ++++----
3365 net/9p/util.c | 4 +-
3366 20 files changed, 451 insertions(+), 439 deletions(-)
3367 $ git reset --hard HEAD^
3368 HEAD is now at 0f71666 Merge remote-tracking branch 'ocfs2/linux-next'
3369 Merging refs/next/20111130/v9fs
3370 $ git merge refs/next/20111130/v9fs
3372 Merging ubifs/linux-next (eaecf43 UBIFS: Use kmemdup rather than duplicating its implementation)
3373 $ git merge ubifs/linux-next
3374 Merge made by the 'recursive' strategy.
3375 fs/ubifs/lpt.c | 6 ++----
3376 fs/ubifs/tnc.c | 3 +--
3377 fs/ubifs/xattr.c | 6 ++----
3378 3 files changed, 5 insertions(+), 10 deletions(-)
3379 Merging xfs/master (4c393a6 xfs: fix attr2 vs large data fork assert)
3380 $ git merge xfs/master
3381 Merge made by the 'recursive' strategy.
3382 fs/xfs/xfs_acl.c | 2 +
3383 fs/xfs/xfs_attr_leaf.c | 64 +++++++++++++++++++++++++++++------------------
3384 fs/xfs/xfs_inode.c | 21 +++++++++++++++
3385 fs/xfs/xfs_inode.h | 1 +
3386 fs/xfs/xfs_sync.c | 11 ++++++++
3387 5 files changed, 74 insertions(+), 25 deletions(-)
3388 Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
3389 $ git merge vfs/for-next
3391 Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
3392 $ git merge vfs-scale/vfs-scale-working
3394 Merging pci/linux-next (cfbf1bd PCI: msi: Disable msi interrupts when we initialize a pci device)
3395 $ git merge pci/linux-next
3396 Auto-merging drivers/pci/msi.c
3397 Auto-merging drivers/pci/ats.c
3398 Merge made by the 'recursive' strategy.
3399 Documentation/ABI/testing/sysfs-bus-pci | 18 +++++
3400 drivers/acpi/pci_root.c | 7 ++
3401 drivers/pci/ats.c | 20 +++---
3402 drivers/pci/hotplug/acpiphp_glue.c | 4 +-
3403 drivers/pci/hotplug/pciehp.h | 1 -
3404 drivers/pci/hotplug/pciehp_core.c | 11 +---
3405 drivers/pci/hotplug/pciehp_ctrl.c | 4 +-
3406 drivers/pci/hotplug/pciehp_hpc.c | 1 -
3407 drivers/pci/msi.c | 121 +++++++++++++++++++++++++++++++
3408 drivers/pci/pci-acpi.c | 13 ++--
3409 drivers/pci/pcie/aspm.c | 58 ++++++++++------
3410 include/linux/acpi.h | 4 +
3411 include/linux/msi.h | 3 +
3412 include/linux/pci-aspm.h | 4 +-
3413 include/linux/pci.h | 1 +
3414 include/linux/pci_regs.h | 4 +-
3415 16 files changed, 218 insertions(+), 56 deletions(-)
3416 Merging hid/for-next (2ddfbbc Merge branch 'multitouch' into for-next)
3417 $ git merge hid/for-next
3418 Auto-merging include/linux/hid.h
3419 Auto-merging drivers/hid/hid-wiimote-core.c
3420 Auto-merging drivers/hid/hid-roccat-common.c
3421 Removing drivers/hid/hid-quanta.c
3422 Auto-merging drivers/hid/hid-picolcd.c
3423 Auto-merging drivers/hid/hid-hyperv.c
3424 Auto-merging drivers/hid/hid-debug.c
3425 Merge made by the 'recursive' strategy.
3426 .../ABI/testing/sysfs-driver-hid-multitouch | 9 +
3427 Documentation/ABI/testing/sysfs-driver-hid-wiimote | 12 +
3428 drivers/hid/Kconfig | 27 +-
3429 drivers/hid/Makefile | 10 +-
3430 drivers/hid/hid-core.c | 17 +-
3431 drivers/hid/hid-debug.c | 8 +
3432 .../{staging/hv/hv_mouse.c => hid/hid-hyperv.c} | 299 ++++----
3433 drivers/hid/hid-ids.h | 21 +-
3434 drivers/hid/hid-input.c | 117 +++
3435 drivers/hid/hid-lg4ff.c | 2 +-
3436 drivers/hid/hid-multitouch.c | 161 +++--
3437 drivers/hid/hid-picolcd.c | 4 +-
3438 drivers/hid/hid-quanta.c | 261 -------
3439 drivers/hid/hid-roccat-common.c | 4 +-
3440 drivers/hid/hid-roccat-kone.c | 4 +-
3441 drivers/hid/hid-wacom.c | 179 ++++-
3442 drivers/hid/{hid-wiimote.c => hid-wiimote-core.c} | 246 +++----
3443 drivers/hid/hid-wiimote-debug.c | 227 ++++++
3444 drivers/hid/hid-wiimote-ext.c | 752 ++++++++++++++++++++
3445 drivers/hid/hid-wiimote.h | 208 ++++++
3446 drivers/hid/usbhid/usbkbd.c | 64 ++-
3447 drivers/staging/hv/Kconfig | 6 -
3448 drivers/staging/hv/Makefile | 1 -
3449 drivers/usb/misc/usbled.c | 2 +
3450 include/linux/hid.h | 16 +
3451 25 files changed, 1994 insertions(+), 663 deletions(-)
3452 create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-multitouch
3453 rename drivers/{staging/hv/hv_mouse.c => hid/hid-hyperv.c} (75%)
3454 delete mode 100644 drivers/hid/hid-quanta.c
3455 rename drivers/hid/{hid-wiimote.c => hid-wiimote-core.c} (89%)
3456 create mode 100644 drivers/hid/hid-wiimote-debug.c
3457 create mode 100644 drivers/hid/hid-wiimote-ext.c
3458 create mode 100644 drivers/hid/hid-wiimote.h
3459 Merging quilt/i2c (caca6a0 Linux 3.2-rc3)
3460 $ git merge quilt/i2c
3462 Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
3463 $ git merge bjdooks-i2c/next-i2c
3464 Resolved 'drivers/i2c/busses/i2c-designware-platdrv.c' using previous resolution.
3465 Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c
3466 CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
3467 Automatic merge failed; fix conflicts and then commit the result.
3469 [master 7fd4933] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
3470 $ git diff -M --stat --summary HEAD^..
3471 drivers/i2c/busses/i2c-designware-platdrv.c | 2 +-
3472 1 files changed, 1 insertions(+), 1 deletions(-)
3473 Merging quilt/jdelvare-hwmon (dda4fa1 hwmon: (lm63) Add support for LM96163)
3474 $ git merge quilt/jdelvare-hwmon
3475 Auto-merging drivers/hwmon/Kconfig
3476 Merge made by the 'recursive' strategy.
3477 Documentation/hwmon/lm63 | 8 +++
3478 drivers/hwmon/Kconfig | 4 +-
3479 drivers/hwmon/lm63.c | 132 ++++++++++++++++++++++++++++++++++++----------
3480 drivers/hwmon/max1111.c | 15 +++--
3481 4 files changed, 122 insertions(+), 37 deletions(-)
3482 Merging hwmon-staging/hwmon-next (a976c2a hwmon: (pmbus/zl6100) Only instantiate external temperature sensor if enabled)
3483 $ git merge hwmon-staging/hwmon-next
3484 Merge made by the 'recursive' strategy.
3485 Documentation/hwmon/pmbus | 5 +--
3486 Documentation/hwmon/zl6100 | 15 +++++++++
3487 drivers/hwmon/pmbus/Kconfig | 9 +++--
3488 drivers/hwmon/pmbus/adm1275.c | 71 +++++++++++++++++++++++++++++------------
3489 drivers/hwmon/pmbus/pmbus.c | 2 -
3490 drivers/hwmon/pmbus/zl6100.c | 43 +++++++++++++++++++++----
3491 6 files changed, 108 insertions(+), 37 deletions(-)
3492 Merging quilt/kernel-doc (c3b92c8 Linux 3.1)
3493 $ git merge quilt/kernel-doc
3495 Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
3496 $ git merge docs/docs-move
3498 Merging v4l-dvb/master (ed3825f Merge branch 'poll-pwc2' of /home/v4l/v4l/patchwork)
3499 $ git merge v4l-dvb/master
3500 Resolved 'drivers/staging/media/as102/as102_drv.h' using previous resolution.
3501 Auto-merging drivers/staging/media/as102/as102_drv.h
3502 CONFLICT (content): Merge conflict in drivers/staging/media/as102/as102_drv.h
3503 Auto-merging drivers/staging/media/as102/as102_drv.c
3504 Auto-merging MAINTAINERS
3505 Automatic merge failed; fix conflicts and then commit the result.
3507 [master ad268e8] Merge remote-tracking branch 'v4l-dvb/master'
3508 $ git diff -M --stat --summary HEAD^..
3509 Documentation/DocBook/media/dvb/dvbproperty.xml | 4 +
3510 Documentation/DocBook/media/v4l/dev-rds.xml | 8 +-
3511 Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml | 14 +-
3512 Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 10 +
3513 Documentation/dvb/get_dvb_firmware | 22 +-
3514 Documentation/video4linux/CARDLIST.bttv | 2 +-
3515 Documentation/video4linux/CARDLIST.cx23885 | 2 +
3516 Documentation/video4linux/CARDLIST.cx88 | 2 +
3517 Documentation/video4linux/CARDLIST.em28xx | 6 +-
3518 Documentation/video4linux/CARDLIST.saa7134 | 1 +
3519 Documentation/video4linux/CARDLIST.saa7164 | 2 +
3520 Documentation/video4linux/v4l2-framework.txt | 11 +
3522 arch/arm/mach-davinci/board-dm646x-evm.c | 6 +-
3523 drivers/media/common/tuners/mt2060.c | 9 +-
3524 drivers/media/common/tuners/mxl5007t.c | 52 +-
3525 drivers/media/common/tuners/qt1010.c | 9 +-
3526 drivers/media/common/tuners/tda18212.c | 66 +-
3527 drivers/media/common/tuners/tda18212.h | 4 +
3528 drivers/media/common/tuners/tda18218.c | 18 +-
3529 drivers/media/common/tuners/tda18218_priv.h | 2 +
3530 drivers/media/common/tuners/tda18271-fe.c | 10 +
3531 drivers/media/common/tuners/tda18271-priv.h | 2 +
3532 drivers/media/common/tuners/tuner-simple.c | 11 +
3533 drivers/media/common/tuners/xc5000.c | 39 +-
3534 drivers/media/dvb/dvb-core/dvb_frontend.c | 2 +
3535 drivers/media/dvb/dvb-usb/Kconfig | 5 +-
3536 drivers/media/dvb/dvb-usb/af9015.c | 97 ++
3537 drivers/media/dvb/dvb-usb/af9015.h | 7 +
3538 drivers/media/dvb/dvb-usb/anysee.c | 411 +++++++--
3539 drivers/media/dvb/dvb-usb/anysee.h | 6 +
3540 drivers/media/dvb/dvb-usb/dib0700_devices.c | 676 ++++++++++++-
3541 drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 4 +
3542 drivers/media/dvb/dvb-usb/dw2102.c | 15 +-
3543 drivers/media/dvb/dvb-usb/it913x.c | 79 +-
3544 drivers/media/dvb/dvb-usb/mxl111sf-tuner.c | 56 +-
3545 drivers/media/dvb/dvb-usb/ttusb2.c | 19 +-
3546 drivers/media/dvb/firewire/firedtv-avc.c | 3 +-
3547 drivers/media/dvb/frontends/af9013.c | 41 +-
3548 drivers/media/dvb/frontends/au8522_dig.c | 31 +-
3549 drivers/media/dvb/frontends/cxd2820r.h | 13 -
3550 drivers/media/dvb/frontends/cxd2820r_c.c | 13 +-
3551 drivers/media/dvb/frontends/cxd2820r_t.c | 55 +-
3552 drivers/media/dvb/frontends/cxd2820r_t2.c | 62 +-
3553 drivers/media/dvb/frontends/dib0090.c | 163 +++-
3554 drivers/media/dvb/frontends/dib0090.h | 54 +-
3555 drivers/media/dvb/frontends/dib7000p.c | 332 ++++---
3556 drivers/media/dvb/frontends/dib7000p.h | 16 +-
3557 drivers/media/dvb/frontends/dib8000.c | 1061 ++++++++++++++++++--
3558 drivers/media/dvb/frontends/dib8000.h | 42 +-
3559 drivers/media/dvb/frontends/dibx000_common.h | 7 +
3560 drivers/media/dvb/frontends/drxd_hard.c | 3 +-
3561 drivers/media/dvb/frontends/drxk.h | 2 +
3562 drivers/media/dvb/frontends/drxk_hard.c | 11 +-
3563 drivers/media/dvb/frontends/it913x-fe-priv.h | 722 +++++++++++++-
3564 drivers/media/dvb/frontends/it913x-fe.c | 167 +++-
3565 drivers/media/dvb/frontends/it913x-fe.h | 24 +-
3566 drivers/media/dvb/frontends/s5h1409.c | 31 +-
3567 drivers/media/dvb/frontends/s5h1411.c | 31 +-
3568 drivers/media/dvb/frontends/tda18271c2dd.c | 32 +-
3569 drivers/media/dvb/ttpci/av7110.c | 2 +-
3570 drivers/media/radio/Kconfig | 297 +++---
3571 drivers/media/radio/tef6862.c | 8 +-
3572 drivers/media/radio/wl128x/fmdrv_v4l2.c | 1 +
3573 drivers/media/rc/Kconfig | 10 +
3574 drivers/media/rc/Makefile | 1 +
3575 drivers/media/rc/ir-nec-decoder.c | 4 +-
3576 drivers/media/rc/ir-raw.c | 1 +
3577 drivers/media/rc/ir-rc6-decoder.c | 67 +-
3578 drivers/media/rc/ir-sanyo-decoder.c | 205 ++++
3579 drivers/media/rc/keymaps/rc-hauppauge.c | 51 +
3580 drivers/media/rc/rc-core-priv.h | 12 +
3581 drivers/media/rc/rc-main.c | 1 +
3582 drivers/media/rc/redrat3.c | 52 +-
3583 drivers/media/video/Kconfig | 412 +++++----
3584 drivers/media/video/Makefile | 2 +
3585 drivers/media/video/adv7170.c | 62 ++
3586 drivers/media/video/atmel-isi.c | 2 +-
3587 drivers/media/video/au0828/au0828-i2c.c | 2 +-
3588 drivers/media/video/bt8xx/bt848.h | 5 +-
3589 drivers/media/video/bt8xx/bttv-cards.c | 58 +-
3590 drivers/media/video/bt8xx/bttv-driver.c | 1 +
3591 drivers/media/video/bt8xx/bttv-i2c.c | 2 +-
3592 drivers/media/video/bt8xx/bttv.h | 3 +-
3593 drivers/media/video/cx18/cx18-i2c.c | 2 +-
3594 drivers/media/video/cx18/cx18-i2c.h | 2 +-
3595 drivers/media/video/cx231xx/Kconfig | 4 +-
3596 drivers/media/video/cx23885/cx23885-cards.c | 36 +
3597 drivers/media/video/cx23885/cx23885-i2c.c | 2 +-
3598 drivers/media/video/cx23885/cx23885-video.c | 3 +-
3599 drivers/media/video/cx23885/cx23885.h | 1 +
3600 drivers/media/video/cx25821/cx25821-alsa.c | 73 +-
3601 .../media/video/cx25821/cx25821-audio-upstream.c | 113 +--
3602 drivers/media/video/cx25821/cx25821-audio.h | 39 +-
3603 drivers/media/video/cx25821/cx25821-cards.c | 2 +-
3604 drivers/media/video/cx25821/cx25821-core.c | 57 +-
3605 drivers/media/video/cx25821/cx25821-i2c.c | 12 +-
3606 .../media/video/cx25821/cx25821-medusa-defines.h | 6 +-
3607 drivers/media/video/cx25821/cx25821-medusa-reg.h | 518 +++++-----
3608 drivers/media/video/cx25821/cx25821-medusa-video.c | 410 +++-----
3609 .../video/cx25821/cx25821-video-upstream-ch2.c | 138 ++--
3610 .../media/video/cx25821/cx25821-video-upstream.c | 156 ++--
3611 drivers/media/video/cx25821/cx25821-video.c | 145 ++--
3612 drivers/media/video/cx25821/cx25821.h | 4 +-
3613 drivers/media/video/cx88/Kconfig | 10 +-
3614 drivers/media/video/cx88/cx88-i2c.c | 2 +-
3615 drivers/media/video/davinci/vpbe_display.c | 5 +-
3616 drivers/media/video/em28xx/em28xx-cards.c | 62 ++-
3617 drivers/media/video/em28xx/em28xx-dvb.c | 131 +++-
3618 drivers/media/video/em28xx/em28xx-input.c | 7 +-
3619 drivers/media/video/em28xx/em28xx.h | 3 +
3620 drivers/media/video/gspca/pac207.c | 10 +-
3621 drivers/media/video/ivtv/ivtv-fileops.c | 6 +-
3622 drivers/media/video/ivtv/ivtv-i2c.h | 2 +-
3623 drivers/media/video/m5mols/m5mols.h | 2 -
3624 drivers/media/video/m5mols/m5mols_core.c | 20 +-
3625 drivers/media/video/mt9m001.c | 5 +-
3626 drivers/media/video/mt9m111.c | 7 +-
3627 drivers/media/video/mt9p031.c | 5 +-
3628 drivers/media/video/mt9t001.c | 5 +-
3629 drivers/media/video/mt9t031.c | 5 +-
3630 drivers/media/video/mt9t112.c | 4 +-
3631 drivers/media/video/mt9v022.c | 5 +-
3632 drivers/media/video/mt9v032.c | 8 +-
3633 drivers/media/video/omap/omap_vout.c | 187 ++--
3634 drivers/media/video/omap/omap_voutdef.h | 2 +-
3635 drivers/media/video/omap3isp/ispvideo.c | 1 +
3636 drivers/media/video/pwc/pwc-ctrl.c | 137 ++--
3637 drivers/media/video/pwc/pwc-dec23.c | 7 +
3638 drivers/media/video/pwc/pwc-dec23.h | 2 +
3639 drivers/media/video/pwc/pwc-if.c | 155 ++--
3640 drivers/media/video/pwc/pwc-v4l.c | 155 ++-
3641 drivers/media/video/pwc/pwc.h | 11 +-
3642 drivers/media/video/s5p-fimc/fimc-capture.c | 13 +-
3643 drivers/media/video/s5p-fimc/fimc-core.c | 24 +-
3644 drivers/media/video/s5p-fimc/fimc-core.h | 2 +
3645 drivers/media/video/s5p-fimc/fimc-mdevice.c | 43 +-
3646 drivers/media/video/s5p-fimc/fimc-reg.c | 15 +-
3647 drivers/media/video/s5p-g2d/Makefile | 3 +
3648 drivers/media/video/s5p-g2d/g2d-hw.c | 106 ++
3649 drivers/media/video/s5p-g2d/g2d-regs.h | 115 +++
3650 drivers/media/video/s5p-g2d/g2d.c | 824 +++++++++++++++
3651 drivers/media/video/s5p-g2d/g2d.h | 83 ++
3652 drivers/media/video/s5p-tv/mixer_video.c | 1 +
3653 drivers/media/video/saa7134/saa7134-cards.c | 33 +
3654 drivers/media/video/saa7134/saa7134.h | 1 +
3655 drivers/media/video/tvp5150.c | 14 +-
3656 drivers/media/video/usbvision/usbvision-i2c.c | 46 +-
3657 drivers/media/video/via-camera.c | 10 +-
3658 drivers/media/video/videobuf-core.c | 3 +-
3659 drivers/media/video/videobuf2-core.c | 48 +-
3660 drivers/media/video/vino.c | 2 +-
3661 drivers/media/video/vivi.c | 9 +-
3662 drivers/staging/media/as102/Kconfig | 1 +
3663 drivers/staging/media/as102/Makefile | 2 +-
3664 drivers/staging/media/as102/as102_drv.c | 126 +--
3665 drivers/staging/media/as102/as102_drv.h | 59 +-
3666 drivers/staging/media/as102/as102_fe.c | 4 -
3667 drivers/staging/media/as102/as102_fw.c | 44 +-
3668 drivers/staging/media/as102/as102_fw.h | 10 +-
3669 drivers/staging/media/as102/as102_usb_drv.c | 36 +-
3670 drivers/staging/media/as102/as102_usb_drv.h | 6 +-
3671 drivers/staging/media/as102/as10x_cmd.c | 139 ++--
3672 drivers/staging/media/as102/as10x_cmd.h | 895 ++++++++---------
3673 drivers/staging/media/as102/as10x_cmd_cfg.c | 66 +-
3674 drivers/staging/media/as102/as10x_cmd_stream.c | 56 +-
3675 drivers/staging/media/as102/as10x_handle.h | 26 +-
3676 drivers/staging/media/as102/as10x_types.h | 250 +++---
3677 drivers/staging/media/easycap/easycap.h | 93 +--
3678 drivers/staging/media/easycap/easycap_ioctl.c | 60 +-
3679 drivers/staging/media/easycap/easycap_low.c | 273 +----
3680 drivers/staging/media/easycap/easycap_main.c | 379 +++-----
3681 drivers/staging/media/easycap/easycap_settings.c | 2 +-
3682 drivers/staging/media/easycap/easycap_sound.c | 340 +++----
3683 drivers/staging/media/go7007/go7007-usb.c | 8 +-
3684 drivers/staging/media/lirc/lirc_imon.c | 4 +-
3685 drivers/staging/media/lirc/lirc_serial.c | 113 +--
3686 drivers/staging/media/solo6x10/Makefile | 2 +-
3687 .../media/solo6x10/{jpeg.h => solo6x10-jpeg.h} | 0
3688 drivers/staging/media/solo6x10/v4l2-enc.c | 2 +-
3689 fs/eventpoll.c | 18 +-
3691 include/linux/dvb/frontend.h | 2 +
3692 include/linux/poll.h | 13 +-
3693 include/media/rc-map.h | 8 +-
3694 185 files changed, 8887 insertions(+), 4143 deletions(-)
3695 create mode 100644 drivers/media/rc/ir-sanyo-decoder.c
3696 create mode 100644 drivers/media/video/s5p-g2d/Makefile
3697 create mode 100644 drivers/media/video/s5p-g2d/g2d-hw.c
3698 create mode 100644 drivers/media/video/s5p-g2d/g2d-regs.h
3699 create mode 100644 drivers/media/video/s5p-g2d/g2d.c
3700 create mode 100644 drivers/media/video/s5p-g2d/g2d.h
3701 rename drivers/staging/media/solo6x10/{jpeg.h => solo6x10-jpeg.h} (100%)
3702 Merging kbuild/for-next (ddb550d Merge branch 'kbuild/misc' into kbuild/for-next)
3703 $ git merge kbuild/for-next
3704 Merge made by the 'recursive' strategy.
3705 scripts/tags.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++--
3706 1 files changed, 44 insertions(+), 2 deletions(-)
3707 Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
3708 $ git merge kconfig/for-next
3710 Merge made by the 'recursive' strategy.
3711 Merging libata/NEXT (3fab0c1 ahci: start engine only during soft/hard resets)
3712 $ git merge libata/NEXT
3713 Merge made by the 'recursive' strategy.
3714 drivers/ata/libahci.c | 5 +----
3715 1 files changed, 1 insertions(+), 4 deletions(-)
3716 Merging infiniband/for-next (a493f1a Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next)
3717 $ git merge infiniband/for-next
3718 Merge made by the 'recursive' strategy.
3719 drivers/infiniband/core/addr.c | 9 ++++++---
3720 drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 ++++
3721 drivers/infiniband/hw/cxgb4/cm.c | 10 +++++++++-
3722 drivers/infiniband/hw/cxgb4/cq.c | 2 +-
3723 drivers/infiniband/hw/nes/nes_cm.c | 6 ++++--
3724 drivers/infiniband/hw/qib/qib_iba7322.c | 18 +++++++++---------
3725 drivers/infiniband/hw/qib/qib_qsfp.c | 12 ------------
3726 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 13 ++++++++-----
3727 drivers/infiniband/ulp/ipoib/ipoib_main.c | 20 ++++++++++++--------
3728 drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 13 +++++++++----
3729 10 files changed, 62 insertions(+), 45 deletions(-)
3730 Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next)
3731 $ git merge acpi/next
3733 Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
3734 $ git merge cpupowerutils/master
3736 Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
3737 $ git merge ieee1394/for-next
3739 Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2)
3740 $ git merge ubi/linux-next
3742 Merging dlm/next (9beb3bf dlm: convert rsb list to rb_tree)
3743 $ git merge dlm/next
3744 Merge made by the 'recursive' strategy.
3745 fs/dlm/debug_fs.c | 28 ++++++++-------
3746 fs/dlm/dlm_internal.h | 9 +++--
3747 fs/dlm/lock.c | 87 +++++++++++++++++++++++++++++++++++++++---------
3748 fs/dlm/lockspace.c | 23 +++++--------
3749 fs/dlm/recover.c | 21 +++++++----
3750 5 files changed, 113 insertions(+), 55 deletions(-)
3751 Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev)
3752 $ git merge scsi/master
3754 Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation)
3755 $ git merge target-updates/for-next
3757 Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
3758 $ git merge target-merge/for-next-merge
3759 Merge made by the 'recursive' strategy.
3760 drivers/infiniband/Kconfig | 1 +
3761 drivers/infiniband/Makefile | 1 +
3762 drivers/infiniband/ulp/srpt/Kconfig | 12 +
3763 drivers/infiniband/ulp/srpt/Makefile | 2 +
3764 drivers/infiniband/ulp/srpt/ib_dm_mad.h | 139 ++
3765 drivers/infiniband/ulp/srpt/ib_srpt.c | 4081 +++++++++++++++++++++++++++++++
3766 drivers/infiniband/ulp/srpt/ib_srpt.h | 444 ++++
3767 7 files changed, 4680 insertions(+), 0 deletions(-)
3768 create mode 100644 drivers/infiniband/ulp/srpt/Kconfig
3769 create mode 100644 drivers/infiniband/ulp/srpt/Makefile
3770 create mode 100644 drivers/infiniband/ulp/srpt/ib_dm_mad.h
3771 create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.c
3772 create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.h
3773 Merging slave-dma/next (02f88be dmaengine: at_hdmac: simplify device selection from platform data or DT)
3774 $ git merge slave-dma/next
3775 Resolved 'drivers/dma/pl330.c' using previous resolution.
3776 Auto-merging drivers/usb/renesas_usbhs/fifo.c
3777 Auto-merging drivers/tty/serial/sh-sci.c
3778 Auto-merging drivers/tty/serial/pch_uart.c
3779 Auto-merging drivers/spi/spi-pl022.c
3780 Auto-merging drivers/misc/carma/carma-fpga-program.c
3781 Auto-merging drivers/dma/pl330.c
3782 CONFLICT (content): Merge conflict in drivers/dma/pl330.c
3783 Auto-merging arch/arm/plat-samsung/include/plat/dma-ops.h
3784 Auto-merging arch/arm/plat-samsung/dma-ops.c
3785 Auto-merging MAINTAINERS
3786 Automatic merge failed; fix conflicts and then commit the result.
3788 [master 9761e04] Merge remote-tracking branch 'slave-dma/next'
3789 $ git diff -M --stat --summary HEAD^..
3790 .../devicetree/bindings/dma/atmel-dma.txt | 14 +
3791 Documentation/dmaengine.txt | 8 +
3793 arch/arm/mach-ep93xx/include/mach/dma.h | 6 +-
3794 arch/arm/plat-nomadik/include/plat/ste_dma40.h | 5 +-
3795 arch/arm/plat-samsung/dma-ops.c | 4 +-
3796 arch/arm/plat-samsung/include/plat/dma-ops.h | 4 +-
3797 drivers/dma/Kconfig | 27 +-
3798 drivers/dma/Makefile | 1 +
3799 drivers/dma/amba-pl08x.c | 24 +-
3800 drivers/dma/at_hdmac.c | 103 +++-
3801 drivers/dma/at_hdmac_regs.h | 1 +
3802 drivers/dma/coh901318.c | 12 +-
3803 drivers/dma/coh901318_lli.c | 23 +-
3804 drivers/dma/coh901318_lli.h | 4 +-
3805 drivers/dma/dmaengine.c | 4 +-
3806 drivers/dma/dw_dmac.c | 83 ++-
3807 drivers/dma/dw_dmac_regs.h | 1 +
3808 drivers/dma/ep93xx_dma.c | 22 +-
3809 drivers/dma/fsldma.c | 4 +-
3810 drivers/dma/imx-dma.c | 10 +-
3811 drivers/dma/imx-sdma.c | 11 +-
3812 drivers/dma/intel_mid_dma.c | 14 +-
3813 drivers/dma/intel_mid_dma_regs.h | 2 +-
3814 drivers/dma/iop-adma.c | 4 +-
3815 drivers/dma/ipu/ipu_idmac.c | 4 +-
3816 drivers/dma/mxs-dma.c | 8 +-
3817 drivers/dma/pch_dma.c | 20 +-
3818 drivers/dma/pl330.c | 18 +-
3819 drivers/dma/shdma.c | 25 +-
3820 drivers/dma/sirf-dma.c | 717 ++++++++++++++++++++
3821 drivers/dma/ste_dma40.c | 386 ++++++++++--
3822 drivers/dma/ste_dma40_ll.h | 11 +
3823 drivers/dma/timb_dma.c | 18 +-
3824 drivers/dma/txx9dmac.c | 12 +-
3825 drivers/media/video/mx3_camera.c | 2 +-
3826 drivers/media/video/timblogiw.c | 2 +-
3827 drivers/misc/carma/carma-fpga-program.c | 2 +-
3828 drivers/mmc/host/atmel-mci.c | 10 +-
3829 drivers/mmc/host/mmci.c | 11 +-
3830 drivers/mmc/host/mxcmmc.c | 10 +-
3831 drivers/mmc/host/mxs-mmc.c | 7 +-
3832 drivers/mmc/host/sh_mmcif.c | 4 +-
3833 drivers/mmc/host/tmio_mmc_dma.c | 4 +-
3834 drivers/net/ethernet/micrel/ks8842.c | 4 +-
3835 drivers/spi/spi-dw-mid.c | 8 +-
3836 drivers/spi/spi-ep93xx.c | 9 +-
3837 drivers/spi/spi-pl022.c | 8 +-
3838 drivers/spi/spi-topcliff-pch.c | 4 +-
3839 drivers/tty/serial/amba-pl011.c | 8 +-
3840 drivers/tty/serial/pch_uart.c | 4 +-
3841 drivers/tty/serial/sh-sci.c | 4 +-
3842 drivers/usb/musb/ux500_dma.c | 4 +-
3843 drivers/usb/renesas_usbhs/fifo.c | 4 +-
3844 drivers/video/mx3fb.c | 4 +-
3845 include/linux/amba/pl08x.h | 4 +-
3846 include/linux/dmaengine.h | 98 +++-
3847 include/linux/dw_dmac.h | 2 +-
3848 include/linux/sh_dma.h | 2 +-
3849 include/linux/sirfsoc_dma.h | 6 +
3850 sound/atmel/abdac.c | 2 +-
3851 sound/atmel/ac97c.c | 10 +-
3852 sound/soc/ep93xx/ep93xx-pcm.c | 4 +-
3853 sound/soc/imx/imx-pcm-dma-mx2.c | 6 +-
3854 sound/soc/samsung/dma.c | 4 +-
3855 sound/soc/sh/siu_pcm.c | 4 +-
3856 sound/soc/txx9/txx9aclc.c | 2 +-
3857 67 files changed, 1559 insertions(+), 309 deletions(-)
3858 create mode 100644 Documentation/devicetree/bindings/dma/atmel-dma.txt
3859 create mode 100644 drivers/dma/sirf-dma.c
3860 create mode 100644 include/linux/sirfsoc_dma.h
3861 Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
3862 $ git merge async_tx/next
3864 Merging net-next/master (449fa02 sfc: fix race in efx_enqueue_skb_tso())
3865 $ git merge net-next/master
3866 Auto-merging net/wireless/reg.c
3867 Auto-merging net/wireless/nl80211.c
3868 Auto-merging net/sched/sch_teql.c
3869 Auto-merging net/netlabel/netlabel_kapi.c
3870 Auto-merging net/mac80211/main.c
3871 Auto-merging net/mac80211/agg-tx.c
3872 Auto-merging net/ipv6/ipv6_sockglue.c
3873 Auto-merging net/core/dev.c
3874 Auto-merging include/net/inetpeer.h
3875 Auto-merging include/linux/virtio_config.h
3876 Auto-merging include/linux/netdevice.h
3877 Auto-merging drivers/virtio/virtio_pci.c
3878 Auto-merging drivers/virtio/virtio_mmio.c
3879 Auto-merging drivers/net/wireless/iwlegacy/prph.h
3880 Removing drivers/net/wireless/iwlegacy/iwl4965-base.c
3881 Removing drivers/net/wireless/iwlegacy/iwl3945-base.c
3882 Removing drivers/net/wireless/iwlegacy/iwl-tx.c
3883 Removing drivers/net/wireless/iwlegacy/iwl-sta.h
3884 Removing drivers/net/wireless/iwlegacy/iwl-scan.c
3885 Removing drivers/net/wireless/iwlegacy/iwl-rx.c
3886 Removing drivers/net/wireless/iwlegacy/iwl-power.h
3887 Removing drivers/net/wireless/iwlegacy/iwl-power.c
3888 Removing drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
3889 Removing drivers/net/wireless/iwlegacy/iwl-led.h
3890 Removing drivers/net/wireless/iwlegacy/iwl-led.c
3891 Removing drivers/net/wireless/iwlegacy/iwl-io.h
3892 Removing drivers/net/wireless/iwlegacy/iwl-helpers.h
3893 Removing drivers/net/wireless/iwlegacy/iwl-hcmd.c
3894 Removing drivers/net/wireless/iwlegacy/iwl-fh.h
3895 Removing drivers/net/wireless/iwlegacy/iwl-eeprom.h
3896 Removing drivers/net/wireless/iwlegacy/iwl-eeprom.c
3897 Removing drivers/net/wireless/iwlegacy/iwl-devtrace.h
3898 Removing drivers/net/wireless/iwlegacy/iwl-devtrace.c
3899 Removing drivers/net/wireless/iwlegacy/iwl-dev.h
3900 Removing drivers/net/wireless/iwlegacy/iwl-debugfs.c
3901 Removing drivers/net/wireless/iwlegacy/iwl-debug.h
3902 Removing drivers/net/wireless/iwlegacy/iwl-core.h
3903 Removing drivers/net/wireless/iwlegacy/iwl-core.c
3904 Removing drivers/net/wireless/iwlegacy/iwl-4965.h
3905 Removing drivers/net/wireless/iwlegacy/iwl-4965.c
3906 Removing drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
3907 Removing drivers/net/wireless/iwlegacy/iwl-4965-tx.c
3908 Removing drivers/net/wireless/iwlegacy/iwl-4965-sta.c
3909 Removing drivers/net/wireless/iwlegacy/iwl-4965-rx.c
3910 Removing drivers/net/wireless/iwlegacy/iwl-4965-rs.c
3911 Removing drivers/net/wireless/iwlegacy/iwl-4965-lib.c
3912 Removing drivers/net/wireless/iwlegacy/iwl-4965-led.h
3913 Removing drivers/net/wireless/iwlegacy/iwl-4965-led.c
3914 Removing drivers/net/wireless/iwlegacy/iwl-4965-hw.h
3915 Removing drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
3916 Removing drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
3917 Removing drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
3918 Removing drivers/net/wireless/iwlegacy/iwl-4965-calib.h
3919 Removing drivers/net/wireless/iwlegacy/iwl-3945.h
3920 Removing drivers/net/wireless/iwlegacy/iwl-3945.c
3921 Removing drivers/net/wireless/iwlegacy/iwl-3945-rs.c
3922 Removing drivers/net/wireless/iwlegacy/iwl-3945-led.h
3923 Removing drivers/net/wireless/iwlegacy/iwl-3945-led.c
3924 Removing drivers/net/wireless/iwlegacy/iwl-3945-hw.h
3925 Removing drivers/net/wireless/iwlegacy/iwl-3945-fh.h
3926 Removing drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
3927 Removing drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
3928 Auto-merging drivers/net/wireless/iwlegacy/csr.h
3929 Auto-merging drivers/net/wireless/iwlegacy/commands.h
3930 Auto-merging drivers/net/wireless/iwlegacy/4965-calib.c
3931 Auto-merging drivers/net/wireless/ath/ath9k/hw.c
3932 Removing drivers/net/wireless/ath/ath6kl/htc_hif.h
3933 Auto-merging drivers/net/wireless/ath/ath6kl/hif.c
3934 Auto-merging drivers/net/ethernet/micrel/ks8842.c
3935 Auto-merging drivers/net/ethernet/jme.c
3936 Auto-merging drivers/net/ethernet/davicom/dm9000.c
3937 Auto-merging drivers/net/ethernet/Makefile
3938 Auto-merging drivers/net/dsa/mv88e6xxx.h
3939 Auto-merging drivers/net/dsa/mv88e6xxx.c
3940 Auto-merging drivers/net/dsa/mv88e6131.c
3941 Auto-merging drivers/net/dsa/mv88e6123_61_65.c
3942 Auto-merging drivers/net/dsa/mv88e6060.c
3943 Removing drivers/net/bonding/bond_ipv6.c
3944 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c
3945 Auto-merging drivers/infiniband/core/addr.c
3946 Auto-merging MAINTAINERS
3947 Merge made by the 'recursive' strategy.
3948 Documentation/cgroups/net_prio.txt | 53 +
3949 .../devicetree/bindings/net/calxeda-xgmac.txt | 15 +
3950 Documentation/networking/ieee802154.txt | 27 +
3951 Documentation/networking/ifenslave.c | 2 +
3952 Documentation/networking/ip-sysctl.txt | 13 +
3953 Documentation/networking/team.txt | 2 +
3955 arch/alpha/include/asm/socket.h | 3 +
3956 arch/arm/include/asm/socket.h | 3 +
3957 arch/avr32/include/asm/socket.h | 3 +
3958 arch/cris/include/asm/socket.h | 3 +
3959 arch/frv/include/asm/socket.h | 3 +
3960 arch/h8300/include/asm/socket.h | 3 +
3961 arch/ia64/include/asm/socket.h | 3 +
3962 arch/m32r/include/asm/socket.h | 3 +
3963 arch/m68k/include/asm/socket.h | 3 +
3964 arch/mips/include/asm/socket.h | 3 +
3965 arch/mn10300/include/asm/socket.h | 3 +
3966 arch/parisc/include/asm/socket.h | 3 +
3967 arch/powerpc/include/asm/socket.h | 3 +
3968 arch/s390/include/asm/socket.h | 3 +
3969 arch/sparc/include/asm/socket.h | 3 +
3970 arch/xtensa/include/asm/socket.h | 3 +
3971 drivers/atm/iphase.c | 4 +-
3972 drivers/bluetooth/ath3k.c | 15 +-
3973 drivers/bluetooth/bfusb.c | 4 +-
3974 drivers/bluetooth/bluecard_cs.c | 4 +-
3975 drivers/bluetooth/bt3c_cs.c | 4 +-
3976 drivers/bluetooth/btuart_cs.c | 4 +-
3977 drivers/bluetooth/btusb.c | 16 +-
3978 drivers/bluetooth/dtl1_cs.c | 4 +-
3979 drivers/bluetooth/hci_vhci.c | 5 +-
3980 drivers/ieee802154/fakehard.c | 2 +-
3981 drivers/infiniband/core/addr.c | 6 +-
3982 drivers/infiniband/core/cma.c | 8 +-
3983 drivers/infiniband/hw/nes/nes_nic.c | 6 +-
3984 drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +-
3985 drivers/isdn/gigaset/i4l.c | 3 +-
3986 drivers/lguest/lguest_device.c | 6 +
3987 drivers/misc/eeprom/eeprom_93cx6.c | 88 +
3988 drivers/misc/sgi-xp/xpnet.c | 2 +-
3989 drivers/net/Kconfig | 4 +
3990 drivers/net/Makefile | 2 +
3991 drivers/net/bonding/bond_ipv6.c | 225 -
3992 drivers/net/bonding/bond_main.c | 11 +-
3993 drivers/net/can/at91_can.c | 13 +-
3994 drivers/net/can/bfin_can.c | 12 +-
3995 drivers/net/can/c_can/c_can_platform.c | 12 +-
3996 drivers/net/can/dev.c | 2 +-
3997 drivers/net/can/flexcan.c | 15 +-
3998 drivers/net/can/janz-ican3.c | 13 +-
3999 drivers/net/can/mscan/mpc5xxx_can.c | 12 +-
4000 drivers/net/can/mscan/mscan.c | 8 +-
4001 drivers/net/can/sja1000/Kconfig | 1 -
4002 drivers/net/can/sja1000/sja1000_isa.c | 118 +-
4003 drivers/net/can/sja1000/sja1000_of_platform.c | 12 +-
4004 drivers/net/can/sja1000/sja1000_platform.c | 13 +-
4005 drivers/net/can/slcan.c | 2 +-
4006 drivers/net/can/softing/softing_main.c | 16 +-
4007 drivers/net/can/ti_hecc.c | 15 +-
4008 drivers/net/dsa/Kconfig | 36 +
4009 drivers/net/dsa/Makefile | 9 +
4010 {net => drivers/net}/dsa/mv88e6060.c | 7 +-
4011 {net => drivers/net}/dsa/mv88e6123_61_65.c | 19 +-
4012 {net => drivers/net}/dsa/mv88e6131.c | 20 +-
4013 {net => drivers/net}/dsa/mv88e6xxx.c | 29 +-
4014 {net => drivers/net}/dsa/mv88e6xxx.h | 3 +
4015 drivers/net/dummy.c | 2 +-
4016 drivers/net/ethernet/3com/3c589_cs.c | 7 +-
4017 drivers/net/ethernet/3com/3c59x.c | 12 +-
4018 drivers/net/ethernet/3com/typhoon.c | 16 +-
4019 drivers/net/ethernet/8390/8390.h | 2 -
4020 drivers/net/ethernet/8390/apne.c | 2 +-
4021 drivers/net/ethernet/8390/ax88796.c | 18 +-
4022 drivers/net/ethernet/8390/es3210.c | 2 +-
4023 drivers/net/ethernet/8390/hp-plus.c | 2 +-
4024 drivers/net/ethernet/8390/hp.c | 2 +-
4025 drivers/net/ethernet/8390/hydra.c | 2 +-
4026 drivers/net/ethernet/8390/lne390.c | 4 +-
4027 drivers/net/ethernet/8390/ne-h8300.c | 2 +-
4028 drivers/net/ethernet/8390/ne.c | 4 +-
4029 drivers/net/ethernet/8390/ne2.c | 2 +-
4030 drivers/net/ethernet/8390/ne2k-pci.c | 6 +-
4031 drivers/net/ethernet/8390/ne3210.c | 2 +-
4032 drivers/net/ethernet/8390/stnic.c | 2 +-
4033 drivers/net/ethernet/8390/zorro8390.c | 2 +-
4034 drivers/net/ethernet/Kconfig | 1 +
4035 drivers/net/ethernet/Makefile | 1 +
4036 drivers/net/ethernet/adaptec/starfire.c | 6 +-
4037 drivers/net/ethernet/aeroflex/greth.c | 13 +-
4038 drivers/net/ethernet/amd/amd8111e.c | 15 +-
4039 drivers/net/ethernet/amd/amd8111e.h | 1 -
4040 drivers/net/ethernet/amd/au1000_eth.c | 15 +-
4041 drivers/net/ethernet/amd/nmclan_cs.c | 19 +-
4042 drivers/net/ethernet/amd/pcnet32.c | 10 +-
4043 drivers/net/ethernet/amd/sunlance.c | 15 +-
4044 drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 1 -
4045 drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 13 +-
4046 drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 10 +-
4047 drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 13 +-
4048 drivers/net/ethernet/atheros/atlx/atl1.c | 1 -
4049 drivers/net/ethernet/atheros/atlx/atl2.c | 23 +-
4050 drivers/net/ethernet/atheros/atlx/atlx.c | 13 +-
4051 drivers/net/ethernet/broadcom/bnx2.c | 188 +-
4052 drivers/net/ethernet/broadcom/bnx2.h | 17 +-
4053 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 60 +-
4054 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 341 +-
4055 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 118 +-
4056 drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 61 +-
4057 drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 4 +-
4058 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 30 +-
4059 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 1060 ++--
4060 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 2 +-
4061 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 156 +-
4062 drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 69 +-
4063 drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 4 +-
4064 drivers/net/ethernet/broadcom/cnic.c | 8 +-
4065 drivers/net/ethernet/broadcom/sb1250-mac.c | 16 +-
4066 drivers/net/ethernet/broadcom/tg3.c | 298 +-
4067 drivers/net/ethernet/broadcom/tg3.h | 11 +-
4068 drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 11 +-
4069 drivers/net/ethernet/brocade/bna/cna.h | 3 +-
4070 drivers/net/ethernet/calxeda/Kconfig | 7 +
4071 drivers/net/ethernet/calxeda/Makefile | 1 +
4072 drivers/net/ethernet/calxeda/xgmac.c | 1928 ++++++
4073 drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 15 +-
4074 drivers/net/ethernet/chelsio/cxgb/sge.c | 2 +-
4075 drivers/net/ethernet/chelsio/cxgb/sge.h | 2 +-
4076 drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 21 +-
4077 drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 4 +-
4078 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 23 +-
4079 drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
4080 .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 15 +-
4081 drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 5 +-
4082 drivers/net/ethernet/cisco/enic/enic_main.c | 8 +-
4083 drivers/net/ethernet/davicom/dm9000.c | 5 +-
4084 drivers/net/ethernet/dec/tulip/de2104x.c | 6 +-
4085 drivers/net/ethernet/dec/tulip/dmfe.c | 7 +-
4086 drivers/net/ethernet/dec/tulip/tulip_core.c | 6 +-
4087 drivers/net/ethernet/dec/tulip/uli526x.c | 7 +-
4088 drivers/net/ethernet/dec/tulip/winbond-840.c | 6 +-
4089 drivers/net/ethernet/dlink/sundance.c | 6 +-
4090 drivers/net/ethernet/dnet.c | 19 +-
4091 drivers/net/ethernet/emulex/benet/be.h | 16 +-
4092 drivers/net/ethernet/emulex/benet/be_cmds.c | 218 +-
4093 drivers/net/ethernet/emulex/benet/be_cmds.h | 77 +-
4094 drivers/net/ethernet/emulex/benet/be_ethtool.c | 102 +-
4095 drivers/net/ethernet/emulex/benet/be_main.c | 318 +-
4096 drivers/net/ethernet/ethoc.c | 13 +-
4097 drivers/net/ethernet/fealnx.c | 6 +-
4098 .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 15 +-
4099 .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 13 +-
4100 drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 13 +-
4101 drivers/net/ethernet/freescale/fsl_pq_mdio.c | 76 +-
4102 drivers/net/ethernet/freescale/gianfar.c | 28 +-
4103 drivers/net/ethernet/freescale/gianfar.h | 7 +-
4104 drivers/net/ethernet/freescale/gianfar_ethtool.c | 7 +-
4105 drivers/net/ethernet/freescale/gianfar_ptp.c | 16 +-
4106 drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
4107 drivers/net/ethernet/freescale/ucc_geth.h | 6 +-
4108 drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 7 +-
4109 drivers/net/ethernet/i825xx/eepro.c | 7 +-
4110 drivers/net/ethernet/ibm/emac/core.c | 3 +
4111 drivers/net/ethernet/ibm/ibmveth.c | 6 +-
4112 drivers/net/ethernet/intel/e100.c | 8 +-
4113 drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 12 +-
4114 drivers/net/ethernet/intel/e1000/e1000_hw.h | 1 -
4115 drivers/net/ethernet/intel/e1000/e1000_main.c | 14 +-
4116 drivers/net/ethernet/intel/e1000e/ethtool.c | 18 +-
4117 drivers/net/ethernet/intel/e1000e/netdev.c | 402 +-
4118 drivers/net/ethernet/intel/igb/e1000_82575.c | 5 +-
4119 drivers/net/ethernet/intel/igb/igb_ethtool.c | 15 +-
4120 drivers/net/ethernet/intel/igb/igb_main.c | 179 +-
4121 drivers/net/ethernet/intel/igbvf/ethtool.c | 10 +-
4122 drivers/net/ethernet/intel/igbvf/netdev.c | 17 +-
4123 drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 10 +-
4124 drivers/net/ethernet/intel/ixgb/ixgb_main.c | 8 +-
4125 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 16 +-
4126 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +-
4127 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +-
4128 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 8 +-
4129 drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 18 +-
4130 drivers/net/ethernet/intel/ixgbevf/defines.h | 1 -
4131 drivers/net/ethernet/intel/ixgbevf/ethtool.c | 16 +-
4132 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 32 +-
4133 drivers/net/ethernet/intel/ixgbevf/vf.c | 4 +-
4134 drivers/net/ethernet/jme.c | 16 +-
4135 drivers/net/ethernet/korina.c | 13 +-
4136 drivers/net/ethernet/marvell/mv643xx_eth.c | 14 +-
4137 drivers/net/ethernet/marvell/pxa168_eth.c | 13 +-
4138 drivers/net/ethernet/marvell/skge.c | 8 +-
4139 drivers/net/ethernet/marvell/sky2.c | 39 +-
4140 drivers/net/ethernet/mellanox/mlx4/en_cq.c | 7 +-
4141 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 31 +-
4142 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 19 +
4143 drivers/net/ethernet/mellanox/mlx4/en_resources.c | 2 +-
4144 drivers/net/ethernet/mellanox/mlx4/en_rx.c | 16 +-
4145 drivers/net/ethernet/mellanox/mlx4/en_tx.c | 76 +-
4146 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 13 +-
4147 drivers/net/ethernet/micrel/Kconfig | 2 +
4148 drivers/net/ethernet/micrel/ks8842.c | 13 +-
4149 drivers/net/ethernet/micrel/ks8851.c | 513 +-
4150 drivers/net/ethernet/micrel/ks8851.h | 15 +-
4151 drivers/net/ethernet/micrel/ks8851_mll.c | 16 +-
4152 drivers/net/ethernet/micrel/ksz884x.c | 75 +-
4153 drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 5 +-
4154 drivers/net/ethernet/natsemi/jazzsonic.c | 13 +-
4155 drivers/net/ethernet/natsemi/macsonic.c | 13 +-
4156 drivers/net/ethernet/natsemi/natsemi.c | 6 +-
4157 drivers/net/ethernet/natsemi/ns83820.c | 6 +-
4158 drivers/net/ethernet/natsemi/xtsonic.c | 13 +-
4159 drivers/net/ethernet/neterion/s2io.c | 11 +-
4160 drivers/net/ethernet/neterion/vxge/vxge-main.c | 9 +-
4161 drivers/net/ethernet/nuvoton/w90p910_ether.c | 13 +-
4162 drivers/net/ethernet/nvidia/forcedeth.c | 502 ++-
4163 .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 8 +-
4164 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 5 +-
4165 .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 12 +-
4166 .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 6 +-
4167 drivers/net/ethernet/qlogic/qla3xxx.c | 9 +-
4168 drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 5 +-
4169 .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 13 +-
4170 drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 9 +-
4171 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +-
4172 drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 11 +-
4173 drivers/net/ethernet/qlogic/qlge/qlge_main.c | 10 +-
4174 drivers/net/ethernet/realtek/8139cp.c | 8 +-
4175 drivers/net/ethernet/realtek/8139too.c | 6 +-
4176 drivers/net/ethernet/realtek/r8169.c | 22 +-
4177 drivers/net/ethernet/renesas/sh_eth.c | 13 +-
4178 drivers/net/ethernet/seeq/sgiseeq.c | 18 +-
4179 drivers/net/ethernet/sfc/efx.c | 2 +-
4180 drivers/net/ethernet/sfc/net_driver.h | 2 +-
4181 drivers/net/ethernet/sfc/tx.c | 27 +-
4182 drivers/net/ethernet/sgi/meth.c | 19 +-
4183 drivers/net/ethernet/sis/sis190.c | 15 +-
4184 drivers/net/ethernet/sis/sis900.c | 7 +-
4185 drivers/net/ethernet/smsc/epic100.c | 6 +-
4186 drivers/net/ethernet/smsc/smc911x.c | 13 +-
4187 drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +-
4188 drivers/net/ethernet/smsc/smc91x.c | 13 +-
4189 drivers/net/ethernet/smsc/smsc911x.c | 111 +-
4190 drivers/net/ethernet/smsc/smsc9420.c | 7 +-
4191 .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 5 +-
4192 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 27 +-
4193 drivers/net/ethernet/sun/cassini.c | 7 +-
4194 drivers/net/ethernet/sun/niu.c | 24 +-
4195 drivers/net/ethernet/sun/sunbmac.c | 13 +-
4196 drivers/net/ethernet/sun/sungem.c | 6 +-
4197 drivers/net/ethernet/sun/sunhme.c | 9 +-
4198 drivers/net/ethernet/tundra/tsi108_eth.c | 20 +-
4199 drivers/net/ethernet/via/via-rhine.c | 6 +-
4200 drivers/net/ethernet/via/via-velocity.c | 6 +-
4201 drivers/net/ethernet/xilinx/ll_temac_main.c | 26 +-
4202 drivers/net/ethernet/xilinx/xilinx_emaclite.c | 22 +-
4203 drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +-
4204 drivers/net/ifb.c | 2 +-
4205 drivers/net/irda/bfin_sir.c | 13 +-
4206 drivers/net/irda/pxaficp_ir.c | 13 +-
4207 drivers/net/irda/sh_irda.c | 13 +-
4208 drivers/net/irda/sh_sir.c | 13 +-
4209 drivers/net/loopback.c | 2 +-
4210 drivers/net/macvtap.c | 8 +-
4211 drivers/net/mii.c | 53 +-
4212 drivers/net/phy/mdio-bitbang.c | 9 +
4213 drivers/net/phy/mdio-gpio.c | 1 +
4214 drivers/net/phy/phy_device.c | 20 +-
4215 drivers/net/ppp/pptp.c | 2 +-
4216 drivers/net/team/Kconfig | 43 +
4217 drivers/net/team/Makefile | 7 +
4218 drivers/net/team/team.c | 1661 +++++
4219 drivers/net/team/team_mode_activebackup.c | 136 +
4220 drivers/net/team/team_mode_roundrobin.c | 107 +
4221 drivers/net/tun.c | 16 +-
4222 drivers/net/usb/cdc-phonet.c | 10 +-
4223 drivers/net/usb/cdc_ncm.c | 4 +-
4224 drivers/net/usb/smsc75xx.c | 3 +-
4225 drivers/net/usb/smsc95xx.c | 3 +-
4226 drivers/net/veth.c | 9 +-
4227 drivers/net/virtio_net.c | 16 +
4228 drivers/net/vmxnet3/vmxnet3_ethtool.c | 9 +-
4229 drivers/net/vmxnet3/vmxnet3_int.h | 2 +-
4230 drivers/net/wireless/Makefile | 8 +-
4231 drivers/net/wireless/airo.c | 4 +-
4232 drivers/net/wireless/ath/ath.h | 1 +
4233 drivers/net/wireless/ath/ath6kl/Makefile | 2 +-
4234 drivers/net/wireless/ath/ath6kl/bmi.c | 7 +-
4235 drivers/net/wireless/ath/ath6kl/bmi.h | 2 +
4236 drivers/net/wireless/ath/ath6kl/cfg80211.c | 1431 ++++--
4237 drivers/net/wireless/ath/ath6kl/cfg80211.h | 30 +-
4238 drivers/net/wireless/ath/ath6kl/common.h | 16 +-
4239 drivers/net/wireless/ath/ath6kl/core.h | 202 +-
4240 drivers/net/wireless/ath/ath6kl/debug.c | 849 +++-
4241 drivers/net/wireless/ath/ath6kl/debug.h | 34 +-
4242 drivers/net/wireless/ath/ath6kl/hif-ops.h | 49 +-
4243 .../net/wireless/ath/ath6kl/{htc_hif.c => hif.c} | 150 +-
4244 drivers/net/wireless/ath/ath6kl/hif.h | 61 +-
4245 drivers/net/wireless/ath/ath6kl/htc.c | 725 ++-
4246 drivers/net/wireless/ath/ath6kl/htc.h | 18 +-
4247 drivers/net/wireless/ath/ath6kl/htc_hif.h | 92 -
4248 drivers/net/wireless/ath/ath6kl/init.c | 675 +-
4249 drivers/net/wireless/ath/ath6kl/main.c | 668 +--
4250 drivers/net/wireless/ath/ath6kl/sdio.c | 335 +-
4251 drivers/net/wireless/ath/ath6kl/target.h | 3 +
4252 drivers/net/wireless/ath/ath6kl/txrx.c | 221 +-
4253 drivers/net/wireless/ath/ath6kl/wmi.c | 688 ++-
4254 drivers/net/wireless/ath/ath6kl/wmi.h | 243 +-
4255 drivers/net/wireless/ath/ath9k/Kconfig | 1 +
4256 drivers/net/wireless/ath/ath9k/Makefile | 1 +
4257 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 140 +-
4258 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 10 +-
4259 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 +-
4260 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +
4261 .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 26 +-
4262 drivers/net/wireless/ath/ath9k/ath9k.h | 4 +
4263 drivers/net/wireless/ath/ath9k/btcoex.c | 107 +-
4264 drivers/net/wireless/ath/ath9k/btcoex.h | 10 +-
4265 drivers/net/wireless/ath/ath9k/debug.c | 13 +-
4266 drivers/net/wireless/ath/ath9k/eeprom.h | 3 +-
4267 drivers/net/wireless/ath/ath9k/gpio.c | 9 +-
4268 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 2 +
4269 drivers/net/wireless/ath/ath9k/hw.c | 4 +-
4270 drivers/net/wireless/ath/ath9k/hw.h | 16 +-
4271 drivers/net/wireless/ath/ath9k/init.c | 3 +
4272 drivers/net/wireless/ath/ath9k/main.c | 12 +-
4273 drivers/net/wireless/ath/ath9k/mci.c | 254 +
4274 drivers/net/wireless/ath/ath9k/mci.h | 118 +
4275 drivers/net/wireless/ath/ath9k/recv.c | 10 +-
4276 drivers/net/wireless/ath/ath9k/reg.h | 15 +-
4277 drivers/net/wireless/ath/ath9k/xmit.c | 5 +-
4278 drivers/net/wireless/ath/carl9170/main.c | 12 +-
4279 drivers/net/wireless/ath/carl9170/tx.c | 4 +-
4280 drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +-
4281 drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h | 7 -
4282 drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 18 +-
4283 .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 5 +-
4284 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 301 +-
4285 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 709 +--
4286 .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 622 ++
4287 .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 136 +
4288 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 41 +-
4289 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 9 -
4290 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 14 +-
4291 drivers/net/wireless/brcm80211/brcmsmac/aiutils.h | 76 -
4292 drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 +-
4293 drivers/net/wireless/brcm80211/brcmsmac/channel.c | 118 -
4294 drivers/net/wireless/brcm80211/brcmsmac/dma.c | 184 +-
4295 drivers/net/wireless/brcm80211/brcmsmac/dma.h | 3 +-
4296 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 124 +-
4297 .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 2 +
4298 drivers/net/wireless/brcm80211/brcmsmac/main.c | 687 +--
4299 drivers/net/wireless/brcm80211/brcmsmac/main.h | 19 +-
4300 .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 10 +-
4301 .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h | 5 -
4302 .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 38 +-
4303 drivers/net/wireless/brcm80211/brcmsmac/pmu.c | 1 +
4304 drivers/net/wireless/brcm80211/brcmsmac/pub.h | 38 +-
4305 drivers/net/wireless/brcm80211/brcmsmac/rate.h | 5 +-
4306 drivers/net/wireless/brcm80211/brcmsmac/srom.c | 469 +--
4307 drivers/net/wireless/brcm80211/brcmsmac/srom.h | 5 -
4308 drivers/net/wireless/brcm80211/brcmutil/utils.c | 218 +-
4309 .../net/wireless/brcm80211/include/brcmu_utils.h | 30 +-
4310 drivers/net/wireless/brcm80211/include/defs.h | 1 -
4311 drivers/net/wireless/brcm80211/include/soc.h | 12 +-
4312 drivers/net/wireless/hostap/hostap_ioctl.c | 4 +-
4313 drivers/net/wireless/ipw2x00/ipw2100.c | 7 +-
4314 drivers/net/wireless/ipw2x00/ipw2200.c | 15 +-
4315 drivers/net/wireless/ipw2x00/libipw.h | 8 -
4316 drivers/net/wireless/iwlegacy/3945-debug.c | 505 ++
4317 drivers/net/wireless/iwlegacy/3945-mac.c | 3977 ++++++++++++
4318 drivers/net/wireless/iwlegacy/3945-rs.c | 995 +++
4319 drivers/net/wireless/iwlegacy/3945.c | 2751 ++++++++
4320 drivers/net/wireless/iwlegacy/3945.h | 626 ++
4321 .../iwlegacy/{iwl-4965-calib.c => 4965-calib.c} | 613 +-
4322 drivers/net/wireless/iwlegacy/4965-debug.c | 746 +++
4323 drivers/net/wireless/iwlegacy/4965-mac.c | 6536 ++++++++++++++++++++
4324 drivers/net/wireless/iwlegacy/4965-rs.c | 2860 +++++++++
4325 drivers/net/wireless/iwlegacy/4965.c | 2421 ++++++++
4326 drivers/net/wireless/iwlegacy/4965.h | 1309 ++++
4327 drivers/net/wireless/iwlegacy/Kconfig | 43 +-
4328 drivers/net/wireless/iwlegacy/Makefile | 24 +-
4329 .../iwlegacy/{iwl-commands.h => commands.h} | 1134 ++--
4330 drivers/net/wireless/iwlegacy/common.c | 5707 +++++++++++++++++
4331 drivers/net/wireless/iwlegacy/common.h | 3424 ++++++++++
4332 drivers/net/wireless/iwlegacy/{iwl-csr.h => csr.h} | 93 +-
4333 drivers/net/wireless/iwlegacy/debug.c | 1411 +++++
4334 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c | 523 --
4335 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h | 60 -
4336 drivers/net/wireless/iwlegacy/iwl-3945-fh.h | 187 -
4337 drivers/net/wireless/iwlegacy/iwl-3945-hw.h | 291 -
4338 drivers/net/wireless/iwlegacy/iwl-3945-led.c | 63 -
4339 drivers/net/wireless/iwlegacy/iwl-3945-led.h | 32 -
4340 drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 996 ---
4341 drivers/net/wireless/iwlegacy/iwl-3945.c | 2741 --------
4342 drivers/net/wireless/iwlegacy/iwl-3945.h | 308 -
4343 drivers/net/wireless/iwlegacy/iwl-4965-calib.h | 75 -
4344 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c | 774 ---
4345 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h | 59 -
4346 drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c | 154 -
4347 drivers/net/wireless/iwlegacy/iwl-4965-hw.h | 811 ---
4348 drivers/net/wireless/iwlegacy/iwl-4965-led.c | 73 -
4349 drivers/net/wireless/iwlegacy/iwl-4965-led.h | 33 -
4350 drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 1194 ----
4351 drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 2871 ---------
4352 drivers/net/wireless/iwlegacy/iwl-4965-rx.c | 215 -
4353 drivers/net/wireless/iwlegacy/iwl-4965-sta.c | 721 ---
4354 drivers/net/wireless/iwlegacy/iwl-4965-tx.c | 1378 -----
4355 drivers/net/wireless/iwlegacy/iwl-4965-ucode.c | 166 -
4356 drivers/net/wireless/iwlegacy/iwl-4965.c | 2183 -------
4357 drivers/net/wireless/iwlegacy/iwl-4965.h | 282 -
4358 drivers/net/wireless/iwlegacy/iwl-core.c | 2661 --------
4359 drivers/net/wireless/iwlegacy/iwl-core.h | 636 --
4360 drivers/net/wireless/iwlegacy/iwl-debug.h | 198 -
4361 drivers/net/wireless/iwlegacy/iwl-debugfs.c | 1314 ----
4362 drivers/net/wireless/iwlegacy/iwl-dev.h | 1364 ----
4363 drivers/net/wireless/iwlegacy/iwl-devtrace.c | 42 -
4364 drivers/net/wireless/iwlegacy/iwl-devtrace.h | 210 -
4365 drivers/net/wireless/iwlegacy/iwl-eeprom.c | 553 --
4366 drivers/net/wireless/iwlegacy/iwl-eeprom.h | 344 -
4367 drivers/net/wireless/iwlegacy/iwl-fh.h | 513 --
4368 drivers/net/wireless/iwlegacy/iwl-hcmd.c | 271 -
4369 drivers/net/wireless/iwlegacy/iwl-helpers.h | 196 -
4370 drivers/net/wireless/iwlegacy/iwl-io.h | 545 --
4371 drivers/net/wireless/iwlegacy/iwl-led.c | 205 -
4372 drivers/net/wireless/iwlegacy/iwl-led.h | 56 -
4373 drivers/net/wireless/iwlegacy/iwl-legacy-rs.h | 456 --
4374 drivers/net/wireless/iwlegacy/iwl-power.c | 165 -
4375 drivers/net/wireless/iwlegacy/iwl-power.h | 55 -
4376 drivers/net/wireless/iwlegacy/iwl-rx.c | 282 -
4377 drivers/net/wireless/iwlegacy/iwl-scan.c | 550 --
4378 drivers/net/wireless/iwlegacy/iwl-spectrum.h | 4 +-
4379 drivers/net/wireless/iwlegacy/iwl-sta.c | 540 +-
4380 drivers/net/wireless/iwlegacy/iwl-sta.h | 148 -
4381 drivers/net/wireless/iwlegacy/iwl-tx.c | 659 --
4382 drivers/net/wireless/iwlegacy/iwl3945-base.c | 4016 ------------
4383 drivers/net/wireless/iwlegacy/iwl4965-base.c | 3281 ----------
4384 .../net/wireless/iwlegacy/{iwl-prph.h => prph.h} | 133 +-
4385 drivers/net/wireless/iwlwifi/Makefile | 2 +-
4386 drivers/net/wireless/iwlwifi/iwl-2000.c | 20 -
4387 drivers/net/wireless/iwlwifi/iwl-6000.c | 10 -
4388 drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 358 ++
4389 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 8 +-
4390 drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 49 +-
4391 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 13 +-
4392 drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 78 +-
4393 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 23 +-
4394 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 154 +-
4395 drivers/net/wireless/iwlwifi/iwl-agn.c | 1781 +-----
4396 drivers/net/wireless/iwlwifi/iwl-agn.h | 31 +-
4397 drivers/net/wireless/iwlwifi/iwl-cfg.h | 6 -
4398 drivers/net/wireless/iwlwifi/iwl-commands.h | 27 +-
4399 drivers/net/wireless/iwlwifi/iwl-core.c | 307 +-
4400 drivers/net/wireless/iwlwifi/iwl-core.h | 14 -
4401 drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +-
4402 drivers/net/wireless/iwlwifi/iwl-debug.h | 42 +-
4403 drivers/net/wireless/iwlwifi/iwl-debugfs.c | 8 +-
4404 drivers/net/wireless/iwlwifi/iwl-dev.h | 34 +-
4405 drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +-
4406 drivers/net/wireless/iwlwifi/iwl-devtrace.h | 23 +-
4407 drivers/net/wireless/iwlwifi/iwl-eeprom.c | 142 +-
4408 drivers/net/wireless/iwlwifi/iwl-io.c | 2 +-
4409 drivers/net/wireless/iwlwifi/iwl-mac80211.c | 1632 +++++
4410 drivers/net/wireless/iwlwifi/iwl-pci.c | 20 +-
4411 drivers/net/wireless/iwlwifi/iwl-scan.c | 50 +-
4412 drivers/net/wireless/iwlwifi/iwl-sv-open.c | 7 +-
4413 drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 40 +-
4414 drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 2 +-
4415 drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 56 +-
4416 drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 35 +-
4417 drivers/net/wireless/iwlwifi/iwl-trans.h | 50 +-
4418 drivers/net/wireless/iwmc3200wifi/cfg80211.c | 15 +-
4419 drivers/net/wireless/libertas/cfg.c | 25 +-
4420 drivers/net/wireless/libertas/ethtool.c | 7 +-
4421 drivers/net/wireless/mac80211_hwsim.c | 2 +
4422 drivers/net/wireless/mwifiex/11n_rxreorder.c | 18 +-
4423 drivers/net/wireless/mwifiex/Kconfig | 4 +-
4424 drivers/net/wireless/mwifiex/cfg80211.c | 4 +-
4425 drivers/net/wireless/mwifiex/cfp.c | 38 +-
4426 drivers/net/wireless/mwifiex/fw.h | 3 +-
4427 drivers/net/wireless/mwifiex/init.c | 4 +-
4428 drivers/net/wireless/mwifiex/join.c | 96 +-
4429 drivers/net/wireless/mwifiex/main.h | 3 +-
4430 drivers/net/wireless/mwifiex/pcie.c | 11 +-
4431 drivers/net/wireless/mwifiex/scan.c | 7 +-
4432 drivers/net/wireless/mwifiex/sdio.c | 21 +-
4433 drivers/net/wireless/mwifiex/sdio.h | 1 +
4434 drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +-
4435 drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +-
4436 drivers/net/wireless/mwifiex/sta_rx.c | 12 +-
4437 drivers/net/wireless/orinoco/scan.c | 16 +-
4438 drivers/net/wireless/p54/p54spi.c | 6 +-
4439 drivers/net/wireless/p54/txrx.c | 4 +-
4440 drivers/net/wireless/prism54/islpci_dev.c | 4 +-
4441 drivers/net/wireless/ray_cs.c | 4 +-
4442 drivers/net/wireless/rayctl.h | 4 +-
4443 drivers/net/wireless/rndis_wlan.c | 109 +-
4444 drivers/net/wireless/rtlwifi/base.c | 6 +-
4445 drivers/net/wireless/rtlwifi/base.h | 2 +-
4446 drivers/net/wireless/rtlwifi/pci.c | 3 -
4447 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 60 +-
4448 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 23 +-
4449 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 9 +-
4450 drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 1 +
4451 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 36 +-
4452 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +-
4453 drivers/net/wireless/rtlwifi/usb.c | 55 +-
4454 drivers/net/wireless/rtlwifi/wifi.h | 7 +-
4455 drivers/net/xen-netback/interface.c | 3 +-
4456 drivers/net/xen-netfront.c | 8 +-
4457 drivers/s390/kvm/kvm_virtio.c | 6 +
4458 drivers/s390/net/qeth_l3_main.c | 6 +-
4459 drivers/usb/gadget/f_phonet.c | 11 +-
4460 drivers/virtio/virtio_mmio.c | 6 +
4461 drivers/virtio/virtio_pci.c | 8 +
4462 fs/dlm/lowcomms.c | 2 +-
4463 include/asm-generic/socket.h | 3 +
4464 include/linux/Kbuild | 1 +
4465 include/linux/atmdev.h | 10 -
4466 include/linux/cgroup_subsys.h | 8 +
4467 include/linux/dynamic_queue_limits.h | 97 +
4468 include/linux/eeprom_93cx6.h | 8 +
4469 include/linux/errqueue.h | 3 +-
4470 include/linux/ethtool.h | 53 -
4471 include/linux/ieee80211.h | 6 +
4472 include/linux/if.h | 1 +
4473 include/linux/if_team.h | 242 +
4474 include/linux/mdio-bitbang.h | 2 +
4475 include/linux/mdio-gpio.h | 2 +
4476 include/linux/mii.h | 200 +
4477 include/linux/mlx4/device.h | 3 +-
4478 include/linux/mlx4/qp.h | 28 +
4479 include/linux/neighbour.h | 1 +
4480 include/linux/netdev_features.h | 146 +
4481 include/linux/netdevice.h | 295 +-
4482 include/linux/netfilter.h | 26 +-
4483 include/linux/nl80211.h | 146 +
4484 include/linux/phonet.h | 2 +
4485 include/linux/skbuff.h | 57 +-
4486 include/linux/sunrpc/clnt.h | 2 +-
4487 include/linux/virtio_config.h | 14 +
4488 include/net/bluetooth/bluetooth.h | 29 +-
4489 include/net/bluetooth/hci.h | 22 +
4490 include/net/bluetooth/hci_core.h | 136 +-
4491 include/net/bluetooth/l2cap.h | 409 ++-
4492 include/net/bluetooth/mgmt.h | 47 +-
4493 include/net/cfg80211.h | 202 +-
4494 include/net/dsa.h | 143 +-
4495 include/net/flow_keys.h | 16 +
4496 include/net/icmp.h | 4 +-
4497 include/net/ieee80211_radiotap.h | 8 -
4498 include/net/ieee802154.h | 6 +
4499 include/net/inet_connection_sock.h | 6 +-
4500 include/net/inetpeer.h | 2 +-
4501 include/net/ip.h | 2 +-
4502 include/net/ip_vs.h | 8 +-
4503 include/net/ipv6.h | 20 +-
4504 include/net/mac80211.h | 57 +-
4505 include/net/neighbour.h | 3 +-
4506 include/net/netns/mib.h | 4 +-
4507 include/net/netprio_cgroup.h | 57 +
4508 include/net/nfc/nci.h | 171 +-
4509 include/net/nfc/nci_core.h | 13 +-
4510 include/net/protocol.h | 4 +-
4511 include/net/regulatory.h | 6 +
4512 include/net/sctp/structs.h | 1 +
4513 include/net/snmp.h | 4 +-
4514 include/net/sock.h | 19 +-
4515 include/net/tcp.h | 11 +-
4516 include/net/udp.h | 3 +-
4517 include/net/xfrm.h | 12 +-
4520 lib/dynamic_queue_limits.c | 133 +
4521 lib/vsprintf.c | 19 +
4522 net/8021q/vlan_dev.c | 9 +-
4524 net/atm/atm_misc.c | 2 +-
4525 net/atm/br2684.c | 38 +-
4526 net/atm/clip.c | 36 +-
4527 net/atm/common.c | 34 +-
4528 net/atm/common.h | 1 +
4529 net/atm/pppoatm.c | 4 +
4530 net/ax25/af_ax25.c | 17 +-
4531 net/batman-adv/bat_sysfs.c | 4 +-
4532 net/batman-adv/bitarray.c | 2 +-
4533 net/batman-adv/gateway_client.c | 153 +-
4534 net/batman-adv/gateway_client.h | 5 +-
4535 net/batman-adv/gateway_common.c | 4 +-
4536 net/batman-adv/hash.c | 4 +-
4537 net/batman-adv/hash.h | 13 +-
4538 net/batman-adv/main.h | 2 +-
4539 net/batman-adv/originator.c | 13 +-
4540 net/batman-adv/originator.h | 2 +-
4541 net/batman-adv/routing.c | 22 +-
4542 net/batman-adv/soft-interface.c | 43 +-
4543 net/batman-adv/translation-table.c | 100 +-
4544 net/batman-adv/vis.c | 17 +-
4545 net/bluetooth/bnep/core.c | 13 +-
4546 net/bluetooth/cmtp/core.c | 13 +-
4547 net/bluetooth/hci_conn.c | 69 +-
4548 net/bluetooth/hci_core.c | 399 +-
4549 net/bluetooth/hci_event.c | 221 +-
4550 net/bluetooth/hci_sysfs.c | 40 +-
4551 net/bluetooth/hidp/core.c | 157 +-
4552 net/bluetooth/l2cap_core.c | 947 +++-
4553 net/bluetooth/l2cap_sock.c | 90 +-
4554 net/bluetooth/mgmt.c | 500 +-
4555 net/bluetooth/rfcomm/core.c | 65 +-
4556 net/bluetooth/rfcomm/sock.c | 2 +
4557 net/bluetooth/rfcomm/tty.c | 45 +-
4558 net/bluetooth/smp.c | 3 +-
4559 net/bridge/br_device.c | 7 +-
4560 net/bridge/br_fdb.c | 38 +-
4561 net/bridge/br_if.c | 5 +-
4562 net/bridge/br_multicast.c | 10 +-
4563 net/bridge/br_private.h | 3 +-
4564 net/core/Makefile | 3 +-
4565 net/core/dev.c | 293 +-
4566 net/core/ethtool.c | 556 +--
4567 net/core/flow_dissector.c | 143 +
4568 net/core/neighbour.c | 162 +-
4569 net/core/net-sysfs.c | 281 +-
4570 net/core/netpoll.c | 10 +-
4571 net/core/netprio_cgroup.c | 344 +
4572 net/core/pktgen.c | 17 +-
4573 net/core/skbuff.c | 71 +-
4574 net/core/sock.c | 69 +-
4575 net/core/sysctl_net_core.c | 9 +-
4576 net/dccp/ipv6.c | 42 +-
4577 net/dccp/minisocks.c | 6 +-
4578 net/decnet/dn_neigh.c | 2 +-
4579 net/dsa/Kconfig | 38 +-
4580 net/dsa/Makefile | 19 +-
4581 net/dsa/dsa.c | 51 +-
4582 net/dsa/dsa_priv.h | 127 +-
4583 net/dsa/tag_dsa.c | 15 +-
4584 net/dsa/tag_edsa.c | 15 +-
4585 net/dsa/tag_trailer.c | 15 +-
4586 net/econet/af_econet.c | 7 +-
4587 net/ieee802154/6lowpan.c | 374 ++-
4588 net/ieee802154/6lowpan.h | 23 +
4589 net/ieee802154/dgram.c | 7 +-
4590 net/ieee802154/raw.c | 7 +-
4591 net/ipv4/af_inet.c | 11 +-
4592 net/ipv4/arp.c | 8 +-
4593 net/ipv4/igmp.c | 13 +-
4594 net/ipv4/inet_connection_sock.c | 17 +-
4595 net/ipv4/inet_diag.c | 19 +-
4596 net/ipv4/ip_gre.c | 4 +-
4597 net/ipv4/ip_sockglue.c | 35 +-
4598 net/ipv4/ipconfig.c | 15 +-
4599 net/ipv4/ipip.c | 2 +-
4600 net/ipv4/ipmr.c | 4 +-
4601 net/ipv4/netfilter/ip_queue.c | 6 +-
4602 net/ipv4/proc.c | 9 +-
4603 net/ipv4/raw.c | 10 +-
4604 net/ipv4/tcp.c | 20 +-
4605 net/ipv4/tcp_cong.c | 2 +-
4606 net/ipv4/tcp_input.c | 44 +-
4607 net/ipv4/tcp_ipv4.c | 1 +
4608 net/ipv4/tcp_minisocks.c | 10 +-
4609 net/ipv4/tcp_output.c | 2 +-
4610 net/ipv4/udp.c | 6 +-
4611 net/ipv6/addrconf.c | 8 +-
4612 net/ipv6/af_inet6.c | 27 +-
4613 net/ipv6/ah6.c | 12 +-
4614 net/ipv6/anycast.c | 4 +-
4615 net/ipv6/datagram.c | 36 +-
4616 net/ipv6/exthdrs.c | 18 +-
4617 net/ipv6/fib6_rules.c | 2 +-
4618 net/ipv6/icmp.c | 18 +-
4619 net/ipv6/inet6_connection_sock.c | 12 +-
4620 net/ipv6/ip6_fib.c | 115 +-
4621 net/ipv6/ip6_flowlabel.c | 2 +-
4622 net/ipv6/ip6_output.c | 26 +-
4623 net/ipv6/ip6_tunnel.c | 14 +-
4624 net/ipv6/ip6mr.c | 12 +-
4625 net/ipv6/ipv6_sockglue.c | 8 +-
4626 net/ipv6/mcast.c | 18 +-
4627 net/ipv6/mip6.c | 4 +-
4628 net/ipv6/ndisc.c | 21 +-
4629 net/ipv6/netfilter/ip6_queue.c | 5 +-
4630 net/ipv6/netfilter/ip6t_REJECT.c | 8 +-
4631 net/ipv6/proc.c | 15 +-
4632 net/ipv6/raw.c | 19 +-
4633 net/ipv6/reassembly.c | 4 +-
4634 net/ipv6/route.c | 55 +-
4635 net/ipv6/sit.c | 6 +-
4636 net/ipv6/syncookies.c | 8 +-
4637 net/ipv6/tcp_ipv6.c | 46 +-
4638 net/ipv6/udp.c | 14 +-
4639 net/ipv6/xfrm6_mode_beet.c | 8 +-
4640 net/ipv6/xfrm6_mode_tunnel.c | 4 +-
4641 net/ipv6/xfrm6_output.c | 4 +-
4642 net/ipv6/xfrm6_policy.c | 4 +-
4643 net/ipv6/xfrm6_state.c | 4 +-
4644 net/irda/irttp.c | 4 +-
4645 net/key/af_key.c | 2 +-
4646 net/mac80211/agg-rx.c | 3 +-
4647 net/mac80211/agg-tx.c | 10 +-
4648 net/mac80211/cfg.c | 167 +-
4649 net/mac80211/debugfs.c | 2 +-
4650 net/mac80211/debugfs_sta.c | 4 +-
4651 net/mac80211/driver-ops.h | 76 +-
4652 net/mac80211/ht.c | 86 +-
4653 net/mac80211/ibss.c | 3 +
4654 net/mac80211/ieee80211_i.h | 102 +-
4655 net/mac80211/iface.c | 44 +-
4656 net/mac80211/key.c | 9 +-
4657 net/mac80211/main.c | 57 +-
4658 net/mac80211/mesh.c | 70 +-
4659 net/mac80211/mesh.h | 7 +
4660 net/mac80211/mesh_hwmp.c | 53 +-
4661 net/mac80211/mesh_pathtbl.c | 30 +-
4662 net/mac80211/mesh_plink.c | 51 +-
4663 net/mac80211/mlme.c | 120 +-
4664 net/mac80211/offchannel.c | 4 +-
4665 net/mac80211/pm.c | 2 +-
4666 net/mac80211/rc80211_minstrel.c | 7 +-
4667 net/mac80211/rc80211_minstrel_ht.c | 62 +-
4668 net/mac80211/rx.c | 73 +-
4669 net/mac80211/scan.c | 199 +-
4670 net/mac80211/sta_info.h | 10 +-
4671 net/mac80211/status.c | 87 +-
4672 net/mac80211/tx.c | 332 +-
4673 net/mac80211/util.c | 300 +-
4674 net/mac80211/wep.c | 5 +-
4675 net/mac80211/wme.c | 10 +-
4676 net/mac80211/work.c | 60 +-
4677 net/mac80211/wpa.c | 34 +-
4678 net/netfilter/core.c | 13 +-
4679 net/netfilter/ipset/ip_set_hash_ip.c | 2 +-
4680 net/netfilter/ipset/ip_set_hash_net.c | 2 +-
4681 net/netfilter/ipvs/ip_vs_core.c | 2 +-
4682 net/netfilter/ipvs/ip_vs_sync.c | 6 +-
4683 net/netfilter/ipvs/ip_vs_xmit.c | 10 +-
4684 net/netfilter/nf_conntrack_h323_main.c | 4 +-
4685 net/netfilter/xt_TCPMSS.c | 2 +-
4686 net/netfilter/xt_addrtype.c | 2 +-
4687 net/netlabel/netlabel_kapi.c | 4 +-
4688 net/netlabel/netlabel_mgmt.c | 4 +-
4689 net/netlabel/netlabel_unlabeled.c | 4 +-
4690 net/netrom/af_netrom.c | 3 +-
4691 net/netrom/nr_route.c | 11 +-
4692 net/nfc/nci/core.c | 18 +-
4693 net/nfc/nci/data.c | 5 +-
4694 net/nfc/nci/lib.c | 8 +-
4695 net/nfc/nci/ntf.c | 152 +-
4696 net/nfc/nci/rsp.c | 83 +-
4697 net/packet/af_packet.c | 21 +-
4698 net/phonet/pep.c | 106 +-
4699 net/rfkill/core.c | 4 +-
4700 net/rxrpc/ar-key.c | 6 +-
4701 net/sched/cls_flow.c | 180 +-
4702 net/sched/sch_choke.c | 113 +-
4703 net/sched/sch_generic.c | 9 +-
4704 net/sched/sch_multiq.c | 6 +-
4705 net/sched/sch_sfb.c | 17 +-
4706 net/sched/sch_sfq.c | 65 +-
4707 net/sched/sch_teql.c | 6 +-
4708 net/sctp/ipv6.c | 40 +-
4709 net/sctp/sm_make_chunk.c | 4 +-
4710 net/sctp/sm_sideeffect.c | 8 +-
4711 net/sctp/socket.c | 2 +-
4712 net/sctp/transport.c | 16 +
4714 net/sunrpc/svcauth_unix.c | 6 +-
4715 net/sunrpc/svcsock.c | 4 +-
4716 net/wireless/core.c | 4 +
4717 net/wireless/core.h | 14 +-
4718 net/wireless/mlme.c | 72 +-
4719 net/wireless/nl80211.c | 543 ++-
4720 net/wireless/nl80211.h | 5 +
4721 net/wireless/reg.c | 39 +
4722 net/wireless/reg.h | 1 +
4723 net/wireless/scan.c | 117 +-
4724 net/wireless/sme.c | 7 +-
4725 net/wireless/util.c | 186 +-
4726 net/wireless/wext-compat.c | 12 +
4727 net/xfrm/xfrm_policy.c | 4 +-
4728 net/xfrm/xfrm_state.c | 12 +-
4729 security/lsm_audit.c | 4 +-
4730 security/selinux/hooks.c | 6 +-
4731 security/selinux/netnode.c | 2 +-
4732 784 files changed, 61533 insertions(+), 51654 deletions(-)
4733 create mode 100644 Documentation/cgroups/net_prio.txt
4734 create mode 100644 Documentation/devicetree/bindings/net/calxeda-xgmac.txt
4735 create mode 100644 Documentation/networking/team.txt
4736 delete mode 100644 drivers/net/bonding/bond_ipv6.c
4737 create mode 100644 drivers/net/dsa/Kconfig
4738 create mode 100644 drivers/net/dsa/Makefile
4739 rename {net => drivers/net}/dsa/mv88e6060.c (96%)
4740 rename {net => drivers/net}/dsa/mv88e6123_61_65.c (96%)
4741 rename {net => drivers/net}/dsa/mv88e6131.c (96%)
4742 rename {net => drivers/net}/dsa/mv88e6xxx.c (93%)
4743 rename {net => drivers/net}/dsa/mv88e6xxx.h (95%)
4744 create mode 100644 drivers/net/ethernet/calxeda/Kconfig
4745 create mode 100644 drivers/net/ethernet/calxeda/Makefile
4746 create mode 100644 drivers/net/ethernet/calxeda/xgmac.c
4747 create mode 100644 drivers/net/team/Kconfig
4748 create mode 100644 drivers/net/team/Makefile
4749 create mode 100644 drivers/net/team/team.c
4750 create mode 100644 drivers/net/team/team_mode_activebackup.c
4751 create mode 100644 drivers/net/team/team_mode_roundrobin.c
4752 rename drivers/net/wireless/ath/ath6kl/{htc_hif.c => hif.c} (80%)
4753 delete mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
4754 create mode 100644 drivers/net/wireless/ath/ath9k/mci.c
4755 create mode 100644 drivers/net/wireless/ath/ath9k/mci.h
4756 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
4757 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
4758 create mode 100644 drivers/net/wireless/iwlegacy/3945-debug.c
4759 create mode 100644 drivers/net/wireless/iwlegacy/3945-mac.c
4760 create mode 100644 drivers/net/wireless/iwlegacy/3945-rs.c
4761 create mode 100644 drivers/net/wireless/iwlegacy/3945.c
4762 create mode 100644 drivers/net/wireless/iwlegacy/3945.h
4763 rename drivers/net/wireless/iwlegacy/{iwl-4965-calib.c => 4965-calib.c} (55%)
4764 create mode 100644 drivers/net/wireless/iwlegacy/4965-debug.c
4765 create mode 100644 drivers/net/wireless/iwlegacy/4965-mac.c
4766 create mode 100644 drivers/net/wireless/iwlegacy/4965-rs.c
4767 create mode 100644 drivers/net/wireless/iwlegacy/4965.c
4768 create mode 100644 drivers/net/wireless/iwlegacy/4965.h
4769 rename drivers/net/wireless/iwlegacy/{iwl-commands.h => commands.h} (79%)
4770 create mode 100644 drivers/net/wireless/iwlegacy/common.c
4771 create mode 100644 drivers/net/wireless/iwlegacy/common.h
4772 rename drivers/net/wireless/iwlegacy/{iwl-csr.h => csr.h} (84%)
4773 create mode 100644 drivers/net/wireless/iwlegacy/debug.c
4774 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
4775 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
4776 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-fh.h
4777 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-hw.h
4778 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-led.c
4779 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-led.h
4780 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-rs.c
4781 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945.c
4782 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945.h
4783 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-calib.h
4784 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
4785 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
4786 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
4787 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-hw.h
4788 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-led.c
4789 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-led.h
4790 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-lib.c
4791 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rs.c
4792 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rx.c
4793 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-sta.c
4794 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-tx.c
4795 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
4796 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.c
4797 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.h
4798 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-core.c
4799 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-core.h
4800 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-debug.h
4801 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-debugfs.c
4802 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-dev.h
4803 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.c
4804 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.h
4805 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.c
4806 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.h
4807 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-fh.h
4808 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-hcmd.c
4809 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-helpers.h
4810 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-io.h
4811 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-led.c
4812 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-led.h
4813 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
4814 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-power.c
4815 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-power.h
4816 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-rx.c
4817 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-scan.c
4818 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.h
4819 delete mode 100644 drivers/net/wireless/iwlegacy/iwl-tx.c
4820 delete mode 100644 drivers/net/wireless/iwlegacy/iwl3945-base.c
4821 delete mode 100644 drivers/net/wireless/iwlegacy/iwl4965-base.c
4822 rename drivers/net/wireless/iwlegacy/{iwl-prph.h => prph.h} (83%)
4823 create mode 100644 drivers/net/wireless/iwlwifi/iwl-mac80211.c
4824 create mode 100644 include/linux/dynamic_queue_limits.h
4825 create mode 100644 include/linux/if_team.h
4826 create mode 100644 include/linux/netdev_features.h
4827 create mode 100644 include/net/flow_keys.h
4828 create mode 100644 include/net/netprio_cgroup.h
4829 create mode 100644 lib/dynamic_queue_limits.c
4830 create mode 100644 net/core/flow_dissector.c
4831 create mode 100644 net/core/netprio_cgroup.c
4832 Merging wireless-next/master (ba5736a ath9k_hw: add default chainmask for AR9462)
4833 $ git merge wireless-next/master
4834 Auto-merging net/wireless/nl80211.c
4835 Auto-merging net/mac80211/util.c
4836 Auto-merging net/mac80211/rx.c
4837 Auto-merging net/mac80211/main.c
4838 Auto-merging net/mac80211/agg-tx.c
4839 Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c
4840 Auto-merging drivers/net/wireless/prism54/isl_ioctl.c
4841 Auto-merging drivers/net/wireless/p54/p54spi.c
4842 Auto-merging drivers/net/wireless/libertas/if_spi.c
4843 Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
4844 Removing drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h
4845 Auto-merging drivers/net/wireless/ath/ath9k/hw.c
4846 Merge made by the 'recursive' strategy.
4847 drivers/net/wireless/ath/ath5k/ahb.c | 4 +-
4848 drivers/net/wireless/ath/ath5k/ani.c | 91 +-
4849 drivers/net/wireless/ath/ath5k/ani.h | 32 +-
4850 drivers/net/wireless/ath/ath5k/ath5k.h | 569 ++++++---
4851 drivers/net/wireless/ath/ath5k/attach.c | 16 +-
4852 drivers/net/wireless/ath/ath5k/base.c | 287 +++--
4853 drivers/net/wireless/ath/ath5k/caps.c | 27 +-
4854 drivers/net/wireless/ath/ath5k/desc.c | 217 +++-
4855 drivers/net/wireless/ath/ath5k/desc.h | 124 ++-
4856 drivers/net/wireless/ath/ath5k/dma.c | 370 +++--
4857 drivers/net/wireless/ath/ath5k/gpio.c | 81 +-
4858 drivers/net/wireless/ath/ath5k/initvals.c | 75 +-
4859 drivers/net/wireless/ath/ath5k/pci.c | 2 +-
4860 drivers/net/wireless/ath/ath5k/pcu.c | 222 ++-
4861 drivers/net/wireless/ath/ath5k/phy.c | 853 +++++++++---
4862 drivers/net/wireless/ath/ath5k/qcu.c | 143 ++-
4863 drivers/net/wireless/ath/ath5k/reg.h | 27 +-
4864 drivers/net/wireless/ath/ath5k/reset.c | 230 +++-
4865 drivers/net/wireless/ath/ath5k/rfbuffer.h | 59 +-
4866 drivers/net/wireless/ath/ath5k/rfgain.h | 22 +-
4867 drivers/net/wireless/ath/ath9k/Makefile | 3 +-
4868 drivers/net/wireless/ath/ath9k/ar9003_calib.c | 45 +-
4869 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 +-
4870 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 36 +-
4871 drivers/net/wireless/ath/ath9k/ar9003_mci.c | 1464 ++++++++++++++++++++
4872 drivers/net/wireless/ath/ath9k/ar9003_mci.h | 102 ++
4873 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 3 +
4874 drivers/net/wireless/ath/ath9k/ath9k.h | 3 +-
4875 drivers/net/wireless/ath/ath9k/btcoex.c | 2 +-
4876 drivers/net/wireless/ath/ath9k/btcoex.h | 31 +
4877 drivers/net/wireless/ath/ath9k/eeprom_4k.c | 6 +-
4878 drivers/net/wireless/ath/ath9k/eeprom_9287.c | 3 +-
4879 drivers/net/wireless/ath/ath9k/eeprom_def.c | 6 +-
4880 drivers/net/wireless/ath/ath9k/hw.c | 178 +++-
4881 drivers/net/wireless/ath/ath9k/hw.h | 182 +++
4882 drivers/net/wireless/ath/ath9k/init.c | 33 +
4883 drivers/net/wireless/ath/ath9k/mac.c | 17 +-
4884 drivers/net/wireless/ath/ath9k/main.c | 9 +-
4885 drivers/net/wireless/ath/ath9k/mci.c | 419 ++++++
4886 drivers/net/wireless/ath/ath9k/mci.h | 20 +
4887 drivers/net/wireless/ath/ath9k/recv.c | 24 +-
4888 drivers/net/wireless/ath/ath9k/reg.h | 306 ++++-
4889 drivers/net/wireless/ath/ath9k/xmit.c | 13 +-
4890 drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h | 25 -
4891 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 148 ++-
4892 .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 211 ++--
4893 drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 31 +-
4894 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 19 +-
4895 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 6 +-
4896 .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 15 -
4897 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 85 +-
4898 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 320 ++---
4899 .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 30 +-
4900 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 9 +-
4901 drivers/net/wireless/brcm80211/brcmsmac/dma.c | 62 +-
4902 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 38 +-
4903 drivers/net/wireless/brcm80211/brcmsmac/main.c | 47 +-
4904 drivers/net/wireless/brcm80211/brcmsmac/main.h | 6 +-
4905 .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +-
4906 drivers/net/wireless/hostap/hostap_cs.c | 3 +
4907 drivers/net/wireless/iwlwifi/iwl-1000.c | 9 -
4908 drivers/net/wireless/iwlwifi/iwl-2000.c | 14 -
4909 drivers/net/wireless/iwlwifi/iwl-5000.c | 16 +-
4910 drivers/net/wireless/iwlwifi/iwl-6000.c | 22 +-
4911 drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 68 +-
4912 drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 3 +-
4913 drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 1 +
4914 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 48 +-
4915 drivers/net/wireless/iwlwifi/iwl-agn.c | 34 +
4916 drivers/net/wireless/iwlwifi/iwl-core.h | 5 +-
4917 drivers/net/wireless/iwlwifi/iwl-dev.h | 24 +-
4918 drivers/net/wireless/iwlwifi/iwl-shared.h | 2 -
4919 drivers/net/wireless/iwlwifi/iwl-sv-open.c | 40 +-
4920 drivers/net/wireless/iwlwifi/iwl-testmode.h | 20 +-
4921 drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 12 +-
4922 drivers/net/wireless/libertas/if_spi.c | 1 -
4923 drivers/net/wireless/mwifiex/cfg80211.c | 3 +-
4924 drivers/net/wireless/p54/p54spi.c | 1 -
4925 drivers/net/wireless/prism54/isl_ioctl.c | 333 -----
4926 drivers/net/wireless/prism54/isl_ioctl.h | 2 -
4927 drivers/net/wireless/prism54/islpci_dev.c | 1 -
4928 drivers/net/wireless/rt2x00/rt2800lib.c | 6 +-
4929 drivers/net/wireless/rtlwifi/pci.c | 7 +-
4930 drivers/net/wireless/wl1251/spi.c | 1 -
4931 drivers/net/wireless/wl12xx/spi.c | 1 -
4932 drivers/nfc/pn533.c | 2 +-
4933 include/linux/nl80211.h | 15 +
4934 include/net/cfg80211.h | 12 +-
4935 net/mac80211/Kconfig | 12 -
4936 net/mac80211/Makefile | 4 +-
4937 net/mac80211/agg-rx.c | 11 +-
4938 net/mac80211/agg-tx.c | 39 +-
4939 net/mac80211/cfg.c | 22 +-
4940 net/mac80211/debugfs.c | 35 -
4941 net/mac80211/debugfs_netdev.c | 3 +
4942 net/mac80211/driver-ops.h | 14 +
4943 net/mac80211/driver-trace.h | 11 -
4944 net/mac80211/ht.c | 6 +-
4945 net/mac80211/ieee80211_i.h | 10 +-
4946 net/mac80211/iface.c | 17 +-
4947 net/mac80211/main.c | 41 -
4948 net/mac80211/mesh.c | 1 +
4949 net/mac80211/mesh.h | 2 +
4950 net/mac80211/mesh_hwmp.c | 146 ++-
4951 net/mac80211/mesh_pathtbl.c | 29 +-
4952 net/mac80211/offchannel.c | 9 +-
4953 net/mac80211/rx.c | 105 +-
4954 net/mac80211/scan.c | 4 +-
4955 net/mac80211/sta_info.c | 4 -
4956 net/mac80211/sta_info.h | 3 +-
4957 net/mac80211/tx.c | 44 +-
4958 net/mac80211/util.c | 7 +-
4959 net/mac80211/wme.c | 32 +-
4960 net/mac80211/wme.h | 3 +
4961 net/mac80211/work.c | 99 +--
4962 net/nfc/core.c | 60 +-
4963 net/nfc/nci/core.c | 84 +-
4964 net/nfc/nci/data.c | 30 +-
4965 net/nfc/nci/ntf.c | 83 +-
4966 net/nfc/nci/rsp.c | 84 +-
4967 net/nfc/netlink.c | 32 +-
4969 net/nfc/rawsock.c | 28 +-
4970 net/rfkill/rfkill-gpio.c | 13 +-
4971 net/rfkill/rfkill-regulator.c | 12 +-
4972 net/wireless/mesh.c | 2 +
4973 net/wireless/nl80211.c | 39 +
4974 127 files changed, 6547 insertions(+), 2759 deletions(-)
4975 create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mci.c
4976 create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mci.h
4977 delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h
4978 Merging bluetooth/master (c6feeb2 Bluetooth: Use queue in the device list)
4979 $ git merge bluetooth/master
4980 Auto-merging net/bluetooth/mgmt.c
4981 Auto-merging net/bluetooth/l2cap_sock.c
4982 Auto-merging include/net/bluetooth/hci_core.h
4983 Merge made by the 'recursive' strategy.
4984 drivers/bluetooth/hci_vhci.c | 8 +
4985 include/net/bluetooth/hci.h | 15 +
4986 include/net/bluetooth/hci_core.h | 19 +-
4987 include/net/bluetooth/l2cap.h | 2 +-
4988 include/net/bluetooth/mgmt.h | 49 +++-
4989 net/bluetooth/hci_core.c | 18 +-
4990 net/bluetooth/hci_event.c | 53 ++--
4991 net/bluetooth/l2cap_core.c | 72 +++---
4992 net/bluetooth/l2cap_sock.c | 16 +-
4993 net/bluetooth/mgmt.c | 588 +++++++++++++++++++++++++++-----------
4994 10 files changed, 596 insertions(+), 244 deletions(-)
4995 Merging mtd/master (e0d6511 Merge git://git.infradead.org/mtd-2.6)
4996 $ git merge mtd/master
4998 Merging l2-mtd/master (63c646f mtd: gpmi: add missing include 'module.h')
4999 $ git merge l2-mtd/master
5000 Merge made by the 'recursive' strategy.
5001 drivers/mtd/chips/cfi_cmdset_0020.c | 5 +-
5002 drivers/mtd/devices/Kconfig | 9 +
5003 drivers/mtd/devices/docg3.c | 1451 +++++++++++++++++++++++++++-----
5004 drivers/mtd/devices/docg3.h | 64 ++-
5005 drivers/mtd/maps/pxa2xx-flash.c | 2 +-
5006 drivers/mtd/mtd_blkdevs.c | 3 +-
5007 drivers/mtd/nand/Kconfig | 2 +-
5008 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +-
5009 drivers/mtd/nand/nand_base.c | 7 +-
5010 drivers/mtd/nand/nand_ids.c | 4 +-
5011 drivers/mtd/nand/ndfc.c | 2 +-
5012 include/linux/mtd/cfi.h | 16 +-
5013 include/linux/mtd/cfi_endian.h | 76 +-
5014 include/linux/mtd/map.h | 1 +
5015 include/linux/mtd/nand.h | 1 +
5016 15 files changed, 1354 insertions(+), 291 deletions(-)
5017 Merging crypto/master (741e8c2 crypto: convert drivers/crypto/* to use module_platform_driver())
5018 $ git merge crypto/master
5019 Auto-merging drivers/crypto/mv_cesa.c
5020 Removing crypto/serpent.c
5021 Auto-merging crypto/crypto_user.c
5022 Merge made by the 'recursive' strategy.
5023 arch/x86/crypto/Makefile | 4 +
5024 arch/x86/crypto/serpent-sse2-i586-asm_32.S | 638 ++++++
5025 arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 761 +++++++
5026 arch/x86/crypto/serpent_sse2_glue.c | 1110 ++++++++++
5027 arch/x86/crypto/twofish_glue_3way.c | 250 +++
5028 arch/x86/include/asm/serpent.h | 63 +
5029 crypto/Kconfig | 38 +-
5030 crypto/Makefile | 2 +-
5031 crypto/algapi.c | 29 +
5032 crypto/ansi_cprng.c | 8 +
5033 crypto/crypto_user.c | 2 +-
5034 crypto/lrw.c | 156 +-
5035 crypto/serpent.c | 587 -----
5036 crypto/serpent_generic.c | 684 ++++++
5037 crypto/tcrypt.c | 310 +++
5038 crypto/tcrypt.h | 2 +
5039 crypto/testmgr.c | 150 ++
5040 crypto/testmgr.h | 3029 ++++++++++++++++++++++++--
5041 crypto/twofish_common.c | 13 +-
5042 crypto/xts.c | 79 +-
5043 drivers/char/hw_random/atmel-rng.c | 12 +-
5044 drivers/char/hw_random/n2-drv.c | 13 +-
5045 drivers/char/hw_random/octeon-rng.c | 13 +-
5046 drivers/char/hw_random/pasemi-rng.c | 12 +-
5047 drivers/char/hw_random/picoxcell-rng.c | 12 +-
5048 drivers/char/hw_random/ppc4xx-rng.c | 12 +-
5049 drivers/char/hw_random/timeriomem-rng.c | 13 +-
5050 drivers/crypto/amcc/crypto4xx_core.c | 13 +-
5051 drivers/crypto/caam/caamalg.c | 57 +
5052 drivers/crypto/caam/compat.h | 1 +
5053 drivers/crypto/caam/ctrl.c | 13 +-
5054 drivers/crypto/mv_cesa.c | 12 +-
5055 drivers/crypto/picoxcell_crypto.c | 12 +-
5056 drivers/crypto/s5p-sss.c | 13 +-
5057 drivers/crypto/talitos.c | 490 ++++-
5058 drivers/crypto/talitos.h | 45 +-
5059 include/crypto/algapi.h | 1 +
5060 include/crypto/lrw.h | 43 +
5061 include/crypto/serpent.h | 27 +
5062 include/crypto/twofish.h | 2 +
5063 include/crypto/xts.h | 27 +
5064 41 files changed, 7738 insertions(+), 1020 deletions(-)
5065 create mode 100644 arch/x86/crypto/serpent-sse2-i586-asm_32.S
5066 create mode 100644 arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
5067 create mode 100644 arch/x86/crypto/serpent_sse2_glue.c
5068 create mode 100644 arch/x86/include/asm/serpent.h
5069 delete mode 100644 crypto/serpent.c
5070 create mode 100644 crypto/serpent_generic.c
5071 create mode 100644 include/crypto/lrw.h
5072 create mode 100644 include/crypto/serpent.h
5073 create mode 100644 include/crypto/xts.h
5074 Merging sound/for-next (ad32d58 Merge branch 'fix/asoc' into for-next)
5075 $ git merge sound/for-next
5076 Auto-merging sound/soc/txx9/txx9aclc.c
5077 Auto-merging sound/soc/samsung/dma.c
5078 Auto-merging sound/soc/nuc900/nuc900-ac97.c
5079 Auto-merging sound/soc/imx/imx-pcm-dma-mx2.c
5080 Auto-merging sound/soc/ep93xx/ep93xx-pcm.c
5081 Auto-merging sound/soc/au1x/db1200.c
5082 Removing sound/soc/atmel/playpaq_wm8510.c
5083 Removing sound/pci/hda/alc262_quirks.c
5084 Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
5085 Merge made by the 'recursive' strategy.
5086 .../devicetree/bindings/sound/tegra20-das.txt | 12 +
5087 .../devicetree/bindings/vendor-prefixes.txt | 1 +
5088 Documentation/sound/alsa/HD-Audio-Models.txt | 14 +-
5089 arch/arm/mach-shmobile/board-ap4evb.c | 15 +-
5090 arch/arm/mach-shmobile/board-mackerel.c | 14 +-
5091 arch/sh/boards/mach-se/7724/setup.c | 14 +-
5092 drivers/base/regmap/internal.h | 1 +
5093 drivers/base/regmap/regcache.c | 19 +
5094 drivers/base/regmap/regmap.c | 4 +-
5095 drivers/firmware/sigma.c | 81 +-
5096 include/linux/regmap.h | 1 +
5097 include/linux/sigma.h | 13 +-
5098 include/sound/sh_fsi.h | 12 +
5099 include/sound/soc-dapm.h | 1 +
5100 include/sound/soc.h | 7 +-
5101 include/sound/sta32x.h | 35 +
5102 sound/arm/pxa2xx-ac97.c | 13 +-
5103 sound/drivers/ml403-ac97cr.c | 13 +-
5104 sound/mips/hal2.c | 13 +-
5105 sound/mips/sgio2audio.c | 13 +-
5106 sound/pci/hda/alc262_quirks.c | 875 ------
5107 sound/pci/hda/alc880_quirks.c | 193 --
5108 sound/pci/hda/alc882_quirks.c | 2933 +-------------------
5109 sound/pci/hda/hda_codec.c | 6 +
5110 sound/pci/hda/hda_codec.h | 3 -
5111 sound/pci/hda/hda_intel.c | 49 +-
5112 sound/pci/hda/patch_hdmi.c | 20 +-
5113 sound/pci/hda/patch_realtek.c | 572 ++++-
5114 sound/pci/hda/patch_sigmatel.c | 4 +-
5115 sound/sh/sh_dac_audio.c | 13 +-
5116 sound/soc/Kconfig | 15 -
5117 sound/soc/atmel/Kconfig | 21 +-
5118 sound/soc/atmel/Makefile | 4 -
5119 sound/soc/atmel/atmel-pcm.c | 12 +-
5120 sound/soc/atmel/atmel_ssc_dai.c | 14 +-
5121 sound/soc/atmel/playpaq_wm8510.c | 473 ----
5122 sound/soc/au1x/ac97c.c | 2 +-
5123 sound/soc/au1x/db1000.c | 13 +-
5124 sound/soc/au1x/db1200.c | 13 +-
5125 sound/soc/au1x/dbdma2.c | 13 +-
5126 sound/soc/au1x/dma.c | 13 +-
5127 sound/soc/au1x/i2sc.c | 13 +-
5128 sound/soc/au1x/psc-ac97.c | 2 +-
5129 sound/soc/au1x/psc-i2s.c | 15 +-
5130 sound/soc/blackfin/bf5xx-ac97-pcm.c | 12 +-
5131 sound/soc/blackfin/bf5xx-ac97.c | 13 +-
5132 sound/soc/blackfin/bf5xx-i2s-pcm.c | 12 +-
5133 sound/soc/blackfin/bf5xx-i2s.c | 15 +-
5134 sound/soc/blackfin/bf5xx-tdm-pcm.c | 12 +-
5135 sound/soc/blackfin/bf5xx-tdm.c | 14 +-
5136 sound/soc/blackfin/bfin-eval-adau1373.c | 12 +-
5137 sound/soc/blackfin/bfin-eval-adau1701.c | 12 +-
5138 sound/soc/blackfin/bfin-eval-adav80x.c | 12 +-
5139 sound/soc/codecs/88pm860x-codec.c | 16 +-
5140 sound/soc/codecs/Kconfig | 7 +
5141 sound/soc/codecs/Makefile | 10 +-
5142 sound/soc/codecs/ac97.c | 14 +-
5143 sound/soc/codecs/ad1836.c | 2 +-
5144 sound/soc/codecs/ad1836.h | 2 +-
5145 sound/soc/codecs/ad193x.c | 190 +-
5146 sound/soc/codecs/ad193x.h | 17 +-
5147 sound/soc/codecs/ad1980.c | 12 +-
5148 sound/soc/codecs/ad73311.c | 12 +-
5149 sound/soc/codecs/ads117x.c | 12 +-
5150 sound/soc/codecs/ak4104.c | 2 +-
5151 sound/soc/codecs/ak4535.c | 3 +-
5152 sound/soc/codecs/ak4641.c | 5 +-
5153 sound/soc/codecs/ak4642.c | 142 +-
5154 sound/soc/codecs/ak4671.c | 2 +-
5155 sound/soc/codecs/alc5623.c | 3 +-
5156 sound/soc/codecs/alc5632.c | 1159 ++++++++
5157 sound/soc/codecs/alc5632.h | 251 ++
5158 sound/soc/codecs/cq93vc.c | 14 +-
5159 sound/soc/codecs/cs4270.c | 13 +-
5160 sound/soc/codecs/cs4271.c | 2 +-
5161 sound/soc/codecs/cs42l51.c | 18 +-
5162 sound/soc/codecs/cs42l73.c | 1452 ++++++++++
5163 sound/soc/codecs/cs42l73.h | 227 ++
5164 sound/soc/codecs/cx20442.c | 12 +-
5165 sound/soc/codecs/da7210.c | 7 +-
5166 sound/soc/codecs/dfbmcs320.c | 12 +-
5167 sound/soc/codecs/dmic.c | 12 +-
5168 sound/soc/codecs/jz4740.c | 14 +-
5169 sound/soc/codecs/max98088.c | 5 +-
5170 sound/soc/codecs/max98095.c | 7 +-
5171 sound/soc/codecs/max9850.c | 2 +-
5172 sound/soc/codecs/max9877.c | 10 +-
5173 sound/soc/codecs/pcm3008.c | 12 +-
5174 sound/soc/codecs/rt5631.c | 3 +-
5175 sound/soc/codecs/sgtl5000.c | 3 +-
5176 sound/soc/codecs/sn95031.c | 22 +-
5177 sound/soc/codecs/spdif_transciever.c | 13 +-
5178 sound/soc/codecs/ssm2602.c | 3 +-
5179 sound/soc/codecs/sta32x.c | 87 +-
5180 sound/soc/codecs/stac9766.c | 16 +-
5181 sound/soc/codecs/tlv320aic23.c | 3 +-
5182 sound/soc/codecs/tlv320aic26.c | 2 +-
5183 sound/soc/codecs/tlv320aic32x4.c | 3 +-
5184 sound/soc/codecs/tlv320aic3x.c | 50 +-
5185 sound/soc/codecs/tlv320dac33.c | 3 +-
5186 sound/soc/codecs/twl4030.c | 16 +-
5187 sound/soc/codecs/twl6040.c | 14 +-
5188 sound/soc/codecs/uda134x.c | 14 +-
5189 sound/soc/codecs/uda1380.c | 6 +-
5190 sound/soc/codecs/wl1273.c | 14 +-
5191 sound/soc/codecs/wm1250-ev1.c | 10 +-
5192 sound/soc/codecs/wm2000.c | 1 -
5193 sound/soc/codecs/wm5100-tables.c | 1489 +++++------
5194 sound/soc/codecs/wm5100.c | 404 ++--
5195 sound/soc/codecs/wm5100.h | 7 +-
5196 sound/soc/codecs/wm8350.c | 14 +-
5197 sound/soc/codecs/wm8400.c | 20 +-
5198 sound/soc/codecs/wm8510.c | 3 +-
5199 sound/soc/codecs/wm8523.c | 3 +-
5200 sound/soc/codecs/wm8580.c | 5 +-
5201 sound/soc/codecs/wm8711.c | 3 +-
5202 sound/soc/codecs/wm8727.c | 12 +-
5203 sound/soc/codecs/wm8728.c | 2 +-
5204 sound/soc/codecs/wm8731.c | 8 +-
5205 sound/soc/codecs/wm8737.c | 3 +-
5206 sound/soc/codecs/wm8741.c | 3 +-
5207 sound/soc/codecs/wm8750.c | 3 +-
5208 sound/soc/codecs/wm8753.c | 29 +-
5209 sound/soc/codecs/wm8770.c | 3 +-
5210 sound/soc/codecs/wm8776.c | 19 +-
5211 sound/soc/codecs/wm8782.c | 12 +-
5212 sound/soc/codecs/wm8804.c | 2 +-
5213 sound/soc/codecs/wm8900.c | 5 +-
5214 sound/soc/codecs/wm8903.c | 7 +-
5215 sound/soc/codecs/wm8904.c | 5 +-
5216 sound/soc/codecs/wm8940.c | 7 +-
5217 sound/soc/codecs/wm8955.c | 3 +-
5218 sound/soc/codecs/wm8958-dsp2.c | 3 +-
5219 sound/soc/codecs/wm8960.c | 5 +-
5220 sound/soc/codecs/wm8961.c | 5 +-
5221 sound/soc/codecs/wm8962.c | 1625 ++++++------
5222 sound/soc/codecs/wm8971.c | 5 +-
5223 sound/soc/codecs/wm8974.c | 5 +-
5224 sound/soc/codecs/wm8978.c | 3 +-
5225 sound/soc/codecs/wm8983.c | 5 +-
5226 sound/soc/codecs/wm8985.c | 5 +-
5227 sound/soc/codecs/wm8988.c | 5 +-
5228 sound/soc/codecs/wm8990.c | 7 +-
5229 sound/soc/codecs/wm8991.c | 7 +-
5230 sound/soc/codecs/wm8993.c | 2 +-
5231 sound/soc/codecs/wm8994.c | 26 +-
5232 sound/soc/codecs/wm8995.c | 729 ++++-
5233 sound/soc/codecs/wm8996.c | 919 ++++---
5234 sound/soc/codecs/wm9081.c | 367 ++-
5235 sound/soc/codecs/wm9705.c | 14 +-
5236 sound/soc/codecs/wm9712.c | 16 +-
5237 sound/soc/codecs/wm9713.c | 18 +-
5238 sound/soc/codecs/wm_hubs.c | 4 +-
5239 sound/soc/davinci/davinci-i2s.c | 14 +-
5240 sound/soc/davinci/davinci-mcasp.c | 14 +-
5241 sound/soc/davinci/davinci-pcm.c | 12 +-
5242 sound/soc/davinci/davinci-vcif.c | 14 +-
5243 sound/soc/ep93xx/edb93xx.c | 12 +-
5244 sound/soc/ep93xx/ep93xx-ac97.c | 14 +-
5245 sound/soc/ep93xx/ep93xx-i2s.c | 15 +-
5246 sound/soc/ep93xx/ep93xx-pcm.c | 13 +-
5247 sound/soc/ep93xx/simone.c | 12 +-
5248 sound/soc/ep93xx/snappercl15.c | 13 +-
5249 sound/soc/fsl/fsl_dma.c | 15 +-
5250 sound/soc/fsl/fsl_ssi.c | 17 +-
5251 sound/soc/fsl/mpc5200_dma.c | 12 +-
5252 sound/soc/fsl/mpc5200_psc_ac97.c | 20 +-
5253 sound/soc/fsl/mpc5200_psc_i2s.c | 18 +-
5254 sound/soc/fsl/mpc8610_hpcd.c | 24 +-
5255 sound/soc/imx/imx-pcm-dma-mx2.c | 12 +-
5256 sound/soc/imx/imx-pcm-fiq.c | 12 +-
5257 sound/soc/imx/imx-ssi.c | 15 +-
5258 sound/soc/jz4740/jz4740-i2s.c | 14 +-
5259 sound/soc/jz4740/jz4740-pcm.c | 12 +-
5260 sound/soc/kirkwood/kirkwood-dma.c | 12 +-
5261 sound/soc/kirkwood/kirkwood-i2s.c | 14 +-
5262 sound/soc/mid-x86/mfld_machine.c | 14 +-
5263 sound/soc/mid-x86/sst_platform.c | 14 +-
5264 sound/soc/mxs/mxs-pcm.c | 12 +-
5265 sound/soc/mxs/mxs-saif.c | 14 +-
5266 sound/soc/mxs/mxs-sgtl5000.c | 12 +-
5267 sound/soc/nuc900/nuc900-ac97.c | 15 +-
5268 sound/soc/nuc900/nuc900-pcm.c | 12 +-
5269 sound/soc/omap/Kconfig | 5 +
5270 sound/soc/omap/Makefile | 2 +
5271 sound/soc/omap/ams-delta.c | 2 +-
5272 sound/soc/omap/omap-dmic.c | 549 ++++
5273 sound/soc/omap/omap-dmic.h | 69 +
5274 sound/soc/omap/omap-hdmi.c | 14 +-
5275 sound/soc/omap/omap-mcbsp.c | 14 +-
5276 sound/soc/omap/omap-mcpdm.c | 14 +-
5277 sound/soc/omap/omap-pcm.c | 12 +-
5278 sound/soc/omap/omap4-hdmi-card.c | 12 +-
5279 sound/soc/omap/sdp4430.c | 85 +-
5280 sound/soc/pxa/hx4700.c | 13 +-
5281 sound/soc/pxa/mioa701_wm9713.c | 13 +-
5282 sound/soc/pxa/palm27x.c | 13 +-
5283 sound/soc/pxa/pxa-ssp.c | 14 +-
5284 sound/soc/pxa/pxa2xx-ac97.c | 18 +-
5285 sound/soc/pxa/pxa2xx-i2s.c | 2 +-
5286 sound/soc/pxa/pxa2xx-pcm.c | 12 +-
5287 sound/soc/s6000/s6000-i2s.c | 14 +-
5288 sound/soc/s6000/s6000-pcm.c | 12 +-
5289 sound/soc/samsung/Kconfig | 13 +
5290 sound/soc/samsung/Makefile | 4 +
5291 sound/soc/samsung/ac97.c | 16 +-
5292 sound/soc/samsung/dma.c | 12 +-
5293 sound/soc/samsung/i2s.c | 14 +-
5294 sound/soc/samsung/idma.c | 12 +-
5295 sound/soc/samsung/littlemill.c | 227 ++
5296 sound/soc/samsung/lowland.c | 236 ++
5297 sound/soc/samsung/pcm.c | 14 +-
5298 sound/soc/samsung/s3c2412-i2s.c | 14 +-
5299 sound/soc/samsung/s3c24xx-i2s.c | 14 +-
5300 sound/soc/samsung/s3c24xx_simtec_hermes.c | 16 +-
5301 sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 16 +-
5302 sound/soc/samsung/s3c24xx_uda134x.c | 14 +-
5303 sound/soc/samsung/smdk_wm8580pcm.c | 14 +-
5304 sound/soc/samsung/smdk_wm8994.c | 1 +
5305 sound/soc/samsung/spdif.c | 14 +-
5306 sound/soc/samsung/speyside.c | 17 +-
5307 sound/soc/samsung/speyside_wm8962.c | 13 +-
5308 sound/soc/sh/dma-sh7760.c | 12 +-
5309 sound/soc/sh/fsi-ak4642.c | 127 +-
5310 sound/soc/sh/fsi-hdmi.c | 13 +-
5311 sound/soc/sh/fsi.c | 36 +-
5312 sound/soc/sh/hac.c | 14 +-
5313 sound/soc/sh/siu_dai.c | 15 +-
5314 sound/soc/sh/ssi.c | 14 +-
5315 sound/soc/soc-cache.c | 384 ---
5316 sound/soc/soc-core.c | 12 +-
5317 sound/soc/soc-dapm.c | 73 +
5318 sound/soc/soc-pcm.c | 3 +-
5319 sound/soc/tegra/tegra_das.c | 53 +-
5320 sound/soc/tegra/tegra_i2s.c | 137 +-
5321 sound/soc/tegra/tegra_i2s.h | 1 +
5322 sound/soc/tegra/tegra_pcm.c | 13 +-
5323 sound/soc/tegra/tegra_spdif.c | 14 +-
5324 sound/soc/tegra/tegra_wm8903.c | 79 +-
5325 sound/soc/tegra/trimslice.c | 45 +-
5326 sound/soc/txx9/txx9aclc-ac97.c | 13 +-
5327 sound/soc/txx9/txx9aclc.c | 12 +-
5328 sound/sparc/cs4231.c | 13 +-
5329 sound/sparc/dbri.c | 14 +-
5330 244 files changed, 8937 insertions(+), 9663 deletions(-)
5331 create mode 100644 Documentation/devicetree/bindings/sound/tegra20-das.txt
5332 create mode 100644 include/sound/sta32x.h
5333 delete mode 100644 sound/pci/hda/alc262_quirks.c
5334 delete mode 100644 sound/soc/atmel/playpaq_wm8510.c
5335 create mode 100644 sound/soc/codecs/alc5632.c
5336 create mode 100644 sound/soc/codecs/alc5632.h
5337 create mode 100644 sound/soc/codecs/cs42l73.c
5338 create mode 100644 sound/soc/codecs/cs42l73.h
5339 create mode 100644 sound/soc/omap/omap-dmic.c
5340 create mode 100644 sound/soc/omap/omap-dmic.h
5341 create mode 100644 sound/soc/samsung/littlemill.c
5342 create mode 100644 sound/soc/samsung/lowland.c
5343 Merging sound-asoc/for-next (a169134 ASoC: Provide debug log of accessory status on WM8958)
5344 $ git merge sound-asoc/for-next
5345 Auto-merging sound/soc/samsung/tobermory.c
5346 Auto-merging sound/soc/codecs/sigmadsp.c
5347 Removing include/linux/sigma.h
5348 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
5349 Auto-merging MAINTAINERS
5350 Merge made by the 'recursive' strategy.
5351 .../devicetree/bindings/sound/tegra20-i2s.txt | 17 ++
5353 arch/arm/mach-s3c64xx/mach-crag6410.c | 6 +-
5354 drivers/firmware/Kconfig | 12 --
5355 drivers/firmware/Makefile | 1 -
5356 include/linux/sigma.h | 55 -------
5357 sound/soc/codecs/Kconfig | 6 +-
5358 sound/soc/codecs/Makefile | 2 +
5359 sound/soc/codecs/adau1701.c | 2 +-
5360 sound/soc/codecs/cs42l73.c | 3 +-
5361 .../sigma.c => sound/soc/codecs/sigmadsp.c | 121 +++++++++++++--
5362 sound/soc/codecs/sigmadsp.h | 21 +++
5363 sound/soc/codecs/wm8994.c | 165 ++++++++++++++++++--
5364 sound/soc/codecs/wm8994.h | 2 +
5365 sound/soc/samsung/Kconfig | 4 +-
5366 sound/soc/samsung/Makefile | 4 +-
5367 sound/soc/samsung/i2s.c | 2 +-
5368 sound/soc/samsung/idma.c | 2 +-
5369 sound/soc/samsung/idma.h | 2 +-
5370 sound/soc/samsung/smdk_wm8994pcm.c | 14 +--
5371 .../soc/samsung/{speyside_wm8962.c => tobermory.c} | 66 ++++----
5372 sound/soc/tegra/tegra_i2s.c | 27 +++-
5373 22 files changed, 377 insertions(+), 158 deletions(-)
5374 create mode 100644 Documentation/devicetree/bindings/sound/tegra20-i2s.txt
5375 delete mode 100644 include/linux/sigma.h
5376 rename drivers/firmware/sigma.c => sound/soc/codecs/sigmadsp.c (53%)
5377 create mode 100644 sound/soc/codecs/sigmadsp.h
5378 rename sound/soc/samsung/{speyside_wm8962.c => tobermory.c} (72%)
5379 Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
5380 $ git merge cpufreq/next
5381 Merge made by the 'recursive' strategy.
5382 Merging quilt/rr (78173d1 lguest: switch segment-voodoo-numbers to readable symbols)
5383 $ git merge quilt/rr
5384 Auto-merging drivers/net/virtio_net.c
5385 Merge made by the 'recursive' strategy.
5386 drivers/block/virtio_blk.c | 2 +-
5387 drivers/char/hw_random/virtio-rng.c | 2 +-
5388 drivers/char/virtio_console.c | 6 +-
5389 drivers/lguest/segments.c | 28 +++--
5390 drivers/net/virtio_net.c | 12 +-
5391 drivers/virtio/virtio_balloon.c | 13 +-
5392 drivers/virtio/virtio_ring.c | 213 +++++++++++++++++++++++++++++++----
5393 include/linux/virtio.h | 70 ++----------
5394 kernel/module.c | 58 ++++------
5395 net/9p/trans_virtio.c | 6 +-
5396 tools/virtio/linux/virtio.h | 21 +---
5397 tools/virtio/virtio_test.c | 3 +-
5398 12 files changed, 268 insertions(+), 166 deletions(-)
5399 Merging input/next (a6c6178 Input: remove redundant spi driver bus initialization)
5400 $ git merge input/next
5401 Resolved 'drivers/input/keyboard/samsung-keypad.c' using previous resolution.
5402 Auto-merging drivers/input/keyboard/samsung-keypad.c
5403 CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c
5404 Automatic merge failed; fix conflicts and then commit the result.
5406 [master 881159d] Merge remote-tracking branch 'input/next'
5407 $ git diff -M --stat --summary HEAD^..
5408 Documentation/input/alps.txt | 188 +++++
5409 arch/arm/plat-samsung/include/plat/keypad.h | 27 +-
5410 drivers/input/input-polldev.c | 8 +-
5411 drivers/input/keyboard/Kconfig | 21 +-
5412 drivers/input/keyboard/Makefile | 1 +
5413 drivers/input/keyboard/atkbd.c | 40 +-
5414 drivers/input/keyboard/lm8323.c | 11 +-
5415 drivers/input/keyboard/samsung-keypad.c | 15 +-
5416 drivers/input/keyboard/tca8418_keypad.c | 430 +++++++++++
5417 drivers/input/misc/adxl34x-spi.c | 1 -
5418 drivers/input/misc/adxl34x.c | 16 +-
5419 drivers/input/misc/ati_remote2.c | 19 +-
5420 drivers/input/mouse/alps.c | 1036 ++++++++++++++++++++++++---
5421 drivers/input/mouse/alps.h | 19 +
5422 drivers/input/mouse/elantech.c | 80 ++-
5423 drivers/input/mouse/elantech.h | 2 +
5424 drivers/input/mouse/hgpk.c | 18 +-
5425 drivers/input/mouse/logips2pp.c | 9 +-
5426 drivers/input/mouse/psmouse-base.c | 36 +-
5427 drivers/input/mouse/psmouse.h | 3 +
5428 drivers/input/mouse/sentelic.c | 43 +-
5429 drivers/input/mouse/synaptics.c | 197 ++++--
5430 drivers/input/mouse/synaptics.h | 5 +
5431 drivers/input/mouse/trackpoint.c | 17 +-
5432 drivers/input/serio/i8042.c | 23 +-
5433 drivers/input/tablet/aiptek.c | 34 +-
5434 drivers/input/tablet/wacom_sys.c | 96 +++-
5435 drivers/input/tablet/wacom_wac.c | 110 +++-
5436 drivers/input/tablet/wacom_wac.h | 4 +-
5437 drivers/input/touchscreen/Kconfig | 16 +
5438 drivers/input/touchscreen/Makefile | 1 +
5439 drivers/input/touchscreen/ad7877.c | 17 +-
5440 drivers/input/touchscreen/ad7879-i2c.c | 27 +-
5441 drivers/input/touchscreen/ad7879-spi.c | 27 +-
5442 drivers/input/touchscreen/ad7879.c | 23 +-
5443 drivers/input/touchscreen/ad7879.h | 4 +-
5444 drivers/input/touchscreen/ads7846.c | 9 +-
5445 drivers/input/touchscreen/egalax_ts.c | 303 ++++++++
5446 drivers/input/touchscreen/usbtouchscreen.c | 36 +
5447 include/linux/input/samsung-keypad.h | 43 ++
5448 include/linux/input/tca8418_keypad.h | 44 ++
5449 41 files changed, 2683 insertions(+), 376 deletions(-)
5450 create mode 100644 Documentation/input/alps.txt
5451 create mode 100644 drivers/input/keyboard/tca8418_keypad.c
5452 create mode 100644 drivers/input/touchscreen/egalax_ts.c
5453 create mode 100644 include/linux/input/samsung-keypad.h
5454 create mode 100644 include/linux/input/tca8418_keypad.h
5455 Merging input-mt/next (02f8c6a Linux 3.0)
5456 $ git merge input-mt/next
5458 Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
5459 $ git merge lsm/for-next
5461 Merging block/for-next (5dc34f4 Merge branch 'for-3.3/mtip32xx' into for-next)
5462 $ git merge block/for-next
5463 Merge made by the 'recursive' strategy.
5464 drivers/block/Kconfig | 2 +
5465 drivers/block/Makefile | 1 +
5466 drivers/block/mtip32xx/Kconfig | 9 +
5467 drivers/block/mtip32xx/Makefile | 5 +
5468 drivers/block/mtip32xx/mtip32xx.c | 3627 +++++++++++++++++++++++++++++++++++++
5469 drivers/block/mtip32xx/mtip32xx.h | 422 +++++
5470 6 files changed, 4066 insertions(+), 0 deletions(-)
5471 create mode 100644 drivers/block/mtip32xx/Kconfig
5472 create mode 100644 drivers/block/mtip32xx/Makefile
5473 create mode 100644 drivers/block/mtip32xx/mtip32xx.c
5474 create mode 100644 drivers/block/mtip32xx/mtip32xx.h
5475 Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
5476 $ git merge quilt/device-mapper
5478 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
5479 $ git merge embedded/master
5481 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
5482 $ git merge firmware/master
5484 Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
5485 $ git merge pcmcia/master
5487 Merging battery/master (00a159a max8925_power: Check at probe time if power to set online)
5488 $ git merge battery/master
5489 Auto-merging drivers/power/power_supply_sysfs.c
5490 Auto-merging drivers/power/max8998_charger.c
5491 Auto-merging drivers/power/max8997_charger.c
5492 Auto-merging drivers/power/max8903_charger.c
5493 Auto-merging drivers/power/max17042_battery.c
5494 Auto-merging drivers/power/ds2780_battery.c
5495 Merge made by the 'recursive' strategy.
5496 .../bindings/power_supply/olpc_battery.txt | 5 +
5497 .../bindings/power_supply/ti_bq20z75.txt | 23 +++
5498 drivers/mfd/max8925-core.c | 15 --
5499 drivers/power/bq20z75.c | 77 +++++++
5500 drivers/power/bq27x00_battery.c | 210 +++++++++++++-------
5501 drivers/power/collie_battery.c | 53 ++----
5502 drivers/power/ds2760_battery.c | 6 +-
5503 drivers/power/ds2780_battery.c | 2 +-
5504 drivers/power/intel_mid_battery.c | 12 +-
5505 drivers/power/max17042_battery.c | 94 ++++++---
5506 drivers/power/max8903_charger.c | 2 +-
5507 drivers/power/max8925_power.c | 63 ++++---
5508 drivers/power/max8997_charger.c | 3 +-
5509 drivers/power/max8998_charger.c | 2 +
5510 drivers/power/olpc_battery.c | 81 +++++---
5511 drivers/power/pda_power.c | 74 ++++++-
5512 drivers/power/power_supply_sysfs.c | 4 +-
5513 drivers/power/tosa_battery.c | 66 ++-----
5514 drivers/power/wm831x_power.c | 44 +++--
5515 drivers/power/wm97xx_battery.c | 2 +-
5516 drivers/power/z2_battery.c | 4 +-
5517 include/linux/mfd/max8925.h | 7 +-
5518 include/linux/pda_power.h | 2 +
5519 23 files changed, 548 insertions(+), 303 deletions(-)
5520 create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
5521 create mode 100644 Documentation/devicetree/bindings/power_supply/ti_bq20z75.txt
5522 Merging mmc/mmc-next (ce8fda6 mmc: core: Fix typo at mmc_card_sleep)
5523 $ git merge mmc/mmc-next
5524 Auto-merging drivers/mmc/host/sdhci-tegra.c
5525 Auto-merging drivers/mmc/host/sdhci-s3c.c
5526 Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
5527 Auto-merging drivers/mmc/host/omap_hsmmc.c
5528 Auto-merging drivers/mmc/host/mxcmmc.c
5529 Auto-merging drivers/mmc/core/sdio_io.c
5530 Auto-merging drivers/mmc/core/sd.c
5531 Auto-merging drivers/mmc/core/mmc.c
5532 Auto-merging drivers/mmc/core/host.c
5533 Auto-merging drivers/mmc/core/debugfs.c
5534 Auto-merging drivers/mmc/core/bus.c
5535 Merge made by the 'recursive' strategy.
5536 Documentation/mmc/mmc-dev-attrs.txt | 10 +
5537 drivers/mmc/card/block.c | 33 +++-
5538 drivers/mmc/core/bus.c | 2 +-
5539 drivers/mmc/core/core.c | 95 +++++++----
5540 drivers/mmc/core/debugfs.c | 2 +
5541 drivers/mmc/core/host.c | 57 ++++++-
5542 drivers/mmc/core/mmc.c | 12 +-
5543 drivers/mmc/core/sd.c | 6 +-
5544 drivers/mmc/core/sdio.c | 329 ++++++++++++++++++++++++++++++++---
5545 drivers/mmc/core/sdio_io.c | 8 +-
5546 drivers/mmc/core/sdio_ops.c | 14 +-
5547 drivers/mmc/host/mxcmmc.c | 1 +
5548 drivers/mmc/host/omap_hsmmc.c | 7 +-
5549 drivers/mmc/host/sdhci-cns3xxx.c | 6 +-
5550 drivers/mmc/host/sdhci-dove.c | 5 +-
5551 drivers/mmc/host/sdhci-esdhc-imx.c | 5 +-
5552 drivers/mmc/host/sdhci-of-esdhc.c | 5 +-
5553 drivers/mmc/host/sdhci-of-hlwd.c | 5 +-
5554 drivers/mmc/host/sdhci-pci.c | 26 ++--
5555 drivers/mmc/host/sdhci-pltfm.c | 18 ++-
5556 drivers/mmc/host/sdhci-pltfm.h | 6 +-
5557 drivers/mmc/host/sdhci-pxav2.c | 5 +-
5558 drivers/mmc/host/sdhci-pxav3.c | 5 +-
5559 drivers/mmc/host/sdhci-s3c.c | 21 ++-
5560 drivers/mmc/host/sdhci-spear.c | 40 +++++
5561 drivers/mmc/host/sdhci-tegra.c | 5 +-
5562 drivers/mmc/host/sdhci.c | 12 ++-
5563 drivers/mmc/host/sdhci.h | 2 +-
5564 include/linux/mmc/card.h | 13 ++-
5565 include/linux/mmc/host.h | 6 +-
5566 include/linux/mmc/sdio.h | 29 +++-
5567 31 files changed, 632 insertions(+), 158 deletions(-)
5568 Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
5569 $ git merge kgdb/kgdb-next
5570 Merge made by the 'recursive' strategy.
5571 Merging slab/for-next (7436099 Merge branch 'slab/next' into for-next)
5572 $ git merge slab/for-next
5573 Merge made by the 'recursive' strategy.
5574 Documentation/kernel-parameters.txt | 6 ++++
5575 Documentation/vm/slub.txt | 2 +-
5576 mm/slab.c | 39 ++++++++++++++++++--------
5577 mm/slub.c | 51 ++++++++++++++++++++++-------------
5578 4 files changed, 66 insertions(+), 32 deletions(-)
5579 Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
5580 $ git merge uclinux/for-next
5582 Merging md/for-next (c7eefaf md/raid1: Mark device replaceable when we see a write error.)
5583 $ git merge md/for-next
5584 Merge made by the 'recursive' strategy.
5585 Documentation/md.txt | 22 ++-
5586 drivers/md/md.c | 123 ++++++++---
5587 drivers/md/md.h | 82 ++++---
5588 drivers/md/multipath.c | 7 +-
5589 drivers/md/raid1.c | 168 ++++++++++----
5590 drivers/md/raid1.h | 7 +-
5591 drivers/md/raid10.c | 572 ++++++++++++++++++++++++++++++++++++---------
5592 drivers/md/raid10.h | 61 +++--
5593 drivers/md/raid5.c | 493 ++++++++++++++++++++++++++++++---------
5594 drivers/md/raid5.h | 98 +++++----
5595 include/linux/raid/md_p.h | 7 +-
5596 11 files changed, 1239 insertions(+), 401 deletions(-)
5597 Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates)
5598 $ git merge mfd/for-next
5600 Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
5601 $ git merge hdlc/hdlc-next
5603 Merging drm/drm-next (248dbc2 drm: move the fb bpp/depth helper into the core.)
5604 $ git merge drm/drm-next
5605 Auto-merging include/drm/drm_mode.h
5606 Auto-merging include/drm/drmP.h
5607 Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
5608 Auto-merging drivers/gpu/drm/radeon/radeon_drv.c
5609 Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c
5610 Auto-merging drivers/gpu/drm/i915/intel_display.c
5611 Auto-merging drivers/gpu/drm/i915/i915_drv.c
5612 Auto-merging drivers/gpu/drm/drm_drv.c
5613 Auto-merging drivers/gpu/drm/drm_crtc_helper.c
5614 Auto-merging drivers/gpu/drm/drm_crtc.c
5615 Auto-merging drivers/gpu/drm/Kconfig
5616 Merge made by the 'recursive' strategy.
5617 drivers/gpu/drm/Kconfig | 3 +
5618 drivers/gpu/drm/Makefile | 1 +
5619 drivers/gpu/drm/drm_crtc.c | 401 +++++++-
5620 drivers/gpu/drm/drm_crtc_helper.c | 10 +-
5621 drivers/gpu/drm/drm_drv.c | 4 +
5622 drivers/gpu/drm/drm_fb_helper.c | 7 +
5623 drivers/gpu/drm/drm_fops.c | 2 +-
5624 drivers/gpu/drm/gma500/Kconfig | 26 +
5625 drivers/gpu/drm/gma500/Makefile | 39 +
5626 drivers/gpu/drm/gma500/accel_2d.c | 362 ++++++
5627 drivers/gpu/drm/gma500/backlight.c | 49 +
5628 drivers/gpu/drm/gma500/cdv_device.c | 351 ++++++
5629 drivers/gpu/drm/gma500/cdv_device.h | 36 +
5630 drivers/gpu/drm/gma500/cdv_intel_crt.c | 326 ++++++
5631 drivers/gpu/drm/gma500/cdv_intel_display.c | 1508 ++++++++++++++++++++++++++
5632 drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 376 +++++++
5633 drivers/gpu/drm/gma500/cdv_intel_lvds.c | 721 ++++++++++++
5634 drivers/gpu/drm/gma500/framebuffer.c | 791 ++++++++++++++
5635 drivers/gpu/drm/gma500/framebuffer.h | 48 +
5636 drivers/gpu/drm/gma500/gem.c | 295 +++++
5637 drivers/gpu/drm/gma500/gem_glue.c | 89 ++
5638 drivers/gpu/drm/gma500/gem_glue.h | 2 +
5639 drivers/gpu/drm/gma500/gtt.c | 500 +++++++++
5640 drivers/gpu/drm/gma500/gtt.h | 61 +
5641 drivers/gpu/drm/gma500/intel_bios.c | 303 ++++++
5642 drivers/gpu/drm/gma500/intel_bios.h | 430 ++++++++
5643 drivers/gpu/drm/gma500/intel_i2c.c | 169 +++
5644 drivers/gpu/drm/gma500/intel_opregion.c | 80 ++
5645 drivers/gpu/drm/gma500/mid_bios.c | 243 +++++
5646 drivers/gpu/drm/gma500/mid_bios.h | 21 +
5647 drivers/gpu/drm/gma500/mmu.c | 858 +++++++++++++++
5648 drivers/gpu/drm/gma500/oaktrail.h | 252 +++++
5649 drivers/gpu/drm/gma500/oaktrail_crtc.c | 610 +++++++++++
5650 drivers/gpu/drm/gma500/oaktrail_device.c | 489 +++++++++
5651 drivers/gpu/drm/gma500/oaktrail_hdmi.c | 852 +++++++++++++++
5652 drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 328 ++++++
5653 drivers/gpu/drm/gma500/oaktrail_lvds.c | 406 +++++++
5654 drivers/gpu/drm/gma500/power.c | 316 ++++++
5655 drivers/gpu/drm/gma500/power.h | 67 ++
5656 drivers/gpu/drm/gma500/psb_device.c | 353 ++++++
5657 drivers/gpu/drm/gma500/psb_drm.h | 207 ++++
5658 drivers/gpu/drm/gma500/psb_drv.c | 1212 +++++++++++++++++++++
5659 drivers/gpu/drm/gma500/psb_drv.h | 924 ++++++++++++++++
5660 drivers/gpu/drm/gma500/psb_intel_display.c | 1431 ++++++++++++++++++++++++
5661 drivers/gpu/drm/gma500/psb_intel_display.h | 28 +
5662 drivers/gpu/drm/gma500/psb_intel_drv.h | 228 ++++
5663 drivers/gpu/drm/gma500/psb_intel_lvds.c | 849 +++++++++++++++
5664 drivers/gpu/drm/gma500/psb_intel_modes.c | 77 ++
5665 drivers/gpu/drm/gma500/psb_intel_reg.h | 1235 +++++++++++++++++++++
5666 drivers/gpu/drm/gma500/psb_intel_sdvo.c | 1293 ++++++++++++++++++++++
5667 drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h | 338 ++++++
5668 drivers/gpu/drm/gma500/psb_irq.c | 553 ++++++++++
5669 drivers/gpu/drm/gma500/psb_irq.h | 45 +
5670 drivers/gpu/drm/gma500/psb_lid.c | 90 ++
5671 drivers/gpu/drm/gma500/psb_reg.h | 582 ++++++++++
5672 drivers/gpu/drm/i810/i810_drv.c | 23 +-
5673 drivers/gpu/drm/i915/i915_drv.c | 31 +-
5674 drivers/gpu/drm/i915/intel_display.c | 39 +-
5675 drivers/gpu/drm/i915/intel_drv.h | 2 +-
5676 drivers/gpu/drm/i915/intel_fb.c | 11 +-
5677 drivers/gpu/drm/mga/mga_drv.c | 29 +-
5678 drivers/gpu/drm/nouveau/nouveau_display.c | 6 +-
5679 drivers/gpu/drm/nouveau/nouveau_drv.c | 31 +-
5680 drivers/gpu/drm/nouveau/nouveau_fb.h | 2 +-
5681 drivers/gpu/drm/nouveau/nouveau_fbcon.c | 13 +-
5682 drivers/gpu/drm/r128/r128_drv.c | 30 +-
5683 drivers/gpu/drm/radeon/radeon_display.c | 8 +-
5684 drivers/gpu/drm/radeon/radeon_drv.c | 60 +-
5685 drivers/gpu/drm/radeon/radeon_fb.c | 20 +-
5686 drivers/gpu/drm/radeon/radeon_mode.h | 2 +-
5687 drivers/gpu/drm/savage/savage_drv.c | 23 +-
5688 drivers/gpu/drm/sis/sis_drv.c | 23 +-
5689 drivers/gpu/drm/tdfx/tdfx_drv.c | 23 +-
5690 drivers/gpu/drm/via/via_drv.c | 23 +-
5691 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 30 +-
5692 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 22 +-
5693 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 +
5694 drivers/staging/gma500/framebuffer.c | 39 +-
5695 drivers/staging/gma500/psb_drv.c | 23 +-
5696 include/drm/drm.h | 4 +
5697 include/drm/drmP.h | 2 +-
5698 include/drm/drm_crtc.h | 87 ++-
5699 include/drm/drm_crtc_helper.h | 2 +-
5700 include/drm/drm_fourcc.h | 63 ++
5701 include/drm/drm_mode.h | 74 ++-
5702 85 files changed, 21367 insertions(+), 256 deletions(-)
5703 create mode 100644 drivers/gpu/drm/gma500/Kconfig
5704 create mode 100644 drivers/gpu/drm/gma500/Makefile
5705 create mode 100644 drivers/gpu/drm/gma500/accel_2d.c
5706 create mode 100644 drivers/gpu/drm/gma500/backlight.c
5707 create mode 100644 drivers/gpu/drm/gma500/cdv_device.c
5708 create mode 100644 drivers/gpu/drm/gma500/cdv_device.h
5709 create mode 100644 drivers/gpu/drm/gma500/cdv_intel_crt.c
5710 create mode 100644 drivers/gpu/drm/gma500/cdv_intel_display.c
5711 create mode 100644 drivers/gpu/drm/gma500/cdv_intel_hdmi.c
5712 create mode 100644 drivers/gpu/drm/gma500/cdv_intel_lvds.c
5713 create mode 100644 drivers/gpu/drm/gma500/framebuffer.c
5714 create mode 100644 drivers/gpu/drm/gma500/framebuffer.h
5715 create mode 100644 drivers/gpu/drm/gma500/gem.c
5716 create mode 100644 drivers/gpu/drm/gma500/gem_glue.c
5717 create mode 100644 drivers/gpu/drm/gma500/gem_glue.h
5718 create mode 100644 drivers/gpu/drm/gma500/gtt.c
5719 create mode 100644 drivers/gpu/drm/gma500/gtt.h
5720 create mode 100644 drivers/gpu/drm/gma500/intel_bios.c
5721 create mode 100644 drivers/gpu/drm/gma500/intel_bios.h
5722 create mode 100644 drivers/gpu/drm/gma500/intel_i2c.c
5723 create mode 100644 drivers/gpu/drm/gma500/intel_opregion.c
5724 create mode 100644 drivers/gpu/drm/gma500/mid_bios.c
5725 create mode 100644 drivers/gpu/drm/gma500/mid_bios.h
5726 create mode 100644 drivers/gpu/drm/gma500/mmu.c
5727 create mode 100644 drivers/gpu/drm/gma500/oaktrail.h
5728 create mode 100644 drivers/gpu/drm/gma500/oaktrail_crtc.c
5729 create mode 100644 drivers/gpu/drm/gma500/oaktrail_device.c
5730 create mode 100644 drivers/gpu/drm/gma500/oaktrail_hdmi.c
5731 create mode 100644 drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c
5732 create mode 100644 drivers/gpu/drm/gma500/oaktrail_lvds.c
5733 create mode 100644 drivers/gpu/drm/gma500/power.c
5734 create mode 100644 drivers/gpu/drm/gma500/power.h
5735 create mode 100644 drivers/gpu/drm/gma500/psb_device.c
5736 create mode 100644 drivers/gpu/drm/gma500/psb_drm.h
5737 create mode 100644 drivers/gpu/drm/gma500/psb_drv.c
5738 create mode 100644 drivers/gpu/drm/gma500/psb_drv.h
5739 create mode 100644 drivers/gpu/drm/gma500/psb_intel_display.c
5740 create mode 100644 drivers/gpu/drm/gma500/psb_intel_display.h
5741 create mode 100644 drivers/gpu/drm/gma500/psb_intel_drv.h
5742 create mode 100644 drivers/gpu/drm/gma500/psb_intel_lvds.c
5743 create mode 100644 drivers/gpu/drm/gma500/psb_intel_modes.c
5744 create mode 100644 drivers/gpu/drm/gma500/psb_intel_reg.h
5745 create mode 100644 drivers/gpu/drm/gma500/psb_intel_sdvo.c
5746 create mode 100644 drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h
5747 create mode 100644 drivers/gpu/drm/gma500/psb_irq.c
5748 create mode 100644 drivers/gpu/drm/gma500/psb_irq.h
5749 create mode 100644 drivers/gpu/drm/gma500/psb_lid.c
5750 create mode 100644 drivers/gpu/drm/gma500/psb_reg.h
5751 create mode 100644 include/drm/drm_fourcc.h
5752 Merging fbdev/fbdev-next (64cebcb Merge branch 'fbdev-for-linus' into fbdev-next)
5753 $ git merge fbdev/fbdev-next
5754 Removing include/linux/display.h
5755 Removing drivers/video/display/display-sysfs.c
5756 Removing drivers/video/display/Makefile
5757 Removing drivers/video/display/Kconfig
5758 Auto-merging drivers/video/Kconfig
5759 Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
5760 Auto-merging arch/arm/mach-shmobile/board-ag5evm.c
5761 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
5762 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
5763 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
5764 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
5765 Auto-merging arch/arm/mach-at91/board-neocore926.c
5766 Auto-merging arch/arm/mach-at91/board-cap9adk.c
5767 Merge made by the 'recursive' strategy.
5768 arch/arm/mach-at91/board-cap9adk.c | 2 +-
5769 arch/arm/mach-at91/board-neocore926.c | 2 +-
5770 arch/arm/mach-at91/board-sam9261ek.c | 4 +-
5771 arch/arm/mach-at91/board-sam9263ek.c | 2 +-
5772 arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
5773 arch/arm/mach-at91/board-sam9rlek.c | 2 +-
5774 arch/arm/mach-shmobile/board-ag5evm.c | 41 ++++-
5775 arch/arm/mach-shmobile/board-ap4evb.c | 28 ++++
5776 arch/arm/mach-shmobile/clock-sh7372.c | 4 +-
5777 arch/arm/mach-shmobile/clock-sh73a0.c | 4 +-
5778 drivers/video/Kconfig | 1 -
5779 drivers/video/Makefile | 2 +-
5780 drivers/video/atmel_lcdfb.c | 41 ++++--
5781 drivers/video/cirrusfb.c | 268 +++++++++++++++++--------------
5782 drivers/video/controlfb.c | 2 +-
5783 drivers/video/display/Kconfig | 24 ---
5784 drivers/video/display/Makefile | 6 -
5785 drivers/video/display/display-sysfs.c | 219 -------------------------
5786 drivers/video/s3c-fb.c | 3 +-
5787 drivers/video/sbuslib.c | 2 +-
5788 drivers/video/sh_mipi_dsi.c | 218 +++++++++++++++----------
5789 drivers/video/sh_mobile_lcdcfb.c | 2 +-
5790 include/linux/display.h | 61 -------
5791 include/linux/zorro_ids.h | 4 +-
5792 include/video/sh_mipi_dsi.h | 21 +++-
5793 25 files changed, 407 insertions(+), 558 deletions(-)
5794 delete mode 100644 drivers/video/display/Kconfig
5795 delete mode 100644 drivers/video/display/Makefile
5796 delete mode 100644 drivers/video/display/display-sysfs.c
5797 delete mode 100644 include/linux/display.h
5798 Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
5799 $ git merge viafb/viafb-next
5801 Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
5802 $ git merge omap_dss2/for-next
5804 Merging regulator/for-next (eb29674 regulator: Allow regulators to register with no init_data)
5805 $ git merge regulator/for-next
5806 Auto-merging sound/soc/codecs/sgtl5000.c
5807 Merge made by the 'recursive' strategy.
5808 .../bindings/regulator/fixed-regulator.txt | 29 ++++
5809 .../devicetree/bindings/regulator/regulator.txt | 54 +++++++
5810 drivers/regulator/88pm8607.c | 2 +-
5811 drivers/regulator/Kconfig | 1 +
5812 drivers/regulator/Makefile | 1 +
5813 drivers/regulator/aat2870-regulator.c | 6 +-
5814 drivers/regulator/ab3100.c | 2 +-
5815 drivers/regulator/ab8500.c | 2 +-
5816 drivers/regulator/ad5398.c | 2 +-
5817 drivers/regulator/bq24022.c | 2 +-
5818 drivers/regulator/core.c | 128 ++++++++++++----
5819 drivers/regulator/da903x.c | 2 +-
5820 drivers/regulator/db8500-prcmu.c | 2 +-
5821 drivers/regulator/dummy.c | 2 +-
5822 drivers/regulator/fixed.c | 83 ++++++++++-
5823 drivers/regulator/gpio-regulator.c | 2 +-
5824 drivers/regulator/isl6271a-regulator.c | 2 +-
5825 drivers/regulator/lp3971.c | 2 +-
5826 drivers/regulator/lp3972.c | 2 +-
5827 drivers/regulator/max1586.c | 2 +-
5828 drivers/regulator/max8649.c | 157 +++++++-------------
5829 drivers/regulator/max8660.c | 2 +-
5830 drivers/regulator/max8925-regulator.c | 2 +-
5831 drivers/regulator/max8952.c | 2 +-
5832 drivers/regulator/max8997.c | 2 +-
5833 drivers/regulator/max8998.c | 2 +-
5834 drivers/regulator/mc13783-regulator.c | 2 +-
5835 drivers/regulator/mc13892-regulator.c | 2 +-
5836 drivers/regulator/of_regulator.c | 83 ++++++++++
5837 drivers/regulator/pcap-regulator.c | 2 +-
5838 drivers/regulator/pcf50633-regulator.c | 2 +-
5839 drivers/regulator/tps6105x-regulator.c | 3 +-
5840 drivers/regulator/tps65023-regulator.c | 89 ++++-------
5841 drivers/regulator/tps6507x-regulator.c | 2 +-
5842 drivers/regulator/tps6524x-regulator.c | 2 +-
5843 drivers/regulator/tps6586x-regulator.c | 2 +-
5844 drivers/regulator/tps65910-regulator.c | 39 ++----
5845 drivers/regulator/tps65912-regulator.c | 2 +-
5846 drivers/regulator/twl-regulator.c | 48 ++++++-
5847 drivers/regulator/userspace-consumer.c | 13 +--
5848 drivers/regulator/virtual.c | 12 +--
5849 drivers/regulator/wm831x-dcdc.c | 8 +-
5850 drivers/regulator/wm831x-isink.c | 2 +-
5851 drivers/regulator/wm831x-ldo.c | 6 +-
5852 drivers/regulator/wm8350-regulator.c | 2 +-
5853 drivers/regulator/wm8400-regulator.c | 2 +-
5854 drivers/regulator/wm8994-regulator.c | 2 +-
5855 include/linux/mfd/tps65910.h | 30 ++++-
5856 include/linux/regulator/driver.h | 4 +-
5857 include/linux/regulator/of_regulator.h | 20 +++
5858 sound/soc/codecs/sgtl5000.c | 2 +-
5859 51 files changed, 586 insertions(+), 290 deletions(-)
5860 create mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.txt
5861 create mode 100644 Documentation/devicetree/bindings/regulator/regulator.txt
5862 create mode 100644 drivers/regulator/of_regulator.c
5863 create mode 100644 include/linux/regulator/of_regulator.h
5864 Merging security/next (de35353 digsig: build dependency fix)
5865 $ git merge security/next
5866 Resolved 'lib/Makefile' using previous resolution.
5867 Auto-merging lib/Makefile
5868 CONFLICT (content): Merge conflict in lib/Makefile
5869 Auto-merging lib/Kconfig
5870 Automatic merge failed; fix conflicts and then commit the result.
5872 [master 1cea752] Merge remote-tracking branch 'security/next'
5873 $ git diff -M --stat --summary HEAD^..
5874 Documentation/digsig.txt | 96 ++
5875 Documentation/security/00-INDEX | 2 +
5876 Documentation/security/LSM.txt | 34 +
5877 Documentation/security/credentials.txt | 6 +-
5878 drivers/char/tpm/Kconfig | 2 +
5879 drivers/char/tpm/tpm.c | 137 +++-
5880 drivers/char/tpm/tpm.h | 9 +-
5881 drivers/char/tpm/tpm_tis.c | 84 +--
5882 include/linux/digsig.h | 64 ++
5883 include/linux/key-type.h | 1 +
5884 include/linux/mpi.h | 146 ++++
5885 include/linux/security.h | 2 +-
5888 lib/digsig.c | 284 ++++++
5889 lib/mpi/Makefile | 32 +
5890 lib/mpi/generic_mpi-asm-defs.h | 4 +
5891 lib/mpi/generic_mpih-add1.c | 61 ++
5892 lib/mpi/generic_mpih-lshift.c | 63 ++
5893 lib/mpi/generic_mpih-mul1.c | 57 ++
5894 lib/mpi/generic_mpih-mul2.c | 60 ++
5895 lib/mpi/generic_mpih-mul3.c | 61 ++
5896 lib/mpi/generic_mpih-rshift.c | 63 ++
5897 lib/mpi/generic_mpih-sub1.c | 60 ++
5898 lib/mpi/longlong.h | 1478 ++++++++++++++++++++++++++++++++
5899 lib/mpi/mpi-add.c | 234 +++++
5900 lib/mpi/mpi-bit.c | 236 +++++
5901 lib/mpi/mpi-cmp.c | 68 ++
5902 lib/mpi/mpi-div.c | 333 +++++++
5903 lib/mpi/mpi-gcd.c | 59 ++
5904 lib/mpi/mpi-inline.c | 31 +
5905 lib/mpi/mpi-inline.h | 122 +++
5906 lib/mpi/mpi-internal.h | 261 ++++++
5907 lib/mpi/mpi-inv.c | 187 ++++
5908 lib/mpi/mpi-mpow.c | 133 +++
5909 lib/mpi/mpi-mul.c | 194 +++++
5910 lib/mpi/mpi-pow.c | 323 +++++++
5911 lib/mpi/mpi-scan.c | 136 +++
5912 lib/mpi/mpicoder.c | 365 ++++++++
5913 lib/mpi/mpih-cmp.c | 56 ++
5914 lib/mpi/mpih-div.c | 541 ++++++++++++
5915 lib/mpi/mpih-mul.c | 527 ++++++++++++
5916 lib/mpi/mpiutil.c | 208 +++++
5917 security/integrity/Kconfig | 14 +
5918 security/integrity/Makefile | 1 +
5919 security/integrity/digsig.c | 48 +
5920 security/integrity/evm/evm.h | 12 +
5921 security/integrity/evm/evm_crypto.c | 66 ++-
5922 security/integrity/evm/evm_main.c | 94 ++-
5923 security/integrity/integrity.h | 21 +
5924 security/keys/key.c | 3 +
5925 security/selinux/selinuxfs.c | 14 +-
5926 52 files changed, 6997 insertions(+), 124 deletions(-)
5927 create mode 100644 Documentation/digsig.txt
5928 create mode 100644 Documentation/security/LSM.txt
5929 create mode 100644 include/linux/digsig.h
5930 create mode 100644 include/linux/mpi.h
5931 create mode 100644 lib/digsig.c
5932 create mode 100644 lib/mpi/Makefile
5933 create mode 100644 lib/mpi/generic_mpi-asm-defs.h
5934 create mode 100644 lib/mpi/generic_mpih-add1.c
5935 create mode 100644 lib/mpi/generic_mpih-lshift.c
5936 create mode 100644 lib/mpi/generic_mpih-mul1.c
5937 create mode 100644 lib/mpi/generic_mpih-mul2.c
5938 create mode 100644 lib/mpi/generic_mpih-mul3.c
5939 create mode 100644 lib/mpi/generic_mpih-rshift.c
5940 create mode 100644 lib/mpi/generic_mpih-sub1.c
5941 create mode 100644 lib/mpi/longlong.h
5942 create mode 100644 lib/mpi/mpi-add.c
5943 create mode 100644 lib/mpi/mpi-bit.c
5944 create mode 100644 lib/mpi/mpi-cmp.c
5945 create mode 100644 lib/mpi/mpi-div.c
5946 create mode 100644 lib/mpi/mpi-gcd.c
5947 create mode 100644 lib/mpi/mpi-inline.c
5948 create mode 100644 lib/mpi/mpi-inline.h
5949 create mode 100644 lib/mpi/mpi-internal.h
5950 create mode 100644 lib/mpi/mpi-inv.c
5951 create mode 100644 lib/mpi/mpi-mpow.c
5952 create mode 100644 lib/mpi/mpi-mul.c
5953 create mode 100644 lib/mpi/mpi-pow.c
5954 create mode 100644 lib/mpi/mpi-scan.c
5955 create mode 100644 lib/mpi/mpicoder.c
5956 create mode 100644 lib/mpi/mpih-cmp.c
5957 create mode 100644 lib/mpi/mpih-div.c
5958 create mode 100644 lib/mpi/mpih-mul.c
5959 create mode 100644 lib/mpi/mpiutil.c
5960 create mode 100644 security/integrity/digsig.c
5961 Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
5962 $ git merge selinux/master
5964 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
5965 $ git merge lblnet/master
5967 Merging watchdog/linux-next (3d17ee5 watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API)
5968 $ git merge watchdog/linux-next
5969 Merge made by the 'recursive' strategy.
5970 Documentation/watchdog/watchdog-kernel-api.txt | 10 +++++++++-
5971 drivers/watchdog/ar7_wdt.c | 17 ++---------------
5972 drivers/watchdog/bcm63xx_wdt.c | 13 +------------
5973 drivers/watchdog/cpu5wdt.c | 3 +--
5974 drivers/watchdog/cpwd.c | 13 +------------
5975 drivers/watchdog/davinci_wdt.c | 13 +------------
5976 drivers/watchdog/dw_wdt.c | 12 +-----------
5977 drivers/watchdog/eurotechwdt.c | 4 +---
5978 drivers/watchdog/ibmasr.c | 4 +---
5979 drivers/watchdog/indydog.c | 4 +---
5980 drivers/watchdog/iop_wdt.c | 5 +----
5981 drivers/watchdog/ixp2000_wdt.c | 3 +--
5982 drivers/watchdog/ixp4xx_wdt.c | 1 -
5983 drivers/watchdog/jz4740_wdt.c | 13 +------------
5984 drivers/watchdog/ks8695_wdt.c | 3 +--
5985 drivers/watchdog/max63xx_wdt.c | 13 +------------
5986 drivers/watchdog/mtx-1_wdt.c | 13 +------------
5987 drivers/watchdog/nuc900_wdt.c | 13 +------------
5988 drivers/watchdog/of_xilinx_wdt.c | 13 +------------
5989 drivers/watchdog/omap_wdt.c | 16 ++--------------
5990 drivers/watchdog/orion_wdt.c | 16 ++--------------
5991 drivers/watchdog/pnx4008_wdt.c | 13 +------------
5992 drivers/watchdog/rc32434_wdt.c | 13 +------------
5993 drivers/watchdog/rdc321x_wdt.c | 13 +------------
5994 drivers/watchdog/riowd.c | 13 +------------
5995 drivers/watchdog/s3c2410_wdt.c | 2 ++
5996 drivers/watchdog/stmp3xxx_wdt.c | 13 +------------
5997 drivers/watchdog/ts72xx_wdt.c | 12 +-----------
5998 drivers/watchdog/twl4030_wdt.c | 12 +-----------
5999 drivers/watchdog/wm831x_wdt.c | 16 ++--------------
6000 drivers/watchdog/wm8350_wdt.c | 12 +-----------
6001 include/linux/watchdog.h | 21 ++++++++++++++++-----
6002 32 files changed, 59 insertions(+), 283 deletions(-)
6003 Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
6004 $ git merge bdev/master
6006 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
6007 $ git merge dwmw2-iommu/master
6009 Merging iommu/next (a7e892e Merge branches 'iommu/fixes', 'iommu/page-sizes' and 'iommu/group-id' into next)
6010 $ git merge iommu/next
6011 Auto-merging Documentation/kernel-parameters.txt
6012 Merge made by the 'recursive' strategy.
6013 Documentation/kernel-parameters.txt | 4 +-
6014 arch/ia64/include/asm/iommu.h | 2 +
6015 arch/ia64/kernel/pci-dma.c | 1 +
6016 arch/x86/include/asm/iommu.h | 1 +
6017 arch/x86/kernel/pci-dma.c | 11 ++
6018 drivers/iommu/amd_iommu.c | 53 +++++++++--
6019 drivers/iommu/intel-iommu.c | 79 ++++++++++++++--
6020 drivers/iommu/iommu.c | 177 ++++++++++++++++++++++++++++++++--
6021 drivers/iommu/msm_iommu.c | 25 +++---
6022 drivers/iommu/omap-iommu.c | 18 ++--
6023 drivers/iommu/omap-iovmm.c | 17 +--
6024 include/linux/iommu.h | 33 ++++++-
6025 virt/kvm/iommu.c | 8 +-
6026 13 files changed, 359 insertions(+), 70 deletions(-)
6027 Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup)
6028 $ git merge cputime/cputime
6029 Auto-merging kernel/fork.c
6030 Auto-merging include/linux/sched.h
6031 Merge made by the 'recursive' strategy.
6032 arch/ia64/include/asm/cputime.h | 69 +++++++---------
6033 arch/powerpc/include/asm/cputime.h | 70 ++++++----------
6034 arch/s390/include/asm/cputime.h | 140 ++++++++++++++-----------------
6035 drivers/cpufreq/cpufreq_conservative.c | 29 +++----
6036 drivers/cpufreq/cpufreq_ondemand.c | 33 ++++----
6037 drivers/cpufreq/cpufreq_stats.c | 5 +-
6038 drivers/macintosh/rack-meter.c | 11 +--
6039 fs/proc/array.c | 8 +-
6040 fs/proc/stat.c | 27 +++---
6041 fs/proc/uptime.c | 4 +-
6042 include/asm-generic/cputime.h | 62 +++++++--------
6043 include/linux/sched.h | 4 +-
6044 kernel/acct.c | 4 +-
6046 kernel/exit.c | 22 ++----
6047 kernel/fork.c | 14 +--
6048 kernel/itimer.c | 15 ++--
6049 kernel/posix-cpu-timers.c | 132 ++++++++++++------------------
6050 kernel/sched.c | 80 ++++++++----------
6051 kernel/sched_stats.h | 6 +-
6052 kernel/signal.c | 6 +-
6054 kernel/tsacct.c | 2 +-
6055 23 files changed, 323 insertions(+), 429 deletions(-)
6056 Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
6057 $ git merge osd/linux-next
6058 Merge made by the 'recursive' strategy.
6059 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
6060 $ git merge jc_docs/docs-next
6062 Merging nommu/master (0ce790e Linux 2.6.39-rc1)
6063 $ git merge nommu/master
6065 Merging trivial/for-next (a13b032 clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR)
6066 $ git merge trivial/for-next
6067 Recorded preimage for 'arch/powerpc/platforms/40x/Kconfig'
6068 Auto-merging lib/Kconfig
6069 Auto-merging kernel/irq/manage.c
6070 Auto-merging include/linux/security.h
6071 Auto-merging fs/namespace.c
6072 Auto-merging drivers/usb/gadget/Kconfig
6073 Auto-merging drivers/tty/serial/Kconfig
6074 Auto-merging drivers/spi/Kconfig
6075 Auto-merging drivers/mtd/nand/Kconfig
6076 Auto-merging drivers/gpio/Kconfig
6077 Auto-merging crypto/Kconfig
6078 Auto-merging arch/s390/Kconfig
6079 Auto-merging arch/powerpc/platforms/40x/Kconfig
6080 CONFLICT (content): Merge conflict in arch/powerpc/platforms/40x/Kconfig
6081 Auto-merging arch/mips/Kconfig
6082 Auto-merging arch/arm/Kconfig
6083 Auto-merging MAINTAINERS
6084 Automatic merge failed; fix conflicts and then commit the result.
6086 Recorded resolution for 'arch/powerpc/platforms/40x/Kconfig'.
6087 [master 52cb89e] Merge remote-tracking branch 'trivial/for-next'
6088 $ git diff -M --stat --summary HEAD^..
6089 Documentation/cpu-freq/governors.txt | 4 +--
6090 Documentation/scsi/53c700.txt | 21 +--------------
6092 arch/arm/Kconfig | 3 +-
6093 arch/arm/mach-pxa/colibri-pxa270-income.c | 2 +-
6094 arch/cris/Kconfig.debug | 1 -
6095 arch/frv/Kconfig | 10 -------
6096 arch/mips/Kconfig | 5 ---
6097 arch/mips/sgi-ip27/Kconfig | 6 ----
6098 arch/mips/sibyte/Kconfig | 1 -
6099 arch/powerpc/platforms/40x/Kconfig | 40 -----------------------------
6100 arch/powerpc/platforms/44x/Kconfig | 18 +------------
6101 arch/powerpc/platforms/512x/Kconfig | 1 -
6102 arch/s390/Kconfig | 1 -
6103 crypto/Kconfig | 2 -
6104 drivers/edac/i82975x_edac.c | 30 +++++++++++++--------
6105 drivers/gpio/Kconfig | 2 +-
6106 drivers/leds/Kconfig | 3 +-
6107 drivers/mtd/nand/Kconfig | 1 -
6108 drivers/parisc/Kconfig | 7 -----
6109 drivers/scsi/qla2xxx/qla_nx.c | 2 +-
6110 drivers/spi/Kconfig | 3 +-
6111 drivers/tty/serial/Kconfig | 2 +-
6112 drivers/usb/gadget/Kconfig | 1 -
6113 drivers/video/console/Kconfig | 2 -
6114 fs/namespace.c | 2 -
6115 fs/qnx4/inode.c | 7 +++--
6116 include/linux/cordic.h | 4 +-
6117 include/linux/security.h | 26 +++++++++---------
6118 kernel/irq/manage.c | 2 +-
6119 kernel/time/Kconfig | 2 +-
6120 lib/Kconfig | 7 ++---
6122 mm/page_alloc.c | 4 +-
6123 net/ipv4/Kconfig | 2 -
6124 net/netfilter/ipvs/Kconfig | 1 -
6125 scripts/package/Makefile | 2 +-
6126 sound/aoa/codecs/Kconfig | 8 ------
6127 sound/core/Kconfig | 1 -
6128 sound/oss/Kconfig | 2 +-
6129 40 files changed, 60 insertions(+), 183 deletions(-)
6130 Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
6131 $ git merge audit/for-next
6133 Merging pm/linux-next (46fc057 Freezer / NFS: make TASK_KILLABLE sleeps attempt to freeze)
6134 $ git merge pm/linux-next
6135 Resolved 'kernel/cgroup_freezer.c' using previous resolution.
6136 Auto-merging kernel/fork.c
6137 Auto-merging kernel/exit.c
6138 Auto-merging kernel/cpu.c
6139 Auto-merging kernel/cgroup_freezer.c
6140 CONFLICT (content): Merge conflict in kernel/cgroup_freezer.c
6141 Auto-merging include/linux/sched.h
6142 Auto-merging fs/gfs2/quota.c
6143 Auto-merging fs/gfs2/log.c
6144 Auto-merging drivers/staging/rts_pstor/rtsx.c
6145 Auto-merging arch/m68k/include/asm/thread_info.h
6146 Automatic merge failed; fix conflicts and then commit the result.
6148 [master 002d8c5] Merge remote-tracking branch 'pm/linux-next'
6149 $ git diff -M --stat --summary HEAD^..
6150 Documentation/power/devices.txt | 111 ++++---
6151 Documentation/power/freezing-of-tasks.txt | 14 +-
6152 Documentation/power/runtime_pm.txt | 40 ++-
6153 arch/alpha/include/asm/thread_info.h | 2 -
6154 arch/arm/include/asm/thread_info.h | 2 -
6155 arch/arm/mach-shmobile/pm-sh7372.c | 44 +++-
6156 arch/avr32/include/asm/thread_info.h | 2 -
6157 arch/blackfin/include/asm/thread_info.h | 2 -
6158 arch/cris/include/asm/thread_info.h | 2 -
6159 arch/frv/include/asm/thread_info.h | 2 -
6160 arch/h8300/include/asm/thread_info.h | 2 -
6161 arch/ia64/include/asm/thread_info.h | 2 -
6162 arch/m32r/include/asm/thread_info.h | 2 -
6163 arch/m68k/include/asm/thread_info.h | 1 -
6164 arch/microblaze/include/asm/thread_info.h | 2 -
6165 arch/mips/include/asm/thread_info.h | 2 -
6166 arch/mn10300/include/asm/thread_info.h | 2 -
6167 arch/parisc/include/asm/thread_info.h | 2 -
6168 arch/powerpc/include/asm/thread_info.h | 2 -
6169 arch/s390/include/asm/thread_info.h | 2 -
6170 arch/sh/include/asm/thread_info.h | 2 -
6171 arch/sparc/include/asm/thread_info_32.h | 2 -
6172 arch/sparc/include/asm/thread_info_64.h | 2 -
6173 arch/um/include/asm/thread_info.h | 2 -
6174 arch/unicore32/include/asm/thread_info.h | 2 -
6175 arch/x86/include/asm/thread_info.h | 2 -
6176 arch/xtensa/include/asm/thread_info.h | 2 -
6177 drivers/base/power/Makefile | 2 +-
6178 drivers/base/power/domain.c | 529 +++++++++++++++++++++--------
6179 drivers/base/power/domain_governor.c | 143 ++++++++
6180 drivers/base/power/main.c | 19 +-
6181 drivers/base/power/qos.c | 24 +-
6182 drivers/base/power/runtime.c | 148 +++++++--
6183 drivers/bluetooth/btmrvl_main.c | 2 -
6184 drivers/devfreq/devfreq.c | 15 +-
6185 drivers/dma/dmatest.c | 46 ++-
6186 drivers/mfd/twl6030-irq.c | 2 -
6187 drivers/net/irda/stir4200.c | 2 +-
6188 drivers/platform/x86/thinkpad_acpi.c | 15 +-
6189 drivers/staging/rts_pstor/rtsx.c | 2 -
6190 drivers/usb/storage/usb.c | 13 +-
6191 fs/btrfs/async-thread.c | 2 +-
6192 fs/btrfs/disk-io.c | 8 +-
6193 fs/ext4/super.c | 3 +-
6194 fs/fs-writeback.c | 4 +-
6195 fs/gfs2/log.c | 4 +-
6196 fs/gfs2/quota.c | 4 +-
6197 fs/jbd/journal.c | 2 +-
6198 fs/jbd2/journal.c | 2 +-
6199 fs/jfs/jfs_logmgr.c | 2 +-
6200 fs/jfs/jfs_txnmgr.c | 4 +-
6201 fs/nfs/inode.c | 3 +-
6202 fs/nfs/nfs3proc.c | 3 +-
6203 fs/nfs/nfs4proc.c | 5 +-
6204 fs/nfs/proc.c | 3 +-
6205 fs/nilfs2/segment.c | 2 +-
6206 fs/xfs/xfs_buf.c | 2 +-
6207 include/linux/freezer.h | 139 ++++----
6208 include/linux/kthread.h | 1 +
6209 include/linux/pm.h | 231 ++++++++-----
6210 include/linux/pm_domain.h | 100 +++++-
6211 include/linux/pm_qos.h | 3 +
6212 include/linux/pm_runtime.h | 5 +
6213 include/linux/sched.h | 4 +-
6214 include/linux/suspend.h | 4 +
6215 kernel/cgroup_freezer.c | 63 ++--
6217 kernel/exit.c | 3 +-
6219 kernel/freezer.c | 203 ++++++------
6220 kernel/kmod.c | 6 +-
6221 kernel/kthread.c | 27 ++-
6222 kernel/power/hibernate.c | 49 +--
6223 kernel/power/main.c | 6 +-
6224 kernel/power/process.c | 77 ++---
6225 kernel/power/suspend.c | 8 +-
6226 kernel/power/user.c | 4 +-
6227 mm/backing-dev.c | 8 +-
6228 mm/oom_kill.c | 2 +-
6229 net/sunrpc/sched.c | 3 +-
6230 80 files changed, 1429 insertions(+), 791 deletions(-)
6231 create mode 100644 drivers/base/power/domain_governor.c
6232 Merging apm/for-next (282e5aa x86: Kconfig: drop unknown symbol 'APM_MODULE')
6233 $ git merge apm/for-next
6234 Auto-merging arch/x86/Kconfig
6235 Merge made by the 'recursive' strategy.
6236 arch/x86/Kconfig | 2 +-
6237 1 files changed, 1 insertions(+), 1 deletions(-)
6238 Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
6239 $ git merge fsnotify/for-next
6240 Auto-merging include/linux/fsnotify_backend.h
6241 Auto-merging fs/notify/mark.c
6242 Auto-merging fs/notify/group.c
6243 Auto-merging fs/notify/fanotify/fanotify_user.c
6244 Auto-merging fs/nfsd/vfs.c
6245 Auto-merging fs/cachefiles/namei.c
6246 Merge made by the 'recursive' strategy.
6247 fs/cachefiles/namei.c | 1 -
6248 fs/cachefiles/xattr.c | 1 -
6250 fs/notify/dnotify/dnotify.c | 15 +++---
6251 fs/notify/fanotify/fanotify.c | 24 +++++----
6252 fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++-----------
6253 fs/notify/group.c | 1 +
6254 fs/notify/mark.c | 36 +++++--------
6255 include/linux/fanotify.h | 5 ++-
6256 include/linux/fsnotify_backend.h | 14 ++++-
6257 10 files changed, 121 insertions(+), 80 deletions(-)
6258 Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
6259 $ git merge irda/for-next
6261 Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
6262 $ git merge edac/linux_next
6264 Merging edac-amd/for-next (ed8ccfa Merge branch '3.3-edac-scrubrate' into edac-for-next)
6265 $ git merge edac-amd/for-next
6266 Merge made by the 'recursive' strategy.
6267 Documentation/edac.txt | 4 ++--
6268 drivers/edac/amd64_edac.c | 32 ++++++++++++++++++++++++++++----
6269 drivers/edac/edac_mc_sysfs.c | 4 ++--
6270 3 files changed, 32 insertions(+), 8 deletions(-)
6271 Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
6272 $ git merge devicetree/devicetree/next
6274 Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
6275 $ git merge spi/spi/next
6277 Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h)
6278 $ git merge gpio/gpio/next
6280 Merging tip/auto-latest (e79d72b Merge branch 'sched/core' into auto-latest)
6281 $ git merge tip/auto-latest
6282 Resolved 'arch/mips/kernel/perf_event_mipsxx.c' using previous resolution.
6283 Auto-merging kernel/sched.c
6284 Auto-merging include/linux/init_task.h
6285 Removing arch/x86/oprofile/nmi_timer_int.c
6286 Auto-merging arch/mips/kernel/perf_event_mipsxx.c
6287 CONFLICT (content): Merge conflict in arch/mips/kernel/perf_event_mipsxx.c
6288 Auto-merging arch/arm/kernel/perf_event.c
6289 Auto-merging Documentation/kernel-parameters.txt
6290 Automatic merge failed; fix conflicts and then commit the result.
6292 [master f7f3a51] Merge remote-tracking branch 'tip/auto-latest'
6293 $ git diff -M --stat --summary HEAD^..
6294 Documentation/kernel-parameters.txt | 3 +
6295 Documentation/trace/events.txt | 2 -
6297 arch/arm/kernel/perf_event.c | 6 +-
6298 arch/mips/kernel/perf_event_mipsxx.c | 6 +-
6299 arch/x86/include/asm/init.h | 2 +
6300 arch/x86/include/asm/insn.h | 7 +
6301 arch/x86/kernel/cpu/perf_event.c | 16 +-
6302 arch/x86/kernel/cpu/perf_event_intel_ds.c | 6 +-
6303 arch/x86/kernel/cpu/perf_event_p4.c | 2 +-
6304 arch/x86/mm/init.c | 23 +++
6305 arch/x86/mm/init_32.c | 16 --
6306 arch/x86/mm/init_64.c | 11 +-
6307 arch/x86/oprofile/Makefile | 3 +-
6308 arch/x86/oprofile/init.c | 25 +--
6309 arch/x86/oprofile/nmi_int.c | 27 +++-
6310 arch/x86/oprofile/nmi_timer_int.c | 50 ------
6311 arch/x86/tools/Makefile | 10 +-
6312 arch/x86/tools/insn_sanity.c | 275 +++++++++++++++++++++++++++++
6313 drivers/oprofile/nmi_timer_int.c | 173 ++++++++++++++++++
6314 drivers/oprofile/oprof.c | 21 ++-
6315 drivers/oprofile/oprof.h | 9 +
6316 drivers/oprofile/timer_int.c | 29 ++--
6317 include/linux/ftrace_event.h | 2 +
6318 include/linux/init_task.h | 4 +-
6319 include/linux/lockdep.h | 4 +
6320 kernel/events/Makefile | 2 +-
6321 kernel/events/callchain.c | 191 ++++++++++++++++++++
6322 kernel/events/core.c | 221 +----------------------
6323 kernel/events/internal.h | 39 ++++-
6324 kernel/jump_label.c | 3 +-
6325 kernel/lockdep.c | 33 ++--
6326 kernel/printk.c | 9 +-
6327 kernel/sched.c | 63 ++++++-
6328 kernel/sched_fair.c | 174 ++++++++++++++----
6329 kernel/sched_features.h | 1 +
6330 kernel/sched_rt.c | 7 +-
6331 kernel/trace/ftrace.c | 5 +-
6332 kernel/trace/trace.c | 15 ++
6333 kernel/trace/trace.h | 1 +
6334 kernel/trace/trace_events.c | 1 -
6335 kernel/trace/trace_events_filter.c | 33 +++-
6336 kernel/trace/trace_irqsoff.c | 13 ++-
6337 kernel/trace/trace_sched_wakeup.c | 13 ++-
6338 tools/perf/util/trace-event-parse.c | 2 +
6339 45 files changed, 1125 insertions(+), 437 deletions(-)
6340 delete mode 100644 arch/x86/oprofile/nmi_timer_int.c
6341 create mode 100644 arch/x86/tools/insn_sanity.c
6342 create mode 100644 drivers/oprofile/nmi_timer_int.c
6343 create mode 100644 kernel/events/callchain.c
6344 Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
6345 $ git merge rcu/rcu/next
6347 Merging uprobes/for-next (b23a347 x86: skip singlestep where possible)
6348 $ git merge uprobes/for-next
6349 Auto-merging kernel/trace/trace.h
6350 Auto-merging kernel/signal.c
6351 Auto-merging kernel/fork.c
6352 Auto-merging include/linux/sched.h
6353 Auto-merging arch/x86/include/asm/thread_info.h
6354 Auto-merging arch/x86/Kconfig
6355 Auto-merging arch/Kconfig
6356 Merge made by the 'recursive' strategy.
6357 Documentation/trace/uprobetracer.txt | 93 ++
6359 arch/x86/Kconfig | 5 +-
6360 arch/x86/include/asm/thread_info.h | 2 +
6361 arch/x86/include/asm/uprobes.h | 59 ++
6362 arch/x86/kernel/Makefile | 1 +
6363 arch/x86/kernel/entry_32.S | 4 +
6364 arch/x86/kernel/signal.c | 6 +
6365 arch/x86/kernel/traps.c | 7 +-
6366 arch/x86/kernel/uprobes.c | 651 ++++++++++++++
6367 include/linux/mm_types.h | 5 +
6368 include/linux/sched.h | 4 +
6369 include/linux/srcu.h | 50 +
6370 include/linux/uprobes.h | 180 ++++
6371 kernel/Makefile | 1 +
6372 kernel/fork.c | 15 +
6373 kernel/signal.c | 3 +
6374 kernel/srcu.c | 3 +-
6375 kernel/trace/Kconfig | 20 +
6376 kernel/trace/Makefile | 2 +
6377 kernel/trace/trace.h | 5 +
6378 kernel/trace/trace_kprobe.c | 899 +------------------
6379 kernel/trace/trace_probe.c | 785 ++++++++++++++++
6380 kernel/trace/trace_probe.h | 161 ++++
6381 kernel/trace/trace_uprobe.c | 768 ++++++++++++++++
6382 kernel/uprobes.c | 1500 +++++++++++++++++++++++++++++++
6384 tools/perf/Documentation/perf-probe.txt | 14 +
6385 tools/perf/builtin-probe.c | 49 +-
6386 tools/perf/util/probe-event.c | 411 +++++++--
6387 tools/perf/util/probe-event.h | 12 +-
6388 tools/perf/util/symbol.c | 8 +
6389 tools/perf/util/symbol.h | 1 +
6390 33 files changed, 4772 insertions(+), 988 deletions(-)
6391 create mode 100644 Documentation/trace/uprobetracer.txt
6392 create mode 100644 arch/x86/include/asm/uprobes.h
6393 create mode 100644 arch/x86/kernel/uprobes.c
6394 create mode 100644 include/linux/uprobes.h
6395 create mode 100644 kernel/trace/trace_probe.c
6396 create mode 100644 kernel/trace/trace_probe.h
6397 create mode 100644 kernel/trace/trace_uprobe.c
6398 create mode 100644 kernel/uprobes.c
6399 Merging cgroup/for-next (a34815b Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
6400 $ git merge cgroup/for-next
6402 Merging kmemleak/kmemleak (99781ba kmemleak: Add support for memory hotplug)
6403 $ git merge kmemleak/kmemleak
6404 Auto-merging mm/percpu.c
6405 Merge made by the 'recursive' strategy.
6406 Documentation/kmemleak.txt | 3 +
6407 include/linux/kmemleak.h | 8 ++
6408 lib/Kconfig.debug | 2 +-
6409 mm/kmemleak.c | 158 ++++++++++++++++++++++++++++++++++++-------
6410 mm/percpu.c | 12 +++-
6411 5 files changed, 155 insertions(+), 28 deletions(-)
6412 Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
6413 $ git merge kvm/kvm-updates/3.2
6415 Merging oprofile/for-next (de346b6 Merge branch 'perf/core' into oprofile/master)
6416 $ git merge oprofile/for-next
6418 Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
6419 $ git merge xen/upstream/xen
6420 Resolved 'arch/x86/xen/Kconfig' using previous resolution.
6421 Auto-merging arch/x86/xen/Kconfig
6422 CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
6423 Auto-merging arch/x86/kernel/microcode_core.c
6424 Auto-merging arch/x86/kernel/Makefile
6425 Automatic merge failed; fix conflicts and then commit the result.
6427 [master 607df19] Merge remote-tracking branch 'xen/upstream/xen'
6428 $ git diff -M --stat --summary HEAD^..
6429 arch/x86/include/asm/microcode.h | 9 ++
6430 arch/x86/kernel/Makefile | 1 +
6431 arch/x86/kernel/microcode_core.c | 5 +-
6432 arch/x86/kernel/microcode_xen.c | 198 ++++++++++++++++++++++++++++++++++++++
6433 arch/x86/xen/Kconfig | 4 +
6434 5 files changed, 216 insertions(+), 1 deletions(-)
6435 create mode 100644 arch/x86/kernel/microcode_xen.c
6436 Merging xen-two/linux-next (54e6a3c Merge branch 'stable/for-linus-3.3' into linux-next)
6437 $ git merge xen-two/linux-next
6438 Resolved 'arch/x86/xen/Kconfig' using previous resolution.
6439 Auto-merging arch/x86/xen/Kconfig
6440 CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
6441 Automatic merge failed; fix conflicts and then commit the result.
6443 [master 7170876] Merge remote-tracking branch 'xen-two/linux-next'
6444 $ git diff -M --stat --summary HEAD^..
6445 Documentation/ABI/stable/sysfs-bus-xen-backend | 75 ++++
6446 .../ABI/stable/sysfs-devices-system-xen_memory | 77 +++++
6447 arch/ia64/include/asm/xen/interface.h | 2 +-
6448 arch/x86/xen/Kconfig | 3 +-
6449 arch/x86/xen/grant-table.c | 44 +++-
6450 drivers/xen/events.c | 74 ++++-
6451 drivers/xen/evtchn.c | 2 +-
6452 drivers/xen/gntalloc.c | 62 +++--
6453 drivers/xen/gntdev.c | 31 ++-
6454 drivers/xen/grant-table.c | 354 +++++++++++++++++---
6455 include/xen/events.h | 7 +
6456 include/xen/grant_table.h | 10 +-
6457 include/xen/interface/grant_table.h | 167 +++++++++-
6458 include/xen/interface/xen.h | 2 +
6459 14 files changed, 828 insertions(+), 82 deletions(-)
6460 create mode 100644 Documentation/ABI/stable/sysfs-bus-xen-backend
6461 create mode 100644 Documentation/ABI/stable/sysfs-devices-system-xen_memory
6462 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
6463 $ git merge xen-pvhvm/linux-next
6465 Merging percpu/for-next (a34815b Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
6466 $ git merge percpu/for-next
6468 Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
6469 $ git merge workqueues/for-next
6471 Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
6472 $ git merge sfi/sfi-test
6474 Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
6475 $ git merge asm-generic/next
6477 Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
6478 $ git merge drivers-x86/linux-next
6480 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
6481 $ git merge hwpoison/hwpoison
6483 Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
6484 $ git merge sysctl/master
6485 Auto-merging fs/proc/proc_sysctl.c
6486 Merge made by the 'recursive' strategy.
6487 fs/proc/proc_sysctl.c | 14 ++------------
6488 1 files changed, 2 insertions(+), 12 deletions(-)
6489 Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
6490 $ git merge namespace/master
6491 Auto-merging fs/proc/inode.c
6492 Merge made by the 'recursive' strategy.
6493 fs/proc/inode.c | 6 +-
6494 fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++-------
6495 2 files changed, 142 insertions(+), 24 deletions(-)
6496 Merging regmap/for-next (bc7ee55 regmap: Add trace event for successful cache reads)
6497 $ git merge regmap/for-next
6498 Removing drivers/base/regmap/regcache-indexed.c
6499 Merge made by the 'recursive' strategy.
6500 drivers/base/regmap/Kconfig | 3 +
6501 drivers/base/regmap/Makefile | 4 +-
6502 drivers/base/regmap/internal.h | 5 +-
6503 drivers/base/regmap/regcache-indexed.c | 64 -------
6504 drivers/base/regmap/regcache-lzo.c | 21 ++-
6505 drivers/base/regmap/regcache-rbtree.c | 61 +++++++-
6506 drivers/base/regmap/regcache.c | 68 ++++----
6507 drivers/base/regmap/regmap-irq.c | 289 ++++++++++++++++++++++++++++++++
6508 drivers/base/regmap/regmap.c | 142 +++++++++++-----
6509 include/linux/regmap.h | 55 ++++++-
6510 include/trace/events/regmap.h | 9 +
6511 11 files changed, 566 insertions(+), 155 deletions(-)
6512 delete mode 100644 drivers/base/regmap/regcache-indexed.c
6513 create mode 100644 drivers/base/regmap/regmap-irq.c
6514 Merging hsi/for-next (a8b4dea HSI: hsi_char: Update ioctl-number.txt)
6515 $ git merge hsi/for-next
6516 Auto-merging include/linux/Kbuild
6517 Auto-merging drivers/Makefile
6518 Auto-merging drivers/Kconfig
6519 Merge made by the 'recursive' strategy.
6520 Documentation/DocBook/device-drivers.tmpl | 17 +
6521 Documentation/ioctl/ioctl-number.txt | 1 +
6522 drivers/Kconfig | 2 +
6523 drivers/Makefile | 1 +
6524 drivers/hsi/Kconfig | 19 +
6525 drivers/hsi/Makefile | 6 +
6526 drivers/hsi/clients/Kconfig | 13 +
6527 drivers/hsi/clients/Makefile | 5 +
6528 drivers/hsi/clients/hsi_char.c | 802 +++++++++++++++++++++++++++++
6529 drivers/hsi/hsi.c | 494 ++++++++++++++++++
6530 drivers/hsi/hsi_boardinfo.c | 62 +++
6531 drivers/hsi/hsi_core.h | 35 ++
6532 include/linux/Kbuild | 1 +
6533 include/linux/hsi/Kbuild | 1 +
6534 include/linux/hsi/hsi.h | 410 +++++++++++++++
6535 include/linux/hsi/hsi_char.h | 63 +++
6536 16 files changed, 1932 insertions(+), 0 deletions(-)
6537 create mode 100644 drivers/hsi/Kconfig
6538 create mode 100644 drivers/hsi/Makefile
6539 create mode 100644 drivers/hsi/clients/Kconfig
6540 create mode 100644 drivers/hsi/clients/Makefile
6541 create mode 100644 drivers/hsi/clients/hsi_char.c
6542 create mode 100644 drivers/hsi/hsi.c
6543 create mode 100644 drivers/hsi/hsi_boardinfo.c
6544 create mode 100644 drivers/hsi/hsi_core.h
6545 create mode 100644 include/linux/hsi/Kbuild
6546 create mode 100644 include/linux/hsi/hsi.h
6547 create mode 100644 include/linux/hsi/hsi_char.h
6548 Merging driver-core/driver-core-next (11e3123 uio: convert drivers/uio/* to use module_platform_driver())
6549 $ git merge driver-core/driver-core-next
6550 Auto-merging include/linux/i2c.h
6551 Auto-merging include/linux/device.h
6552 Auto-merging drivers/usb/storage/ene_ub6250.c
6553 Auto-merging drivers/usb/misc/usbled.c
6554 Auto-merging drivers/staging/media/lirc/lirc_imon.c
6555 Auto-merging drivers/staging/media/go7007/go7007-usb.c
6556 Auto-merging drivers/nfc/pn533.c
6557 Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
6558 Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c
6559 Auto-merging drivers/net/wireless/rndis_wlan.c
6560 Auto-merging drivers/net/usb/smsc95xx.c
6561 Auto-merging drivers/net/usb/smsc75xx.c
6562 Auto-merging drivers/net/usb/lg-vl600.c
6563 Auto-merging drivers/net/usb/cdc_ncm.c
6564 Auto-merging drivers/net/usb/cdc_ether.c
6565 Auto-merging drivers/net/usb/cdc-phonet.c
6566 Auto-merging drivers/net/usb/asix.c
6567 Auto-merging drivers/net/irda/stir4200.c
6568 Auto-merging drivers/media/video/gspca/pac207.c
6569 Auto-merging drivers/media/video/em28xx/em28xx-cards.c
6570 Auto-merging drivers/media/rc/redrat3.c
6571 Auto-merging drivers/media/dvb/dvb-usb/ttusb2.c
6572 Auto-merging drivers/media/dvb/dvb-usb/it913x.c
6573 Auto-merging drivers/media/dvb/dvb-usb/dw2102.c
6574 Auto-merging drivers/media/dvb/dvb-usb/anysee.c
6575 Auto-merging drivers/media/dvb/dvb-usb/af9015.c
6576 Auto-merging drivers/input/touchscreen/usbtouchscreen.c
6577 Auto-merging drivers/input/tablet/wacom_sys.c
6578 Auto-merging drivers/input/tablet/aiptek.c
6579 Auto-merging drivers/input/misc/ati_remote2.c
6580 Auto-merging drivers/hid/usbhid/usbkbd.c
6581 Auto-merging drivers/bluetooth/btusb.c
6582 Auto-merging drivers/bluetooth/bfusb.c
6583 Auto-merging drivers/bluetooth/ath3k.c
6584 Auto-merging drivers/Kconfig
6585 Merge made by the 'recursive' strategy.
6586 Documentation/driver-model/devres.txt | 1 +
6587 Documentation/filesystems/debugfs.txt | 32 +++++++-
6588 drivers/Kconfig | 4 +-
6589 drivers/base/Makefile | 4 +-
6590 drivers/base/devtmpfs.c | 3 +-
6591 drivers/bluetooth/ath3k.c | 14 +---
6592 drivers/bluetooth/bcm203x.c | 21 +-----
6593 drivers/bluetooth/bfusb.c | 21 +-----
6594 drivers/bluetooth/bpa10x.c | 15 +---
6595 drivers/bluetooth/btusb.c | 15 +---
6596 drivers/hid/usbhid/usbkbd.c | 17 +----
6597 drivers/hid/usbhid/usbmouse.c | 17 +----
6598 drivers/hv/Kconfig | 4 +-
6599 drivers/hv/vmbus_drv.c | 2 +-
6600 drivers/i2c/busses/i2c-diolan-u2c.c | 15 +---
6601 drivers/i2c/busses/i2c-tiny-usb.c | 15 +---
6602 drivers/input/joystick/xpad.c | 13 +---
6603 drivers/input/misc/ati_remote2.c | 21 +-----
6604 drivers/input/misc/keyspan_remote.c | 21 +-----
6605 drivers/input/misc/powermate.c | 13 +---
6606 drivers/input/misc/yealink.c | 17 +----
6607 drivers/input/mouse/appletouch.c | 13 +---
6608 drivers/input/mouse/bcm5974.c | 14 +---
6609 drivers/input/tablet/acecad.c | 17 +----
6610 drivers/input/tablet/aiptek.c | 19 +----
6611 drivers/input/tablet/gtco.c | 28 +------
6612 drivers/input/tablet/hanwang.c | 13 +---
6613 drivers/input/tablet/kbtab.c | 20 +-----
6614 drivers/input/tablet/wacom_sys.c | 19 +----
6615 drivers/input/touchscreen/usbtouchscreen.c | 13 +---
6616 drivers/isdn/hardware/mISDN/hfcsusb.c | 28 +------
6617 drivers/media/dvb/b2c2/flexcop-usb.c | 20 +-----
6618 drivers/media/dvb/dvb-usb/a800.c | 21 +-----
6619 drivers/media/dvb/dvb-usb/af9015.c | 20 +-----
6620 drivers/media/dvb/dvb-usb/anysee.c | 21 +-----
6621 drivers/media/dvb/dvb-usb/au6610.c | 21 +-----
6622 drivers/media/dvb/dvb-usb/az6027.c | 23 +-----
6623 drivers/media/dvb/dvb-usb/ce6230.c | 22 +-----
6624 drivers/media/dvb/dvb-usb/cinergyT2-core.c | 20 +-----
6625 drivers/media/dvb/dvb-usb/cxusb.c | 21 +-----
6626 drivers/media/dvb/dvb-usb/dib0700_core.c | 22 +-----
6627 drivers/media/dvb/dvb-usb/dibusb-mb.c | 21 +-----
6628 drivers/media/dvb/dvb-usb/dibusb-mc.c | 21 +-----
6629 drivers/media/dvb/dvb-usb/digitv.c | 21 +-----
6630 drivers/media/dvb/dvb-usb/dtt200u.c | 21 +-----
6631 drivers/media/dvb/dvb-usb/dtv5100.c | 21 +-----
6632 drivers/media/dvb/dvb-usb/dw2102.c | 17 +----
6633 drivers/media/dvb/dvb-usb/ec168.c | 22 +-----
6634 drivers/media/dvb/dvb-usb/friio.c | 23 +-----
6635 drivers/media/dvb/dvb-usb/gl861.c | 21 +-----
6636 drivers/media/dvb/dvb-usb/gp8psk.c | 21 +-----
6637 drivers/media/dvb/dvb-usb/it913x.c | 21 +-----
6638 drivers/media/dvb/dvb-usb/lmedm04.c | 21 +-----
6639 drivers/media/dvb/dvb-usb/m920x.c | 22 +-----
6640 drivers/media/dvb/dvb-usb/mxl111sf.c | 19 +----
6641 drivers/media/dvb/dvb-usb/nova-t-usb2.c | 21 +-----
6642 drivers/media/dvb/dvb-usb/opera1.c | 17 +----
6643 drivers/media/dvb/dvb-usb/pctv452e.c | 17 +----
6644 drivers/media/dvb/dvb-usb/technisat-usb2.c | 20 +-----
6645 drivers/media/dvb/dvb-usb/ttusb2.c | 21 +-----
6646 drivers/media/dvb/dvb-usb/umt-010.c | 21 +-----
6647 drivers/media/dvb/dvb-usb/vp702x.c | 21 +-----
6648 drivers/media/dvb/dvb-usb/vp7045.c | 21 +-----
6649 drivers/media/dvb/siano/smsusb.c | 21 +-----
6650 drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 21 +-----
6651 drivers/media/dvb/ttusb-dec/ttusb_dec.c | 21 +-----
6652 drivers/media/radio/dsbr100.c | 16 +----
6653 drivers/media/radio/radio-mr800.c | 23 +-----
6654 drivers/media/radio/si470x/radio-si470x-usb.c | 28 +------
6655 drivers/media/rc/ati_remote.c | 33 +-------
6656 drivers/media/rc/imon.c | 21 +-----
6657 drivers/media/rc/mceusb.c | 20 +-----
6658 drivers/media/rc/redrat3.c | 20 +-----
6659 drivers/media/rc/streamzap.c | 28 +------
6660 drivers/media/video/cx231xx/cx231xx-cards.c | 24 +-----
6661 drivers/media/video/em28xx/em28xx-cards.c | 24 +-----
6662 drivers/media/video/et61x251/et61x251_core.c | 25 +------
6663 drivers/media/video/gspca/benq.c | 13 +---
6664 drivers/media/video/gspca/conex.c | 13 +---
6665 drivers/media/video/gspca/cpia1.c | 13 +---
6666 drivers/media/video/gspca/etoms.c | 14 +---
6667 drivers/media/video/gspca/finepix.c | 14 +---
6668 drivers/media/video/gspca/gl860/gl860.c | 17 +----
6669 drivers/media/video/gspca/jeilinj.c | 14 +---
6670 drivers/media/video/gspca/kinect.c | 14 +---
6671 drivers/media/video/gspca/konica.c | 13 +---
6672 drivers/media/video/gspca/m5602/m5602_core.c | 14 +---
6673 drivers/media/video/gspca/mars.c | 13 +---
6674 drivers/media/video/gspca/mr97310a.c | 13 +---
6675 drivers/media/video/gspca/nw80x.c | 13 +---
6676 drivers/media/video/gspca/ov519.c | 13 +---
6677 drivers/media/video/gspca/ov534.c | 14 +---
6678 drivers/media/video/gspca/ov534_9.c | 14 +---
6679 drivers/media/video/gspca/pac207.c | 13 +---
6680 drivers/media/video/gspca/pac7302.c | 13 +---
6681 drivers/media/video/gspca/pac7311.c | 13 +---
6682 drivers/media/video/gspca/se401.c | 13 +---
6683 drivers/media/video/gspca/sn9c2028.c | 14 +---
6684 drivers/media/video/gspca/sn9c20x.c | 13 +---
6685 drivers/media/video/gspca/sonixb.c | 13 +---
6686 drivers/media/video/gspca/sonixj.c | 13 +---
6687 drivers/media/video/gspca/spca1528.c | 13 +---
6688 drivers/media/video/gspca/spca500.c | 13 +---
6689 drivers/media/video/gspca/spca501.c | 13 +---
6690 drivers/media/video/gspca/spca505.c | 13 +---
6691 drivers/media/video/gspca/spca506.c | 19 +----
6692 drivers/media/video/gspca/spca508.c | 13 +---
6693 drivers/media/video/gspca/spca561.c | 13 +---
6694 drivers/media/video/gspca/sq905.c | 14 +---
6695 drivers/media/video/gspca/sq905c.c | 14 +---
6696 drivers/media/video/gspca/sq930x.c | 13 +---
6697 drivers/media/video/gspca/stk014.c | 13 +---
6698 drivers/media/video/gspca/stv0680.c | 13 +---
6699 drivers/media/video/gspca/stv06xx/stv06xx.c | 13 +---
6700 drivers/media/video/gspca/sunplus.c | 13 +---
6701 drivers/media/video/gspca/t613.c | 13 +---
6702 drivers/media/video/gspca/topro.c | 13 +---
6703 drivers/media/video/gspca/tv8532.c | 14 +---
6704 drivers/media/video/gspca/vc032x.c | 13 +---
6705 drivers/media/video/gspca/vicam.c | 14 +---
6706 drivers/media/video/gspca/xirlink_cit.c | 13 +---
6707 drivers/media/video/gspca/zc3xx.c | 13 +---
6708 drivers/media/video/hdpvr/hdpvr-core.c | 21 +-----
6709 drivers/media/video/s2255drv.c | 20 +-----
6710 drivers/media/video/sn9c102/sn9c102_core.c | 25 +------
6711 drivers/media/video/stk-webcam.c | 23 +-----
6712 drivers/media/video/tm6000/tm6000-cards.c | 26 +------
6713 drivers/media/video/zr364xx.c | 23 +-----
6714 drivers/mmc/host/ushc.c | 12 +---
6715 drivers/mtd/nand/alauda.c | 13 +---
6716 drivers/net/can/usb/ems_usb.c | 26 +------
6717 drivers/net/can/usb/esd_usb2.c | 23 +-----
6718 drivers/net/irda/irda-usb.c | 35 +--------
6719 drivers/net/irda/kingsun-sir.c | 19 +----
6720 drivers/net/irda/ks959-sir.c | 21 +-----
6721 drivers/net/irda/ksdazzle-sir.c | 21 +-----
6722 drivers/net/irda/mcs7780.c | 23 +-----
6723 drivers/net/irda/stir4200.c | 19 +----
6724 drivers/net/usb/asix.c | 12 +---
6725 drivers/net/usb/catc.c | 17 +----
6726 drivers/net/usb/cdc-phonet.c | 13 +---
6727 drivers/net/usb/cdc_eem.c | 13 +---
6728 drivers/net/usb/cdc_ether.c | 19 +----
6729 drivers/net/usb/cdc_ncm.c | 15 +---
6730 drivers/net/usb/cdc_subset.c | 12 +---
6731 drivers/net/usb/cx82310_eth.c | 12 +---
6732 drivers/net/usb/dm9601.c | 13 +---
6733 drivers/net/usb/gl620a.c | 12 +---
6734 drivers/net/usb/int51x1.c | 12 +---
6735 drivers/net/usb/ipheth.c | 20 +-----
6736 drivers/net/usb/kalmia.c | 12 +---
6737 drivers/net/usb/kaweth.c | 30 +-------
6738 drivers/net/usb/lg-vl600.c | 12 +---
6739 drivers/net/usb/mcs7830.c | 12 +---
6740 drivers/net/usb/net1080.c | 12 +---
6741 drivers/net/usb/plusb.c | 12 +---
6742 drivers/net/usb/rndis_host.c | 12 +---
6743 drivers/net/usb/rtl8150.c | 15 +---
6744 drivers/net/usb/sierra_net.c | 19 +----
6745 drivers/net/usb/smsc75xx.c | 12 +---
6746 drivers/net/usb/smsc95xx.c | 12 +---
6747 drivers/net/usb/zaurus.c | 12 +---
6748 drivers/net/wireless/ath/carl9170/usb.c | 13 +---
6749 drivers/net/wireless/libertas/if_usb.c | 24 +-----
6750 drivers/net/wireless/libertas_tf/if_usb.c | 22 +-----
6751 drivers/net/wireless/orinoco/orinoco_usb.c | 27 +------
6752 drivers/net/wireless/p54/p54usb.c | 13 +---
6753 drivers/net/wireless/rndis_wlan.c | 12 +---
6754 drivers/net/wireless/rt2x00/rt2500usb.c | 13 +---
6755 drivers/net/wireless/rt2x00/rt2800usb.c | 13 +---
6756 drivers/net/wireless/rt2x00/rt73usb.c | 13 +---
6757 drivers/net/wireless/rtl818x/rtl8187/dev.c | 13 +---
6758 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 13 +---
6759 drivers/net/wireless/zd1201.c | 13 +---
6760 drivers/nfc/pn533.c | 19 +----
6761 drivers/staging/frontier/alphatrack.c | 28 +------
6762 drivers/staging/frontier/tranzport.c | 27 +------
6763 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 22 +-----
6764 drivers/staging/iio/accel/adis16201_core.c | 13 +---
6765 drivers/staging/iio/accel/adis16203_core.c | 13 +---
6766 drivers/staging/iio/accel/adis16204_core.c | 13 +---
6767 drivers/staging/iio/accel/adis16209_core.c | 13 +---
6768 drivers/staging/iio/accel/adis16220_core.c | 13 +---
6769 drivers/staging/iio/accel/adis16240_core.c | 13 +---
6770 drivers/staging/iio/accel/kxsd9.c | 13 +---
6771 drivers/staging/iio/accel/lis3l02dq_core.c | 13 +---
6772 drivers/staging/iio/accel/sca3000_core.c | 13 +---
6773 drivers/staging/iio/adc/ad7192.c | 13 +---
6774 drivers/staging/iio/adc/ad7280a.c | 13 +---
6775 drivers/staging/iio/adc/ad7291.c | 14 +---
6776 drivers/staging/iio/adc/ad7298_core.c | 13 +---
6777 drivers/staging/iio/adc/ad7476_core.c | 13 +---
6778 drivers/staging/iio/adc/ad7606_spi.c | 13 +---
6779 drivers/staging/iio/adc/ad7780.c | 13 +---
6780 drivers/staging/iio/adc/ad7793.c | 13 +---
6781 drivers/staging/iio/adc/ad7816.c | 14 +---
6782 drivers/staging/iio/adc/ad7887_core.c | 13 +---
6783 drivers/staging/iio/adc/ad799x_core.c | 14 +---
6784 drivers/staging/iio/adc/adt7310.c | 14 +---
6785 drivers/staging/iio/adc/adt7410.c | 14 +---
6786 drivers/staging/iio/adc/max1363_core.c | 14 +---
6787 drivers/staging/iio/addac/adt7316-i2c.c | 14 +---
6788 drivers/staging/iio/addac/adt7316-spi.c | 14 +---
6789 drivers/staging/iio/cdc/ad7150.c | 14 +---
6790 drivers/staging/iio/cdc/ad7152.c | 14 +---
6791 drivers/staging/iio/cdc/ad7746.c | 14 +---
6792 drivers/staging/iio/dac/ad5064.c | 13 +---
6793 drivers/staging/iio/dac/ad5360.c | 13 +---
6794 drivers/staging/iio/dac/ad5446.c | 13 +---
6795 drivers/staging/iio/dac/ad5504.c | 13 +---
6796 drivers/staging/iio/dac/ad5624r_spi.c | 13 +---
6797 drivers/staging/iio/dac/ad5686.c | 13 +---
6798 drivers/staging/iio/dac/ad5791.c | 13 +---
6799 drivers/staging/iio/dac/max517.c | 14 +---
6800 drivers/staging/iio/dds/ad5930.c | 13 +---
6801 drivers/staging/iio/dds/ad9832.c | 13 +---
6802 drivers/staging/iio/dds/ad9834.c | 13 +---
6803 drivers/staging/iio/dds/ad9850.c | 13 +---
6804 drivers/staging/iio/dds/ad9852.c | 13 +---
6805 drivers/staging/iio/dds/ad9910.c | 13 +---
6806 drivers/staging/iio/dds/ad9951.c | 13 +---
6807 drivers/staging/iio/gyro/adis16080_core.c | 13 +---
6808 drivers/staging/iio/gyro/adis16130_core.c | 13 +---
6809 drivers/staging/iio/gyro/adis16260_core.c | 13 +---
6810 drivers/staging/iio/gyro/adxrs450_core.c | 13 +---
6811 drivers/staging/iio/impedance-analyzer/ad5933.c | 13 +---
6812 drivers/staging/iio/imu/adis16400_core.c | 13 +---
6813 drivers/staging/iio/light/isl29018.c | 14 +---
6814 drivers/staging/iio/light/tsl2563.c | 14 +---
6815 drivers/staging/iio/light/tsl2583.c | 14 +---
6816 drivers/staging/iio/magnetometer/ak8975.c | 14 +---
6817 drivers/staging/iio/magnetometer/hmc5843.c | 14 +---
6818 drivers/staging/iio/meter/ade7753.c | 13 +---
6819 drivers/staging/iio/meter/ade7754.c | 13 +---
6820 drivers/staging/iio/meter/ade7758_core.c | 13 +---
6821 drivers/staging/iio/meter/ade7759.c | 13 +---
6822 drivers/staging/iio/meter/ade7854-i2c.c | 14 +---
6823 drivers/staging/iio/meter/ade7854-spi.c | 13 +---
6824 drivers/staging/iio/resolver/ad2s1200.c | 13 +---
6825 drivers/staging/iio/resolver/ad2s1210.c | 13 +---
6826 drivers/staging/iio/resolver/ad2s90.c | 13 +---
6827 drivers/staging/keucr/usb.c | 24 +-----
6828 drivers/staging/media/go7007/go7007-usb.c | 15 +---
6829 drivers/staging/media/lirc/lirc_igorplugusb.c | 21 +-----
6830 drivers/staging/media/lirc/lirc_imon.c | 24 +-----
6831 drivers/staging/media/lirc/lirc_sasem.c | 25 +------
6832 drivers/staging/media/lirc/lirc_ttusbir.c | 22 +-----
6833 drivers/staging/rts5139/rts51x.c | 32 +-------
6834 drivers/staging/vt6656/main_usb.c | 14 +---
6835 drivers/staging/winbond/wbusb.c | 13 +---
6836 drivers/staging/wlan-ng/prism2usb.c | 14 +---
6837 drivers/uio/uio_pdrv.c | 12 +---
6838 drivers/uio/uio_pdrv_genirq.c | 13 +---
6839 drivers/uio/uio_pruss.c | 14 +---
6840 drivers/usb/atm/cxacru.c | 13 +---
6841 drivers/usb/atm/speedtch.c | 17 +----
6842 drivers/usb/atm/ueagle-atm.c | 31 +-------
6843 drivers/usb/class/cdc-wdm.c | 19 +----
6844 drivers/usb/class/usblp.c | 13 +---
6845 drivers/usb/class/usbtmc.c | 17 +----
6846 drivers/usb/dwc3/debugfs.c | 16 +---
6847 drivers/usb/host/hwa-hc.c | 13 +---
6848 drivers/usb/image/microtek.c | 14 +---
6849 drivers/usb/misc/adutux.c | 35 +--------
6850 drivers/usb/misc/cypress_cy7c63.c | 22 +-----
6851 drivers/usb/misc/cytherm.c | 26 +------
6852 drivers/usb/misc/emi26.c | 13 +---
6853 drivers/usb/misc/emi62.c | 17 +----
6854 drivers/usb/misc/idmouse.c | 24 +-----
6855 drivers/usb/misc/iowarrior.c | 13 +---
6856 drivers/usb/misc/isight_firmware.c | 13 +---
6857 drivers/usb/misc/ldusb.c | 27 +------
6858 drivers/usb/misc/legousbtower.c | 46 +----------
6859 drivers/usb/misc/rio500.c | 28 +------
6860 drivers/usb/misc/trancevibrator.c | 21 +-----
6861 drivers/usb/misc/usblcd.c | 20 +-----
6862 drivers/usb/misc/usbled.c | 18 +----
6863 drivers/usb/misc/usbsevseg.c | 18 +----
6864 drivers/usb/misc/yurex.c | 22 +-----
6865 drivers/usb/storage/alauda.c | 13 +---
6866 drivers/usb/storage/cypress_atacb.c | 13 +---
6867 drivers/usb/storage/datafab.c | 13 +---
6868 drivers/usb/storage/ene_ub6250.c | 13 +---
6869 drivers/usb/storage/freecom.c | 13 +---
6870 drivers/usb/storage/isd200.c | 13 +---
6871 drivers/usb/storage/jumpshot.c | 13 +---
6872 drivers/usb/storage/karma.c | 13 +---
6873 drivers/usb/storage/onetouch.c | 13 +---
6874 drivers/usb/storage/realtek_cr.c | 13 +---
6875 drivers/usb/storage/sddr09.c | 13 +---
6876 drivers/usb/storage/sddr55.c | 13 +---
6877 drivers/usb/storage/shuttle_usbat.c | 13 +---
6878 drivers/usb/storage/uas.c | 13 +---
6879 drivers/usb/usb-skeleton.c | 21 +-----
6880 drivers/usb/wusbcore/cbaf.c | 12 +---
6881 drivers/uwb/hwa-rc.c | 12 +---
6882 drivers/uwb/i1480/dfu/usb.c | 20 +-----
6883 drivers/video/smscufx.c | 19 +----
6884 drivers/video/udlfb.c | 19 +----
6885 drivers/w1/masters/ds2490.c | 21 +-----
6886 drivers/w1/slaves/w1_therm.c | 36 +++++++-
6887 drivers/watchdog/pcwd_usb.c | 35 +--------
6888 fs/debugfs/file.c | 91 +++++++++++++++++++++
6889 include/linux/debugfs.h | 26 ++++++
6890 include/linux/device.h | 24 ++++++
6891 include/linux/i2c.h | 13 +++
6892 include/linux/platform_device.h | 12 +---
6893 include/linux/spi/spi.h | 11 +++
6894 include/linux/usb.h | 12 +++
6895 lib/devres.c | 55 ++++++++++++-
6896 sound/usb/6fire/chip.c | 15 +---
6897 sound/usb/caiaq/device.c | 13 +---
6898 sound/usb/misc/ua101.c | 14 +---
6899 sound/usb/usx2y/us122l.c | 14 +---
6900 sound/usb/usx2y/usbusx2y.c | 13 +---
6901 315 files changed, 612 insertions(+), 4714 deletions(-)
6902 Merging tty/tty-next (7962fce tty: n_hdlc not atomic use tty->flags.)
6903 $ git merge tty/tty-next
6904 Resolved 'drivers/tty/serial/Kconfig' using previous resolution.
6905 Resolved 'drivers/tty/serial/Makefile' using previous resolution.
6906 Auto-merging include/linux/serial_core.h
6907 Auto-merging drivers/tty/serial/pch_uart.c
6908 Auto-merging drivers/tty/serial/Makefile
6909 CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
6910 Auto-merging drivers/tty/serial/Kconfig
6911 CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
6912 Automatic merge failed; fix conflicts and then commit the result.
6914 [master 20aa4e5] Merge remote-tracking branch 'tty/tty-next'
6915 $ git diff -M --stat --summary HEAD^..
6916 arch/x86/include/asm/mrst.h | 2 +-
6917 arch/x86/kernel/early_printk.c | 2 +-
6918 arch/x86/platform/mrst/early_printk_mrst.c | 16 +-
6919 drivers/parport/parport_ax88796.c | 13 +-
6920 drivers/parport/parport_sunbpp.c | 13 +-
6921 drivers/tty/n_hdlc.c | 6 +-
6922 drivers/tty/pty.c | 26 +-
6923 drivers/tty/serial/8250.c | 4 +-
6924 drivers/tty/serial/8250_dw.c | 12 +-
6925 drivers/tty/serial/8250_pci.c | 31 ++-
6926 drivers/tty/serial/Kconfig | 33 ++-
6927 drivers/tty/serial/Makefile | 1 +
6928 drivers/tty/serial/atmel_serial.c | 7 +-
6929 drivers/tty/serial/ifx6x60.c | 1 -
6930 drivers/tty/serial/imx.c | 2 +-
6931 drivers/tty/serial/max3100.c | 1 -
6932 drivers/tty/serial/max3107-aava.c | 1 -
6933 drivers/tty/serial/max3107.c | 1 -
6934 drivers/tty/serial/mfd.c | 18 +-
6935 drivers/tty/serial/mrst_max3110.c | 1 -
6936 drivers/tty/serial/mxs-auart.c | 5 +-
6937 drivers/tty/serial/omap-serial.c | 2 +-
6938 drivers/tty/serial/pch_uart.c | 160 ++++++-
6939 drivers/tty/serial/sc26xx.c | 14 +-
6940 drivers/tty/serial/serial_core.c | 323 +++++++-----
6941 drivers/tty/serial/sirfsoc_uart.c | 783 ++++++++++++++++++++++++++++
6942 drivers/tty/serial/sirfsoc_uart.h | 185 +++++++
6943 drivers/tty/serial/timbuart.c | 15 +-
6944 drivers/tty/serial/vr41xx_siu.c | 13 +-
6945 drivers/tty/tty_io.c | 309 +++++++-----
6946 drivers/tty/tty_ldisc.c | 22 +-
6947 include/linux/serial_core.h | 100 +---
6948 32 files changed, 1629 insertions(+), 493 deletions(-)
6949 create mode 100644 drivers/tty/serial/sirfsoc_uart.c
6950 create mode 100644 drivers/tty/serial/sirfsoc_uart.h
6951 Merging usb/usb-next (b870def USB: ohci-s3c2410: add PM support)
6952 $ git merge usb/usb-next
6953 Auto-merging include/linux/usb.h
6954 Auto-merging drivers/usb/storage/shuttle_usbat.c
6955 Auto-merging drivers/usb/storage/sddr55.c
6956 Auto-merging drivers/usb/storage/sddr09.c
6957 Auto-merging drivers/usb/storage/realtek_cr.c
6958 Auto-merging drivers/usb/storage/onetouch.c
6959 Auto-merging drivers/usb/storage/karma.c
6960 Auto-merging drivers/usb/storage/jumpshot.c
6961 Auto-merging drivers/usb/storage/isd200.c
6962 Auto-merging drivers/usb/storage/freecom.c
6963 Auto-merging drivers/usb/storage/ene_ub6250.c
6964 Auto-merging drivers/usb/storage/datafab.c
6965 Auto-merging drivers/usb/storage/cypress_atacb.c
6966 Auto-merging drivers/usb/storage/alauda.c
6967 Removing drivers/usb/serial/ChangeLog.history
6968 Auto-merging drivers/usb/musb/musb_core.c
6969 Auto-merging drivers/usb/host/ohci-au1xxx.c
6970 Auto-merging drivers/usb/host/hwa-hc.c
6971 Auto-merging drivers/usb/gadget/s3c-hsudc.c
6972 Auto-merging drivers/usb/gadget/s3c-hsotg.c
6973 Auto-merging drivers/usb/gadget/fsl_qe_udc.c
6974 Auto-merging drivers/usb/gadget/Kconfig
6975 Auto-merging Documentation/kernel-parameters.txt
6976 Merge made by the 'recursive' strategy.
6977 Documentation/ABI/testing/sysfs-bus-usb | 25 +
6978 Documentation/kernel-parameters.txt | 4 +
6979 drivers/hv/hv_kvp.c | 10 +-
6980 drivers/usb/Makefile | 3 +-
6981 drivers/usb/c67x00/c67x00-drv.c | 15 +-
6982 drivers/usb/c67x00/c67x00-hcd.c | 1 -
6983 drivers/usb/core/devio.c | 186 ++++++---
6984 drivers/usb/core/driver.c | 8 +-
6985 drivers/usb/core/hcd-pci.c | 4 -
6986 drivers/usb/core/hcd.c | 24 +-
6987 drivers/usb/core/hub.c | 1 -
6988 drivers/usb/core/usb.h | 14 -
6989 drivers/usb/dwc3/dwc3-omap.c | 14 +-
6990 drivers/usb/gadget/Kconfig | 1 +
6991 drivers/usb/gadget/fsl_qe_udc.c | 15 +-
6992 drivers/usb/gadget/mv_udc_core.c | 19 +-
6993 drivers/usb/gadget/s3c-hsotg.c | 13 +-
6994 drivers/usb/gadget/s3c-hsudc.c | 15 +-
6995 drivers/usb/gadget/usbstring.c | 73 +---
6996 drivers/usb/host/ehci-hcd.c | 2 +-
6997 drivers/usb/host/ehci-q.c | 11 +
6998 drivers/usb/host/ehci-s5p.c | 2 -
6999 drivers/usb/host/ehci-xls.c | 2 +-
7000 drivers/usb/host/fhci-hcd.c | 12 +-
7001 drivers/usb/host/fsl-mph-dr-of.c | 12 +-
7002 drivers/usb/host/hwa-hc.c | 1 -
7003 drivers/usb/host/imx21-hcd.c | 13 +-
7004 drivers/usb/host/isp1760-hcd.c | 74 ++--
7005 drivers/usb/host/ohci-au1xxx.c | 5 +-
7006 drivers/usb/host/ohci-dbg.c | 18 +-
7007 drivers/usb/host/ohci-ep93xx.c | 2 -
7008 drivers/usb/host/ohci-hcd.c | 28 +-
7009 drivers/usb/host/ohci-hub.c | 7 +-
7010 drivers/usb/host/ohci-omap.c | 1 -
7011 drivers/usb/host/ohci-pci.c | 5 +-
7012 drivers/usb/host/ohci-pxa27x.c | 2 -
7013 drivers/usb/host/ohci-q.c | 8 +-
7014 drivers/usb/host/ohci-s3c2410.c | 55 +++-
7015 drivers/usb/host/ohci-sh.c | 1 -
7016 drivers/usb/host/ohci-sm501.c | 1 -
7017 drivers/usb/host/ohci-spear.c | 1 -
7018 drivers/usb/host/ohci-tmio.c | 3 -
7019 drivers/usb/host/ohci-xls.c | 2 +-
7020 drivers/usb/host/ohci.h | 14 +-
7021 drivers/usb/host/oxu210hp-hcd.c | 19 +-
7022 drivers/usb/host/xhci-hub.c | 18 +-
7023 drivers/usb/host/xhci-ring.c | 12 +-
7024 drivers/usb/misc/usbtest.c | 1 -
7025 drivers/usb/musb/musb_core.c | 1 -
7026 drivers/usb/otg/fsl_otg.c | 13 +-
7027 drivers/usb/renesas_usbhs/common.c | 13 +-
7028 drivers/usb/serial/ChangeLog.history | 730 -------------------------------
7029 drivers/usb/serial/belkin_sa.c | 43 --
7030 drivers/usb/serial/ch341.c | 3 +-
7031 drivers/usb/serial/cp210x.c | 58 ++-
7032 drivers/usb/serial/cyberjack.c | 33 +--
7033 drivers/usb/serial/cypress_m8.c | 29 --
7034 drivers/usb/serial/digi_acceleport.c | 227 +----------
7035 drivers/usb/serial/ftdi_sio.c | 4 +
7036 drivers/usb/serial/garmin_gps.c | 9 -
7037 drivers/usb/serial/generic.c | 83 +++-
7038 drivers/usb/serial/io_edgeport.c | 3 -
7039 drivers/usb/serial/io_ti.c | 28 +-
7040 drivers/usb/serial/ipaq.c | 34 --
7041 drivers/usb/serial/ir-usb.c | 32 --
7042 drivers/usb/serial/iuu_phoenix.c | 3 +-
7043 drivers/usb/serial/keyspan.c | 90 ----
7044 drivers/usb/serial/keyspan_pda.c | 66 +---
7045 drivers/usb/serial/kobil_sct.c | 25 -
7046 drivers/usb/serial/mct_u232.c | 46 --
7047 drivers/usb/serial/mos7720.c | 18 -
7048 drivers/usb/serial/mos7840.c | 4 -
7049 drivers/usb/serial/omninet.c | 51 +--
7050 drivers/usb/serial/opticon.c | 1 -
7051 drivers/usb/serial/oti6858.c | 23 +-
7052 drivers/usb/serial/pl2303.c | 17 +-
7053 drivers/usb/serial/sierra.c | 1 -
7054 drivers/usb/serial/symbolserial.c | 1 -
7055 drivers/usb/serial/ti_usb_3410_5052.c | 13 +-
7056 drivers/usb/serial/usb-serial.c | 98 +++--
7057 drivers/usb/serial/usb_debug.c | 13 +-
7058 drivers/usb/serial/whiteheat.c | 58 ---
7059 drivers/usb/storage/alauda.c | 2 +-
7060 drivers/usb/storage/cypress_atacb.c | 2 +-
7061 drivers/usb/storage/datafab.c | 2 +-
7062 drivers/usb/storage/ene_ub6250.c | 12 +-
7063 drivers/usb/storage/freecom.c | 2 +-
7064 drivers/usb/storage/isd200.c | 2 +-
7065 drivers/usb/storage/jumpshot.c | 2 +-
7066 drivers/usb/storage/karma.c | 2 +-
7067 drivers/usb/storage/onetouch.c | 2 +-
7068 drivers/usb/storage/realtek_cr.c | 14 +-
7069 drivers/usb/storage/sddr09.c | 2 +-
7070 drivers/usb/storage/sddr55.c | 2 +-
7071 drivers/usb/storage/shuttle_usbat.c | 2 +-
7072 fs/fat/namei_vfat.c | 3 +-
7073 fs/nls/nls_base.c | 73 ++-
7074 include/linux/nls.h | 5 +-
7075 include/linux/usb.h | 13 +
7076 include/linux/usb/ch11.h | 19 +-
7077 include/linux/usb/hcd.h | 2 -
7078 include/linux/usb/serial.h | 11 +-
7079 102 files changed, 647 insertions(+), 2175 deletions(-)
7080 delete mode 100644 drivers/usb/serial/ChangeLog.history
7081 Merging staging/staging-next (976d534 rtl8192e: Rename clashing symbols)
7082 $ git merge staging/staging-next
7083 Removing drivers/staging/xgifb/vb_ext.h
7084 Removing drivers/staging/xgifb/vb_ext.c
7085 Auto-merging drivers/staging/vt6656/main_usb.c
7086 Removing drivers/staging/spectra/spectraswconfig.h
7087 Removing drivers/staging/spectra/nand_regs.h
7088 Removing drivers/staging/spectra/lld_nand.h
7089 Removing drivers/staging/spectra/lld_nand.c
7090 Removing drivers/staging/spectra/lld_mtd.h
7091 Removing drivers/staging/spectra/lld_mtd.c
7092 Removing drivers/staging/spectra/lld_emu.h
7093 Removing drivers/staging/spectra/lld_emu.c
7094 Removing drivers/staging/spectra/lld_cdma.h
7095 Removing drivers/staging/spectra/lld_cdma.c
7096 Removing drivers/staging/spectra/lld.h
7097 Removing drivers/staging/spectra/lld.c
7098 Removing drivers/staging/spectra/flash.h
7099 Removing drivers/staging/spectra/flash.c
7100 Removing drivers/staging/spectra/ffsport.h
7101 Removing drivers/staging/spectra/ffsport.c
7102 Removing drivers/staging/spectra/ffsdefs.h
7103 Removing drivers/staging/spectra/README
7104 Removing drivers/staging/spectra/Makefile
7105 Removing drivers/staging/spectra/Kconfig
7106 Removing drivers/staging/rtl8192u/ieee80211/api.c
7107 Removing drivers/staging/rtl8192e/rtl_debug.h
7108 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
7109 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
7110 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pm.h
7111 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
7112 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pci.h
7113 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_debug.c
7114 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.h
7115 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.c
7116 Auto-merging drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
7117 Auto-merging drivers/staging/iio/resolver/ad2s90.c
7118 Auto-merging drivers/staging/iio/resolver/ad2s1210.c
7119 Auto-merging drivers/staging/iio/resolver/ad2s1200.c
7120 Auto-merging drivers/staging/iio/meter/ade7854-spi.c
7121 Auto-merging drivers/staging/iio/meter/ade7759.c
7122 Auto-merging drivers/staging/iio/meter/ade7758_core.c
7123 Auto-merging drivers/staging/iio/meter/ade7754.c
7124 Auto-merging drivers/staging/iio/meter/ade7753.c
7125 Auto-merging drivers/staging/iio/magnetometer/hmc5843.c
7126 Auto-merging drivers/staging/iio/magnetometer/ak8975.c
7127 Auto-merging drivers/staging/iio/light/tsl2563.c
7128 Auto-merging drivers/staging/iio/light/isl29018.c
7129 Auto-merging drivers/staging/iio/industrialio-core.c
7130 CONFLICT (content): Merge conflict in drivers/staging/iio/industrialio-core.c
7131 Auto-merging drivers/staging/iio/imu/adis16400_core.c
7132 Auto-merging drivers/staging/iio/impedance-analyzer/ad5933.c
7133 Auto-merging drivers/staging/iio/gyro/adxrs450_core.c
7134 Auto-merging drivers/staging/iio/gyro/adis16260_core.c
7135 Auto-merging drivers/staging/iio/gyro/adis16130_core.c
7136 Auto-merging drivers/staging/iio/gyro/adis16080_core.c
7137 Auto-merging drivers/staging/iio/dds/ad9951.c
7138 Auto-merging drivers/staging/iio/dds/ad9910.c
7139 Auto-merging drivers/staging/iio/dds/ad9852.c
7140 Auto-merging drivers/staging/iio/dds/ad9850.c
7141 Auto-merging drivers/staging/iio/dds/ad9834.c
7142 Auto-merging drivers/staging/iio/dds/ad9832.c
7143 Auto-merging drivers/staging/iio/dds/ad5930.c
7144 Auto-merging drivers/staging/iio/dac/ad5791.c
7145 Auto-merging drivers/staging/iio/dac/ad5686.c
7146 Auto-merging drivers/staging/iio/dac/ad5624r_spi.c
7147 Auto-merging drivers/staging/iio/dac/ad5504.c
7148 Auto-merging drivers/staging/iio/dac/ad5446.c
7149 Auto-merging drivers/staging/iio/dac/ad5360.c
7150 Auto-merging drivers/staging/iio/dac/ad5064.c
7151 Removing drivers/staging/iio/chrdev.h
7152 Auto-merging drivers/staging/iio/cdc/ad7746.c
7153 Auto-merging drivers/staging/iio/cdc/ad7152.c
7154 Auto-merging drivers/staging/iio/cdc/ad7150.c
7155 Auto-merging drivers/staging/iio/buffer.h
7156 Auto-merging drivers/staging/iio/adc/max1363_core.c
7157 Auto-merging drivers/staging/iio/adc/adt7410.c
7158 Auto-merging drivers/staging/iio/adc/adt7310.c
7159 Auto-merging drivers/staging/iio/adc/ad799x_core.c
7160 CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad799x_core.c
7161 Auto-merging drivers/staging/iio/adc/ad7887_core.c
7162 Auto-merging drivers/staging/iio/adc/ad7816.c
7163 Auto-merging drivers/staging/iio/adc/ad7793.c
7164 Auto-merging drivers/staging/iio/adc/ad7780.c
7165 Auto-merging drivers/staging/iio/adc/ad7606_spi.c
7166 Auto-merging drivers/staging/iio/adcRecorded preimage for 'drivers/hid/hid-hyperv.c'
7167 Recorded preimage for 'drivers/staging/hv/Kconfig'
7168 Recorded preimage for 'drivers/staging/hv/Makefile'
7169 Resolved 'drivers/staging/iio/adc/ad799x_core.c' using previous resolution.
7170 Resolved 'drivers/staging/iio/industrialio-core.c' using previous resolution.
7172 Auto-merging drivers/staging/iio/adc/ad7298_core.c
7173 Auto-merging drivers/staging/iio/adc/ad7291.c
7174 Auto-merging drivers/staging/iio/adc/ad7280a.c
7175 Auto-merging drivers/staging/iio/adc/ad7192.c
7176 Auto-merging drivers/staging/iio/accel/sca3000_core.c
7177 Auto-merging drivers/staging/iio/accel/lis3l02dq_core.c
7178 Auto-merging drivers/staging/iio/accel/kxsd9.c
7179 Auto-merging drivers/staging/iio/accel/adis16240_core.c
7180 Auto-merging drivers/staging/iio/accel/adis16220_core.c
7181 Auto-merging drivers/staging/iio/accel/adis16209_core.c
7182 Auto-merging drivers/staging/iio/accel/adis16204_core.c
7183 Auto-merging drivers/staging/iio/accel/adis16203_core.c
7184 Auto-merging drivers/staging/iio/accel/adis16201_core.c
7185 Auto-merging drivers/staging/hv/Makefile
7186 CONFLICT (content): Merge conflict in drivers/staging/hv/Makefile
7187 Auto-merging drivers/staging/hv/Kconfig
7188 CONFLICT (content): Merge conflict in drivers/staging/hv/Kconfig
7189 Auto-merging drivers/staging/frontier/tranzport.c
7190 Auto-merging drivers/net/hyperv/netvsc.c
7191 Auto-merging drivers/net/Makefile
7192 Auto-merging drivers/net/Kconfig
7193 Auto-merging drivers/hid/hid-hyperv.c
7194 CONFLICT (content): Merge conflict in drivers/hid/hid-hyperv.c
7195 Auto-merging MAINTAINERS
7196 Automatic merge failed; fix conflicts and then commit the result.
7198 Recorded resolution for 'drivers/hid/hid-hyperv.c'.
7199 Recorded resolution for 'drivers/staging/hv/Kconfig'.
7200 Recorded resolution for 'drivers/staging/hv/Makefile'.
7201 [master dab08dd] Merge remote-tracking branch 'staging/staging-next'
7202 $ git diff -M --stat --summary HEAD^..
7203 .../devicetree/bindings/nvec/nvec_nvidia.txt | 9 +
7205 drivers/net/Kconfig | 2 +
7206 drivers/net/Makefile | 2 +
7207 drivers/net/hyperv/Kconfig | 5 +
7208 drivers/net/hyperv/Makefile | 3 +
7209 drivers/{staging/hv => net/hyperv}/hyperv_net.h | 0
7210 drivers/{staging/hv => net/hyperv}/netvsc.c | 11 +-
7211 drivers/{staging/hv => net/hyperv}/netvsc_drv.c | 0
7212 drivers/{staging/hv => net/hyperv}/rndis_filter.c | 0
7213 drivers/staging/Kconfig | 8 +-
7214 drivers/staging/Makefile | 4 +-
7215 drivers/staging/android/Kconfig | 95 +
7216 drivers/staging/android/Makefile | 6 +
7217 drivers/staging/android/TODO | 10 +
7218 drivers/staging/android/binder.c | 3600 ++++++++++++++++
7219 drivers/staging/android/binder.h | 330 ++
7220 drivers/staging/android/logger.c | 616 +++
7221 drivers/staging/android/logger.h | 49 +
7222 drivers/staging/android/lowmemorykiller.c | 219 +
7223 drivers/staging/android/ram_console.c | 443 ++
7224 drivers/staging/android/ram_console.h | 22 +
7225 drivers/staging/android/timed_gpio.c | 176 +
7226 drivers/staging/android/timed_gpio.h | 33 +
7227 drivers/staging/android/timed_output.c | 123 +
7228 drivers/staging/android/timed_output.h | 37 +
7229 drivers/staging/asus_oled/asus_oled.c | 4 +-
7230 drivers/staging/bcm/Bcmchar.c | 279 +-
7231 drivers/staging/bcm/InterfaceDld.c | 12 +-
7232 drivers/staging/bcm/InterfaceIdleMode.c | 33 +-
7233 drivers/staging/bcm/InterfaceInit.c | 12 +-
7234 drivers/staging/bcm/InterfaceMisc.c | 24 +-
7235 drivers/staging/bcm/Misc.c | 32 +-
7236 drivers/staging/bcm/hostmibs.c | 178 +-
7237 drivers/staging/bcm/nvm.c | 95 +-
7238 .../staging/comedi/drivers/addi-data/addi_common.c | 137 +-
7239 drivers/staging/comedi/drivers/adl_pci7230.c | 10 +-
7240 drivers/staging/comedi/drivers/adl_pci7296.c | 6 +-
7241 drivers/staging/comedi/drivers/adl_pci7432.c | 6 +-
7242 drivers/staging/comedi/drivers/adl_pci8164.c | 6 +-
7243 drivers/staging/comedi/drivers/adl_pci9111.c | 6 +-
7244 drivers/staging/comedi/drivers/adv_pci1710.c | 32 +-
7245 drivers/staging/comedi/drivers/adv_pci_dio.c | 23 +-
7246 drivers/staging/comedi/drivers/amplc_dio200.c | 9 +-
7247 drivers/staging/comedi/drivers/amplc_pc236.c | 6 +-
7248 drivers/staging/comedi/drivers/amplc_pc263.c | 6 +-
7249 drivers/staging/comedi/drivers/amplc_pci224.c | 9 +-
7250 drivers/staging/comedi/drivers/amplc_pci230.c | 9 +-
7251 drivers/staging/comedi/drivers/cb_das16_cs.c | 18 +-
7252 drivers/staging/comedi/drivers/cb_pcidas.c | 17 +-
7253 drivers/staging/comedi/drivers/cb_pcidda.c | 18 +-
7254 drivers/staging/comedi/drivers/cb_pcidio.c | 23 +-
7255 drivers/staging/comedi/drivers/cb_pcimdas.c | 50 +-
7256 drivers/staging/comedi/drivers/cb_pcimdda.c | 6 +-
7257 drivers/staging/comedi/drivers/contec_pci_dio.c | 7 +-
7258 drivers/staging/comedi/drivers/daqboard2000.c | 25 +-
7259 drivers/staging/comedi/drivers/das08.c | 6 +-
7260 drivers/staging/comedi/drivers/das08_cs.c | 8 +-
7261 drivers/staging/comedi/drivers/das16m1.c | 37 +-
7262 drivers/staging/comedi/drivers/das6402.c | 23 +-
7263 drivers/staging/comedi/drivers/das800.c | 43 +-
7264 drivers/staging/comedi/drivers/jr3_pci.c | 18 +-
7265 drivers/staging/comedi/drivers/ke_counter.c | 6 +-
7266 drivers/staging/comedi/drivers/me_daq.c | 9 +-
7267 drivers/staging/comedi/drivers/ni_daq_dio24.c | 19 +-
7268 drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 +-
7269 drivers/staging/comedi/drivers/ni_pcimio.c | 29 +-
7270 drivers/staging/comedi/drivers/pcl816.c | 4 +-
7271 drivers/staging/comedi/drivers/pcl818.c | 108 +-
7272 drivers/staging/comedi/drivers/pcmmio.c | 26 +-
7273 drivers/staging/comedi/drivers/pcmuio.c | 10 +-
7274 drivers/staging/comedi/drivers/serial2002.c | 7 +-
7275 drivers/staging/cxt1e1/comet.h | 22 -
7276 drivers/staging/cxt1e1/comet_tables.c | 24 -
7277 drivers/staging/cxt1e1/comet_tables.h | 24 -
7278 drivers/staging/cxt1e1/libsbew.h | 32 -
7279 drivers/staging/cxt1e1/musycc.c | 49 -
7280 drivers/staging/cxt1e1/musycc.h | 31 -
7281 drivers/staging/cxt1e1/ossiRelease.c | 10 -
7282 drivers/staging/cxt1e1/pmc93x6_eeprom.h | 21 -
7283 drivers/staging/cxt1e1/pmcc4.h | 42 -
7284 drivers/staging/cxt1e1/pmcc4_cpld.h | 33 -
7285 drivers/staging/cxt1e1/pmcc4_defs.h | 14 -
7286 drivers/staging/cxt1e1/pmcc4_drv.c | 70 -
7287 drivers/staging/cxt1e1/pmcc4_ioctls.h | 16 -
7288 drivers/staging/cxt1e1/sbe_bid.h | 14 -
7289 drivers/staging/cxt1e1/sbe_promformat.h | 27 -
7290 drivers/staging/cxt1e1/sbecom_inline_linux.h | 20 -
7291 drivers/staging/cxt1e1/sbeproc.h | 20 -
7292 drivers/staging/cxt1e1/sbew_ioc.h | 55 -
7293 drivers/staging/et131x/et131x.c | 384 +-
7294 drivers/staging/frontier/tranzport.c | 2 +-
7295 drivers/staging/gma500/Kconfig | 2 +-
7296 drivers/staging/hv/Kconfig | 6 -
7297 drivers/staging/hv/Makefile | 2 -
7298 drivers/staging/hv/TODO | 1 -
7299 drivers/staging/hv/storvsc_drv.c | 207 +-
7300 drivers/staging/iio/Documentation/iio_utils.h | 1 +
7301 drivers/staging/iio/Documentation/sysfs-bus-iio | 10 +
7302 drivers/staging/iio/Kconfig | 1 -
7303 drivers/staging/iio/accel/adis16201_core.c | 36 +-
7304 drivers/staging/iio/accel/adis16203_core.c | 24 +-
7305 drivers/staging/iio/accel/adis16204_core.c | 35 +-
7306 drivers/staging/iio/accel/adis16209_core.c | 32 +-
7307 drivers/staging/iio/accel/adis16220_core.c | 27 +-
7308 drivers/staging/iio/accel/adis16240_core.c | 32 +-
7309 drivers/staging/iio/accel/kxsd9.c | 10 +-
7310 drivers/staging/iio/accel/lis3l02dq_core.c | 26 +-
7311 drivers/staging/iio/accel/lis3l02dq_ring.c | 3 +-
7312 drivers/staging/iio/accel/sca3000_core.c | 12 +-
7313 drivers/staging/iio/accel/sca3000_ring.c | 2 +-
7314 drivers/staging/iio/adc/ad7192.c | 39 +-
7315 drivers/staging/iio/adc/ad7280a.c | 27 +-
7316 drivers/staging/iio/adc/ad7291.c | 39 +-
7317 drivers/staging/iio/adc/ad7298_core.c | 58 +-
7318 drivers/staging/iio/adc/ad7298_ring.c | 2 +-
7319 drivers/staging/iio/adc/ad7476_core.c | 22 +-
7320 drivers/staging/iio/adc/ad7476_ring.c | 2 +-
7321 drivers/staging/iio/adc/ad7606_core.c | 4 +-
7322 drivers/staging/iio/adc/ad7606_par.c | 1 -
7323 drivers/staging/iio/adc/ad7606_ring.c | 2 +-
7324 drivers/staging/iio/adc/ad7606_spi.c | 2 +-
7325 drivers/staging/iio/adc/ad7780.c | 7 +-
7326 drivers/staging/iio/adc/ad7793.c | 53 +-
7327 drivers/staging/iio/adc/ad7816.c | 1 +
7328 drivers/staging/iio/adc/ad7887_core.c | 10 +-
7329 drivers/staging/iio/adc/ad7887_ring.c | 2 +-
7330 drivers/staging/iio/adc/ad799x_core.c | 6 +-
7331 drivers/staging/iio/adc/ad799x_ring.c | 2 +-
7332 drivers/staging/iio/adc/adt7310.c | 2 +-
7333 drivers/staging/iio/adc/adt7410.c | 1 +
7334 drivers/staging/iio/adc/max1363_core.c | 7 +-
7335 drivers/staging/iio/adc/max1363_ring.c | 2 +-
7336 drivers/staging/iio/addac/adt7316.c | 1 +
7337 drivers/staging/iio/{buffer_generic.h => buffer.h} | 1 -
7338 drivers/staging/iio/cdc/ad7150.c | 8 +-
7339 drivers/staging/iio/cdc/ad7152.c | 38 +-
7340 drivers/staging/iio/cdc/ad7746.c | 50 +-
7341 drivers/staging/iio/chrdev.h | 25 -
7342 drivers/staging/iio/dac/Kconfig | 12 +-
7343 drivers/staging/iio/dac/Makefile | 1 +
7344 drivers/staging/iio/dac/ad5064.c | 6 +-
7345 drivers/staging/iio/dac/ad5360.c | 24 +-
7346 drivers/staging/iio/dac/ad5421.c | 555 +++
7347 drivers/staging/iio/dac/ad5421.h | 32 +
7348 drivers/staging/iio/dac/ad5446.c | 183 +-
7349 drivers/staging/iio/dac/ad5446.h | 10 +-
7350 drivers/staging/iio/dac/ad5504.c | 132 +-
7351 drivers/staging/iio/dac/ad5504.h | 5 +-
7352 drivers/staging/iio/dac/ad5624r.h | 4 +-
7353 drivers/staging/iio/dac/ad5624r_spi.c | 127 +-
7354 drivers/staging/iio/dac/ad5686.c | 5 +-
7355 drivers/staging/iio/dac/ad5791.c | 9 +-
7356 drivers/staging/iio/dds/ad5930.c | 1 +
7357 drivers/staging/iio/dds/ad9832.c | 4 +-
7358 drivers/staging/iio/dds/ad9834.c | 6 +-
7359 drivers/staging/iio/dds/ad9850.c | 1 +
7360 drivers/staging/iio/dds/ad9852.c | 1 +
7361 drivers/staging/iio/dds/ad9910.c | 1 +
7362 drivers/staging/iio/dds/ad9951.c | 1 +
7363 drivers/staging/iio/events.h | 103 +
7364 drivers/staging/iio/gyro/adis16060_core.c | 8 +-
7365 drivers/staging/iio/gyro/adis16080_core.c | 1 +
7366 drivers/staging/iio/gyro/adis16130_core.c | 1 +
7367 drivers/staging/iio/gyro/adis16260_core.c | 30 +-
7368 drivers/staging/iio/gyro/adxrs450_core.c | 9 +-
7369 drivers/staging/iio/iio.h | 109 +-
7370 drivers/staging/iio/iio_core.h | 2 +-
7371 drivers/staging/iio/iio_core_trigger.h | 3 +-
7372 drivers/staging/iio/iio_dummy_evgen.c | 4 +
7373 drivers/staging/iio/iio_simple_dummy.c | 49 +-
7374 drivers/staging/iio/iio_simple_dummy_events.c | 1 +
7375 drivers/staging/iio/impedance-analyzer/ad5933.c | 10 +-
7376 drivers/staging/iio/imu/adis16400.h | 2 +
7377 drivers/staging/iio/imu/adis16400_core.c | 269 +-
7378 drivers/staging/iio/industrialio-buffer.c | 22 +-
7379 drivers/staging/iio/industrialio-core.c | 48 +-
7380 drivers/staging/iio/industrialio-trigger.c | 34 +-
7381 drivers/staging/iio/kfifo_buf.c | 9 +-
7382 drivers/staging/iio/kfifo_buf.h | 2 +-
7383 drivers/staging/iio/light/isl29018.c | 7 +-
7384 drivers/staging/iio/light/tsl2563.c | 11 +-
7385 drivers/staging/iio/magnetometer/ak8975.c | 4 +-
7386 drivers/staging/iio/magnetometer/hmc5843.c | 5 +-
7387 drivers/staging/iio/meter/ade7753.c | 1 +
7388 drivers/staging/iio/meter/ade7754.c | 1 +
7389 drivers/staging/iio/meter/ade7758_core.c | 37 +-
7390 drivers/staging/iio/meter/ade7759.c | 1 +
7391 drivers/staging/iio/meter/ade7854-spi.c | 1 +
7392 drivers/staging/iio/resolver/ad2s1200.c | 1 +
7393 drivers/staging/iio/resolver/ad2s1210.c | 1 +
7394 drivers/staging/iio/resolver/ad2s90.c | 1 +
7395 drivers/staging/iio/ring_sw.h | 2 +-
7396 drivers/staging/iio/sysfs.h | 43 -
7397 drivers/staging/iio/types.h | 49 +
7398 drivers/staging/line6/Makefile | 3 +-
7399 drivers/staging/line6/capture.c | 15 +
7400 drivers/staging/line6/driver.c | 24 +-
7401 drivers/staging/line6/midi.c | 13 +-
7402 drivers/staging/line6/pcm.c | 36 +-
7403 drivers/staging/line6/playback.c | 15 +
7404 drivers/staging/line6/podhd.c | 158 +
7405 drivers/staging/line6/podhd.h | 30 +
7406 drivers/staging/line6/usbdefs.h | 2 +
7407 drivers/staging/lttng/Kconfig | 35 +
7408 drivers/staging/lttng/LICENSE | 27 +
7409 drivers/staging/lttng/Makefile | 33 +
7410 drivers/staging/lttng/README | 48 +
7411 drivers/staging/lttng/TODO | 137 +
7412 .../staging/lttng/instrumentation/events/README | 7 +
7413 .../instrumentation/events/lttng-module/block.h | 626 +++
7414 .../instrumentation/events/lttng-module/irq.h | 155 +
7415 .../instrumentation/events/lttng-module/kvm.h | 312 ++
7416 .../instrumentation/events/lttng-module/lttng.h | 34 +
7417 .../instrumentation/events/lttng-module/sched.h | 400 ++
7418 .../instrumentation/events/lttng-module/syscalls.h | 76 +
7419 .../lttng/instrumentation/events/mainline/block.h | 569 +++
7420 .../lttng/instrumentation/events/mainline/irq.h | 150 +
7421 .../lttng/instrumentation/events/mainline/kvm.h | 312 ++
7422 .../lttng/instrumentation/events/mainline/sched.h | 397 ++
7423 .../instrumentation/events/mainline/syscalls.h | 75 +
7424 .../syscalls/3.0.4/x86-64-syscalls-3.0.4 | 263 ++
7425 .../syscalls/3.1.0-rc6/x86-32-syscalls-3.1.0-rc6 | 291 ++
7426 .../staging/lttng/instrumentation/syscalls/README | 18 +
7427 .../syscalls/headers/compat_syscalls_integers.h | 3 +
7428 .../syscalls/headers/compat_syscalls_pointers.h | 3 +
7429 .../syscalls/headers/syscalls_integers.h | 7 +
7430 .../syscalls/headers/syscalls_integers_override.h | 14 +
7431 .../syscalls/headers/syscalls_pointers.h | 7 +
7432 .../syscalls/headers/syscalls_pointers_override.h | 4 +
7433 .../syscalls/headers/syscalls_unknown.h | 55 +
7434 .../headers/x86-32-syscalls-3.1.0-rc6_integers.h | 1163 ++++++
7435 .../x86-32-syscalls-3.1.0-rc6_integers_override.h | 38 +
7436 .../headers/x86-32-syscalls-3.1.0-rc6_pointers.h | 2232 ++++++++++
7437 .../x86-32-syscalls-3.1.0-rc6_pointers_override.h | 17 +
7438 .../headers/x86-64-syscalls-3.0.4_integers.h | 1013 +++++
7439 .../x86-64-syscalls-3.0.4_integers_override.h | 3 +
7440 .../headers/x86-64-syscalls-3.0.4_pointers.h | 2076 ++++++++++
7441 .../x86-64-syscalls-3.0.4_pointers_override.h | 5 +
7442 .../syscalls/lttng-syscalls-extractor/Makefile | 1 +
7443 .../lttng-syscalls-extractor.c | 85 +
7444 .../syscalls/lttng-syscalls-generate-headers.sh | 275 ++
7445 drivers/staging/lttng/lib/Makefile | 11 +
7446 drivers/staging/lttng/lib/align.h | 61 +
7447 drivers/staging/lttng/lib/bitfield.h | 400 ++
7448 drivers/staging/lttng/lib/bug.h | 29 +
7449 .../staging/lttng/lib/prio_heap/lttng_prio_heap.c | 207 +
7450 .../staging/lttng/lib/prio_heap/lttng_prio_heap.h | 117 +
7451 drivers/staging/lttng/lib/ringbuffer/api.h | 25 +
7452 drivers/staging/lttng/lib/ringbuffer/backend.h | 250 ++
7453 .../lttng/lib/ringbuffer/backend_internal.h | 449 ++
7454 .../staging/lttng/lib/ringbuffer/backend_types.h | 80 +
7455 drivers/staging/lttng/lib/ringbuffer/config.h | 298 ++
7456 drivers/staging/lttng/lib/ringbuffer/frontend.h | 228 ++
7457 .../staging/lttng/lib/ringbuffer/frontend_api.h | 358 ++
7458 .../lttng/lib/ringbuffer/frontend_internal.h | 424 ++
7459 .../staging/lttng/lib/ringbuffer/frontend_types.h | 176 +
7460 drivers/staging/lttng/lib/ringbuffer/iterator.h | 70 +
7461 drivers/staging/lttng/lib/ringbuffer/nohz.h | 30 +
7462 .../lttng/lib/ringbuffer/ring_buffer_backend.c | 854 ++++
7463 .../lttng/lib/ringbuffer/ring_buffer_frontend.c | 1721 ++++++++
7464 .../lttng/lib/ringbuffer/ring_buffer_iterator.c | 798 ++++
7465 .../lttng/lib/ringbuffer/ring_buffer_mmap.c | 115 +
7466 .../lttng/lib/ringbuffer/ring_buffer_splice.c | 202 +
7467 .../staging/lttng/lib/ringbuffer/ring_buffer_vfs.c | 387 ++
7468 drivers/staging/lttng/lib/ringbuffer/vatomic.h | 85 +
7469 drivers/staging/lttng/lib/ringbuffer/vfs.h | 89 +
7470 drivers/staging/lttng/ltt-context.c | 93 +
7471 drivers/staging/lttng/ltt-debugfs-abi.c | 777 ++++
7472 drivers/staging/lttng/ltt-debugfs-abi.h | 153 +
7473 drivers/staging/lttng/ltt-endian.h | 31 +
7474 drivers/staging/lttng/ltt-events.c | 1009 +++++
7475 drivers/staging/lttng/ltt-events.h | 452 ++
7476 drivers/staging/lttng/ltt-probes.c | 164 +
7477 .../staging/lttng/ltt-ring-buffer-client-discard.c | 21 +
7478 .../lttng/ltt-ring-buffer-client-mmap-discard.c | 21 +
7479 .../lttng/ltt-ring-buffer-client-mmap-overwrite.c | 21 +
7480 .../lttng/ltt-ring-buffer-client-overwrite.c | 21 +
7481 drivers/staging/lttng/ltt-ring-buffer-client.h | 569 +++
7482 .../lttng/ltt-ring-buffer-metadata-client.c | 21 +
7483 .../lttng/ltt-ring-buffer-metadata-client.h | 330 ++
7484 .../lttng/ltt-ring-buffer-metadata-mmap-client.c | 21 +
7485 drivers/staging/lttng/ltt-tracer-core.h | 28 +
7486 drivers/staging/lttng/ltt-tracer.h | 67 +
7487 drivers/staging/lttng/lttng-calibrate.c | 30 +
7488 drivers/staging/lttng/lttng-context-nice.c | 68 +
7489 .../staging/lttng/lttng-context-perf-counters.c | 271 ++
7490 drivers/staging/lttng/lttng-context-pid.c | 68 +
7491 drivers/staging/lttng/lttng-context-ppid.c | 71 +
7492 drivers/staging/lttng/lttng-context-prio.c | 89 +
7493 drivers/staging/lttng/lttng-context-procname.c | 72 +
7494 drivers/staging/lttng/lttng-context-tid.c | 68 +
7495 drivers/staging/lttng/lttng-context-vpid.c | 74 +
7496 drivers/staging/lttng/lttng-context-vppid.c | 79 +
7497 drivers/staging/lttng/lttng-context-vtid.c | 74 +
7498 drivers/staging/lttng/lttng-syscalls.c | 438 ++
7499 drivers/staging/lttng/probes/Makefile | 37 +
7500 drivers/staging/lttng/probes/define_trace.h | 132 +
7501 drivers/staging/lttng/probes/lttng-events-reset.h | 84 +
7502 drivers/staging/lttng/probes/lttng-events.h | 703 ++++
7503 drivers/staging/lttng/probes/lttng-ftrace.c | 188 +
7504 drivers/staging/lttng/probes/lttng-kprobes.c | 164 +
7505 drivers/staging/lttng/probes/lttng-kretprobes.c | 277 ++
7506 drivers/staging/lttng/probes/lttng-probe-block.c | 31 +
7507 drivers/staging/lttng/probes/lttng-probe-irq.c | 31 +
7508 drivers/staging/lttng/probes/lttng-probe-kvm.c | 31 +
7509 drivers/staging/lttng/probes/lttng-probe-lttng.c | 24 +
7510 drivers/staging/lttng/probes/lttng-probe-sched.c | 30 +
7511 drivers/staging/lttng/probes/lttng-type-list.h | 21 +
7512 drivers/staging/lttng/probes/lttng-types.c | 49 +
7513 drivers/staging/lttng/probes/lttng-types.h | 72 +
7514 drivers/staging/lttng/probes/lttng.h | 15 +
7515 drivers/staging/lttng/wrapper/ftrace.h | 70 +
7516 drivers/staging/lttng/wrapper/inline_memcpy.h | 11 +
7517 drivers/staging/lttng/wrapper/kallsyms.h | 28 +
7518 drivers/staging/lttng/wrapper/perf.h | 32 +
7519 drivers/staging/lttng/wrapper/poll.h | 14 +
7520 drivers/staging/lttng/wrapper/ringbuffer/api.h | 1 +
7521 drivers/staging/lttng/wrapper/ringbuffer/backend.h | 1 +
7522 .../lttng/wrapper/ringbuffer/backend_internal.h | 2 +
7523 .../lttng/wrapper/ringbuffer/backend_types.h | 1 +
7524 drivers/staging/lttng/wrapper/ringbuffer/config.h | 1 +
7525 .../staging/lttng/wrapper/ringbuffer/frontend.h | 1 +
7526 .../lttng/wrapper/ringbuffer/frontend_api.h | 1 +
7527 .../lttng/wrapper/ringbuffer/frontend_internal.h | 1 +
7528 .../lttng/wrapper/ringbuffer/frontend_types.h | 1 +
7529 .../staging/lttng/wrapper/ringbuffer/iterator.h | 1 +
7530 drivers/staging/lttng/wrapper/ringbuffer/nohz.h | 1 +
7531 drivers/staging/lttng/wrapper/ringbuffer/vatomic.h | 1 +
7532 drivers/staging/lttng/wrapper/ringbuffer/vfs.h | 1 +
7533 drivers/staging/lttng/wrapper/spinlock.h | 26 +
7534 drivers/staging/lttng/wrapper/splice.c | 46 +
7535 drivers/staging/lttng/wrapper/splice.h | 23 +
7536 drivers/staging/lttng/wrapper/trace-clock.h | 75 +
7537 drivers/staging/lttng/wrapper/uuid.h | 29 +
7538 drivers/staging/lttng/wrapper/vmalloc.h | 49 +
7539 drivers/staging/mei/init.c | 35 +-
7540 drivers/staging/mei/interrupt.c | 296 +-
7541 drivers/staging/mei/iorw.c | 58 +-
7542 drivers/staging/mei/main.c | 561 +--
7543 drivers/staging/mei/mei_dev.h | 8 -
7544 drivers/staging/mei/wd.c | 4 +-
7545 drivers/staging/nvec/nvec.c | 30 +-
7546 drivers/staging/omapdrm/Kconfig | 25 +
7547 drivers/staging/omapdrm/Makefile | 12 +
7548 drivers/staging/omapdrm/TODO | 32 +
7549 drivers/staging/omapdrm/omap_connector.c | 371 ++
7550 drivers/staging/omapdrm/omap_crtc.c | 327 ++
7551 drivers/staging/omapdrm/omap_drm.h | 123 +
7552 drivers/staging/omapdrm/omap_drv.c | 810 ++++
7553 drivers/staging/omapdrm/omap_drv.h | 124 +
7554 drivers/staging/omapdrm/omap_encoder.c | 172 +
7555 drivers/staging/omapdrm/omap_fb.c | 261 ++
7556 drivers/staging/omapdrm/omap_fbdev.c | 304 ++
7557 drivers/staging/omapdrm/omap_gem.c | 774 ++++
7558 drivers/staging/omapdrm/omap_gem_helpers.c | 114 +
7559 drivers/staging/omapdrm/omap_priv.h | 42 +
7560 drivers/staging/phison/phison.c | 2 +-
7561 drivers/staging/rtl8192e/Kconfig | 58 +-
7562 drivers/staging/rtl8192e/Makefile | 47 +-
7563 drivers/staging/rtl8192e/dot11d.c | 4 +-
7564 drivers/staging/rtl8192e/dot11d.h | 2 +-
7565 drivers/staging/rtl8192e/rtl8192e/Kconfig | 9 +
7566 drivers/staging/rtl8192e/rtl8192e/Makefile | 21 +
7567 .../staging/rtl8192e/{ => }/rtl8192e/r8190P_def.h | 0
7568 .../rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.c | 0
7569 .../rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.h | 0
7570 .../rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.c | 0
7571 .../rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.h | 0
7572 .../staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.c | 0
7573 .../staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.h | 0
7574 .../rtl8192e/{ => }/rtl8192e/r8192E_firmware.c | 0
7575 .../rtl8192e/{ => }/rtl8192e/r8192E_firmware.h | 0
7576 .../staging/rtl8192e/{ => }/rtl8192e/r8192E_hw.h | 0
7577 .../rtl8192e/{ => }/rtl8192e/r8192E_hwimg.c | 0
7578 .../rtl8192e/{ => }/rtl8192e/r8192E_hwimg.h | 0
7579 .../staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.c | 3 +-
7580 .../staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.h | 0
7581 .../rtl8192e/{ => }/rtl8192e/r8192E_phyreg.h | 0
7582 .../rtl8192e/{ => }/rtl8192e/r819xE_phyreg.h | 0
7583 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.c | 0
7584 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.h | 0
7585 .../staging/rtl8192e/{ => }/rtl8192e/rtl_core.c | 68 +-
7586 .../staging/rtl8192e/{ => }/rtl8192e/rtl_core.h | 52 +-
7587 .../staging/rtl8192e/{ => }/rtl8192e/rtl_crypto.h | 0
7588 .../staging/rtl8192e/{ => }/rtl8192e/rtl_debug.c | 79 -
7589 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.c | 0
7590 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.h | 0
7591 .../staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.c | 0
7592 .../staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.h | 0
7593 .../staging/rtl8192e/{ => }/rtl8192e/rtl_ethtool.c | 0
7594 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.c | 0
7595 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.h | 1 -
7596 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.c | 2 -
7597 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.h | 4 -
7598 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.c | 0
7599 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.h | 2 +-
7600 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.c | 1 -
7601 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.h | 0
7602 drivers/staging/rtl8192e/rtl819x_BAProc.c | 1 -
7603 drivers/staging/rtl8192e/rtl819x_HTProc.c | 5 +-
7604 drivers/staging/rtl8192e/rtl819x_TSProc.c | 1 +
7605 drivers/staging/rtl8192e/rtl_debug.h | 299 --
7606 drivers/staging/rtl8192e/rtllib.h | 9 +-
7607 drivers/staging/rtl8192e/rtllib_crypt.c | 17 +-
7608 drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 13 +-
7609 drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 12 +-
7610 drivers/staging/rtl8192e/rtllib_crypt_wep.c | 12 +-
7611 drivers/staging/rtl8192e/rtllib_debug.h | 86 +
7612 drivers/staging/rtl8192e/rtllib_module.c | 15 +-
7613 drivers/staging/rtl8192e/rtllib_rx.c | 6 +-
7614 drivers/staging/rtl8192e/rtllib_softmac.c | 29 +-
7615 drivers/staging/rtl8192e/rtllib_softmac_wx.c | 19 +-
7616 drivers/staging/rtl8192e/rtllib_tx.c | 1 +
7617 drivers/staging/rtl8192e/rtllib_wx.c | 16 +-
7618 drivers/staging/rtl8192u/ieee80211/api.c | 244 --
7619 drivers/staging/rtl8712/rtl871x_mlme.c | 2 +-
7620 drivers/staging/sep/sep_driver.c | 2 +
7621 drivers/staging/serial/68360serial.c | 4 +-
7622 drivers/staging/sm7xx/smtcfb.c | 6 +-
7623 drivers/staging/speakup/kobjects.c | 3 +-
7624 drivers/staging/speakup/main.c | 5 +-
7625 drivers/staging/spectra/Kconfig | 41 -
7626 drivers/staging/spectra/Makefile | 11 -
7627 drivers/staging/spectra/README | 29 -
7628 drivers/staging/spectra/ffsdefs.h | 58 -
7629 drivers/staging/spectra/ffsport.c | 834 ----
7630 drivers/staging/spectra/ffsport.h | 85 -
7631 drivers/staging/spectra/flash.c | 4305 --------------------
7632 drivers/staging/spectra/flash.h | 198 -
7633 drivers/staging/spectra/lld.c | 339 --
7634 drivers/staging/spectra/lld.h | 111 -
7635 drivers/staging/spectra/lld_cdma.c | 910 -----
7636 drivers/staging/spectra/lld_cdma.h | 123 -
7637 drivers/staging/spectra/lld_emu.c | 776 ----
7638 drivers/staging/spectra/lld_emu.h | 51 -
7639 drivers/staging/spectra/lld_mtd.c | 683 ----
7640 drivers/staging/spectra/lld_mtd.h | 51 -
7641 drivers/staging/spectra/lld_nand.c | 2619 ------------
7642 drivers/staging/spectra/lld_nand.h | 131 -
7643 drivers/staging/spectra/nand_regs.h | 619 ---
7644 drivers/staging/spectra/spectraswconfig.h | 82 -
7645 drivers/staging/tidspbridge/core/dsp-clock.c | 15 +-
7646 drivers/staging/tidspbridge/rmgr/drv_interface.c | 4 -
7647 drivers/staging/vme/TODO | 67 +-
7648 drivers/staging/vme/bridges/vme_ca91cx42.c | 13 +-
7649 drivers/staging/vme/devices/Kconfig | 12 +
7650 drivers/staging/vme/devices/Makefile | 3 +
7651 drivers/staging/vme/devices/vme_pio2.h | 249 ++
7652 drivers/staging/vme/devices/vme_pio2_cntr.c | 71 +
7653 drivers/staging/vme/devices/vme_pio2_core.c | 524 +++
7654 drivers/staging/vme/devices/vme_pio2_gpio.c | 232 ++
7655 drivers/staging/vme/vme.c | 31 +-
7656 drivers/staging/vme/vme.h | 2 +-
7657 drivers/staging/vt6655/device_main.c | 6 +-
7658 drivers/staging/vt6655/ioctl.c | 8 +
7659 drivers/staging/vt6655/iwctl.c | 12 -
7660 drivers/staging/vt6655/iwctl.h | 5 -
7661 drivers/staging/vt6656/80211mgr.c | 35 +-
7662 drivers/staging/vt6656/baseband.c | 61 +-
7663 drivers/staging/vt6656/bssdb.c | 100 +-
7664 drivers/staging/vt6656/card.c | 4 +-
7665 drivers/staging/vt6656/card.h | 2 +-
7666 drivers/staging/vt6656/ioctl.c | 8 +
7667 drivers/staging/vt6656/iwctl.c | 12 -
7668 drivers/staging/vt6656/iwctl.h | 5 -
7669 drivers/staging/vt6656/main_usb.c | 12 +-
7670 drivers/staging/wlags49_h2/wl_pci.c | 13 +-
7671 drivers/staging/xgifb/Makefile | 2 +-
7672 drivers/staging/xgifb/XGI_main.h | 12 +-
7673 drivers/staging/xgifb/vb_ext.c | 444 --
7674 drivers/staging/xgifb/vb_ext.h | 9 -
7675 drivers/staging/xgifb/vb_init.c | 45 +-
7676 drivers/staging/xgifb/vb_setmode.c | 897 ++---
7677 drivers/staging/xgifb/vb_setmode.h | 46 -
7678 drivers/staging/xgifb/vb_struct.h | 2 +-
7679 drivers/staging/zcache/zcache-main.c | 6 +-
7680 drivers/video/omap2/omapfb/Kconfig | 2 +-
7681 478 files changed, 40472 insertions(+), 17490 deletions(-)
7682 create mode 100644 Documentation/devicetree/bindings/nvec/nvec_nvidia.txt
7683 create mode 100644 drivers/net/hyperv/Kconfig
7684 create mode 100644 drivers/net/hyperv/Makefile
7685 rename drivers/{staging/hv => net/hyperv}/hyperv_net.h (100%)
7686 rename drivers/{staging/hv => net/hyperv}/netvsc.c (98%)
7687 rename drivers/{staging/hv => net/hyperv}/netvsc_drv.c (100%)
7688 rename drivers/{staging/hv => net/hyperv}/rndis_filter.c (100%)
7689 create mode 100644 drivers/staging/android/Kconfig
7690 create mode 100644 drivers/staging/android/Makefile
7691 create mode 100644 drivers/staging/android/TODO
7692 create mode 100644 drivers/staging/android/binder.c
7693 create mode 100644 drivers/staging/android/binder.h
7694 create mode 100644 drivers/staging/android/logger.c
7695 create mode 100644 drivers/staging/android/logger.h
7696 create mode 100644 drivers/staging/android/lowmemorykiller.c
7697 create mode 100644 drivers/staging/android/ram_console.c
7698 create mode 100644 drivers/staging/android/ram_console.h
7699 create mode 100644 drivers/staging/android/timed_gpio.c
7700 create mode 100644 drivers/staging/android/timed_gpio.h
7701 create mode 100644 drivers/staging/android/timed_output.c
7702 create mode 100644 drivers/staging/android/timed_output.h
7703 rename drivers/staging/iio/{buffer_generic.h => buffer.h} (99%)
7704 delete mode 100644 drivers/staging/iio/chrdev.h
7705 create mode 100644 drivers/staging/iio/dac/ad5421.c
7706 create mode 100644 drivers/staging/iio/dac/ad5421.h
7707 create mode 100644 drivers/staging/iio/events.h
7708 create mode 100644 drivers/staging/iio/types.h
7709 create mode 100644 drivers/staging/line6/podhd.c
7710 create mode 100644 drivers/staging/line6/podhd.h
7711 create mode 100644 drivers/staging/lttng/Kconfig
7712 create mode 100644 drivers/staging/lttng/LICENSE
7713 create mode 100644 drivers/staging/lttng/Makefile
7714 create mode 100644 drivers/staging/lttng/README
7715 create mode 100644 drivers/staging/lttng/TODO
7716 create mode 100644 drivers/staging/lttng/instrumentation/events/README
7717 create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/block.h
7718 create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/irq.h
7719 create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/kvm.h
7720 create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/lttng.h
7721 create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/sched.h
7722 create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/syscalls.h
7723 create mode 100644 drivers/staging/lttng/instrumentation/events/mainline/block.h
7724 create mode 100644 drivers/staging/lttng/instrumentation/events/mainline/irq.h
7725 create mode 100644 drivers/staging/lttng/instrumentation/events/mainline/kvm.h
7726 create mode 100644 drivers/staging/lttng/instrumentation/events/mainline/sched.h
7727 create mode 100644 drivers/staging/lttng/instrumentation/events/mainline/syscalls.h
7728 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/3.0.4/x86-64-syscalls-3.0.4
7729 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/3.1.0-rc6/x86-32-syscalls-3.1.0-rc6
7730 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/README
7731 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/compat_syscalls_integers.h
7732 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/compat_syscalls_pointers.h
7733 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/syscalls_integers.h
7734 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/syscalls_integers_override.h
7735 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/syscalls_pointers.h
7736 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/syscalls_pointers_override.h
7737 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/syscalls_unknown.h
7738 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers.h
7739 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers_override.h
7740 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers.h
7741 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers_override.h
7742 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4_integers.h
7743 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4_integers_override.h
7744 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4_pointers.h
7745 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4_pointers_override.h
7746 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/lttng-syscalls-extractor/Makefile
7747 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/lttng-syscalls-extractor/lttng-syscalls-extractor.c
7748 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/lttng-syscalls-generate-headers.sh
7749 create mode 100644 drivers/staging/lttng/lib/Makefile
7750 create mode 100644 drivers/staging/lttng/lib/align.h
7751 create mode 100644 drivers/staging/lttng/lib/bitfield.h
7752 create mode 100644 drivers/staging/lttng/lib/bug.h
7753 create mode 100644 drivers/staging/lttng/lib/prio_heap/lttng_prio_heap.c
7754 create mode 100644 drivers/staging/lttng/lib/prio_heap/lttng_prio_heap.h
7755 create mode 100644 drivers/staging/lttng/lib/ringbuffer/api.h
7756 create mode 100644 drivers/staging/lttng/lib/ringbuffer/backend.h
7757 create mode 100644 drivers/staging/lttng/lib/ringbuffer/backend_internal.h
7758 create mode 100644 drivers/staging/lttng/lib/ringbuffer/backend_types.h
7759 create mode 100644 drivers/staging/lttng/lib/ringbuffer/config.h
7760 create mode 100644 drivers/staging/lttng/lib/ringbuffer/frontend.h
7761 create mode 100644 drivers/staging/lttng/lib/ringbuffer/frontend_api.h
7762 create mode 100644 drivers/staging/lttng/lib/ringbuffer/frontend_internal.h
7763 create mode 100644 drivers/staging/lttng/lib/ringbuffer/frontend_types.h
7764 create mode 100644 drivers/staging/lttng/lib/ringbuffer/iterator.h
7765 create mode 100644 drivers/staging/lttng/lib/ringbuffer/nohz.h
7766 create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_backend.c
7767 create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c
7768 create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_iterator.c
7769 create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c
7770 create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_splice.c
7771 create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_vfs.c
7772 create mode 100644 drivers/staging/lttng/lib/ringbuffer/vatomic.h
7773 create mode 100644 drivers/staging/lttng/lib/ringbuffer/vfs.h
7774 create mode 100644 drivers/staging/lttng/ltt-context.c
7775 create mode 100644 drivers/staging/lttng/ltt-debugfs-abi.c
7776 create mode 100644 drivers/staging/lttng/ltt-debugfs-abi.h
7777 create mode 100644 drivers/staging/lttng/ltt-endian.h
7778 create mode 100644 drivers/staging/lttng/ltt-events.c
7779 create mode 100644 drivers/staging/lttng/ltt-events.h
7780 create mode 100644 drivers/staging/lttng/ltt-probes.c
7781 create mode 100644 drivers/staging/lttng/ltt-ring-buffer-client-discard.c
7782 create mode 100644 drivers/staging/lttng/ltt-ring-buffer-client-mmap-discard.c
7783 create mode 100644 drivers/staging/lttng/ltt-ring-buffer-client-mmap-overwrite.c
7784 create mode 100644 drivers/staging/lttng/ltt-ring-buffer-client-overwrite.c
7785 create mode 100644 drivers/staging/lttng/ltt-ring-buffer-client.h
7786 create mode 100644 drivers/staging/lttng/ltt-ring-buffer-metadata-client.c
7787 create mode 100644 drivers/staging/lttng/ltt-ring-buffer-metadata-client.h
7788 create mode 100644 drivers/staging/lttng/ltt-ring-buffer-metadata-mmap-client.c
7789 create mode 100644 drivers/staging/lttng/ltt-tracer-core.h
7790 create mode 100644 drivers/staging/lttng/ltt-tracer.h
7791 create mode 100644 drivers/staging/lttng/lttng-calibrate.c
7792 create mode 100644 drivers/staging/lttng/lttng-context-nice.c
7793 create mode 100644 drivers/staging/lttng/lttng-context-perf-counters.c
7794 create mode 100644 drivers/staging/lttng/lttng-context-pid.c
7795 create mode 100644 drivers/staging/lttng/lttng-context-ppid.c
7796 create mode 100644 drivers/staging/lttng/lttng-context-prio.c
7797 create mode 100644 drivers/staging/lttng/lttng-context-procname.c
7798 create mode 100644 drivers/staging/lttng/lttng-context-tid.c
7799 create mode 100644 drivers/staging/lttng/lttng-context-vpid.c
7800 create mode 100644 drivers/staging/lttng/lttng-context-vppid.c
7801 create mode 100644 drivers/staging/lttng/lttng-context-vtid.c
7802 create mode 100644 drivers/staging/lttng/lttng-syscalls.c
7803 create mode 100644 drivers/staging/lttng/probes/Makefile
7804 create mode 100644 drivers/staging/lttng/probes/define_trace.h
7805 create mode 100644 drivers/staging/lttng/probes/lttng-events-reset.h
7806 create mode 100644 drivers/staging/lttng/probes/lttng-events.h
7807 create mode 100644 drivers/staging/lttng/probes/lttng-ftrace.c
7808 create mode 100644 drivers/staging/lttng/probes/lttng-kprobes.c
7809 create mode 100644 drivers/staging/lttng/probes/lttng-kretprobes.c
7810 create mode 100644 drivers/staging/lttng/probes/lttng-probe-block.c
7811 create mode 100644 drivers/staging/lttng/probes/lttng-probe-irq.c
7812 create mode 100644 drivers/staging/lttng/probes/lttng-probe-kvm.c
7813 create mode 100644 drivers/staging/lttng/probes/lttng-probe-lttng.c
7814 create mode 100644 drivers/staging/lttng/probes/lttng-probe-sched.c
7815 create mode 100644 drivers/staging/lttng/probes/lttng-type-list.h
7816 create mode 100644 drivers/staging/lttng/probes/lttng-types.c
7817 create mode 100644 drivers/staging/lttng/probes/lttng-types.h
7818 create mode 100644 drivers/staging/lttng/probes/lttng.h
7819 create mode 100644 drivers/staging/lttng/wrapper/ftrace.h
7820 create mode 100644 drivers/staging/lttng/wrapper/inline_memcpy.h
7821 create mode 100644 drivers/staging/lttng/wrapper/kallsyms.h
7822 create mode 100644 drivers/staging/lttng/wrapper/perf.h
7823 create mode 100644 drivers/staging/lttng/wrapper/poll.h
7824 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/api.h
7825 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/backend.h
7826 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/backend_internal.h
7827 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/backend_types.h
7828 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/config.h
7829 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/frontend.h
7830 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/frontend_api.h
7831 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/frontend_internal.h
7832 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/frontend_types.h
7833 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/iterator.h
7834 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/nohz.h
7835 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/vatomic.h
7836 create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/vfs.h
7837 create mode 100644 drivers/staging/lttng/wrapper/spinlock.h
7838 create mode 100644 drivers/staging/lttng/wrapper/splice.c
7839 create mode 100644 drivers/staging/lttng/wrapper/splice.h
7840 create mode 100644 drivers/staging/lttng/wrapper/trace-clock.h
7841 create mode 100644 drivers/staging/lttng/wrapper/uuid.h
7842 create mode 100644 drivers/staging/lttng/wrapper/vmalloc.h
7843 create mode 100644 drivers/staging/omapdrm/Kconfig
7844 create mode 100644 drivers/staging/omapdrm/Makefile
7845 create mode 100644 drivers/staging/omapdrm/TODO
7846 create mode 100644 drivers/staging/omapdrm/omap_connector.c
7847 create mode 100644 drivers/staging/omapdrm/omap_crtc.c
7848 create mode 100644 drivers/staging/omapdrm/omap_drm.h
7849 create mode 100644 drivers/staging/omapdrm/omap_drv.c
7850 create mode 100644 drivers/staging/omapdrm/omap_drv.h
7851 create mode 100644 drivers/staging/omapdrm/omap_encoder.c
7852 create mode 100644 drivers/staging/omapdrm/omap_fb.c
7853 create mode 100644 drivers/staging/omapdrm/omap_fbdev.c
7854 create mode 100644 drivers/staging/omapdrm/omap_gem.c
7855 create mode 100644 drivers/staging/omapdrm/omap_gem_helpers.c
7856 create mode 100644 drivers/staging/omapdrm/omap_priv.h
7857 create mode 100644 drivers/staging/rtl8192e/rtl8192e/Kconfig
7858 create mode 100644 drivers/staging/rtl8192e/rtl8192e/Makefile
7859 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_def.h (100%)
7860 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.c (100%)
7861 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.h (100%)
7862 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.c (100%)
7863 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.h (100%)
7864 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.c (100%)
7865 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.h (100%)
7866 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_firmware.c (100%)
7867 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_firmware.h (100%)
7868 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hw.h (100%)
7869 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hwimg.c (100%)
7870 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hwimg.h (100%)
7871 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.c (99%)
7872 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.h (100%)
7873 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phyreg.h (100%)
7874 rename drivers/staging/rtl8192e/{ => }/rtl8192e/r819xE_phyreg.h (100%)
7875 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.c (100%)
7876 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.h (100%)
7877 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_core.c (98%)
7878 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_core.h (97%)
7879 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_crypto.h (100%)
7880 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_debug.c (94%)
7881 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.c (100%)
7882 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.h (100%)
7883 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.c (100%)
7884 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.h (100%)
7885 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ethtool.c (100%)
7886 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.c (100%)
7887 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.h (99%)
7888 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.c (99%)
7889 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.h (97%)
7890 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.c (100%)
7891 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.h (98%)
7892 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.c (99%)
7893 rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.h (100%)
7894 delete mode 100644 drivers/staging/rtl8192e/rtl_debug.h
7895 create mode 100644 drivers/staging/rtl8192e/rtllib_debug.h
7896 delete mode 100644 drivers/staging/rtl8192u/ieee80211/api.c
7897 delete mode 100644 drivers/staging/spectra/Kconfig
7898 delete mode 100644 drivers/staging/spectra/Makefile
7899 delete mode 100644 drivers/staging/spectra/README
7900 delete mode 100644 drivers/staging/spectra/ffsdefs.h
7901 delete mode 100644 drivers/staging/spectra/ffsport.c
7902 delete mode 100644 drivers/staging/spectra/ffsport.h
7903 delete mode 100644 drivers/staging/spectra/flash.c
7904 delete mode 100644 drivers/staging/spectra/flash.h
7905 delete mode 100644 drivers/staging/spectra/lld.c
7906 delete mode 100644 drivers/staging/spectra/lld.h
7907 delete mode 100644 drivers/staging/spectra/lld_cdma.c
7908 delete mode 100644 drivers/staging/spectra/lld_cdma.h
7909 delete mode 100644 drivers/staging/spectra/lld_emu.c
7910 delete mode 100644 drivers/staging/spectra/lld_emu.h
7911 delete mode 100644 drivers/staging/spectra/lld_mtd.c
7912 delete mode 100644 drivers/staging/spectra/lld_mtd.h
7913 delete mode 100644 drivers/staging/spectra/lld_nand.c
7914 delete mode 100644 drivers/staging/spectra/lld_nand.h
7915 delete mode 100644 drivers/staging/spectra/nand_regs.h
7916 delete mode 100644 drivers/staging/spectra/spectraswconfig.h
7917 create mode 100644 drivers/staging/vme/devices/vme_pio2.h
7918 create mode 100644 drivers/staging/vme/devices/vme_pio2_cntr.c
7919 create mode 100644 drivers/staging/vme/devices/vme_pio2_core.c
7920 create mode 100644 drivers/staging/vme/devices/vme_pio2_gpio.c
7921 delete mode 100644 drivers/staging/xgifb/vb_ext.c
7922 delete mode 100644 drivers/staging/xgifb/vb_ext.h
7923 Merging char-misc/char-misc-next (7f3379d misc: ad525x_dpot: Add support for SPI module device table matching)
7924 $ git merge char-misc/char-misc-next
7925 Auto-merging drivers/misc/ad525x_dpot.h
7926 Merge made by the 'recursive' strategy.
7927 drivers/misc/ad525x_dpot-i2c.c | 10 +---
7928 drivers/misc/ad525x_dpot-spi.c | 97 ++++++++++++++++------------------------
7929 drivers/misc/ad525x_dpot.c | 24 +++++-----
7930 drivers/misc/ad525x_dpot.h | 8 +---
7931 4 files changed, 53 insertions(+), 86 deletions(-)
7932 Merging bkl-config/config (4ba8216 BKL: That's all, folks)
7933 $ git merge bkl-config/config
7935 Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
7936 $ git merge tmem/tmem
7937 Resolved 'mm/swapfile.c' using previous resolution.
7938 Auto-merging mm/truncate.c
7939 Auto-merging mm/swapfile.c
7940 CONFLICT (content): Merge conflict in mm/swapfile.c
7941 Auto-merging mm/filemap.c
7942 Auto-merging mm/Makefile
7943 Auto-merging mm/Kconfig
7944 Auto-merging include/linux/swap.h
7945 Auto-merging fs/super.c
7946 Auto-merging fs/buffer.c
7947 Auto-merging drivers/staging/zcache/zcache-main.c
7948 Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache
7949 Automatic merge failed; fix conflicts and then commit the result.
7951 [master e7b2e13] Merge remote-tracking branch 'tmem/tmem'
7952 $ git diff -M --stat --summary HEAD^..
7953 .../ABI/testing/sysfs-kernel-mm-cleancache | 11 -
7954 Documentation/vm/cleancache.txt | 41 ++--
7955 Documentation/vm/frontswap.txt | 210 +++++++++++++++
7956 drivers/staging/zcache/zcache-main.c | 10 +-
7957 drivers/xen/tmem.c | 10 +-
7960 include/linux/cleancache.h | 24 +-
7961 include/linux/frontswap.h | 126 +++++++++
7962 include/linux/swap.h | 4 +
7963 include/linux/swapfile.h | 13 +
7966 mm/cleancache.c | 98 +++-----
7968 mm/frontswap.c | 273 ++++++++++++++++++++
7970 mm/swapfile.c | 64 ++++-
7971 mm/truncate.c | 10 +-
7972 19 files changed, 796 insertions(+), 134 deletions(-)
7973 delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache
7974 create mode 100644 Documentation/vm/frontswap.txt
7975 create mode 100644 include/linux/frontswap.h
7976 create mode 100644 include/linux/swapfile.h
7977 create mode 100644 mm/frontswap.c
7978 Merging writeback/writeback-for-next (16ed8d9 btrfs: fix dirtied pages accounting on sub-page writes)
7979 $ git merge writeback/writeback-for-next
7980 Auto-merging kernel/fork.c
7981 Auto-merging kernel/exit.c
7982 Auto-merging include/linux/sched.h
7983 Auto-merging fs/fs-writeback.c
7984 Merge made by the 'recursive' strategy.
7985 fs/btrfs/file.c | 3 +-
7986 fs/fs-writeback.c | 5 ++
7987 include/linux/sched.h | 1 +
7988 include/linux/writeback.h | 4 +
7989 include/trace/events/writeback.h | 14 ++++-
7992 mm/page-writeback.c | 119 +++++++++++++++++++++++++++++++++-----
7993 8 files changed, 130 insertions(+), 19 deletions(-)
7994 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
7995 $ git merge arm-dt/devicetree/arm-next
7997 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
7998 $ git merge hwspinlock/linux-next
8000 Merging pinctrl/for-next (5becdc7 pinctrl/coh901: driver to request its pins)
8001 $ git merge pinctrl/for-next
8002 Auto-merging drivers/pinctrl/pinctrl-coh901.c
8003 Auto-merging drivers/gpio/Makefile
8004 Auto-merging drivers/gpio/Kconfig
8005 Auto-merging arch/arm/mach-u300/core.c
8006 Merge made by the 'recursive' strategy.
8007 Documentation/pinctrl.txt | 124 +++++++------
8008 arch/arm/mach-u300/Kconfig | 2 +-
8009 arch/arm/mach-u300/core.c | 2 +-
8010 arch/arm/mach-u300/include/mach/gpio-u300.h | 115 -----------
8011 arch/arm/mach-u300/include/mach/irqs.h | 2 +-
8012 arch/arm/mach-u300/mmc.c | 2 +-
8013 arch/arm/mach-u300/u300-gpio.h | 114 +++++++++++
8014 drivers/gpio/Kconfig | 9 -
8015 drivers/gpio/Makefile | 1 -
8016 drivers/pinctrl/Kconfig | 9 +
8017 drivers/pinctrl/Makefile | 1 +
8018 drivers/pinctrl/core.c | 40 ++++-
8019 drivers/pinctrl/core.h | 4 +-
8020 .../{gpio/gpio-u300.c => pinctrl/pinctrl-coh901.c} | 21 ++
8021 drivers/pinctrl/pinmux-sirf.c | 6 +-
8022 drivers/pinctrl/pinmux-u300.c | 46 ++++--
8023 drivers/pinctrl/pinmux.c | 202 +++++++++++++-------
8024 include/linux/pinctrl/machine.h | 2 +-
8025 include/linux/pinctrl/pinctrl.h | 2 +
8026 include/linux/pinctrl/pinmux.h | 29 +++-
8027 20 files changed, 459 insertions(+), 274 deletions(-)
8028 create mode 100644 arch/arm/mach-u300/u300-gpio.h
8029 rename drivers/{gpio/gpio-u300.c => pinctrl/pinctrl-coh901.c} (98%)
8030 Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
8031 $ git merge moduleh/for-sfr
8033 Merging vhost/linux-next (cf64b8c frv: switch to GENERIC_PCI_IOMAP)
8034 $ git merge vhost/linux-next
8035 Resolved 'arch/hexagon/Kconfig' using previous resolution.
8036 Resolved 'arch/m68k/Kconfig' using previous resolution.
8037 Auto-merging lib/Makefile
8038 Auto-merging lib/Kconfig
8039 Auto-merging include/asm-generic/io.h
8040 Auto-merging arch/x86/Kconfig
8041 Auto-merging arch/powerpc/Kconfig
8042 Auto-merging arch/mips/Kconfig
8043 Auto-merging arch/m68k/Kconfig
8044 CONFLICT (content): Merge conflict in arch/m68k/Kconfig
8045 Auto-merging arch/hexagon/Kconfig
8046 CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
8047 Removing arch/frv/mb93090-mb00/pci-iomap.c
8048 Auto-merging arch/frv/Kconfig
8049 Auto-merging arch/arm/Kconfig
8050 Automatic merge failed; fix conflicts and then commit the result.
8052 [master 88a6cf6] Merge remote-tracking branch 'vhost/linux-next'
8053 $ git diff -M --stat --summary HEAD^..
8054 arch/alpha/Kconfig | 5 +---
8055 arch/alpha/kernel/pci.c | 26 +-------------------
8056 arch/arm/Kconfig | 1 +
8057 arch/arm/include/asm/io.h | 2 +-
8058 arch/arm/mm/iomap.c | 21 ----------------
8059 arch/cris/Kconfig | 5 +---
8060 arch/frv/Kconfig | 1 +
8061 arch/frv/include/asm/io.h | 2 +-
8062 arch/frv/mb93090-mb00/Makefile | 2 +-
8063 arch/frv/mb93090-mb00/pci-iomap.c | 29 ----------------------
8064 arch/hexagon/Kconfig | 4 +--
8065 arch/ia64/Kconfig | 5 +---
8066 arch/m68k/Kconfig | 4 +--
8067 arch/microblaze/Kconfig | 1 +
8068 arch/microblaze/pci/iomap.c | 19 --------------
8069 arch/mips/Kconfig | 1 +
8070 arch/mips/lib/iomap-pci.c | 26 --------------------
8071 arch/openrisc/Kconfig | 3 --
8072 arch/parisc/Kconfig | 1 +
8073 arch/parisc/lib/iomap.c | 23 -----------------
8074 arch/powerpc/Kconfig | 1 +
8075 arch/powerpc/kernel/iomap.c | 19 --------------
8076 arch/powerpc/platforms/Kconfig | 3 --
8077 arch/score/Kconfig | 4 +--
8078 arch/sh/Kconfig | 4 +--
8079 arch/sh/drivers/pci/pci.c | 23 -----------------
8080 arch/sparc/Kconfig | 1 +
8081 arch/sparc/include/asm/io_32.h | 5 +++-
8082 arch/sparc/include/asm/io_64.h | 5 +++-
8083 arch/sparc/lib/iomap.c | 23 -----------------
8084 arch/tile/Kconfig | 1 +
8085 arch/tile/include/asm/io.h | 3 +-
8086 arch/tile/include/asm/pci.h | 2 +-
8087 arch/tile/kernel/pci.c | 21 ----------------
8088 arch/unicore32/Kconfig | 4 +--
8089 arch/x86/Kconfig | 4 +--
8090 include/asm-generic/io.h | 4 +-
8091 include/asm-generic/iomap.h | 9 ++----
8092 include/asm-generic/pci_iomap.h | 25 +++++++++++++++++++
8093 lib/Kconfig | 7 +++++
8095 lib/iomap.c | 38 +---------------------------
8096 lib/pci_iomap.c | 48 +++++++++++++++++++++++++++++++++++++
8097 43 files changed, 120 insertions(+), 316 deletions(-)
8098 delete mode 100644 arch/frv/mb93090-mb00/pci-iomap.c
8099 create mode 100644 include/asm-generic/pci_iomap.h
8100 create mode 100644 lib/pci_iomap.c
8101 Merging kvmtool/master (1fbd119 kvm tools: Drop write operation in ro_ops_nowrite)
8102 $ git merge kvmtool/master
8103 Resolved 'include/net/9p/9p.h' using previous resolution.
8104 Resolved 'scripts/kconfig/Makefile' using previous resolution.
8105 Auto-merging scripts/kconfig/Makefile
8106 CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
8107 Auto-merging include/net/9p/9p.h
8108 CONFLICT (content): Merge conflict in include/net/9p/9p.h
8109 Auto-merging arch/x86/Kconfig
8110 Auto-merging MAINTAINERS
8111 Automatic merge failed; fix conflicts and then commit the result.
8113 [master 0538222] Merge remote-tracking branch 'kvmtool/master'
8114 $ git diff -M --stat --summary HEAD^..
8116 arch/x86/Kconfig | 30 +
8117 scripts/kconfig/Makefile | 6 +-
8118 tools/kvm/.gitignore | 10 +
8119 tools/kvm/CREDITS-Git | 30 +
8120 tools/kvm/Documentation/kernel-debugging.txt | 15 +
8121 tools/kvm/Documentation/kvm-balloon.txt | 24 +
8122 tools/kvm/Documentation/kvm-debug.txt | 16 +
8123 tools/kvm/Documentation/kvm-list.txt | 16 +
8124 tools/kvm/Documentation/kvm-pause.txt | 16 +
8125 tools/kvm/Documentation/kvm-resume.txt | 16 +
8126 tools/kvm/Documentation/kvm-run.txt | 62 ++
8127 tools/kvm/Documentation/kvm-setup.txt | 15 +
8128 tools/kvm/Documentation/kvm-stat.txt | 19 +
8129 tools/kvm/Documentation/kvm-stop.txt | 16 +
8130 tools/kvm/Documentation/kvm-version.txt | 21 +
8131 tools/kvm/Makefile | 306 ++++++
8132 tools/kvm/README | 109 ++
8133 tools/kvm/bios.c | 174 +++
8134 tools/kvm/bios/.gitignore | 3 +
8135 tools/kvm/bios/bios-rom.S | 12 +
8136 tools/kvm/bios/e820.c | 72 ++
8137 tools/kvm/bios/entry.S | 92 ++
8138 tools/kvm/bios/gen-offsets.sh | 14 +
8139 tools/kvm/bios/int10.c | 110 ++
8140 tools/kvm/bios/int15.c | 18 +
8141 tools/kvm/bios/local.S | 7 +
8142 tools/kvm/bios/macro.S | 25 +
8143 tools/kvm/bios/memcpy.c | 23 +
8144 tools/kvm/bios/rom.ld.S | 17 +
8145 tools/kvm/builtin-balloon.c | 90 ++
8146 tools/kvm/builtin-debug.c | 89 ++
8147 tools/kvm/builtin-help.c | 62 ++
8148 tools/kvm/builtin-list.c | 156 +++
8149 tools/kvm/builtin-pause.c | 78 ++
8150 tools/kvm/builtin-resume.c | 78 ++
8151 tools/kvm/builtin-run.c | 1002 ++++++++++++++++++
8152 tools/kvm/builtin-setup.c | 241 +++++
8153 tools/kvm/builtin-stat.c | 131 +++
8154 tools/kvm/builtin-stop.c | 78 ++
8155 tools/kvm/builtin-version.c | 15 +
8156 tools/kvm/code16gcc.h | 15 +
8157 tools/kvm/command-list.txt | 14 +
8158 tools/kvm/config/feature-tests.mak | 168 +++
8159 tools/kvm/config/utilities.mak | 188 ++++
8160 tools/kvm/cpuid.c | 55 +
8161 tools/kvm/disk/blk.c | 39 +
8162 tools/kvm/disk/core.c | 242 +++++
8163 tools/kvm/disk/qcow.c | 1454 ++++++++++++++++++++++++++
8164 tools/kvm/disk/raw.c | 140 +++
8165 tools/kvm/framebuffer.c | 68 ++
8166 tools/kvm/guest/init.c | 46 +
8167 tools/kvm/guest/passwd | 1 +
8168 tools/kvm/guest_compat.c | 104 ++
8169 tools/kvm/hw/i8042.c | 348 ++++++
8170 tools/kvm/hw/pci-shmem.c | 261 +++++
8171 tools/kvm/hw/rtc.c | 118 +++
8172 tools/kvm/hw/serial.c | 364 +++++++
8173 tools/kvm/hw/vesa.c | 77 ++
8174 tools/kvm/include/asm/hweight.h | 8 +
8175 tools/kvm/include/bios/memcpy.h | 9 +
8176 tools/kvm/include/kvm/8250-serial.h | 10 +
8177 tools/kvm/include/kvm/apic.h | 17 +
8178 tools/kvm/include/kvm/assembly.h | 24 +
8179 tools/kvm/include/kvm/barrier.h | 15 +
8180 tools/kvm/include/kvm/bios-export.h | 13 +
8181 tools/kvm/include/kvm/bios.h | 88 ++
8182 tools/kvm/include/kvm/boot-protocol.h | 16 +
8183 tools/kvm/include/kvm/brlock.h | 41 +
8184 tools/kvm/include/kvm/builtin-balloon.h | 7 +
8185 tools/kvm/include/kvm/builtin-debug.h | 7 +
8186 tools/kvm/include/kvm/builtin-help.h | 6 +
8187 tools/kvm/include/kvm/builtin-list.h | 7 +
8188 tools/kvm/include/kvm/builtin-pause.h | 7 +
8189 tools/kvm/include/kvm/builtin-resume.h | 7 +
8190 tools/kvm/include/kvm/builtin-run.h | 7 +
8191 tools/kvm/include/kvm/builtin-setup.h | 9 +
8192 tools/kvm/include/kvm/builtin-stat.h | 7 +
8193 tools/kvm/include/kvm/builtin-stop.h | 7 +
8194 tools/kvm/include/kvm/builtin-version.h | 6 +
8195 tools/kvm/include/kvm/compiler.h | 6 +
8196 tools/kvm/include/kvm/cpufeature.h | 41 +
8197 tools/kvm/include/kvm/disk-image.h | 81 ++
8198 tools/kvm/include/kvm/e820.h | 12 +
8199 tools/kvm/include/kvm/framebuffer.h | 34 +
8200 tools/kvm/include/kvm/guest_compat.h | 9 +
8201 tools/kvm/include/kvm/i8042.h | 12 +
8202 tools/kvm/include/kvm/interrupt.h | 26 +
8203 tools/kvm/include/kvm/ioeventfd.h | 27 +
8204 tools/kvm/include/kvm/ioport.h | 65 ++
8205 tools/kvm/include/kvm/irq.h | 31 +
8206 tools/kvm/include/kvm/kvm-cmd.h | 17 +
8207 tools/kvm/include/kvm/kvm-cpu.h | 46 +
8208 tools/kvm/include/kvm/kvm-ipc.h | 27 +
8209 tools/kvm/include/kvm/kvm.h | 108 ++
8210 tools/kvm/include/kvm/mptable.h | 8 +
8211 tools/kvm/include/kvm/mutex.h | 33 +
8212 tools/kvm/include/kvm/parse-options.h | 213 ++++
8213 tools/kvm/include/kvm/pci-shmem.h | 28 +
8214 tools/kvm/include/kvm/pci.h | 74 ++
8215 tools/kvm/include/kvm/qcow.h | 133 +++
8216 tools/kvm/include/kvm/rbtree-interval.h | 27 +
8217 tools/kvm/include/kvm/read-write.h | 43 +
8218 tools/kvm/include/kvm/rtc.h | 6 +
8219 tools/kvm/include/kvm/rwsem.h | 39 +
8220 tools/kvm/include/kvm/sdl.h | 17 +
8221 tools/kvm/include/kvm/segment.h | 21 +
8222 tools/kvm/include/kvm/strbuf.h | 6 +
8223 tools/kvm/include/kvm/symbol.h | 22 +
8224 tools/kvm/include/kvm/term.h | 18 +
8225 tools/kvm/include/kvm/threadpool.h | 37 +
8226 tools/kvm/include/kvm/types.h | 7 +
8227 tools/kvm/include/kvm/uip.h | 358 +++++++
8228 tools/kvm/include/kvm/util.h | 78 ++
8229 tools/kvm/include/kvm/vesa.h | 18 +
8230 tools/kvm/include/kvm/virtio-9p.h | 74 ++
8231 tools/kvm/include/kvm/virtio-balloon.h | 8 +
8232 tools/kvm/include/kvm/virtio-blk.h | 13 +
8233 tools/kvm/include/kvm/virtio-console.h | 9 +
8234 tools/kvm/include/kvm/virtio-net.h | 22 +
8235 tools/kvm/include/kvm/virtio-pci-dev.h | 37 +
8236 tools/kvm/include/kvm/virtio-pci.h | 49 +
8237 tools/kvm/include/kvm/virtio-rng.h | 9 +
8238 tools/kvm/include/kvm/virtio-trans.h | 43 +
8239 tools/kvm/include/kvm/virtio.h | 68 ++
8240 tools/kvm/include/kvm/vnc.h | 14 +
8241 tools/kvm/include/linux/bitops.h | 33 +
8242 tools/kvm/include/linux/byteorder.h | 7 +
8243 tools/kvm/include/linux/kernel.h | 39 +
8244 tools/kvm/include/linux/module.h | 6 +
8245 tools/kvm/include/linux/prefetch.h | 6 +
8246 tools/kvm/include/linux/types.h | 50 +
8247 tools/kvm/interrupt.c | 27 +
8248 tools/kvm/ioeventfd.c | 128 +++
8249 tools/kvm/ioport.c | 192 ++++
8250 tools/kvm/irq.c | 193 ++++
8251 tools/kvm/kvm-cmd.c | 91 ++
8252 tools/kvm/kvm-cpu.c | 523 +++++++++
8253 tools/kvm/kvm-ipc.c | 171 +++
8254 tools/kvm/kvm.c | 821 +++++++++++++++
8255 tools/kvm/main.c | 19 +
8256 tools/kvm/mmio.c | 132 +++
8257 tools/kvm/mptable.c | 284 +++++
8258 tools/kvm/net/uip/arp.c | 30 +
8259 tools/kvm/net/uip/buf.c | 114 ++
8260 tools/kvm/net/uip/core.c | 190 ++++
8261 tools/kvm/net/uip/csum.c | 92 ++
8262 tools/kvm/net/uip/dhcp.c | 203 ++++
8263 tools/kvm/net/uip/icmp.c | 29 +
8264 tools/kvm/net/uip/ipv4.c | 29 +
8265 tools/kvm/net/uip/tcp.c | 317 ++++++
8266 tools/kvm/net/uip/udp.c | 236 +++++
8267 tools/kvm/pci.c | 169 +++
8268 tools/kvm/read-write.c | 344 ++++++
8269 tools/kvm/symbol.c | 98 ++
8270 tools/kvm/term.c | 170 +++
8271 tools/kvm/tests/Makefile | 19 +
8272 tools/kvm/tests/boot/Makefile | 13 +
8273 tools/kvm/tests/boot/init.c | 11 +
8274 tools/kvm/tests/kernel/.gitignore | 2 +
8275 tools/kvm/tests/kernel/Makefile | 20 +
8276 tools/kvm/tests/kernel/README | 16 +
8277 tools/kvm/tests/kernel/kernel.S | 8 +
8278 tools/kvm/tests/pit/.gitignore | 2 +
8279 tools/kvm/tests/pit/Makefile | 20 +
8280 tools/kvm/tests/pit/README | 16 +
8281 tools/kvm/tests/pit/tick.S | 109 ++
8282 tools/kvm/threadpool.c | 146 +++
8283 tools/kvm/ui/sdl.c | 280 +++++
8284 tools/kvm/ui/vnc.c | 218 ++++
8285 tools/kvm/util.c | 101 ++
8286 tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
8287 tools/kvm/util/generate-cmdlist.sh | 23 +
8288 tools/kvm/util/kvm-ifup-vbr0 | 6 +
8289 tools/kvm/util/parse-options.c | 577 ++++++++++
8290 tools/kvm/util/rbtree-interval.c | 90 ++
8291 tools/kvm/util/set_private_br.sh | 51 +
8292 tools/kvm/util/strbuf.c | 13 +
8293 tools/kvm/virtio/9p-pdu.c | 287 +++++
8294 tools/kvm/virtio/9p.c | 1320 +++++++++++++++++++++++
8295 tools/kvm/virtio/balloon.c | 268 +++++
8296 tools/kvm/virtio/blk.c | 273 +++++
8297 tools/kvm/virtio/console.c | 204 ++++
8298 tools/kvm/virtio/core.c | 166 +++
8299 tools/kvm/virtio/net.c | 550 ++++++++++
8300 tools/kvm/virtio/pci.c | 347 ++++++
8301 tools/kvm/virtio/rng.c | 189 ++++
8302 tools/kvm/virtio/trans.c | 22 +
8303 188 files changed, 19565 insertions(+), 1 deletions(-)
8304 create mode 100644 tools/kvm/.gitignore
8305 create mode 100644 tools/kvm/CREDITS-Git
8306 create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
8307 create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
8308 create mode 100644 tools/kvm/Documentation/kvm-debug.txt
8309 create mode 100644 tools/kvm/Documentation/kvm-list.txt
8310 create mode 100644 tools/kvm/Documentation/kvm-pause.txt
8311 create mode 100644 tools/kvm/Documentation/kvm-resume.txt
8312 create mode 100644 tools/kvm/Documentation/kvm-run.txt
8313 create mode 100644 tools/kvm/Documentation/kvm-setup.txt
8314 create mode 100644 tools/kvm/Documentation/kvm-stat.txt
8315 create mode 100644 tools/kvm/Documentation/kvm-stop.txt
8316 create mode 100644 tools/kvm/Documentation/kvm-version.txt
8317 create mode 100644 tools/kvm/Makefile
8318 create mode 100644 tools/kvm/README
8319 create mode 100644 tools/kvm/bios.c
8320 create mode 100644 tools/kvm/bios/.gitignore
8321 create mode 100644 tools/kvm/bios/bios-rom.S
8322 create mode 100644 tools/kvm/bios/e820.c
8323 create mode 100644 tools/kvm/bios/entry.S
8324 create mode 100644 tools/kvm/bios/gen-offsets.sh
8325 create mode 100644 tools/kvm/bios/int10.c
8326 create mode 100644 tools/kvm/bios/int15.c
8327 create mode 100644 tools/kvm/bios/local.S
8328 create mode 100644 tools/kvm/bios/macro.S
8329 create mode 100644 tools/kvm/bios/memcpy.c
8330 create mode 100644 tools/kvm/bios/rom.ld.S
8331 create mode 100644 tools/kvm/builtin-balloon.c
8332 create mode 100644 tools/kvm/builtin-debug.c
8333 create mode 100644 tools/kvm/builtin-help.c
8334 create mode 100644 tools/kvm/builtin-list.c
8335 create mode 100644 tools/kvm/builtin-pause.c
8336 create mode 100644 tools/kvm/builtin-resume.c
8337 create mode 100644 tools/kvm/builtin-run.c
8338 create mode 100644 tools/kvm/builtin-setup.c
8339 create mode 100644 tools/kvm/builtin-stat.c
8340 create mode 100644 tools/kvm/builtin-stop.c
8341 create mode 100644 tools/kvm/builtin-version.c
8342 create mode 100644 tools/kvm/code16gcc.h
8343 create mode 100644 tools/kvm/command-list.txt
8344 create mode 100644 tools/kvm/config/feature-tests.mak
8345 create mode 100644 tools/kvm/config/utilities.mak
8346 create mode 100644 tools/kvm/cpuid.c
8347 create mode 100644 tools/kvm/disk/blk.c
8348 create mode 100644 tools/kvm/disk/core.c
8349 create mode 100644 tools/kvm/disk/qcow.c
8350 create mode 100644 tools/kvm/disk/raw.c
8351 create mode 100644 tools/kvm/framebuffer.c
8352 create mode 100644 tools/kvm/guest/init.c
8353 create mode 100644 tools/kvm/guest/passwd
8354 create mode 100644 tools/kvm/guest_compat.c
8355 create mode 100644 tools/kvm/hw/i8042.c
8356 create mode 100644 tools/kvm/hw/pci-shmem.c
8357 create mode 100644 tools/kvm/hw/rtc.c
8358 create mode 100644 tools/kvm/hw/serial.c
8359 create mode 100644 tools/kvm/hw/vesa.c
8360 create mode 100644 tools/kvm/include/asm/hweight.h
8361 create mode 100644 tools/kvm/include/bios/memcpy.h
8362 create mode 100644 tools/kvm/include/kvm/8250-serial.h
8363 create mode 100644 tools/kvm/include/kvm/apic.h
8364 create mode 100644 tools/kvm/include/kvm/assembly.h
8365 create mode 100644 tools/kvm/include/kvm/barrier.h
8366 create mode 100644 tools/kvm/include/kvm/bios-export.h
8367 create mode 100644 tools/kvm/include/kvm/bios.h
8368 create mode 100644 tools/kvm/include/kvm/boot-protocol.h
8369 create mode 100644 tools/kvm/include/kvm/brlock.h
8370 create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
8371 create mode 100644 tools/kvm/include/kvm/builtin-debug.h
8372 create mode 100644 tools/kvm/include/kvm/builtin-help.h
8373 create mode 100644 tools/kvm/include/kvm/builtin-list.h
8374 create mode 100644 tools/kvm/include/kvm/builtin-pause.h
8375 create mode 100644 tools/kvm/include/kvm/builtin-resume.h
8376 create mode 100644 tools/kvm/include/kvm/builtin-run.h
8377 create mode 100644 tools/kvm/include/kvm/builtin-setup.h
8378 create mode 100644 tools/kvm/include/kvm/builtin-stat.h
8379 create mode 100644 tools/kvm/include/kvm/builtin-stop.h
8380 create mode 100644 tools/kvm/include/kvm/builtin-version.h
8381 create mode 100644 tools/kvm/include/kvm/compiler.h
8382 create mode 100644 tools/kvm/include/kvm/cpufeature.h
8383 create mode 100644 tools/kvm/include/kvm/disk-image.h
8384 create mode 100644 tools/kvm/include/kvm/e820.h
8385 create mode 100644 tools/kvm/include/kvm/framebuffer.h
8386 create mode 100644 tools/kvm/include/kvm/guest_compat.h
8387 create mode 100644 tools/kvm/include/kvm/i8042.h
8388 create mode 100644 tools/kvm/include/kvm/interrupt.h
8389 create mode 100644 tools/kvm/include/kvm/ioeventfd.h
8390 create mode 100644 tools/kvm/include/kvm/ioport.h
8391 create mode 100644 tools/kvm/include/kvm/irq.h
8392 create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
8393 create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
8394 create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
8395 create mode 100644 tools/kvm/include/kvm/kvm.h
8396 create mode 100644 tools/kvm/include/kvm/mptable.h
8397 create mode 100644 tools/kvm/include/kvm/mutex.h
8398 create mode 100644 tools/kvm/include/kvm/parse-options.h
8399 create mode 100644 tools/kvm/include/kvm/pci-shmem.h
8400 create mode 100644 tools/kvm/include/kvm/pci.h
8401 create mode 100644 tools/kvm/include/kvm/qcow.h
8402 create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
8403 create mode 100644 tools/kvm/include/kvm/read-write.h
8404 create mode 100644 tools/kvm/include/kvm/rtc.h
8405 create mode 100644 tools/kvm/include/kvm/rwsem.h
8406 create mode 100644 tools/kvm/include/kvm/sdl.h
8407 create mode 100644 tools/kvm/include/kvm/segment.h
8408 create mode 100644 tools/kvm/include/kvm/strbuf.h
8409 create mode 100644 tools/kvm/include/kvm/symbol.h
8410 create mode 100644 tools/kvm/include/kvm/term.h
8411 create mode 100644 tools/kvm/include/kvm/threadpool.h
8412 create mode 100644 tools/kvm/include/kvm/types.h
8413 create mode 100644 tools/kvm/include/kvm/uip.h
8414 create mode 100644 tools/kvm/include/kvm/util.h
8415 create mode 100644 tools/kvm/include/kvm/vesa.h
8416 create mode 100644 tools/kvm/include/kvm/virtio-9p.h
8417 create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
8418 create mode 100644 tools/kvm/include/kvm/virtio-blk.h
8419 create mode 100644 tools/kvm/include/kvm/virtio-console.h
8420 create mode 100644 tools/kvm/include/kvm/virtio-net.h
8421 create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
8422 create mode 100644 tools/kvm/include/kvm/virtio-pci.h
8423 create mode 100644 tools/kvm/include/kvm/virtio-rng.h
8424 create mode 100644 tools/kvm/include/kvm/virtio-trans.h
8425 create mode 100644 tools/kvm/include/kvm/virtio.h
8426 create mode 100644 tools/kvm/include/kvm/vnc.h
8427 create mode 100644 tools/kvm/include/linux/bitops.h
8428 create mode 100644 tools/kvm/include/linux/byteorder.h
8429 create mode 100644 tools/kvm/include/linux/kernel.h
8430 create mode 100644 tools/kvm/include/linux/module.h
8431 create mode 100644 tools/kvm/include/linux/prefetch.h
8432 create mode 100644 tools/kvm/include/linux/types.h
8433 create mode 100644 tools/kvm/interrupt.c
8434 create mode 100644 tools/kvm/ioeventfd.c
8435 create mode 100644 tools/kvm/ioport.c
8436 create mode 100644 tools/kvm/irq.c
8437 create mode 100644 tools/kvm/kvm-cmd.c
8438 create mode 100644 tools/kvm/kvm-cpu.c
8439 create mode 100644 tools/kvm/kvm-ipc.c
8440 create mode 100644 tools/kvm/kvm.c
8441 create mode 100644 tools/kvm/main.c
8442 create mode 100644 tools/kvm/mmio.c
8443 create mode 100644 tools/kvm/mptable.c
8444 create mode 100644 tools/kvm/net/uip/arp.c
8445 create mode 100644 tools/kvm/net/uip/buf.c
8446 create mode 100644 tools/kvm/net/uip/core.c
8447 create mode 100644 tools/kvm/net/uip/csum.c
8448 create mode 100644 tools/kvm/net/uip/dhcp.c
8449 create mode 100644 tools/kvm/net/uip/icmp.c
8450 create mode 100644 tools/kvm/net/uip/ipv4.c
8451 create mode 100644 tools/kvm/net/uip/tcp.c
8452 create mode 100644 tools/kvm/net/uip/udp.c
8453 create mode 100644 tools/kvm/pci.c
8454 create mode 100644 tools/kvm/read-write.c
8455 create mode 100644 tools/kvm/symbol.c
8456 create mode 100644 tools/kvm/term.c
8457 create mode 100644 tools/kvm/tests/Makefile
8458 create mode 100644 tools/kvm/tests/boot/Makefile
8459 create mode 100644 tools/kvm/tests/boot/init.c
8460 create mode 100644 tools/kvm/tests/kernel/.gitignore
8461 create mode 100644 tools/kvm/tests/kernel/Makefile
8462 create mode 100644 tools/kvm/tests/kernel/README
8463 create mode 100644 tools/kvm/tests/kernel/kernel.S
8464 create mode 100644 tools/kvm/tests/pit/.gitignore
8465 create mode 100644 tools/kvm/tests/pit/Makefile
8466 create mode 100644 tools/kvm/tests/pit/README
8467 create mode 100644 tools/kvm/tests/pit/tick.S
8468 create mode 100644 tools/kvm/threadpool.c
8469 create mode 100644 tools/kvm/ui/sdl.c
8470 create mode 100644 tools/kvm/ui/vnc.c
8471 create mode 100644 tools/kvm/util.c
8472 create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
8473 create mode 100755 tools/kvm/util/generate-cmdlist.sh
8474 create mode 100755 tools/kvm/util/kvm-ifup-vbr0
8475 create mode 100644 tools/kvm/util/parse-options.c
8476 create mode 100644 tools/kvm/util/rbtree-interval.c
8477 create mode 100755 tools/kvm/util/set_private_br.sh
8478 create mode 100644 tools/kvm/util/strbuf.c
8479 create mode 100644 tools/kvm/virtio/9p-pdu.c
8480 create mode 100644 tools/kvm/virtio/9p.c
8481 create mode 100644 tools/kvm/virtio/balloon.c
8482 create mode 100644 tools/kvm/virtio/blk.c
8483 create mode 100644 tools/kvm/virtio/console.c
8484 create mode 100644 tools/kvm/virtio/core.c
8485 create mode 100644 tools/kvm/virtio/net.c
8486 create mode 100644 tools/kvm/virtio/pci.c
8487 create mode 100644 tools/kvm/virtio/rng.c
8488 create mode 100644 tools/kvm/virtio/trans.c
8489 Merging scsi-post-merge/merge-base:master ()
8490 $ git clone -s -l -n -q . ../rebase-tmp
8492 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
8494 * [new branch] quilt/akpm -> akpm
8495 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
8497 * [new branch] quilt/akpm-base -> akpm-base
8499 Switched to branch 'akpm'
8500 $ git rebase --onto master akpm-base
8501 First, rewinding head to replay your work on top of it...
8502 Applying: vmscan: fix initial shrinker size handling
8503 Applying: vmscan: use atomic-long for shrinker batching
8504 Applying: fs/proc/meminfo.c: fix compilation error
8505 Applying: thp: reduce khugepaged freezing latency
8506 Applying: CREDITS: update Kees's expired fingerprint and fix details
8507 Applying: cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask
8508 Applying: drivers/rtc/rtc-s3c.c: fix driver clock enable/disable balance issues
8509 Applying: memcg: update maintainers
8510 Applying: printk: avoid double lock acquire
8511 Applying: thp: add compound tail page _mapcount when mapped
8512 Applying: thp: set compound tail page _count to zero
8513 Applying: mm/migrate.c: pair unlock_page() and lock_page() when migrating huge pages
8514 Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
8515 Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
8516 Applying: acerhdf: add support for new hardware
8517 Applying: acerhdf: lowered default temp fanon/fanoff values
8518 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
8519 Applying: x86: fix mmap random address range
8520 Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
8521 Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
8522 Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
8523 Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
8524 Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
8525 Applying: x86: tlb flush avoid superflous leave_mm()
8526 Applying: x86: reduce clock calibration time during slave cpu startup
8527 Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
8528 Applying: mm/vmalloc.c: eliminate extra loop in pcpu_get_vm_areas error path
8529 Applying: mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path-fix
8530 Applying: x86: mpparse: account for bus types other than ISA and PCI
8531 Applying: drivers/platform/x86/sony-laptop.c: fix scancodes
8532 Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-checkpatch-fixes
8533 Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
8534 Applying: arm, exec: remove redundant set_fs(USER_DS)
8535 Applying: intel-iommu: Fix __init section missmatch of dmar_parse_rmrr_atsr_dev
8536 Applying: hrtimers: Special-case zero length sleeps
8537 Applying: ia64, exec: remove redundant set_fs(USER_DS)
8538 Applying: kconfig: add merge_config.sh script
8539 Applying: merge_config.sh: use signal names compatible with dash and bash
8540 Applying: merge_config.sh: whitespace cleanup
8541 Applying: ipc/mqueue: cleanup definition names and locations
8542 Applying: ipc/mqueue: switch back to using non-max values on create
8543 Applying: ipc/mqueue: enforce hard limits
8544 Applying: ipc/mqueue: update maximums for the mqueue subsystem
8545 Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix
8546 Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
8547 Applying: include/net/netprio_cgroup.h: various fixes
8548 Applying: debugobjects: be smarter about static objects
8549 Applying: debugobjects: extend to assert that an object is initialized
8550 Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
8551 Applying: ext4: use proper little-endian bitops
8552 Applying: ocfs2: avoid unaligned access to dqc_bitmap
8553 Applying: parisc, exec: remove redundant set_fs(USER_DS)
8554 Applying: scsi: fix a header to include linux/types.h
8555 Applying: drivers/scsi/megaraid.c: fix sparse warnings
8556 Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
8557 Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
8558 Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
8559 Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
8560 Applying: fs: remove unneeded plug in mpage_readpages()
8561 Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media
8562 Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
8563 Applying: vmscan: promote shared file mapped pages
8564 Applying: vmscan: activate executable pages after first usage
8565 Applying: mm: add free_hot_cold_page_list() helper
8566 Applying: mm-add-free_hot_cold_page_list-helper-v2
8567 Applying: mm-add-free_hot_cold_page_list-helper-v3
8568 Applying: mm: remove unused pagevec_free
8569 Applying: mm-tracepoint: rename page-free events
8570 Applying: mm-tracepoint: fix documentation and examples
8571 Applying: mm: fix page-faults detection in swap-token logic
8572 Applying: mm: add extra free kbytes tunable
8573 Applying: mm-add-extra-free-kbytes-tunable-update
8574 Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
8575 Applying: mm: migrate: one less atomic operation
8576 Applying: mm: do not stall in synchronous compaction for THP allocations
8577 Applying: mm-do-not-stall-in-synchronous-compaction-for-thp-allocations-v3
8578 Applying: mm: reduce the amount of work done when updating min_free_kbytes
8579 Applying: mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes
8580 Applying: mm: avoid livelock on !__GFP_FS allocations
8581 Applying: mm: account reaped page cache on inode cache pruning
8582 Applying: hugetlb: detect race upon page allocation failure during COW
8583 Applying: hugetlb: clarify hugetlb_instantiation_mutex usage
8584 Applying: mm/hugetlb.c: fix virtual address handling in hugetlb fault
8585 Applying: mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault-fix
8586 Applying: kernel.h: add BUILD_BUG() macro
8587 Applying: kernel.h: Add BUILD_BUG() macro.
8588 Applying: hugetlb: replace BUG() with BUILD_BUG() for dummy definitions
8589 Applying: mm: more intensive memory corruption debugging
8590 Applying: mm-more-intensive-memory-corruption-debug-fix
8591 Applying: PM/Hibernate: do not count debug pages as savable
8592 Applying: slub: min order when debug_guardpage_minorder > 0
8593 Applying: fadvise: only initiate writeback for specified range with FADV_DONTNEED
8594 Applying: mm, debug: test for online nid when allocating on single node
8595 Applying: vmscan: add task name to warn_scan_unevictable() messages
8596 Applying: mm: exclude reserved pages from dirtyable memory
8597 Applying: mm-exclude-reserved-pages-from-dirtyable-memory-fix
8598 Applying: mm: writeback: cleanups in preparation for per-zone dirty limits
8599 Applying: mm: try to distribute dirty pages fairly across zones
8600 Applying: mm: filemap: pass __GFP_WRITE from grab_cache_page_write_begin()
8601 Applying: Btrfs: pass __GFP_WRITE for buffered write page allocations
8602 Applying: mm: compaction: push isolate search base of compact control one pfn ahead
8603 Applying: hpet: factor timer allocate from open
8604 Applying: intel_idle: fix API misuse
8605 Applying: intel_idle: disable auto_demotion for hotplugged CPUs
8606 Applying: kernel.h: neaten panic prototype
8607 Applying: include/linux/linkage.h: remove unused NORET_AND macro
8608 Applying: treewide: remove useless NORET_TYPE macro and uses
8609 Applying: treewide: convert uses of ATTRIB_NORETURN to __noreturn
8610 Applying: treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes
8611 Applying: include/linux/linkage.h: remove unused ATTRIB_NORET macro
8612 Applying: mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL
8613 Applying: mm,x86,um: move CMPXCHG_LOCAL config option
8614 Applying: mm,x86,um: move CMPXCHG_DOUBLE config option
8615 Applying: audit: always follow va_copy() with va_end()
8616 Applying: brlocks/lglocks: clean up code
8617 Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
8618 Applying: include/log2.h: fix rounddown_pow_of_two(1)
8619 Applying: get_maintainers.pl: follow renames when looking up commit signers
8620 Applying: backlight: remove ADX backlight device support
8621 Applying: leds: convert led platform drivers to module_platform_driver
8622 Applying: leds: convert led i2c drivers to module_i2c_driver
8623 Applying: leds: convert leds-dac124s085 to module_spi_driver
8624 Applying: lib: add GENERIC_PCI_IOMAP
8625 Using index info to reconstruct a base tree...
8626 Falling back to patching base and 3-way merge...
8627 No changes -- Patch already applied.
8628 Applying: checkpatch: update signature "might be better as" warning
8629 Applying: checkpatch: prefer __printf over __attribute__((format(printf,...)))
8630 Applying: crc32: optimize inner loop
8631 Applying: epoll: limit paths
8632 Applying: fs: binfmt_elf: create Kconfig variable for PIE randomization
8633 Applying: MIPS: randomize PIE load address
8634 Applying: drivers/rtc/rtc-cmos.c: fix broken NVRAM bank 2 writing
8635 Applying: drivers/rtc/rtc-mxc.c: fix setting time for MX1 SoC
8636 Applying: drivers-rtc-rtc-mxcc-fix-setting-time-for-mx1-soc-fix
8637 Applying: drivers/rtc/rtc-mxc.c: make alarm work
8638 Applying: drivers-rtc-rtc-mxcc-make-alarm-work-fix
8639 Applying: rtc/ab8500: don't disable IRQ:s when suspending
8640 Applying: rtc/ab8500: set can_wake flag
8641 Applying: rtc/ab8500: change to mdelay
8642 Applying: rtc/ab8500: Add calibration attribute to AB8500 RTC
8643 Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-checkpatch-fixes
8644 Applying: reiserfs: delete comments refering to the BKL
8645 Applying: reiserfs: delay reiserfs lock until journal initialization
8646 Applying: reiserfs: don't lock journal_init()
8647 Applying: reiserfs: don't lock root inode searching
8648 Applying: cgroups: add res_counter_write_u64() API
8649 Applying: cgroups: new resource counter inheritance API
8650 Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
8651 Applying: cgroups: new cancel_attach_task() subsystem callback
8652 Applying: cgroups: ability to stop res charge propagation on bounded ancestor
8653 Applying: cgroups: add res counter common ancestor searching
8654 Applying: res_counter: allow charge failure pointer to be null
8655 Applying: cgroups: pull up res counter charge failure interpretation to caller
8656 Applying: cgroups: allow subsystems to cancel a fork
8657 Applying: cgroups: add a task counter subsystem
8658 Applying: cgroups: ERR_PTR needs err.h
8659 Applying: cgroup: Fix task counter common ancestor logic
8660 Applying: cgroup-fix-task-counter-common-ancestor-logic-checkpatch-fixes
8661 Applying: mm: memcg: consolidate hierarchy iteration primitives
8662 Applying: mm: vmscan: distinguish global reclaim from global LRU scanning
8663 Applying: mm: vmscan: distinguish between memcg triggering reclaim and memcg being scanned
8664 Applying: mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes
8665 Applying: mm: memcg: per-priority per-zone hierarchy scan generations
8666 Applying: mm: move memcg hierarchy reclaim to generic reclaim code
8667 Applying: mm: memcg: remove optimization of keeping the root_mem_cgroup LRU lists empty
8668 Applying: mm: vmscan: convert global reclaim to per-memcg LRU lists
8669 Applying: mm: collect LRU list heads into struct lruvec
8670 Applying: mm: make per-memcg LRU lists exclusive
8671 Applying: mm: memcg: remove unused node/section info from pc->flags
8672 Applying: mm: memcg: remove unused node/section info from pc->flags fix
8673 Applying: memcg: make mem_cgroup_split_huge_fixup() more efficient
8674 Applying: memcg-make-mem_cgroup_split_huge_fixup-more-efficient-fix
8675 Applying: mm: memcg: shorten preempt-disabled section around event checks
8676 Applying: Documentation/cgroups/memory.txt: fix typo
8677 Applying: memcg: fix pgpgin/pgpgout documentation
8678 Applying: thp: improve the error code path
8679 Applying: thp: remove unnecessary tlb flush for mprotect
8680 Applying: thp: add tlb_remove_pmd_tlb_entry
8681 Applying: thp: improve order in lru list for split huge page
8682 Applying: procfs: make proc_get_link to use dentry instead of inode
8683 Applying: procfs: introduce the /proc/<pid>/map_files/ directory
8684 Applying: procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes
8685 Applying: procfs: parse mount options
8686 Applying: procfs: add hidepid= and gid= mount options
8687 Applying: workqueue: make alloc_workqueue() take printf fmt and args for name
8688 Applying: workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix
8689 Applying: cpumask: update setup_node_to_cpumask_map() comments
8690 Applying: kexec: remove KMSG_DUMP_KEXEC
8691 Applying: kdump: add missing RAM resource in crash_shrink_memory()
8692 Applying: kdump: add udev events for memory online/offline
8693 Applying: kdump: crashk_res init check for /sys/kernel/kexec_crash_size
8694 Applying: ipc/mqueue: simplify reading msgqueue limit
8695 Applying: ipc/sem.c: alternatives to preempt_disable()
8696 Applying: user namespace: make signal.c respect user namespaces
8697 Applying: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2)
8698 Applying: drivers/memstick: use kmemdup rather than duplicating its implementation
8699 Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks()
8700 Applying: vfs: cache request_queue in struct block_device
8701 Applying: dio: optimize cache misses in the submission path
8702 Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
8703 Applying: dio: using prefetch requires including prefetch.h
8704 Applying: ramoops: fix use of rounddown_pow_of_two()
8705 Applying: ramoops: update parameters only after successful init
8706 Applying: unlzo: Fix input buffer free
8707 Applying: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix
8709 $ git fetch -f ../rebase-tmp akpm:akpm
8711 + 8fd3cfd...0993075 akpm -> akpm (forced update)
8712 $ rm -rf ../rebase-tmp
8713 Merging akpm (0993075 cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix)
8714 $ git merge --no-ff akpm
8715 Removing drivers/video/backlight/adx_bl.c
8716 Merge made by the 'recursive' strategy.
8718 .../sysfs-class-rtc-rtc0-device-rtc_calibration | 12 +
8719 Documentation/DocBook/debugobjects.tmpl | 50 ++
8720 Documentation/cgroups/cgroups.txt | 14 +-
8721 Documentation/cgroups/memory.txt | 9 +-
8722 Documentation/cgroups/resource_counter.txt | 20 +-
8723 Documentation/cgroups/task_counter.txt | 153 ++++
8724 Documentation/filesystems/proc.txt | 39 +
8725 Documentation/kernel-parameters.txt | 19 +
8726 Documentation/laptops/sony-laptop.txt | 5 +
8727 Documentation/sysctl/vm.txt | 16 +
8728 Documentation/trace/events-kmem.txt | 12 +-
8729 .../postprocess/trace-pagealloc-postprocess.pl | 20 +-
8730 Documentation/trace/tracepoint-analysis.txt | 40 +-
8733 arch/arm/Kconfig | 1 +
8734 arch/arm/include/asm/processor.h | 1 -
8735 arch/arm/mach-ux500/mbox-db5500.c | 2 +-
8736 arch/avr32/include/asm/system.h | 2 +-
8737 arch/avr32/kernel/traps.c | 2 +-
8738 arch/ia64/include/asm/processor.h | 1 -
8739 arch/ia64/kernel/machine_kexec.c | 4 +-
8740 arch/m68k/amiga/config.c | 3 +-
8741 arch/mips/Kconfig | 1 +
8742 arch/mips/include/asm/ptrace.h | 2 +-
8743 arch/mips/kernel/traps.c | 2 +-
8744 arch/mn10300/include/asm/exceptions.h | 2 +-
8745 arch/parisc/include/asm/processor.h | 2 -
8746 arch/parisc/kernel/process.c | 1 -
8747 arch/powerpc/kernel/machine_kexec_32.c | 4 +-
8748 arch/powerpc/kernel/machine_kexec_64.c | 6 +-
8749 arch/powerpc/mm/numa.c | 2 +-
8750 arch/powerpc/platforms/pseries/nvram.c | 1 -
8751 arch/s390/include/asm/processor.h | 2 +-
8752 arch/s390/kernel/nmi.c | 2 +-
8753 arch/sh/kernel/process_32.c | 2 +-
8754 arch/sh/kernel/process_64.c | 2 +-
8755 arch/tile/kernel/machine_kexec.c | 6 +-
8756 arch/x86/Kconfig | 4 +
8757 arch/x86/Kconfig.cpu | 6 -
8758 arch/x86/include/asm/mrst.h | 9 +
8759 arch/x86/kernel/e820.c | 59 +-
8760 arch/x86/kernel/mpparse.c | 2 +-
8761 arch/x86/kernel/ptrace.c | 3 +-
8762 arch/x86/kernel/rtc.c | 5 +
8763 arch/x86/kernel/smpboot.c | 16 +-
8764 arch/x86/kernel/tsc.c | 20 +
8765 arch/x86/mm/gup.c | 2 +
8766 arch/x86/mm/highmem_32.c | 2 +
8767 arch/x86/mm/mmap.c | 4 +-
8768 arch/x86/mm/numa.c | 2 +-
8769 arch/x86/mm/pageattr.c | 2 +-
8770 arch/x86/mm/tlb.c | 16 +-
8771 arch/x86/platform/iris/iris.c | 67 ++-
8772 arch/x86/um/Kconfig | 8 -
8773 block/blk-cgroup.c | 12 +-
8774 drivers/base/memory.c | 17 +-
8775 drivers/char/hpet.c | 56 ++-
8776 drivers/char/ramoops.c | 24 +-
8777 drivers/idle/intel_idle.c | 59 +-
8778 drivers/iommu/intel-iommu.c | 2 +-
8779 drivers/leds/leds-88pm860x.c | 12 +-
8780 drivers/leds/leds-adp5520.c | 12 +-
8781 drivers/leds/leds-ams-delta.c | 13 +-
8782 drivers/leds/leds-asic3.c | 16 +-
8783 drivers/leds/leds-atmel-pwm.c | 17 +-
8784 drivers/leds/leds-bd2802.c | 12 +-
8785 drivers/leds/leds-cobalt-qube.c | 17 +-
8786 drivers/leds/leds-da903x.c | 12 +-
8787 drivers/leds/leds-dac124s085.c | 13 +-
8788 drivers/leds/leds-fsg.c | 15 +-
8789 drivers/leds/leds-gpio.c | 16 +-
8790 drivers/leds/leds-hp6xx.c | 17 +-
8791 drivers/leds/leds-lm3530.c | 13 +-
8792 drivers/leds/leds-lp3944.c | 13 +-
8793 drivers/leds/leds-lp5521.c | 20 +-
8794 drivers/leds/leds-lp5523.c | 20 +-
8795 drivers/leds/leds-lt3593.c | 16 +-
8796 drivers/leds/leds-mc13783.c | 12 +-
8797 drivers/leds/leds-netxbig.c | 15 +-
8798 drivers/leds/leds-ns2.c | 15 +-
8799 drivers/leds/leds-pca9532.c | 14 +-
8800 drivers/leds/leds-pca955x.c | 13 +-
8801 drivers/leds/leds-pwm.c | 13 +-
8802 drivers/leds/leds-rb532.c | 16 +-
8803 drivers/leds/leds-regulator.c | 12 +-
8804 drivers/leds/leds-renesas-tpu.c | 13 +-
8805 drivers/leds/leds-s3c24xx.c | 13 +-
8806 drivers/leds/leds-wm831x-status.c | 12 +-
8807 drivers/leds/leds-wm8350.c | 12 +-
8808 drivers/memstick/core/mspro_block.c | 3 +-
8809 drivers/message/fusion/mptbase.c | 7 +-
8810 drivers/message/fusion/mptbase.h | 1 +
8811 drivers/mtd/mtdoops.c | 3 +-
8812 drivers/platform/x86/acerhdf.c | 67 ++-
8813 drivers/platform/x86/sony-laptop.c | 10 +-
8814 drivers/rtc/rtc-ab8500.c | 121 +++-
8815 drivers/rtc/rtc-cmos.c | 2 +-
8816 drivers/rtc/rtc-mxc.c | 123 ++--
8817 drivers/rtc/rtc-s3c.c | 2 +-
8818 drivers/scsi/aacraid/commctrl.c | 1 +
8819 drivers/scsi/megaraid.c | 8 +-
8820 drivers/scsi/mpt2sas/mpt2sas_base.c | 3 +-
8821 drivers/scsi/sg.c | 25 +-
8822 drivers/video/backlight/Kconfig | 8 -
8823 drivers/video/backlight/Makefile | 1 -
8824 drivers/video/backlight/adx_bl.c | 182 -----
8825 fs/Kconfig.binfmt | 3 +
8826 fs/binfmt_elf.c | 2 +-
8827 fs/block_dev.c | 3 +
8828 fs/btrfs/file.c | 2 +-
8830 fs/direct-io.c | 57 +-
8831 fs/eventpoll.c | 226 +++++-
8832 fs/ext4/ext4.h | 7 +-
8833 fs/ext4/ialloc.c | 4 +-
8834 fs/file_table.c | 23 +-
8836 fs/internal.h | 3 +-
8839 fs/namespace.c | 124 ++--
8840 fs/ocfs2/ocfs2.h | 47 ++
8841 fs/ocfs2/quota_local.c | 10 +-
8843 fs/proc/base.c | 433 +++++++++++-
8844 fs/proc/inode.c | 18 +
8845 fs/proc/internal.h | 1 +
8846 fs/proc/meminfo.c | 7 +-
8847 fs/proc/root.c | 72 ++-
8848 fs/reiserfs/bitmap.c | 3 -
8849 fs/reiserfs/journal.c | 64 +-
8850 fs/reiserfs/super.c | 54 +-
8851 include/asm-generic/tlb.h | 14 +
8852 include/linux/cgroup.h | 28 +-
8853 include/linux/cgroup_subsys.h | 6 +
8854 include/linux/compiler-gcc4.h | 1 +
8855 include/linux/compiler.h | 4 +-
8856 include/linux/debugobjects.h | 6 +
8857 include/linux/eventpoll.h | 1 +
8858 include/linux/fs.h | 5 +-
8859 include/linux/gfp.h | 34 +-
8860 include/linux/hpet.h | 1 +
8861 include/linux/huge_mm.h | 10 +-
8862 include/linux/hugetlb.h | 14 +-
8863 include/linux/ipc_namespace.h | 40 +-
8864 include/linux/kernel.h | 29 +-
8865 include/linux/kmsg_dump.h | 1 -
8866 include/linux/lglock.h | 152 +---
8867 include/linux/linkage.h | 4 -
8868 include/linux/log2.h | 2 +-
8869 include/linux/memcontrol.h | 78 ++-
8870 include/linux/mm.h | 30 +
8871 include/linux/mm_inline.h | 21 +-
8872 include/linux/mm_types.h | 10 +-
8873 include/linux/mmzone.h | 18 +-
8874 include/linux/page-debug-flags.h | 4 +-
8875 include/linux/page_cgroup.h | 34 -
8876 include/linux/pagevec.h | 7 -
8877 include/linux/pid_namespace.h | 2 +
8878 include/linux/proc_fs.h | 2 +-
8879 include/linux/res_counter.h | 27 +-
8880 include/linux/sched.h | 2 +-
8881 include/linux/shrinker.h | 2 +-
8882 include/linux/swap.h | 37 +
8883 include/linux/workqueue.h | 47 +-
8884 include/linux/writeback.h | 3 +-
8885 include/net/netprio_cgroup.h | 38 +-
8886 include/scsi/scsi_netlink.h | 2 +-
8887 include/trace/events/kmem.h | 4 +-
8889 init/calibrate.c | 15 +
8890 ipc/mq_sysctl.c | 31 +-
8891 ipc/mqueue.c | 34 +-
8892 ipc/sem.c | 250 +++++--
8893 kernel/Makefile | 3 +-
8894 kernel/audit.c | 5 +-
8895 kernel/cgroup.c | 89 ++-
8896 kernel/cgroup_freezer.c | 9 +-
8897 kernel/cgroup_task_counter.c | 243 ++++++
8898 kernel/cpuset.c | 25 +-
8899 kernel/events/core.c | 5 +-
8900 kernel/exit.c | 8 +-
8901 kernel/fork.c | 8 +-
8902 kernel/hrtimer.c | 8 +
8903 kernel/kexec.c | 25 +-
8904 kernel/lglock.c | 101 +++
8905 kernel/panic.c | 2 +-
8906 kernel/power/snapshot.c | 6 +
8907 kernel/printk.c | 3 +-
8908 kernel/res_counter.c | 97 ++-
8909 kernel/sched.c | 6 +-
8910 kernel/signal.c | 43 +-
8911 kernel/sysctl.c | 11 +-
8912 kernel/timer.c | 62 ++-
8913 kernel/workqueue.c | 32 +-
8915 lib/debugobjects.c | 53 ++-
8916 lib/decompress_unlzo.c | 2 +-
8917 mm/Kconfig.debug | 5 +
8918 mm/compaction.c | 4 +-
8921 mm/huge_memory.c | 99 ++-
8922 mm/hugetlb.c | 15 +-
8923 mm/memcontrol.c | 800 +++++++++----------
8925 mm/migrate.c | 12 +-
8926 mm/page-writeback.c | 290 +++++---
8927 mm/page_alloc.c | 268 ++++++--
8928 mm/page_cgroup.c | 60 +--
8932 mm/swapfile.c | 6 +-
8934 mm/vmscan.c | 448 +++++++-----
8936 net/core/dev.c | 4 +-
8937 net/core/sock.c | 2 +
8938 net/netfilter/nf_conntrack_netlink.c | 5 +
8939 scripts/checkpatch.pl | 13 +-
8940 scripts/get_maintainer.pl | 2 +-
8941 scripts/kconfig/merge_config.sh | 117 +++
8942 tools/perf/Documentation/examples.txt | 34 +-
8943 226 files changed, 4707 insertions(+), 2572 deletions(-)
8944 create mode 100644 Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration
8945 create mode 100644 Documentation/cgroups/task_counter.txt
8946 delete mode 100644 drivers/video/backlight/adx_bl.c
8947 create mode 100644 kernel/cgroup_task_counter.c
8948 create mode 100644 kernel/lglock.c
8949 create mode 100644 scripts/kconfig/merge_config.sh
8950 $ git revert 56850055c5fd
8951 [master a3a0e7c] Revert "include/net/netprio_cgroup.h: various fixes"
8952 3 files changed, 19 insertions(+), 25 deletions(-)
projects / karo-tx-linux.git / blob