2 Fri Sep 9 10:58:14 EST 2011
5 $ git reset --hard stable
6 HEAD is now at ddf2835 Linux 3.1-rc5
8 $ git merge origin/master
9 Updating ddf2835..e4e436e
11 Documentation/hwmon/max16065 | 7 ++
12 arch/x86/include/asm/pvclock.h | 2 +-
13 arch/x86/kernel/cpu/perf_event.c | 3 +
14 arch/x86/xen/setup.c | 19 +++++
15 arch/x86/xen/smp.c | 10 +++
16 arch/x86/xen/xen-asm_32.S | 8 ++-
17 drivers/base/regmap/regmap.c | 5 +-
18 drivers/dma/ste_dma40.c | 42 ++++++++----
19 drivers/hid/hid-ids.h | 1 +
20 drivers/hid/hid-magicmouse.c | 66 ++++++++++++++---
21 drivers/hid/hid-wacom.c | 22 +++---
22 drivers/hid/usbhid/hid-quirks.c | 1 +
23 drivers/hwmon/max16065.c | 2 +-
24 drivers/hwmon/pmbus/ucd9000.c | 6 +-
25 drivers/hwmon/pmbus/ucd9200.c | 6 +-
26 drivers/i2c/busses/i2c-pxa-pci.c | 5 +-
27 drivers/i2c/busses/i2c-tegra.c | 60 ++++++++++++----
28 drivers/iommu/amd_iommu.c | 18 +++--
29 drivers/mtd/ubi/debug.h | 2 +-
30 drivers/rtc/rtc-ep93xx.c | 16 ++--
31 drivers/rtc/rtc-lib.c | 2 +
32 drivers/rtc/rtc-twl.c | 60 ++++++---------
33 fs/9p/v9fs_vfs.h | 6 +-
34 fs/9p/vfs_file.c | 36 +++++++--
35 fs/9p/vfs_inode.c | 139 ++++++++++++++++++++++-------------
36 fs/9p/vfs_inode_dotl.c | 86 +++++++++++++++++++----
37 fs/9p/vfs_super.c | 2 +-
38 fs/ubifs/debug.h | 6 +-
39 include/linux/perf_event.h | 24 ++++---
40 include/linux/regulator/consumer.h | 2 +-
41 include/net/9p/9p.h | 29 ++++++++
42 include/net/cfg80211.h | 2 +
43 kernel/events/core.c | 67 ++++++++++++++---
44 kernel/sched.c | 43 +++++++----
45 kernel/time/alarmtimer.c | 18 ++++--
46 net/9p/trans_virtio.c | 17 +++--
47 36 files changed, 591 insertions(+), 249 deletions(-)
49 $ git merge fixes/fixes
51 Merging kbuild-current/rc-fixes
52 $ git merge kbuild-current/rc-fixes
54 Merging arm-current/master
55 $ git merge arm-current/master
57 Merging m68k-current/for-linus
58 $ git merge m68k-current/for-linus
60 Merging powerpc-merge/merge
61 $ git merge powerpc-merge/merge
63 Merging 52xx-and-virtex-current/powerpc/merge
64 $ git merge 52xx-and-virtex-current/powerpc/merge
66 Merging sparc-current/master
67 $ git merge sparc-current/master
69 Merging scsi-rc-fixes/master
70 $ git merge scsi-rc-fixes/master
71 Auto-merging MAINTAINERS
72 Merge made by recursive.
73 Documentation/ABI/testing/sysfs-class-scsi_host | 13 +
75 drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +-
76 drivers/scsi/fcoe/fcoe.c | 13 +-
77 drivers/scsi/hpsa.c | 57 +++--
78 drivers/scsi/isci/host.c | 13 +-
79 drivers/scsi/isci/host.h | 3 +
80 drivers/scsi/isci/init.c | 47 +++--
81 drivers/scsi/isci/phy.c | 13 +
82 drivers/scsi/isci/registers.h | 12 +
83 drivers/scsi/isci/request.c | 30 ++--
84 drivers/scsi/isci/unsolicited_frame_control.c | 2 +-
85 drivers/scsi/isci/unsolicited_frame_control.h | 2 +-
86 drivers/scsi/libfc/fc_exch.c | 59 ++++--
87 drivers/scsi/libfc/fc_fcp.c | 11 +-
88 drivers/scsi/libfc/fc_lport.c | 11 +-
89 drivers/scsi/qla2xxx/qla_attr.c | 7 +-
90 drivers/scsi/qla2xxx/qla_dbg.c | 36 ++--
91 drivers/scsi/qla2xxx/qla_def.h | 2 +
92 drivers/scsi/qla2xxx/qla_fw.h | 5 +
93 drivers/scsi/qla2xxx/qla_init.c | 3 -
94 drivers/scsi/qla2xxx/qla_inline.h | 29 +++
95 drivers/scsi/qla2xxx/qla_iocb.c | 282 +++++++++++++++++++----
96 drivers/scsi/qla2xxx/qla_isr.c | 109 +++++++--
97 drivers/scsi/qla2xxx/qla_mid.c | 2 +-
98 drivers/scsi/qla2xxx/qla_nx.c | 25 +-
99 drivers/scsi/qla2xxx/qla_os.c | 30 ++-
100 drivers/scsi/qla2xxx/qla_version.h | 2 +-
101 28 files changed, 631 insertions(+), 200 deletions(-)
102 create mode 100644 Documentation/ABI/testing/sysfs-class-scsi_host
103 Merging net-current/master
104 $ git merge net-current/master
105 Auto-merging MAINTAINERS
106 Merge made by recursive.
107 MAINTAINERS | 6 ++----
108 include/net/transp_v6.h | 1 +
109 net/bridge/netfilter/Kconfig | 2 +-
110 net/ipv4/af_inet.c | 7 ++++++-
111 net/ipv4/netfilter/ip_queue.c | 12 +++++-------
112 net/ipv6/datagram.c | 5 +++--
113 net/ipv6/ip6_flowlabel.c | 8 ++++----
114 net/ipv6/ipv6_sockglue.c | 2 +-
115 net/ipv6/netfilter/ip6_queue.c | 12 +++++-------
116 net/ipv6/raw.c | 4 ++--
117 net/ipv6/udp.c | 4 ++--
118 net/netfilter/nf_conntrack_pptp.c | 1 +
119 net/netfilter/nf_conntrack_proto_tcp.c | 6 +++---
120 net/netfilter/nfnetlink_queue.c | 4 ++--
121 net/netfilter/xt_rateest.c | 9 ++++-----
122 15 files changed, 42 insertions(+), 41 deletions(-)
123 Merging sound-current/for-linus
124 $ git merge sound-current/for-linus
126 Merging pci-current/for-linus
127 $ git merge pci-current/for-linus
128 Merge made by recursive.
129 drivers/pci/hotplug/shpchp_core.c | 4 ++--
130 drivers/pci/hotplug/shpchp_hpc.c | 4 ++--
131 2 files changed, 4 insertions(+), 4 deletions(-)
132 Merging wireless-current/master
133 $ git merge wireless-current/master
134 Merge made by recursive.
135 drivers/net/wireless/ath/ath9k/ar9002_calib.c | 3 ++-
136 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +-
137 drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 13 ++++++++-----
138 3 files changed, 11 insertions(+), 7 deletions(-)
139 Merging driver-core.current/driver-core-linus
140 $ git merge driver-core.current/driver-core-linus
142 Merging tty.current/tty-linus
143 $ git merge tty.current/tty-linus
145 Merging usb.current/usb-linus
146 $ git merge usb.current/usb-linus
148 Merging staging.current/staging-linus
149 $ git merge staging.current/staging-linus
151 Merging cpufreq-current/fixes
152 $ git merge cpufreq-current/fixes
154 Merging input-current/for-linus
155 $ git merge input-current/for-linus
156 Merge made by recursive.
157 drivers/input/keyboard/adp5588-keys.c | 1 -
158 drivers/input/misc/cm109.c | 2 +-
159 drivers/input/tablet/wacom_sys.c | 14 --------------
160 drivers/input/tablet/wacom_wac.c | 10 +++++-----
161 4 files changed, 6 insertions(+), 21 deletions(-)
162 Merging md-current/for-linus
163 $ git merge md-current/for-linus
165 Merging audit-current/for-linus
166 $ git merge audit-current/for-linus
168 Merging crypto-current/master
169 $ git merge crypto-current/master
171 Merging ide-curent/master
172 $ git merge ide-curent/master
175 $ git merge dwmw2/master
177 Merging sh-current/sh-fixes-for-linus
178 $ git merge sh-current/sh-fixes-for-linus
180 Merging rmobile-current/rmobile-fixes-for-linus
181 $ git merge rmobile-current/rmobile-fixes-for-linus
183 Merging devicetree-current/devicetree/merge
184 $ git merge devicetree-current/devicetree/merge
186 Merging spi-current/spi/merge
187 $ git merge spi-current/spi/merge
190 $ git merge arm/for-next
191 Removing arch/arm/include/asm/auxvec.h
192 Removing arch/arm/include/asm/bitsperlong.h
193 Removing arch/arm/include/asm/cputime.h
194 Removing arch/arm/include/asm/emergency-restart.h
195 Removing arch/arm/include/asm/errno.h
196 Removing arch/arm/include/asm/ioctl.h
197 Removing arch/arm/include/asm/irq_regs.h
198 Removing arch/arm/include/asm/kdebug.h
199 Removing arch/arm/include/asm/local.h
200 Removing arch/arm/include/asm/local64.h
201 Removing arch/arm/include/asm/percpu.h
202 Removing arch/arm/include/asm/poll.h
203 Removing arch/arm/include/asm/resource.h
204 Removing arch/arm/include/asm/sections.h
205 Removing arch/arm/include/asm/siginfo.h
206 Removing arch/arm/include/asm/sizes.h
207 Auto-merging arch/arm/mach-exynos4/mach-universal_c210.c
208 Auto-merging arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
209 Auto-merging arch/arm/mach-orion5x/dns323-setup.c
210 Auto-merging arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
211 Auto-merging arch/arm/mach-shmobile/board-ag5evm.c
212 Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
213 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
214 Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
215 Auto-merging drivers/gpio/gpio-davinci.c
216 Auto-merging drivers/gpio/gpio-ks8695.c
217 Auto-merging drivers/gpio/gpio-lpc32xx.c
218 Auto-merging drivers/gpio/gpio-sa1100.c
219 Merge made by recursive.
220 Documentation/devicetree/bindings/arm/l2cc.txt | 42 ++++
221 arch/arm/Kconfig | 43 +++-
222 arch/arm/Makefile | 3 +
223 arch/arm/boot/Makefile | 9 +
224 arch/arm/boot/compressed/Makefile | 8 +
225 arch/arm/common/gic.c | 17 +-
226 arch/arm/common/scoop.c | 2 +-
227 arch/arm/include/asm/Kbuild | 17 ++
228 arch/arm/include/asm/auxvec.h | 4 -
229 arch/arm/include/asm/bitsperlong.h | 1 -
230 arch/arm/include/asm/cputime.h | 6 -
231 arch/arm/include/asm/cputype.h | 6 +
232 arch/arm/include/asm/dma-mapping.h | 9 +-
233 arch/arm/include/asm/ecard.h | 1 -
234 arch/arm/include/asm/emergency-restart.h | 6 -
235 arch/arm/include/asm/errno.h | 6 -
236 arch/arm/include/asm/gpio.h | 19 ++
237 arch/arm/include/asm/hardware/cache-l2x0.h | 17 ++
238 arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 +
239 arch/arm/include/asm/io.h | 21 ++
240 arch/arm/include/asm/ioctl.h | 1 -
241 arch/arm/include/asm/irq_regs.h | 1 -
242 arch/arm/include/asm/kdebug.h | 1 -
243 arch/arm/include/asm/local.h | 1 -
244 arch/arm/include/asm/local64.h | 1 -
245 arch/arm/include/asm/mach/arch.h | 2 +-
246 arch/arm/include/asm/memory.h | 16 --
247 arch/arm/include/asm/module.h | 4 -
248 arch/arm/include/asm/percpu.h | 6 -
249 arch/arm/include/asm/pgalloc.h | 2 +-
250 arch/arm/include/asm/pgtable.h | 23 +-
251 arch/arm/include/asm/poll.h | 1 -
252 arch/arm/include/asm/resource.h | 6 -
253 arch/arm/include/asm/sections.h | 1 -
254 arch/arm/include/asm/siginfo.h | 6 -
255 arch/arm/include/asm/sizes.h | 21 --
256 arch/arm/include/asm/smp.h | 6 +
257 arch/arm/include/asm/system.h | 3 +-
258 arch/arm/include/asm/tlb.h | 1 +
259 arch/arm/include/asm/topology.h | 33 +++
260 arch/arm/kernel/Makefile | 1 +
261 arch/arm/kernel/ecard.c | 36 +--
262 arch/arm/kernel/entry-armv.S | 44 +++-
263 arch/arm/kernel/head.S | 135 ++++-------
264 arch/arm/kernel/module.c | 2 +-
265 arch/arm/kernel/setup.c | 41 ++--
266 arch/arm/kernel/smp.c | 20 ++
267 arch/arm/kernel/topology.c | 148 +++++++++++
268 arch/arm/mach-at91/Makefile.boot | 6 +-
269 arch/arm/mach-at91/at91cap9_devices.c | 2 +-
270 arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
271 arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
272 arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
273 arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
274 arch/arm/mach-at91/at91sam9g45.c | 2 +
275 arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
276 arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
277 arch/arm/mach-at91/board-1arm.c | 2 +-
278 arch/arm/mach-at91/board-afeb-9260v1.c | 2 +-
279 arch/arm/mach-at91/board-cam60.c | 2 +-
280 arch/arm/mach-at91/board-cap9adk.c | 2 +-
281 arch/arm/mach-at91/board-carmeva.c | 2 +-
282 arch/arm/mach-at91/board-cpu9krea.c | 2 +-
283 arch/arm/mach-at91/board-cpuat91.c | 2 +-
284 arch/arm/mach-at91/board-csb337.c | 2 +-
285 arch/arm/mach-at91/board-csb637.c | 2 +-
286 arch/arm/mach-at91/board-eb9200.c | 2 +-
287 arch/arm/mach-at91/board-ecbat91.c | 2 +-
288 arch/arm/mach-at91/board-kafa.c | 2 +-
289 arch/arm/mach-at91/board-kb9202.c | 2 +-
290 arch/arm/mach-at91/board-neocore926.c | 2 +-
291 arch/arm/mach-at91/board-picotux200.c | 2 +-
292 arch/arm/mach-at91/board-qil-a9260.c | 2 +-
293 arch/arm/mach-at91/board-rm9200dk.c | 2 +-
294 arch/arm/mach-at91/board-rm9200ek.c | 2 +-
295 arch/arm/mach-at91/board-sam9-l9260.c | 2 +-
296 arch/arm/mach-at91/board-sam9260ek.c | 2 +-
297 arch/arm/mach-at91/board-sam9261ek.c | 2 +-
298 arch/arm/mach-at91/board-sam9263ek.c | 2 +-
299 arch/arm/mach-at91/board-sam9g20ek.c | 2 +-
300 arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
301 arch/arm/mach-at91/board-sam9rlek.c | 2 +-
302 arch/arm/mach-at91/board-usb-a9260.c | 2 +-
303 arch/arm/mach-at91/board-usb-a9263.c | 2 +-
304 arch/arm/mach-at91/board-yl-9200.c | 2 +-
305 arch/arm/mach-at91/gpio.c | 4 +-
306 arch/arm/mach-at91/include/mach/at91sam9g45.h | 2 -
307 arch/arm/mach-at91/include/mach/gpio.h | 5 -
308 arch/arm/mach-at91/leds.c | 2 +-
309 arch/arm/mach-at91/pm.c | 2 +-
310 arch/arm/mach-bcmring/Makefile.boot | 2 +-
311 arch/arm/mach-bcmring/include/mach/memory.h | 5 -
312 arch/arm/mach-bcmring/mm.c | 3 +
313 arch/arm/mach-clps711x/Makefile.boot | 2 +-
314 arch/arm/mach-clps711x/autcpu12.c | 2 +-
315 arch/arm/mach-clps711x/cdb89712.c | 2 +-
316 arch/arm/mach-clps711x/ceiva.c | 2 +-
317 arch/arm/mach-clps711x/clep7312.c | 2 +-
318 arch/arm/mach-clps711x/edb7211-arch.c | 2 +-
319 arch/arm/mach-clps711x/fortunet.c | 1 -
320 arch/arm/mach-clps711x/p720t.c | 2 +-
321 arch/arm/mach-cns3xxx/Makefile.boot | 2 +-
322 arch/arm/mach-cns3xxx/cns3420vb.c | 2 +-
323 arch/arm/mach-davinci/Makefile | 3 +-
324 arch/arm/mach-davinci/Makefile.boot | 4 +-
325 arch/arm/mach-davinci/board-da830-evm.c | 2 +-
326 arch/arm/mach-davinci/board-da850-evm.c | 2 +-
327 arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
328 arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
329 arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
330 arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
331 arch/arm/mach-davinci/board-dm646x-evm.c | 4 +-
332 arch/arm/mach-davinci/board-mityomapl138.c | 2 +-
333 arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
334 arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +-
335 arch/arm/mach-davinci/board-sffsdr.c | 2 +-
336 arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +-
337 arch/arm/mach-davinci/common.c | 3 +
338 arch/arm/mach-davinci/da830.c | 3 +-
339 arch/arm/mach-davinci/da850.c | 3 +-
340 arch/arm/mach-davinci/dm355.c | 2 +-
341 arch/arm/mach-davinci/dm365.c | 3 +-
342 arch/arm/mach-davinci/dm644x.c | 2 +-
343 arch/arm/mach-davinci/dm646x.c | 2 +-
344 arch/arm/mach-davinci/include/mach/gpio-davinci.h | 91 +++++++
345 arch/arm/mach-davinci/include/mach/gpio.h | 79 +------
346 arch/arm/mach-davinci/include/mach/memory.h | 5 -
347 arch/arm/mach-davinci/tnetv107x.c | 3 +-
348 arch/arm/mach-dove/Makefile.boot | 2 +-
349 arch/arm/mach-dove/cm-a510.c | 2 +-
350 arch/arm/mach-dove/dove-db-setup.c | 2 +-
351 arch/arm/mach-ebsa110/Makefile.boot | 2 +-
352 arch/arm/mach-ebsa110/core.c | 2 +-
353 arch/arm/mach-ebsa110/include/mach/io.h | 2 -
354 arch/arm/mach-ep93xx/Makefile.boot | 10 +-
355 arch/arm/mach-ep93xx/adssphere.c | 2 +-
356 arch/arm/mach-ep93xx/edb93xx.c | 16 +-
357 arch/arm/mach-ep93xx/gesbc9312.c | 2 +-
358 arch/arm/mach-ep93xx/include/mach/gpio.h | 17 +--
359 arch/arm/mach-ep93xx/micro9.c | 8 +-
360 arch/arm/mach-ep93xx/simone.c | 4 +-
361 arch/arm/mach-ep93xx/snappercl15.c | 2 +-
362 arch/arm/mach-ep93xx/ts72xx.c | 2 +-
363 arch/arm/mach-exynos4/Makefile.boot | 2 +-
364 arch/arm/mach-exynos4/include/mach/gpio.h | 7 -
365 arch/arm/mach-exynos4/mach-armlex4210.c | 2 +-
366 arch/arm/mach-exynos4/mach-nuri.c | 2 +-
367 arch/arm/mach-exynos4/mach-smdkc210.c | 2 +-
368 arch/arm/mach-exynos4/mach-smdkv310.c | 2 +-
369 arch/arm/mach-exynos4/mach-universal_c210.c | 2 +-
370 arch/arm/mach-footbridge/Makefile.boot | 2 +-
371 arch/arm/mach-footbridge/cats-hw.c | 2 +-
372 arch/arm/mach-footbridge/ebsa285.c | 2 +-
373 arch/arm/mach-footbridge/include/mach/io.h | 2 -
374 arch/arm/mach-footbridge/netwinder-hw.c | 2 +-
375 arch/arm/mach-footbridge/personal.c | 2 +-
376 arch/arm/mach-gemini/Makefile.boot | 4 +-
377 arch/arm/mach-gemini/board-nas4220b.c | 2 +-
378 arch/arm/mach-gemini/board-rut1xx.c | 2 +-
379 arch/arm/mach-gemini/board-wbd111.c | 2 +-
380 arch/arm/mach-gemini/board-wbd222.c | 2 +-
381 arch/arm/mach-gemini/include/mach/gpio.h | 5 -
382 arch/arm/mach-h720x/Makefile.boot | 2 +-
383 arch/arm/mach-h720x/h7201-eval.c | 2 +-
384 arch/arm/mach-h720x/h7202-eval.c | 2 +-
385 arch/arm/mach-imx/Makefile.boot | 10 +-
386 arch/arm/mach-imx/iomux-imx31.c | 3 +-
387 arch/arm/mach-imx/mach-armadillo5x0.c | 2 +-
388 arch/arm/mach-imx/mach-cpuimx27.c | 2 +-
389 arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
390 arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 +-
391 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +-
392 arch/arm/mach-imx/mach-imx27ipcam.c | 2 +-
393 arch/arm/mach-imx/mach-imx27lite.c | 2 +-
394 arch/arm/mach-imx/mach-kzm_arm11_01.c | 2 +-
395 arch/arm/mach-imx/mach-mx1ads.c | 4 +-
396 arch/arm/mach-imx/mach-mx21ads.c | 2 +-
397 arch/arm/mach-imx/mach-mx25_3ds.c | 2 +-
398 arch/arm/mach-imx/mach-mx27_3ds.c | 2 +-
399 arch/arm/mach-imx/mach-mx27ads.c | 5 +-
400 arch/arm/mach-imx/mach-mx31_3ds.c | 2 +-
401 arch/arm/mach-imx/mach-mx31ads.c | 2 +-
402 arch/arm/mach-imx/mach-mx31lilly.c | 2 +-
403 arch/arm/mach-imx/mach-mx31lite.c | 2 +-
404 arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
405 arch/arm/mach-imx/mach-mx35_3ds.c | 2 +-
406 arch/arm/mach-imx/mach-mxt_td60.c | 2 +-
407 arch/arm/mach-imx/mach-pca100.c | 2 +-
408 arch/arm/mach-imx/mach-pcm037.c | 2 +-
409 arch/arm/mach-imx/mach-pcm038.c | 2 +-
410 arch/arm/mach-imx/mach-pcm043.c | 2 +-
411 arch/arm/mach-imx/mach-qong.c | 2 +-
412 arch/arm/mach-imx/mach-scb9328.c | 2 +-
413 arch/arm/mach-integrator/Makefile.boot | 2 +-
414 arch/arm/mach-integrator/include/mach/io.h | 2 -
415 arch/arm/mach-integrator/integrator_ap.c | 2 +-
416 arch/arm/mach-integrator/integrator_cp.c | 2 +-
417 arch/arm/mach-iop13xx/Makefile.boot | 2 +-
418 arch/arm/mach-iop13xx/iq81340mc.c | 2 +-
419 arch/arm/mach-iop13xx/iq81340sc.c | 2 +-
420 arch/arm/mach-iop32x/Makefile.boot | 2 +-
421 arch/arm/mach-iop32x/em7210.c | 2 +-
422 arch/arm/mach-iop32x/glantank.c | 2 +-
423 arch/arm/mach-iop32x/iq31244.c | 4 +-
424 arch/arm/mach-iop32x/iq80321.c | 2 +-
425 arch/arm/mach-iop32x/n2100.c | 2 +-
426 arch/arm/mach-iop33x/Makefile.boot | 2 +-
427 arch/arm/mach-iop33x/iq80331.c | 2 +-
428 arch/arm/mach-iop33x/iq80332.c | 2 +-
429 arch/arm/mach-ixp2000/Makefile.boot | 2 +-
430 arch/arm/mach-ixp2000/core.c | 4 +-
431 arch/arm/mach-ixp2000/enp2611.c | 2 +-
432 .../include/mach/{gpio.h => gpio-ixp2000.h} | 4 +-
433 arch/arm/mach-ixp2000/ixdp2400.c | 2 +-
434 arch/arm/mach-ixp2000/ixdp2800.c | 2 +-
435 arch/arm/mach-ixp2000/ixdp2x00.c | 4 +-
436 arch/arm/mach-ixp2000/ixdp2x01.c | 6 +-
437 arch/arm/mach-ixp23xx/Makefile.boot | 2 +-
438 arch/arm/mach-ixp23xx/espresso.c | 2 +-
439 arch/arm/mach-ixp23xx/ixdp2351.c | 2 +-
440 arch/arm/mach-ixp23xx/roadrunner.c | 2 +-
441 arch/arm/mach-ixp4xx/Makefile.boot | 2 +-
442 arch/arm/mach-ixp4xx/avila-setup.c | 4 +-
443 arch/arm/mach-ixp4xx/common-pci.c | 3 +-
444 arch/arm/mach-ixp4xx/coyote-setup.c | 4 +-
445 arch/arm/mach-ixp4xx/dsmg600-setup.c | 5 +-
446 arch/arm/mach-ixp4xx/fsg-setup.c | 5 +-
447 arch/arm/mach-ixp4xx/gateway7001-setup.c | 2 +-
448 arch/arm/mach-ixp4xx/goramo_mlr.c | 2 +-
449 arch/arm/mach-ixp4xx/gtwx5715-setup.c | 2 +-
450 arch/arm/mach-ixp4xx/include/mach/gpio.h | 3 +
451 arch/arm/mach-ixp4xx/include/mach/io.h | 2 -
452 arch/arm/mach-ixp4xx/ixdp425-setup.c | 8 +-
453 arch/arm/mach-ixp4xx/nas100d-setup.c | 5 +-
454 arch/arm/mach-ixp4xx/nslu2-setup.c | 5 +-
455 arch/arm/mach-ixp4xx/vulcan-setup.c | 2 +-
456 arch/arm/mach-ixp4xx/wg302v2-setup.c | 2 +-
457 arch/arm/mach-kirkwood/Makefile.boot | 2 +-
458 arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
459 arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +-
460 arch/arm/mach-kirkwood/dockstar-setup.c | 2 +-
461 arch/arm/mach-kirkwood/guruplug-setup.c | 2 +-
462 arch/arm/mach-kirkwood/irq.c | 3 +-
463 arch/arm/mach-kirkwood/mpp.c | 3 +-
464 arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-
465 arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 +-
466 arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +-
467 arch/arm/mach-kirkwood/openrd-setup.c | 6 +-
468 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-
469 arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +-
470 arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 +-
471 arch/arm/mach-kirkwood/t5325-setup.c | 2 +-
472 arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
473 arch/arm/mach-kirkwood/ts41x-setup.c | 2 +-
474 arch/arm/mach-ks8695/Makefile | 2 +-
475 arch/arm/mach-ks8695/Makefile.boot | 2 +-
476 arch/arm/mach-ks8695/board-acs5k.c | 6 +-
477 arch/arm/mach-ks8695/board-dsm320.c | 6 +-
478 arch/arm/mach-ks8695/board-micrel.c | 6 +-
479 arch/arm/mach-ks8695/devices.c | 1 +
480 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h | 39 +++
481 arch/arm/mach-ks8695/include/mach/gpio.h | 38 ---
482 arch/arm/mach-ks8695/leds.c | 4 +-
483 arch/arm/mach-lpc32xx/Makefile | 2 +-
484 arch/arm/mach-lpc32xx/Makefile.boot | 2 +-
485 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h | 50 ++++
486 arch/arm/mach-lpc32xx/include/mach/gpio.h | 74 ------
487 arch/arm/mach-lpc32xx/phy3250.c | 3 +-
488 arch/arm/mach-mmp/Makefile.boot | 2 +-
489 arch/arm/mach-mmp/aspenite.c | 5 +-
490 arch/arm/mach-mmp/mmp2.c | 3 +-
491 arch/arm/mach-mmp/pxa168.c | 3 +-
492 arch/arm/mach-mmp/pxa910.c | 3 +-
493 arch/arm/mach-mmp/tavorevb.c | 3 +-
494 arch/arm/mach-mmp/ttc_dkb.c | 2 +-
495 arch/arm/mach-msm/Makefile.boot | 2 +-
496 arch/arm/mach-msm/board-halibut.c | 2 +-
497 arch/arm/mach-msm/board-mahimahi.c | 2 +-
498 arch/arm/mach-msm/board-msm7x27.c | 11 +-
499 arch/arm/mach-msm/board-msm7x30.c | 31 ++-
500 arch/arm/mach-msm/board-msm8960.c | 22 ++
501 arch/arm/mach-msm/board-msm8x60.c | 25 ++
502 arch/arm/mach-msm/board-qsd8x50.c | 7 +-
503 arch/arm/mach-msm/board-sapphire.c | 5 +-
504 arch/arm/mach-msm/board-trout-mmc.c | 3 +-
505 arch/arm/mach-msm/board-trout-panel.c | 3 +-
506 arch/arm/mach-msm/board-trout.c | 2 +-
507 arch/arm/mach-msm/include/mach/gpio.h | 27 +--
508 arch/arm/mach-msm/include/mach/memory.h | 6 +-
509 arch/arm/mach-mv78xx0/Makefile.boot | 2 +-
510 arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +-
511 arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +-
512 arch/arm/mach-mv78xx0/irq.c | 3 +-
513 arch/arm/mach-mv78xx0/mpp.c | 3 +-
514 arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +-
515 arch/arm/mach-mx5/Makefile.boot | 6 +-
516 arch/arm/mach-mx5/board-cpuimx51.c | 2 +-
517 arch/arm/mach-mx5/board-cpuimx51sd.c | 2 +-
518 arch/arm/mach-mx5/board-mx51_3ds.c | 2 +-
519 arch/arm/mach-mx5/board-mx51_babbage.c | 2 +-
520 arch/arm/mach-mx5/board-mx51_efikamx.c | 2 +-
521 arch/arm/mach-mx5/board-mx51_efikasb.c | 2 +-
522 arch/arm/mach-mxs/Makefile.boot | 2 +-
523 arch/arm/mach-mxs/include/mach/gpio.h | 8 -
524 arch/arm/mach-netx/Makefile.boot | 2 +-
525 arch/arm/mach-netx/nxdb500.c | 2 +-
526 arch/arm/mach-netx/nxdkn.c | 2 +-
527 arch/arm/mach-netx/nxeb500hmi.c | 2 +-
528 arch/arm/mach-nomadik/Makefile.boot | 2 +-
529 arch/arm/mach-nomadik/board-nhk8815.c | 3 +-
530 arch/arm/mach-nomadik/cpu-8815.c | 2 +-
531 arch/arm/mach-nomadik/i2c-8815nhk.c | 2 +-
532 arch/arm/mach-nomadik/include/mach/gpio.h | 2 -
533 arch/arm/mach-nuc93x/Makefile.boot | 2 +-
534 arch/arm/mach-nuc93x/mach-nuc932evb.c | 1 -
535 arch/arm/mach-omap1/Makefile.boot | 2 +-
536 arch/arm/mach-omap1/board-ams-delta.c | 5 +-
537 arch/arm/mach-omap1/board-fsample.c | 5 +-
538 arch/arm/mach-omap1/board-generic.c | 5 +-
539 arch/arm/mach-omap1/board-h2-mmc.c | 3 +-
540 arch/arm/mach-omap1/board-h2.c | 5 +-
541 arch/arm/mach-omap1/board-h3-mmc.c | 3 +-
542 arch/arm/mach-omap1/board-h3.c | 5 +-
543 arch/arm/mach-omap1/board-htcherald.c | 3 +-
544 arch/arm/mach-omap1/board-innovator.c | 5 +-
545 arch/arm/mach-omap1/board-nokia770.c | 5 +-
546 arch/arm/mach-omap1/board-osk.c | 5 +-
547 arch/arm/mach-omap1/board-palmte.c | 5 +-
548 arch/arm/mach-omap1/board-palmtt.c | 4 +-
549 arch/arm/mach-omap1/board-palmz71.c | 4 +-
550 arch/arm/mach-omap1/board-perseus2.c | 5 +-
551 arch/arm/mach-omap1/board-sx1-mmc.c | 2 +-
552 arch/arm/mach-omap1/board-sx1.c | 5 +-
553 arch/arm/mach-omap1/board-voiceblue.c | 4 +-
554 arch/arm/mach-omap1/devices.c | 2 +-
555 arch/arm/mach-omap1/fpga.c | 2 +-
556 arch/arm/mach-omap1/io.c | 1 +
557 arch/arm/mach-omap1/irq.c | 3 +-
558 arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +-
559 arch/arm/mach-omap1/leds-osk.c | 3 +-
560 arch/arm/mach-omap1/leds.c | 2 +-
561 arch/arm/mach-omap1/serial.c | 3 +-
562 arch/arm/mach-omap2/Makefile.boot | 2 +-
563 arch/arm/mach-omap2/board-2430sdp.c | 2 +-
564 arch/arm/mach-omap2/board-3430sdp.c | 2 +-
565 arch/arm/mach-omap2/board-3630sdp.c | 2 +-
566 arch/arm/mach-omap2/board-4430sdp.c | 2 +-
567 arch/arm/mach-omap2/board-am3517crane.c | 2 +-
568 arch/arm/mach-omap2/board-am3517evm.c | 2 +-
569 arch/arm/mach-omap2/board-apollon.c | 2 +-
570 arch/arm/mach-omap2/board-cm-t35.c | 4 +-
571 arch/arm/mach-omap2/board-cm-t3517.c | 2 +-
572 arch/arm/mach-omap2/board-devkit8000.c | 2 +-
573 arch/arm/mach-omap2/board-generic.c | 5 +-
574 arch/arm/mach-omap2/board-h4.c | 5 +-
575 arch/arm/mach-omap2/board-igep0020.c | 4 +-
576 arch/arm/mach-omap2/board-ldp.c | 5 +-
577 arch/arm/mach-omap2/board-n8x0.c | 6 +-
578 arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
579 arch/arm/mach-omap2/board-omap3evm.c | 2 +-
580 arch/arm/mach-omap2/board-omap3logic.c | 4 +-
581 arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
582 arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
583 arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
584 arch/arm/mach-omap2/board-omap4panda.c | 2 +-
585 arch/arm/mach-omap2/board-overo.c | 2 +-
586 arch/arm/mach-omap2/board-rm680.c | 2 +-
587 arch/arm/mach-omap2/board-rx51.c | 2 +-
588 arch/arm/mach-omap2/board-ti8168evm.c | 2 +-
589 arch/arm/mach-omap2/board-zoom.c | 4 +-
590 arch/arm/mach-omap2/devices.c | 3 +-
591 arch/arm/mach-omap2/io.c | 2 +-
592 arch/arm/mach-orion5x/Makefile.boot | 2 +-
593 arch/arm/mach-orion5x/d2net-setup.c | 4 +-
594 arch/arm/mach-orion5x/db88f5281-setup.c | 5 +-
595 arch/arm/mach-orion5x/dns323-setup.c | 5 +-
596 arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +-
597 arch/arm/mach-orion5x/irq.c | 3 +-
598 arch/arm/mach-orion5x/kurobox_pro-setup.c | 7 +-
599 arch/arm/mach-orion5x/ls-chl-setup.c | 2 +-
600 arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +-
601 arch/arm/mach-orion5x/lsmini-setup.c | 2 +-
602 arch/arm/mach-orion5x/mss2-setup.c | 2 +-
603 arch/arm/mach-orion5x/mv2120-setup.c | 5 +-
604 arch/arm/mach-orion5x/net2big-setup.c | 2 +-
605 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 5 +-
606 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 5 +-
607 arch/arm/mach-orion5x/rd88f5182-setup.c | 5 +-
608 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 5 +-
609 arch/arm/mach-orion5x/terastation_pro2-setup.c | 5 +-
610 arch/arm/mach-orion5x/ts209-setup.c | 5 +-
611 arch/arm/mach-orion5x/ts409-setup.c | 5 +-
612 arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
613 arch/arm/mach-orion5x/wnr854t-setup.c | 5 +-
614 arch/arm/mach-orion5x/wrt350n-v2-setup.c | 5 +-
615 arch/arm/mach-pnx4008/Makefile.boot | 2 +-
616 arch/arm/mach-pnx4008/core.c | 2 +-
617 arch/arm/mach-pnx4008/gpio.c | 3 +-
618 .../include/mach/{gpio.h => gpio-pnx4008.h} | 2 +-
619 arch/arm/mach-pnx4008/serial.c | 3 +-
620 arch/arm/mach-prima2/Makefile.boot | 2 +-
621 arch/arm/mach-prima2/prima2.c | 2 +-
622 arch/arm/mach-pxa/Makefile.boot | 2 +-
623 arch/arm/mach-pxa/balloon3.c | 2 +-
624 arch/arm/mach-pxa/capc7117.c | 2 +-
625 arch/arm/mach-pxa/cm-x2xx.c | 2 +-
626 arch/arm/mach-pxa/cm-x300.c | 2 +-
627 arch/arm/mach-pxa/colibri-pxa270.c | 4 +-
628 arch/arm/mach-pxa/colibri-pxa300.c | 2 +-
629 arch/arm/mach-pxa/colibri-pxa320.c | 2 +-
630 arch/arm/mach-pxa/csb726.c | 2 +-
631 arch/arm/mach-pxa/em-x270.c | 4 +-
632 arch/arm/mach-pxa/eseries.c | 12 +-
633 arch/arm/mach-pxa/ezx.c | 12 +-
634 arch/arm/mach-pxa/generic.c | 2 +-
635 arch/arm/mach-pxa/gumstix.c | 2 +-
636 arch/arm/mach-pxa/h5000.c | 2 +-
637 arch/arm/mach-pxa/himalaya.c | 2 +-
638 arch/arm/mach-pxa/hx4700.c | 2 +-
639 arch/arm/mach-pxa/icontrol.c | 2 +-
640 arch/arm/mach-pxa/include/mach/littleton.h | 2 +-
641 arch/arm/mach-pxa/irq.c | 3 +-
642 arch/arm/mach-pxa/littleton.c | 2 +-
643 arch/arm/mach-pxa/lpd270.c | 5 +-
644 arch/arm/mach-pxa/lubbock.c | 2 +-
645 arch/arm/mach-pxa/magician.c | 2 +-
646 arch/arm/mach-pxa/mainstone.c | 5 +-
647 arch/arm/mach-pxa/mfp-pxa2xx.c | 3 +-
648 arch/arm/mach-pxa/mioa701.c | 2 +-
649 arch/arm/mach-pxa/mp900.c | 2 +-
650 arch/arm/mach-pxa/palmld.c | 2 +-
651 arch/arm/mach-pxa/palmt5.c | 2 +-
652 arch/arm/mach-pxa/palmtc.c | 2 +-
653 arch/arm/mach-pxa/palmte2.c | 2 +-
654 arch/arm/mach-pxa/palmtreo.c | 4 +-
655 arch/arm/mach-pxa/palmtx.c | 2 +-
656 arch/arm/mach-pxa/palmz72.c | 2 +-
657 arch/arm/mach-pxa/pcm027.c | 2 +-
658 arch/arm/mach-pxa/pcm990-baseboard.c | 3 +-
659 arch/arm/mach-pxa/pxa25x.c | 2 +-
660 arch/arm/mach-pxa/pxa27x.c | 2 +-
661 arch/arm/mach-pxa/pxa3xx.c | 3 +-
662 arch/arm/mach-pxa/pxa95x.c | 3 +-
663 arch/arm/mach-pxa/raumfeld.c | 6 +-
664 arch/arm/mach-pxa/saar.c | 4 +-
665 arch/arm/mach-pxa/saarb.c | 5 +-
666 arch/arm/mach-pxa/stargate2.c | 4 +-
667 arch/arm/mach-pxa/tavorevb.c | 2 +-
668 arch/arm/mach-pxa/tavorevb3.c | 2 +-
669 arch/arm/mach-pxa/trizeps4.c | 4 +-
670 arch/arm/mach-pxa/viper.c | 2 +-
671 arch/arm/mach-pxa/vpac270.c | 2 +-
672 arch/arm/mach-pxa/xcep.c | 2 +-
673 arch/arm/mach-pxa/z2.c | 2 +-
674 arch/arm/mach-pxa/zeus.c | 2 +-
675 arch/arm/mach-pxa/zylonite.c | 2 +-
676 arch/arm/mach-realview/Makefile.boot | 4 +-
677 arch/arm/mach-realview/include/mach/gpio.h | 7 +-
678 arch/arm/mach-realview/realview_eb.c | 2 +-
679 arch/arm/mach-realview/realview_pb1176.c | 2 +-
680 arch/arm/mach-realview/realview_pb11mp.c | 2 +-
681 arch/arm/mach-realview/realview_pba8.c | 2 +-
682 arch/arm/mach-realview/realview_pbx.c | 2 +-
683 arch/arm/mach-rpc/Makefile.boot | 2 +-
684 arch/arm/mach-rpc/include/mach/hardware.h | 25 +-
685 arch/arm/mach-rpc/include/mach/io.h | 193 +--------------
686 arch/arm/mach-rpc/riscpc.c | 4 +-
687 arch/arm/mach-s3c2410/Makefile.boot | 4 +-
688 arch/arm/mach-s3c2410/include/mach/gpio.h | 6 -
689 arch/arm/mach-s3c2410/include/mach/h1940-latch.h | 2 +-
690 arch/arm/mach-s3c2410/include/mach/io.h | 2 -
691 arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +-
692 arch/arm/mach-s3c2410/mach-bast.c | 2 +-
693 arch/arm/mach-s3c2410/mach-h1940.c | 2 +-
694 arch/arm/mach-s3c2410/mach-n30.c | 4 +-
695 arch/arm/mach-s3c2410/mach-otom.c | 2 +-
696 arch/arm/mach-s3c2410/mach-qt2410.c | 2 +-
697 arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +-
698 arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +-
699 arch/arm/mach-s3c2410/mach-vr1000.c | 2 +-
700 arch/arm/mach-s3c2412/mach-jive.c | 2 +-
701 arch/arm/mach-s3c2412/mach-smdk2413.c | 6 +-
702 arch/arm/mach-s3c2412/mach-vstms.c | 2 +-
703 arch/arm/mach-s3c2416/mach-smdk2416.c | 2 +-
704 arch/arm/mach-s3c2440/mach-anubis.c | 2 +-
705 arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +-
706 arch/arm/mach-s3c2440/mach-gta02.c | 2 +-
707 arch/arm/mach-s3c2440/mach-mini2440.c | 2 +-
708 arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +-
709 arch/arm/mach-s3c2440/mach-osiris.c | 2 +-
710 arch/arm/mach-s3c2440/mach-rx1950.c | 2 +-
711 arch/arm/mach-s3c2440/mach-rx3715.c | 2 +-
712 arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +-
713 arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +-
714 arch/arm/mach-s3c64xx/Makefile.boot | 2 +-
715 arch/arm/mach-s3c64xx/cpu.c | 2 +
716 arch/arm/mach-s3c64xx/include/mach/gpio.h | 7 -
717 arch/arm/mach-s3c64xx/include/mach/memory.h | 2 -
718 arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
719 arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
720 arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
721 arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
722 arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
723 arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
724 arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
725 arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
726 arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
727 arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
728 arch/arm/mach-s5p64x0/Makefile.boot | 2 +-
729 arch/arm/mach-s5p64x0/cpu.c | 3 +
730 arch/arm/mach-s5p64x0/include/mach/gpio.h | 7 -
731 arch/arm/mach-s5p64x0/include/mach/memory.h | 1 -
732 arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +-
733 arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +-
734 arch/arm/mach-s5pc100/Makefile.boot | 2 +-
735 arch/arm/mach-s5pc100/include/mach/gpio.h | 7 -
736 arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +-
737 arch/arm/mach-s5pv210/Makefile.boot | 2 +-
738 arch/arm/mach-s5pv210/cpu.c | 2 +
739 arch/arm/mach-s5pv210/include/mach/gpio.h | 7 -
740 arch/arm/mach-s5pv210/include/mach/memory.h | 1 -
741 arch/arm/mach-s5pv210/mach-aquila.c | 2 +-
742 arch/arm/mach-s5pv210/mach-goni.c | 2 +-
743 arch/arm/mach-s5pv210/mach-smdkc110.c | 2 +-
744 arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +-
745 arch/arm/mach-s5pv210/mach-torbreck.c | 2 +-
746 arch/arm/mach-sa1100/Makefile | 2 +-
747 arch/arm/mach-sa1100/Makefile.boot | 5 +-
748 arch/arm/mach-sa1100/assabet.c | 2 +-
749 arch/arm/mach-sa1100/badge4.c | 2 +-
750 arch/arm/mach-sa1100/generic.c | 2 +-
751 arch/arm/mach-sa1100/h3100.c | 2 +-
752 arch/arm/mach-sa1100/h3600.c | 2 +-
753 arch/arm/mach-sa1100/hackkit.c | 2 +-
754 arch/arm/mach-sa1100/include/mach/gpio.h | 4 +-
755 arch/arm/mach-sa1100/include/mach/io.h | 6 +-
756 arch/arm/mach-sa1100/jornada720.c | 2 +-
757 arch/arm/mach-sa1100/lart.c | 2 +-
758 arch/arm/mach-sa1100/nanoengine.c | 2 +-
759 arch/arm/mach-sa1100/shannon.c | 2 +-
760 arch/arm/mach-sa1100/simpad.c | 2 +-
761 arch/arm/mach-shark/Makefile.boot | 2 +-
762 arch/arm/mach-shark/core.c | 2 +-
763 arch/arm/mach-shmobile/Makefile.boot | 2 +-
764 arch/arm/mach-shmobile/board-ag5evm.c | 3 +
765 arch/arm/mach-shmobile/board-ap4evb.c | 3 +
766 arch/arm/mach-shmobile/board-g3evm.c | 3 +
767 arch/arm/mach-shmobile/board-g4evm.c | 3 +
768 arch/arm/mach-shmobile/board-mackerel.c | 3 +
769 arch/arm/mach-shmobile/include/mach/gpio.h | 24 +--
770 arch/arm/mach-shmobile/include/mach/memory.h | 3 -
771 arch/arm/mach-spear3xx/Makefile.boot | 2 +-
772 arch/arm/mach-spear3xx/spear300_evb.c | 2 +-
773 arch/arm/mach-spear3xx/spear310_evb.c | 2 +-
774 arch/arm/mach-spear3xx/spear320_evb.c | 2 +-
775 arch/arm/mach-spear6xx/Makefile.boot | 2 +-
776 arch/arm/mach-spear6xx/spear600_evb.c | 2 +-
777 arch/arm/mach-tcc8k/Makefile.boot | 2 +-
778 arch/arm/mach-tcc8k/board-tcc8000-sdk.c | 2 +-
779 arch/arm/mach-tegra/Makefile.boot | 2 +-
780 arch/arm/mach-tegra/board-harmony.c | 2 +-
781 arch/arm/mach-tegra/board-paz00.c | 2 +-
782 arch/arm/mach-tegra/board-seaboard.c | 6 +-
783 arch/arm/mach-tegra/board-trimslice-pinmux.c | 3 +-
784 arch/arm/mach-tegra/board-trimslice.c | 2 +-
785 arch/arm/mach-tegra/include/mach/gpio.h | 23 +--
786 arch/arm/mach-u300/Makefile.boot | 4 +-
787 arch/arm/mach-u300/core.c | 3 +
788 arch/arm/mach-u300/include/mach/gpio-u300.h | 253 +++++++++++++++++++
789 arch/arm/mach-u300/include/mach/gpio.h | 259 +-------------------
790 arch/arm/mach-u300/include/mach/memory.h | 13 +-
791 arch/arm/mach-u300/mmc.c | 2 +-
792 arch/arm/mach-u300/u300.c | 2 +-
793 arch/arm/mach-ux500/Makefile.boot | 2 +-
794 arch/arm/mach-ux500/board-mop500-pins.c | 2 +-
795 arch/arm/mach-ux500/board-mop500-u8500uib.c | 3 +-
796 arch/arm/mach-ux500/board-mop500.c | 7 +-
797 arch/arm/mach-ux500/board-u5500-sdi.c | 2 +-
798 arch/arm/mach-ux500/board-u5500.c | 4 +-
799 arch/arm/mach-ux500/cpu-db5500.c | 2 +-
800 arch/arm/mach-ux500/cpu-db8500.c | 2 +-
801 arch/arm/mach-ux500/devices-common.c | 2 +-
802 arch/arm/mach-ux500/include/mach/gpio.h | 2 -
803 arch/arm/mach-versatile/Makefile.boot | 2 +-
804 arch/arm/mach-versatile/include/mach/gpio.h | 7 +-
805 arch/arm/mach-versatile/versatile_ab.c | 2 +-
806 arch/arm/mach-versatile/versatile_pb.c | 2 +-
807 arch/arm/mach-vexpress/Makefile.boot | 2 +-
808 arch/arm/mach-vexpress/include/mach/io.h | 2 -
809 arch/arm/mach-vexpress/v2m.c | 2 +-
810 arch/arm/mach-vt8500/Makefile.boot | 2 +-
811 arch/arm/mach-vt8500/bv07.c | 2 +-
812 arch/arm/mach-vt8500/include/mach/gpio.h | 7 +-
813 arch/arm/mach-vt8500/include/mach/io.h | 2 -
814 arch/arm/mach-vt8500/wm8505_7in.c | 2 +-
815 arch/arm/mach-w90x900/Makefile.boot | 2 +-
816 arch/arm/mach-w90x900/include/mach/gpio.h | 6 +-
817 arch/arm/mach-w90x900/mach-nuc910evb.c | 1 -
818 arch/arm/mach-w90x900/mach-nuc950evb.c | 1 -
819 arch/arm/mach-w90x900/mach-nuc960evb.c | 1 -
820 arch/arm/mach-zynq/Makefile.boot | 2 +-
821 arch/arm/mm/cache-l2x0.c | 103 ++++++++
822 arch/arm/mm/dma-mapping.c | 46 +++-
823 arch/arm/mm/init.c | 9 -
824 arch/arm/mm/mmu.c | 14 +-
825 arch/arm/plat-mxc/include/mach/gpio.h | 6 -
826 arch/arm/plat-mxc/include/mach/memory.h | 15 --
827 .../include/plat/{gpio.h => gpio-nomadik.h} | 17 +-
828 arch/arm/plat-omap/debug-devices.c | 3 +-
829 arch/arm/plat-omap/debug-leds.c | 3 +-
830 arch/arm/plat-omap/devices.c | 3 +-
831 arch/arm/plat-omap/include/plat/gpio.h | 20 --
832 arch/arm/plat-omap/include/plat/io.h | 2 +
833 arch/arm/plat-omap/include/plat/memory.h | 13 -
834 arch/arm/plat-omap/io.c | 8 +
835 arch/arm/plat-orion/include/plat/gpio.h | 10 +-
836 arch/arm/plat-pxa/gpio.c | 4 +-
837 arch/arm/plat-pxa/include/plat/gpio.h | 2 +
838 arch/arm/plat-spear/include/plat/gpio.h | 25 +--
839 drivers/amba/bus.c | 57 ++++-
840 drivers/ata/pata_at91.c | 2 +-
841 drivers/gpio/Makefile | 6 +-
842 .../gpio.c => drivers/gpio/gpio-davinci.c | 4 +-
843 drivers/gpio/gpio-ep93xx.c | 19 ++-
844 .../gpio.c => drivers/gpio/gpio-ks8695.c | 4 +-
845 .../gpiolib.c => drivers/gpio/gpio-lpc32xx.c | 2 +-
846 drivers/gpio/gpio-nomadik.c | 3 +-
847 drivers/gpio/gpio-omap.c | 2 +-
848 .../gpio.c => drivers/gpio/gpio-sa1100.c | 4 +-
849 drivers/gpio/gpio-tegra.c | 22 ++-
850 .../mach-davinci => drivers/gpio}/gpio-tnetv107x.c | 0
851 drivers/gpio/gpio-u300.c | 1 +
852 drivers/i2c/busses/i2c-ixp2000.c | 2 +-
853 drivers/ide/at91_ide.c | 2 +-
854 drivers/input/keyboard/omap-keypad.c | 2 +-
855 drivers/mfd/menelaus.c | 2 +-
856 drivers/mmc/host/mmci.c | 12 +
857 drivers/mmc/host/omap.c | 2 +-
858 drivers/mmc/host/sdhci-tegra.c | 2 +-
859 drivers/mtd/nand/ams-delta.c | 2 +-
860 drivers/mtd/onenand/omap2.c | 2 +-
861 drivers/net/arm/at91_ether.c | 2 +-
862 drivers/pcmcia/pxa2xx_vpac270.c | 2 +-
863 drivers/spi/spi-atmel.c | 2 +-
864 drivers/spi/spi-pl022.c | 80 ++++---
865 drivers/tty/serial/atmel_serial.c | 2 +-
866 drivers/usb/host/ohci-pnx4008.c | 2 +-
867 drivers/usb/musb/davinci.c | 2 +-
868 drivers/video/atmel_lcdfb.c | 2 +-
869 drivers/video/omap/lcd_apollon.c | 2 +-
870 drivers/video/omap/lcd_h3.c | 2 +-
871 drivers/video/omap/lcd_inn1610.c | 2 +-
872 drivers/video/omap/lcd_ldp.c | 2 +-
873 drivers/video/omap/lcd_osk.c | 2 +-
874 drivers/video/omap/lcd_overo.c | 2 +-
875 drivers/video/omap/lcd_palmtt.c | 2 +-
876 drivers/video/pnx4008/sdum.c | 2 +-
877 657 files changed, 2123 insertions(+), 2028 deletions(-)
878 create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt
879 delete mode 100644 arch/arm/include/asm/auxvec.h
880 delete mode 100644 arch/arm/include/asm/bitsperlong.h
881 delete mode 100644 arch/arm/include/asm/cputime.h
882 delete mode 100644 arch/arm/include/asm/emergency-restart.h
883 delete mode 100644 arch/arm/include/asm/errno.h
884 delete mode 100644 arch/arm/include/asm/ioctl.h
885 delete mode 100644 arch/arm/include/asm/irq_regs.h
886 delete mode 100644 arch/arm/include/asm/kdebug.h
887 delete mode 100644 arch/arm/include/asm/local.h
888 delete mode 100644 arch/arm/include/asm/local64.h
889 delete mode 100644 arch/arm/include/asm/percpu.h
890 delete mode 100644 arch/arm/include/asm/poll.h
891 delete mode 100644 arch/arm/include/asm/resource.h
892 delete mode 100644 arch/arm/include/asm/sections.h
893 delete mode 100644 arch/arm/include/asm/siginfo.h
894 delete mode 100644 arch/arm/include/asm/sizes.h
895 create mode 100644 arch/arm/kernel/topology.c
896 create mode 100644 arch/arm/mach-davinci/include/mach/gpio-davinci.h
897 rename arch/arm/mach-ixp2000/include/mach/{gpio.h => gpio-ixp2000.h} (95%)
898 create mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h
899 create mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h
900 rename arch/arm/mach-pnx4008/include/mach/{gpio.h => gpio-pnx4008.h} (99%)
901 create mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h
902 rename arch/arm/plat-nomadik/include/plat/{gpio.h => gpio-nomadik.h} (82%)
903 rename arch/arm/mach-davinci/gpio.c => drivers/gpio/gpio-davinci.c (99%)
904 rename arch/arm/mach-ks8695/gpio.c => drivers/gpio/gpio-ks8695.c (99%)
905 rename arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c (99%)
906 rename arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c (96%)
907 rename {arch/arm/mach-davinci => drivers/gpio}/gpio-tnetv107x.c (100%)
908 Merging arm-lpae/for-next
909 $ git merge arm-lpae/for-next
910 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
911 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
912 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
913 Resolved 'arch/arm/kernel/head.S' using previous resolution.
914 Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution.
915 Resolved 'arch/arm/mm/mmu.c' using previous resolution.
916 Auto-merging arch/arm/Kconfig
917 Auto-merging arch/arm/include/asm/pgalloc.h
918 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
919 Auto-merging arch/arm/include/asm/pgtable.h
920 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
921 Auto-merging arch/arm/include/asm/system.h
922 Auto-merging arch/arm/include/asm/tlb.h
923 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
924 Auto-merging arch/arm/kernel/head.S
925 CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
926 Auto-merging arch/arm/kernel/setup.c
927 Auto-merging arch/arm/mm/dma-mapping.c
928 CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
929 Auto-merging arch/arm/mm/mmu.c
930 CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
931 Automatic merge failed; fix conflicts and then commit the result.
933 [master 3639757] Merge remote-tracking branch 'arm-lpae/for-next'
934 $ git diff -M --stat --summary HEAD^..
935 arch/arm/Kconfig | 2 +-
936 arch/arm/boot/compressed/head.S | 1 +
937 arch/arm/include/asm/assembler.h | 11 +
938 arch/arm/include/asm/page.h | 44 +---
939 arch/arm/include/asm/pgalloc.h | 28 ++-
940 arch/arm/include/asm/pgtable-2level-hwdef.h | 93 ++++++
941 arch/arm/include/asm/pgtable-2level-types.h | 67 +++++
942 arch/arm/include/asm/pgtable-2level.h | 143 +++++++++
943 arch/arm/include/asm/pgtable-3level-hwdef.h | 82 ++++++
944 arch/arm/include/asm/pgtable-3level-types.h | 70 +++++
945 arch/arm/include/asm/pgtable-3level.h | 107 +++++++
946 arch/arm/include/asm/pgtable-hwdef.h | 81 +-----
947 arch/arm/include/asm/pgtable.h | 211 +++++---------
948 arch/arm/include/asm/proc-fns.h | 21 ++
949 arch/arm/include/asm/setup.h | 8 +
950 arch/arm/include/asm/system.h | 8 +
951 arch/arm/include/asm/tlb.h | 11 +-
952 arch/arm/include/asm/tlbflush.h | 4 +-
953 arch/arm/kernel/head.S | 45 +++-
954 arch/arm/kernel/hw_breakpoint.c | 8 +-
955 arch/arm/kernel/setup.c | 10 +
956 arch/arm/kernel/sleep.S | 2 +
957 arch/arm/mm/Kconfig | 13 +
958 arch/arm/mm/Makefile | 4 +
959 arch/arm/mm/alignment.c | 2 +-
960 arch/arm/mm/context.c | 19 +-
961 arch/arm/mm/fault.c | 87 ++++++
962 arch/arm/mm/idmap.c | 36 +++-
963 arch/arm/mm/ioremap.c | 39 ++-
964 arch/arm/mm/mm.h | 4 +-
965 arch/arm/mm/mmu.c | 39 +++-
966 arch/arm/mm/pgd.c | 51 +++-
967 arch/arm/mm/proc-macros.S | 5 +-
968 arch/arm/mm/proc-v7lpae.S | 422 +++++++++++++++++++++++++++
969 34 files changed, 1477 insertions(+), 301 deletions(-)
970 create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
971 create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
972 create mode 100644 arch/arm/include/asm/pgtable-2level.h
973 create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
974 create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
975 create mode 100644 arch/arm/include/asm/pgtable-3level.h
976 create mode 100644 arch/arm/mm/proc-v7lpae.S
977 Merging arm-soc/for-next
978 $ git merge arm-soc/for-next
979 Resolved 'arch/arm/mach-u300/Makefile.boot' using previous resolution.
980 Auto-merging arch/arm/Kconfig
981 Auto-merging arch/arm/Makefile
982 Auto-merging arch/arm/configs/imx_v4_v5_defconfig
983 Removing arch/arm/configs/mx1_defconfig
984 Removing arch/arm/configs/mx21_defconfig
985 Auto-merging arch/arm/configs/mx5_defconfig
986 Removing arch/arm/mach-mx5/devices.c
987 Removing arch/arm/mach-mx5/devices.h
988 Auto-merging arch/arm/mach-u300/Makefile.boot
989 CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
990 Automatic merge failed; fix conflicts and then commit the result.
992 [master 45285da] Merge remote-tracking branch 'arm-soc/for-next'
993 $ git diff -M --stat --summary HEAD^..
994 arch/arm/Kconfig | 1 +
995 arch/arm/Makefile | 4 +-
996 .../{mx27_defconfig => imx_v4_v5_defconfig} | 68 +-
997 arch/arm/configs/mx1_defconfig | 91 -
998 arch/arm/configs/mx21_defconfig | 97 -
999 arch/arm/configs/{mx51_defconfig => mx5_defconfig} | 60 +-
1000 arch/arm/mach-imx/Kconfig | 51 +-
1001 arch/arm/mach-imx/Makefile | 10 +-
1002 arch/arm/mach-imx/cache-l2x0.c | 2 +-
1003 arch/arm/mach-imx/clock-imx25.c | 6 +
1004 arch/arm/mach-imx/clock-imx27.c | 6 +-
1005 arch/arm/mach-imx/clock-imx31.c | 8 +-
1006 arch/arm/mach-imx/clock-imx35.c | 7 +-
1007 arch/arm/mach-imx/cpu-imx25.c | 41 +
1008 arch/arm/mach-imx/cpu-imx27.c | 28 +-
1009 arch/arm/mach-imx/cpu-imx31.c | 49 +-
1010 arch/arm/mach-imx/cpu-imx35.c | 30 +-
1011 arch/arm/mach-imx/devices-imx27.h | 4 +
1012 arch/arm/mach-imx/devices-imx31.h | 4 +
1013 arch/arm/mach-imx/devices-imx35.h | 4 +
1014 arch/arm/mach-imx/mach-armadillo5x0.c | 18 +-
1015 arch/arm/mach-imx/mach-mx1ads.c | 15 +-
1016 arch/arm/mach-imx/mach-mx25_3ds.c | 10 +
1017 arch/arm/mach-mx5/Kconfig | 29 +-
1018 arch/arm/mach-mx5/Makefile | 2 +-
1019 arch/arm/mach-mx5/board-cpuimx51.c | 19 +-
1020 arch/arm/mach-mx5/board-cpuimx51sd.c | 21 +-
1021 arch/arm/mach-mx5/board-mx51_3ds.c | 1 -
1022 arch/arm/mach-mx5/board-mx51_babbage.c | 26 +-
1023 arch/arm/mach-mx5/board-mx51_efikamx.c | 2 -
1024 arch/arm/mach-mx5/board-mx51_efikasb.c | 6 +-
1025 arch/arm/mach-mx5/board-mx53_loco.c | 20 +
1026 arch/arm/mach-mx5/clock-mx51-mx53.c | 14 +-
1027 arch/arm/mach-mx5/cpu.c | 74 +-
1028 arch/arm/mach-mx5/devices-imx51.h | 17 +
1029 arch/arm/mach-mx5/devices-imx53.h | 4 +
1030 arch/arm/mach-mx5/devices.c | 120 -
1031 arch/arm/mach-mx5/devices.h | 5 -
1032 arch/arm/mach-mx5/ehci.c | 2 +-
1033 arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 1 -
1034 arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 6 +-
1035 arch/arm/mach-mx5/mm.c | 8 +-
1036 arch/arm/mach-mx5/mx51_efika.c | 17 +-
1037 arch/arm/mach-mxs/Kconfig | 6 +
1038 arch/arm/mach-mxs/clock-mx28.c | 8 +-
1039 arch/arm/mach-mxs/devices-mx23.h | 2 +
1040 arch/arm/mach-mxs/devices-mx28.h | 5 +
1041 arch/arm/mach-mxs/devices/Kconfig | 6 +
1042 arch/arm/mach-mxs/devices/Makefile | 2 +
1043 arch/arm/mach-mxs/devices/platform-mxs-saif.c | 60 +
1044 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 +
1045 arch/arm/mach-mxs/include/mach/devices-common.h | 12 +
1046 arch/arm/mach-mxs/mach-mx23evk.c | 2 +-
1047 arch/arm/mach-mxs/mach-mx28evk.c | 79 +-
1048 arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 +-
1049 arch/arm/mach-mxs/mach-tx28.c | 1 +
1050 arch/arm/mach-tegra/board-harmony.c | 5 +-
1051 arch/arm/mach-tegra/board-paz00-pinmux.c | 3 +
1052 arch/arm/mach-tegra/board-paz00.c | 62 +-
1053 arch/arm/mach-tegra/board-paz00.h | 16 +-
1054 arch/arm/mach-tegra/board-seaboard-pinmux.c | 6 +-
1055 arch/arm/mach-tegra/board-seaboard.c | 81 +-
1056 arch/arm/mach-tegra/board-seaboard.h | 12 +-
1057 arch/arm/mach-tegra/board-trimslice.c | 3 +-
1058 arch/arm/mach-u300/Kconfig | 46 -
1059 arch/arm/mach-u300/Makefile.boot | 17 +-
1060 arch/arm/mach-u300/core.c | 82 +-
1061 arch/arm/mach-u300/include/mach/memory.h | 22 +-
1062 arch/arm/mach-u300/u300.c | 16 -
1063 arch/arm/plat-mxc/Kconfig | 39 +-
1064 arch/arm/plat-mxc/audmux-v2.c | 18 +-
1065 arch/arm/plat-mxc/cpu.c | 9 +
1066 arch/arm/plat-mxc/devices.c | 14 -
1067 arch/arm/plat-mxc/devices/Kconfig | 5 +-
1068 arch/arm/plat-mxc/devices/Makefile | 1 +
1069 arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 5 +
1070 arch/arm/plat-mxc/devices/platform-imx-i2c.c | 6 +
1071 arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 9 +
1072 arch/arm/plat-mxc/devices/platform-pata_imx.c | 59 +
1073 arch/arm/plat-mxc/include/mach/common.h | 2 +-
1074 arch/arm/plat-mxc/include/mach/devices-common.h | 8 +
1075 arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2270 +++++---------
1076 arch/arm/plat-mxc/include/mach/iomux-mx53.h | 3530 +++++++-------------
1077 arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 +
1078 arch/arm/plat-mxc/include/mach/memory.h | 16 +-
1079 arch/arm/plat-mxc/include/mach/mx25.h | 4 +
1080 arch/arm/plat-mxc/include/mach/mx35.h | 2 +-
1081 arch/arm/plat-mxc/include/mach/mx3x.h | 18 +-
1082 arch/arm/plat-mxc/include/mach/mx51.h | 167 +-
1083 arch/arm/plat-mxc/pwm.c | 2 +-
1084 90 files changed, 2954 insertions(+), 4846 deletions(-)
1085 rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
1086 delete mode 100644 arch/arm/configs/mx1_defconfig
1087 delete mode 100644 arch/arm/configs/mx21_defconfig
1088 rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
1089 create mode 100644 arch/arm/mach-imx/cpu-imx25.c
1090 delete mode 100644 arch/arm/mach-mx5/devices.c
1091 delete mode 100644 arch/arm/mach-mx5/devices.h
1092 create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
1093 create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
1094 create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
1095 Merging at91/at91-next
1096 $ git merge at91/at91-next
1097 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
1098 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
1099 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
1100 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
1101 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
1102 Auto-merging arch/arm/mach-at91/at91sam9g45.c
1103 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
1104 CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in at91/at91-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
1105 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
1106 Automatic merge failed; fix conflicts and then commit the result.
1107 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c
1108 arch/arm/mach-at91/board-usb-a9260.c: needs merge
1109 rm 'arch/arm/mach-at91/board-usb-a9260.c'
1111 [master 90b3e33] Merge remote-tracking branch 'at91/at91-next'
1112 $ git diff -M --stat --summary HEAD^..
1113 arch/arm/mach-at91/Kconfig | 13 +
1114 arch/arm/mach-at91/Makefile | 6 +-
1115 arch/arm/mach-at91/at91cap9.c | 2 +
1116 arch/arm/mach-at91/at91cap9_devices.c | 6 +
1117 arch/arm/mach-at91/at91rm9200.c | 2 +
1118 arch/arm/mach-at91/at91rm9200_devices.c | 8 +
1119 arch/arm/mach-at91/at91sam9260.c | 2 +
1120 arch/arm/mach-at91/at91sam9260_devices.c | 8 +
1121 arch/arm/mach-at91/at91sam9261.c | 29 ++--
1122 arch/arm/mach-at91/at91sam9261_devices.c | 8 +
1123 arch/arm/mach-at91/at91sam9263.c | 2 +
1124 arch/arm/mach-at91/at91sam9263_devices.c | 6 +
1125 arch/arm/mach-at91/at91sam9g45.c | 2 +
1126 arch/arm/mach-at91/at91sam9g45_devices.c | 6 +
1127 arch/arm/mach-at91/board-rsi-ews.c | 233 +++++++++++++++++++
1128 arch/arm/mach-at91/board-usb-a9260.c | 230 -------------------
1129 .../{board-usb-a9263.c => board-usb-a926x.c} | 179 +++++++++++++--
1130 arch/arm/mach-at91/include/mach/board.h | 5 +
1131 arch/arm/mach-at91/include/mach/timex.h | 5 +
1132 drivers/usb/host/ohci-at91.c | 239 ++++++++++++++++++--
1133 20 files changed, 705 insertions(+), 286 deletions(-)
1134 create mode 100644 arch/arm/mach-at91/board-rsi-ews.c
1135 delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c
1136 rename arch/arm/mach-at91/{board-usb-a9263.c => board-usb-a926x.c} (54%)
1137 Merging davinci/davinci-next
1138 $ git merge davinci/davinci-next
1140 Merging i.MX/for-next
1141 $ git merge i.MX/for-next
1142 Recorded preimage for 'arch/arm/mach-imx/Makefile'
1143 Recorded preimage for 'arch/arm/plat-mxc/devices/platform-pata_imx.c'
1144 Auto-merging arch/arm/mach-imx/Makefile
1145 CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
1146 Auto-merging arch/arm/mach-mx5/board-mx51_efikamx.c
1147 Auto-merging arch/arm/mach-mx5/board-mx51_efikasb.c
1148 Auto-merging arch/arm/mach-mx5/mx51_efika.c
1149 Auto-merging arch/arm/plat-mxc/devices/platform-pata_imx.c
1150 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices/platform-pata_imx.c
1151 Auto-merging arch/arm/plat-mxc/include/mach/mx25.h
1152 Automatic merge failed; fix conflicts and then commit the result.
1154 Recorded resolution for 'arch/arm/mach-imx/Makefile'.
1155 Recorded resolution for 'arch/arm/plat-mxc/devices/platform-pata_imx.c'.
1156 [master fe8608a] Merge remote-tracking branch 'i.MX/for-next'
1157 $ git diff -M --stat --summary HEAD^..
1158 arch/arm/mach-imx/Makefile | 2 +-
1159 arch/arm/mach-mx5/board-mx51_efikamx.c | 11 +++++++++--
1160 arch/arm/mach-mx5/board-mx51_efikasb.c | 18 +++++++++++++++++-
1161 arch/arm/mach-mx5/mx51_efika.c | 1 -
1162 arch/arm/mach-mx5/pm-imx5.c | 15 ++++++++++++---
1163 arch/arm/plat-mxc/devices/platform-pata_imx.c | 2 +-
1164 arch/arm/plat-mxc/include/mach/mx25.h | 1 +
1165 7 files changed, 41 insertions(+), 9 deletions(-)
1166 Merging linux-spec/for-next
1167 $ git merge linux-spec/for-next
1169 Merging omap/for-next
1170 $ git merge omap/for-next
1172 Merging pxa/for-next
1173 $ git merge pxa/for-next
1175 Merging samsung/next-samsung
1176 $ git merge samsung/next-samsung
1178 Merging s5p/for-next
1179 $ git merge s5p/for-next
1180 Auto-merging arch/arm/mach-exynos4/mach-nuri.c
1181 CONFLICT (delete/modify): arch/arm/mach-exynos4/mach-smdkc210.c deleted in s5p/for-next and modified in HEAD. Version HEAD of arch/arm/mach-exynos4/mach-smdkc210.c left in tree.
1182 Auto-merging arch/arm/mach-exynos4/mach-smdkv310.c
1183 Auto-merging arch/arm/mach-exynos4/mach-universal_c210.c
1184 Removing arch/arm/mach-s3c2410/gpio.c
1185 Removing arch/arm/mach-s3c2412/gpio.c
1186 Auto-merging arch/arm/mach-s3c64xx/cpu.c
1187 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
1188 Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
1189 Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
1190 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
1191 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
1192 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
1193 Auto-merging arch/arm/mach-s5pc100/mach-smdkc100.c
1194 Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c
1195 Automatic merge failed; fix conflicts and then commit the result.
1196 $ git rm -f arch/arm/mach-exynos4/mach-smdkc210.c
1197 arch/arm/mach-exynos4/mach-smdkc210.c: needs merge
1198 rm 'arch/arm/mach-exynos4/mach-smdkc210.c'
1200 [master 46af23a] Merge remote-tracking branch 's5p/for-next'
1201 $ git diff -M --stat --summary HEAD^..
1202 arch/arm/configs/exynos4_defconfig | 1 +
1203 arch/arm/mach-exynos4/Kconfig | 63 +++-
1204 arch/arm/mach-exynos4/Makefile | 11 +-
1205 arch/arm/mach-exynos4/clock-exynos4210.c | 139 +++++++++
1206 arch/arm/mach-exynos4/clock-exynos4212.c | 118 ++++++++
1207 arch/arm/mach-exynos4/clock.c | 218 +++++++++-----
1208 arch/arm/mach-exynos4/cpu.c | 40 +++-
1209 arch/arm/mach-exynos4/include/mach/exynos4-clock.h | 43 +++
1210 arch/arm/mach-exynos4/include/mach/map.h | 3 +-
1211 arch/arm/mach-exynos4/include/mach/regs-clock.h | 54 +++--
1212 arch/arm/mach-exynos4/mach-nuri.c | 34 +++
1213 arch/arm/mach-exynos4/mach-origen.c | 108 +++++++
1214 arch/arm/mach-exynos4/mach-smdk4212.c | 292 ++++++++++++++++++
1215 arch/arm/mach-exynos4/mach-smdkc210.c | 309 --------------------
1216 arch/arm/mach-exynos4/mach-smdkv310.c | 89 ++++++
1217 arch/arm/mach-exynos4/mach-universal_c210.c | 34 +++
1218 arch/arm/mach-exynos4/mct.c | 4 +-
1219 arch/arm/mach-exynos4/platsmp.c | 10 +-
1220 arch/arm/mach-exynos4/pm.c | 79 +-----
1221 arch/arm/mach-s3c2410/Kconfig | 6 -
1222 arch/arm/mach-s3c2410/Makefile | 1 -
1223 arch/arm/mach-s3c2410/dma.c | 14 -
1224 arch/arm/mach-s3c2410/gpio.c | 72 -----
1225 arch/arm/mach-s3c2412/Kconfig | 1 -
1226 arch/arm/mach-s3c2412/Makefile | 1 -
1227 arch/arm/mach-s3c2412/dma.c | 18 --
1228 arch/arm/mach-s3c2412/gpio.c | 62 ----
1229 arch/arm/mach-s3c2440/Kconfig | 2 -
1230 arch/arm/mach-s3c2440/dma.c | 17 -
1231 arch/arm/mach-s3c2443/dma.c | 27 --
1232 arch/arm/mach-s3c64xx/Kconfig | 1 +
1233 arch/arm/mach-s3c64xx/Makefile | 2 +-
1234 arch/arm/mach-s3c64xx/clock.c | 8 +-
1235 arch/arm/mach-s3c64xx/cpu.c | 22 +-
1236 arch/arm/mach-s3c64xx/dma.c | 2 +-
1237 arch/arm/mach-s3c64xx/include/mach/crag6410.h | 23 ++
1238 arch/arm/mach-s3c64xx/include/mach/regs-sys.h | 3 +
1239 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 173 +++++++++++
1240 arch/arm/mach-s3c64xx/mach-crag6410.c | 97 +------
1241 arch/arm/mach-s3c64xx/mach-mini6410.c | 8 +-
1242 arch/arm/mach-s3c64xx/mach-real6410.c | 8 +-
1243 arch/arm/mach-s3c64xx/mach-smdk6410.c | 47 +---
1244 arch/arm/mach-s3c64xx/pm.c | 4 +
1245 arch/arm/mach-s5p64x0/dev-spi.c | 8 +-
1246 arch/arm/mach-s5p64x0/dma.c | 7 +-
1247 arch/arm/mach-s5p64x0/gpiolib.c | 7 +-
1248 arch/arm/mach-s5p64x0/irq-eint.c | 3 +-
1249 arch/arm/mach-s5p64x0/mach-smdk6440.c | 8 +-
1250 arch/arm/mach-s5p64x0/mach-smdk6450.c | 8 +-
1251 arch/arm/mach-s5pc100/mach-smdkc100.c | 8 +-
1252 arch/arm/mach-s5pv210/Kconfig | 6 -
1253 arch/arm/mach-s5pv210/Makefile | 2 +-
1254 arch/arm/mach-s5pv210/mach-smdkv210.c | 8 +-
1255 arch/arm/plat-s3c24xx/cpu.c | 9 +-
1256 arch/arm/plat-s5p/cpu.c | 37 ++-
1257 arch/arm/plat-s5p/include/plat/exynos4.h | 5 +-
1258 arch/arm/plat-s5p/include/plat/pll.h | 56 ++++-
1259 arch/arm/plat-samsung/Makefile | 2 +-
1260 arch/arm/plat-samsung/cpu.c | 58 ++++
1261 arch/arm/plat-samsung/dev-hsmmc.c | 19 +--
1262 arch/arm/plat-samsung/dev-hsmmc1.c | 19 +--
1263 arch/arm/plat-samsung/dev-hsmmc2.c | 19 +--
1264 arch/arm/plat-samsung/dev-hsmmc3.c | 19 +--
1265 arch/arm/plat-samsung/dev-ts.c | 9 +
1266 arch/arm/plat-samsung/include/plat/cpu.h | 105 +++++++-
1267 arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 6 -
1268 arch/arm/plat-samsung/include/plat/sdhci.h | 7 +
1269 arch/arm/plat-samsung/platformdata.c | 22 ++
1270 68 files changed, 1688 insertions(+), 1037 deletions(-)
1271 create mode 100644 arch/arm/mach-exynos4/clock-exynos4210.c
1272 create mode 100644 arch/arm/mach-exynos4/clock-exynos4212.c
1273 create mode 100644 arch/arm/mach-exynos4/include/mach/exynos4-clock.h
1274 create mode 100644 arch/arm/mach-exynos4/mach-origen.c
1275 create mode 100644 arch/arm/mach-exynos4/mach-smdk4212.c
1276 delete mode 100644 arch/arm/mach-exynos4/mach-smdkc210.c
1277 delete mode 100644 arch/arm/mach-s3c2410/gpio.c
1278 delete mode 100644 arch/arm/mach-s3c2412/gpio.c
1279 create mode 100644 arch/arm/mach-s3c64xx/include/mach/crag6410.h
1280 create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410-module.c
1281 create mode 100644 arch/arm/plat-samsung/cpu.c
1282 $ git am -3 ../patches/0001-s5p-merge-fixup-for-atags_offset-use.patch
1283 Applying: s5p: merge fixup for atags_offset use
1285 Unstaged changes after reset:
1286 M arch/arm/mach-exynos4/mach-smdkv310.c
1288 $ git commit -v -a --amend
1289 [master c4f19cb] Merge remote-tracking branch 's5p/for-next'
1290 Merging tegra/for-next
1291 $ git merge tegra/for-next
1293 Merging ux500-core/ux500-core
1294 $ git merge ux500-core/ux500-core
1295 Auto-merging arch/arm/mach-ux500/board-mop500-pins.c
1296 Auto-merging arch/arm/mach-ux500/board-mop500.c
1297 Merge made by recursive.
1298 arch/arm/mach-ux500/Makefile | 1 +
1299 arch/arm/mach-ux500/board-mop500-pins.c | 34 ++++--
1300 arch/arm/mach-ux500/board-mop500-sdi.c | 52 ++++++---
1301 arch/arm/mach-ux500/board-mop500.c | 78 +++++++++++---
1302 arch/arm/mach-ux500/board-mop500.h | 3 +
1303 arch/arm/mach-ux500/cache-l2x0.c | 72 +++++++++++++
1304 arch/arm/mach-ux500/cpu.c | 69 ------------
1305 arch/arm/mach-ux500/include/mach/uncompress.h | 10 +--
1306 arch/arm/mach-ux500/pins-db8500.h | 142 +++++++++++++------------
1307 arch/arm/plat-nomadik/include/plat/pincfg.h | 5 -
1308 10 files changed, 270 insertions(+), 196 deletions(-)
1309 create mode 100644 arch/arm/mach-ux500/cache-l2x0.c
1310 Merging xilinx/arm-next
1311 $ git merge xilinx/arm-next
1313 Merging blackfin/for-linus
1314 $ git merge blackfin/for-linus
1315 Removing arch/blackfin/include/asm/mutex.h
1316 Merge made by recursive.
1317 arch/blackfin/include/asm/Kbuild | 1 +
1318 arch/blackfin/include/asm/bfin_serial.h | 2 +
1319 arch/blackfin/include/asm/mutex.h | 1 -
1320 arch/blackfin/include/asm/uaccess.h | 6 ++--
1321 arch/blackfin/mach-bf518/boards/ezbrd.c | 14 +++++++++++-
1322 arch/blackfin/mach-bf518/boards/tcm-bf518.c | 14 +++++++++++-
1323 arch/blackfin/mach-bf527/boards/ad7160eval.c | 14 +++++++++++-
1324 arch/blackfin/mach-bf527/boards/cm_bf527.c | 14 +++++++++++-
1325 arch/blackfin/mach-bf527/boards/ezbrd.c | 14 +++++++++++-
1326 arch/blackfin/mach-bf527/boards/ezkit.c | 14 +++++++++++-
1327 arch/blackfin/mach-bf527/boards/tll6527m.c | 14 +++++++++++-
1328 arch/blackfin/mach-bf533/boards/H8606.c | 10 +++++++-
1329 arch/blackfin/mach-bf533/boards/blackstamp.c | 7 +++++-
1330 arch/blackfin/mach-bf533/boards/cm_bf533.c | 7 +++++-
1331 arch/blackfin/mach-bf533/boards/ezkit.c | 7 +++++-
1332 arch/blackfin/mach-bf533/boards/ip0x.c | 7 +++++-
1333 arch/blackfin/mach-bf533/boards/stamp.c | 7 +++++-
1334 arch/blackfin/mach-bf537/boards/cm_bf537e.c | 14 +++++++++++-
1335 arch/blackfin/mach-bf537/boards/cm_bf537u.c | 14 +++++++++++-
1336 arch/blackfin/mach-bf537/boards/dnp5370.c | 14 +++++++++++-
1337 arch/blackfin/mach-bf537/boards/minotaur.c | 14 +++++++++++-
1338 arch/blackfin/mach-bf537/boards/pnav10.c | 14 +++++++++++-
1339 arch/blackfin/mach-bf537/boards/stamp.c | 14 +++++++++++-
1340 arch/blackfin/mach-bf537/boards/tcm_bf537.c | 14 +++++++++++-
1341 arch/blackfin/mach-bf538/boards/ezkit.c | 21 ++++++++++++++++--
1342 arch/blackfin/mach-bf548/boards/cm_bf548.c | 28 ++++++++++++++++++++++---
1343 arch/blackfin/mach-bf548/boards/ezkit.c | 28 ++++++++++++++++++++++---
1344 arch/blackfin/mach-bf561/boards/acvilon.c | 7 +++++-
1345 arch/blackfin/mach-bf561/boards/cm_bf561.c | 7 +++++-
1346 arch/blackfin/mach-bf561/boards/ezkit.c | 7 +++++-
1347 arch/blackfin/mach-bf561/boards/tepla.c | 7 +++++-
1348 31 files changed, 302 insertions(+), 54 deletions(-)
1349 delete mode 100644 arch/blackfin/include/asm/mutex.h
1350 Merging cris/for-next
1351 $ git merge cris/for-next
1352 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
1353 Auto-merging drivers/net/cris/eth_v10.c
1354 Merge made by recursive.
1355 Documentation/cris/README | 62 +++++++++++++++---------------
1356 arch/cris/arch-v32/drivers/cryptocop.c | 6 +--
1357 arch/cris/arch-v32/kernel/ptrace.c | 2 -
1358 arch/cris/include/arch-v32/arch/cache.h | 2 +-
1359 drivers/net/cris/eth_v10.c | 1 -
1360 5 files changed, 34 insertions(+), 39 deletions(-)
1362 $ git merge ia64/test
1363 Merge made by recursive.
1364 arch/ia64/configs/generic_defconfig | 1 +
1365 arch/ia64/configs/gensparse_defconfig | 1 +
1366 arch/ia64/configs/tiger_defconfig | 1 +
1367 arch/ia64/configs/xen_domu_defconfig | 1 +
1368 arch/ia64/configs/zx1_defconfig | 1 +
1369 arch/ia64/sn/kernel/sn2/sn_hwperf.c | 12 +++--
1370 drivers/acpi/apei/erst.c | 2 +-
1371 drivers/char/agp/hp-agp.c | 6 ++-
1372 drivers/firmware/efivars.c | 2 +-
1373 fs/pstore/inode.c | 40 ++++++++++++++--
1374 fs/pstore/internal.h | 2 +-
1375 fs/pstore/platform.c | 82 ++++++++++++++++++++++++++------
1376 include/linux/pstore.h | 2 +-
1377 13 files changed, 123 insertions(+), 30 deletions(-)
1378 Merging m68k/for-next
1379 $ git merge m68k/for-next
1380 Merge made by recursive.
1381 arch/m68k/mac/macints.c | 2 +-
1382 arch/m68k/mac/misc.c | 40 +++++++++++++++++++++++-----------------
1383 drivers/zorro/zorro-driver.c | 8 ++++----
1384 3 files changed, 28 insertions(+), 22 deletions(-)
1385 Merging m68knommu/for-next
1386 $ git merge m68knommu/for-next
1387 Auto-merging arch/m68k/Kconfig.machine
1388 Removing arch/m68k/Kconfig.mmu
1389 Removing arch/m68k/Makefile_mm
1390 Removing arch/m68k/Makefile_no
1391 Removing arch/m68k/include/asm/entry_mm.h
1392 Removing arch/m68k/include/asm/entry_no.h
1393 Removing arch/m68k/kernel/Makefile_mm
1394 Removing arch/m68k/kernel/Makefile_no
1395 Removing arch/m68k/kernel/traps_mm.c
1396 Removing arch/m68k/kernel/traps_no.c
1397 Merge made by recursive.
1398 arch/m68k/Kconfig | 195 +----
1399 arch/m68k/Kconfig.bus | 55 ++
1400 arch/m68k/Kconfig.cpu | 429 +++++++++
1401 arch/m68k/Kconfig.devices | 171 ++++
1402 arch/m68k/{Kconfig.nommu => Kconfig.machine} | 543 ++++--------
1403 arch/m68k/Kconfig.mmu | 411 ---------
1404 arch/m68k/Makefile | 168 ++++-
1405 arch/m68k/Makefile_mm | 121 ---
1406 arch/m68k/Makefile_no | 124 ---
1407 arch/m68k/include/asm/entry.h | 255 ++++++-
1408 arch/m68k/include/asm/entry_mm.h | 128 ---
1409 arch/m68k/include/asm/entry_no.h | 181 ----
1410 arch/m68k/include/asm/m520xsim.h | 26 +-
1411 arch/m68k/include/asm/mcfqspi.h | 8 +-
1412 arch/m68k/include/asm/page_no.h | 3 +
1413 arch/m68k/include/asm/processor.h | 6 +
1414 arch/m68k/include/asm/sections.h | 2 +
1415 arch/m68k/kernel/Makefile | 24 +-
1416 arch/m68k/kernel/Makefile_mm | 17 -
1417 arch/m68k/kernel/Makefile_no | 10 -
1418 arch/m68k/kernel/entry_no.S | 6 +-
1419 arch/m68k/kernel/setup_no.c | 4 +-
1420 arch/m68k/kernel/traps.c | 1108 +++++++++++++++++++++++-
1421 arch/m68k/kernel/traps_mm.c | 1207 --------------------------
1422 arch/m68k/kernel/traps_no.c | 361 --------
1423 arch/m68k/kernel/vectors.c | 145 +++
1424 arch/m68k/lib/memcpy.c | 9 +
1425 arch/m68k/mm/init_no.c | 21 +-
1426 arch/m68k/platform/520x/config.c | 6 +-
1427 arch/m68k/platform/520x/gpio.c | 50 +-
1428 arch/m68k/platform/68328/Makefile | 5 +-
1429 arch/m68k/platform/68328/entry.S | 18 +-
1430 arch/m68k/platform/68360/Makefile | 6 +-
1431 arch/m68k/platform/68360/entry.S | 4 +-
1432 arch/m68k/platform/coldfire/entry.S | 6 +-
1433 35 files changed, 2656 insertions(+), 3177 deletions(-)
1434 create mode 100644 arch/m68k/Kconfig.bus
1435 create mode 100644 arch/m68k/Kconfig.cpu
1436 create mode 100644 arch/m68k/Kconfig.devices
1437 rename arch/m68k/{Kconfig.nommu => Kconfig.machine} (62%)
1438 delete mode 100644 arch/m68k/Kconfig.mmu
1439 delete mode 100644 arch/m68k/Makefile_mm
1440 delete mode 100644 arch/m68k/Makefile_no
1441 delete mode 100644 arch/m68k/include/asm/entry_mm.h
1442 delete mode 100644 arch/m68k/include/asm/entry_no.h
1443 delete mode 100644 arch/m68k/kernel/Makefile_mm
1444 delete mode 100644 arch/m68k/kernel/Makefile_no
1445 delete mode 100644 arch/m68k/kernel/traps_mm.c
1446 delete mode 100644 arch/m68k/kernel/traps_no.c
1447 create mode 100644 arch/m68k/kernel/vectors.c
1448 Merging microblaze/next
1449 $ git merge microblaze/next
1451 Merging mips/mips-for-linux-next
1452 $ git merge mips/mips-for-linux-next
1453 Auto-merging arch/mips/kernel/scall32-o32.S
1454 Removing arch/mips/nxp/pnx8550/common/pci.c
1455 Removing arch/mips/nxp/pnx8550/common/setup.c
1456 Merge made by recursive.
1457 arch/mips/Kconfig | 1 +
1458 arch/mips/Makefile | 2 +
1459 arch/mips/alchemy/common/platform.c | 2 +-
1460 arch/mips/alchemy/common/power.c | 22 ++-
1461 arch/mips/ar7/irq.c | 3 +-
1462 arch/mips/bcm63xx/irq.c | 1 +
1463 arch/mips/cobalt/irq.c | 1 +
1464 arch/mips/dec/setup.c | 4 +
1465 arch/mips/emma/markeins/irq.c | 2 +-
1466 arch/mips/include/asm/cacheflush.h | 24 ++++
1467 arch/mips/include/asm/io.h | 12 +--
1468 .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 -
1469 arch/mips/include/asm/mipsprom.h | 6 +-
1470 arch/mips/include/asm/prom.h | 6 +-
1471 arch/mips/kernel/ftrace.c | 39 +++---
1472 arch/mips/kernel/scall32-o32.S | 2 +-
1473 arch/mips/kernel/signal.c | 3 +
1474 arch/mips/kernel/traps.c | 6 +-
1475 arch/mips/lantiq/irq.c | 6 +-
1476 arch/mips/lasat/interrupt.c | 1 +
1477 arch/mips/loongson/fuloong-2e/irq.c | 1 +
1478 arch/mips/loongson/lemote-2f/irq.c | 3 +-
1479 arch/mips/mm/c-octeon.c | 6 +
1480 arch/mips/mm/c-r3k.c | 7 +
1481 arch/mips/mm/c-r4k.c | 35 +++++
1482 arch/mips/mm/c-tx39.c | 7 +
1483 arch/mips/mm/cache.c | 5 +
1484 arch/mips/mm/tlbex.c | 3 +-
1485 arch/mips/mti-malta/malta-int.c | 6 +-
1486 arch/mips/netlogic/Platform | 5 +
1487 arch/mips/netlogic/xlr/setup.c | 4 +-
1488 arch/mips/netlogic/xlr/smp.c | 2 +-
1489 arch/mips/netlogic/xlr/smpboot.S | 16 ++-
1490 arch/mips/nxp/pnx8550/common/pci.c | 134 ------------------
1491 arch/mips/nxp/pnx8550/common/setup.c | 143 --------------------
1492 arch/mips/pci/pci-lantiq.c | 9 +-
1493 arch/mips/pci/pci-rc32434.c | 2 +-
1494 arch/mips/pmc-sierra/msp71xx/msp_irq.c | 6 +-
1495 arch/mips/pmc-sierra/msp71xx/msp_setup.c | 1 +
1496 arch/mips/pmc-sierra/yosemite/py-console.c | 12 +--
1497 arch/mips/pnx8550/common/int.c | 2 +-
1498 arch/mips/pnx8550/common/prom.c | 2 +-
1499 arch/mips/sgi-ip22/ip22-int.c | 10 +-
1500 arch/mips/sgi-ip27/ip27-irq.c | 4 +-
1501 arch/mips/sni/rm200.c | 1 +
1502 arch/mips/vr41xx/common/irq.c | 1 +
1503 drivers/mtd/maps/lantiq-flash.c | 4 +-
1504 47 files changed, 204 insertions(+), 371 deletions(-)
1505 delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c
1506 delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c
1507 Merging openrisc/for-upstream
1508 $ git merge openrisc/for-upstream
1509 Merge made by recursive.
1510 arch/openrisc/include/asm/sigcontext.h | 7 +------
1511 arch/openrisc/kernel/signal.c | 21 +++++----------------
1512 2 files changed, 6 insertions(+), 22 deletions(-)
1513 Merging parisc/for-next
1514 $ git merge parisc/for-next
1516 Merging powerpc/next
1517 $ git merge powerpc/next
1518 Removing arch/powerpc/boot/dts/hcu4.dts
1519 Removing arch/powerpc/configs/40x/hcu4_defconfig
1520 Removing arch/powerpc/platforms/40x/hcu4.c
1521 Merge made by recursive.
1522 arch/powerpc/Kconfig | 2 +-
1523 arch/powerpc/boot/dts/hcu4.dts | 168 ------------------------------
1524 arch/powerpc/boot/dts/yosemite.dts | 36 +++++++
1525 arch/powerpc/configs/40x/hcu4_defconfig | 80 --------------
1526 arch/powerpc/configs/ppc40x_defconfig | 1 -
1527 arch/powerpc/include/asm/kexec.h | 2 +-
1528 arch/powerpc/kernel/misc_32.S | 171 +++++++++++++++++++++++++++++++
1529 arch/powerpc/platforms/40x/Kconfig | 8 --
1530 arch/powerpc/platforms/40x/Makefile | 1 -
1531 arch/powerpc/platforms/40x/hcu4.c | 61 -----------
1532 arch/powerpc/sysdev/ppc4xx_pci.c | 89 +++++++++++++---
1533 arch/powerpc/sysdev/ppc4xx_pci.h | 12 ++
1534 drivers/edac/ppc4xx_edac.c | 2 +-
1535 13 files changed, 294 insertions(+), 339 deletions(-)
1536 delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
1537 delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
1538 delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
1540 $ git merge 4xx/next
1542 Merging 52xx-and-virtex/powerpc/next
1543 $ git merge 52xx-and-virtex/powerpc/next
1544 Merge made by recursive.
1545 arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++
1546 arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++-
1547 arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
1548 3 files changed, 249 insertions(+), 8 deletions(-)
1549 create mode 100644 arch/powerpc/boot/dts/charon.dts
1551 $ git merge galak/next
1553 Merging s390/features
1554 $ git merge s390/features
1555 Merge made by recursive.
1556 Documentation/kernel-parameters.txt | 6 +-
1557 arch/s390/Kconfig | 10 ++
1558 arch/s390/include/asm/ipl.h | 1 +
1559 arch/s390/include/asm/kexec.h | 3 +
1560 arch/s390/include/asm/setup.h | 9 ++
1561 arch/s390/include/asm/smp.h | 5 +
1562 arch/s390/include/asm/system.h | 2 +
1563 arch/s390/include/asm/thread_info.h | 2 +-
1564 arch/s390/kernel/Makefile | 1 +
1565 arch/s390/kernel/crash_dump.c | 39 ++++++
1566 arch/s390/kernel/head.S | 16 +++
1567 arch/s390/kernel/head_kdump.S | 116 +++++++++++++++++
1568 arch/s390/kernel/ipl.c | 5 +
1569 arch/s390/kernel/machine_kexec.c | 245 +++++++++++++++++++++++++++++++++++
1570 arch/s390/kernel/mem_detect.c | 69 ++++++++++
1571 arch/s390/kernel/setup.c | 203 +++++++++++++++++++++++++++++
1572 arch/s390/kernel/smp.c | 23 ++++
1573 arch/s390/mm/maccess.c | 57 ++++++++
1574 arch/s390/mm/vmem.c | 6 +
1575 drivers/s390/char/zcore.c | 20 +---
1576 drivers/s390/cio/ccwreq.c | 23 +++-
1577 include/linux/crash_dump.h | 1 +
1578 include/linux/kexec.h | 4 +
1579 kernel/crash_dump.c | 11 ++
1580 kernel/kexec.c | 2 +-
1581 25 files changed, 853 insertions(+), 26 deletions(-)
1582 create mode 100644 arch/s390/kernel/crash_dump.c
1583 create mode 100644 arch/s390/kernel/head_kdump.S
1584 Merging sh/sh-latest
1585 $ git merge sh/sh-latest
1586 Merge made by recursive.
1587 arch/sh/boards/mach-ecovec24/setup.c | 4 ++++
1588 1 files changed, 4 insertions(+), 0 deletions(-)
1589 Merging rmobile/rmobile-latest
1590 $ git merge rmobile/rmobile-latest
1591 Merge made by recursive.
1592 arch/arm/mach-shmobile/include/mach/sh73a0.h | 13 ++++
1593 arch/arm/mach-shmobile/pfc-sh73a0.c | 77 +++++++++++++++++++++-----
1594 2 files changed, 75 insertions(+), 15 deletions(-)
1595 Merging sparc/master
1596 $ git merge sparc/master
1599 $ git merge tile/master
1600 Merge made by recursive.
1601 arch/tile/kernel/intvec_32.S | 2 +-
1602 arch/tile/lib/atomic_asm_32.S | 2 +-
1603 fs/nfs/nfs4filelayout.c | 6 +++---
1604 3 files changed, 5 insertions(+), 5 deletions(-)
1605 Merging unicore32/unicore32
1606 $ git merge unicore32/unicore32
1607 Merge made by recursive.
1608 arch/unicore32/boot/compressed/Makefile | 4 ++--
1609 arch/unicore32/include/asm/bitops.h | 12 ++++++------
1610 arch/unicore32/kernel/ksyms.c | 4 ++--
1611 arch/unicore32/lib/findbit.S | 14 ++++++++------
1612 4 files changed, 18 insertions(+), 16 deletions(-)
1613 Merging xtensa/master
1614 $ git merge xtensa/master
1615 Merge made by recursive.
1616 arch/xtensa/include/asm/irqflags.h | 1 +
1617 arch/xtensa/include/asm/regs.h | 91 ++++++++++++++++++---------------
1618 arch/xtensa/include/asm/timex.h | 4 +-
1619 arch/xtensa/include/asm/uaccess.h | 2 +-
1620 arch/xtensa/kernel/align.S | 14 +++---
1621 arch/xtensa/kernel/coprocessor.S | 10 ++--
1622 arch/xtensa/kernel/entry.S | 98 ++++++++++++++++++------------------
1623 arch/xtensa/kernel/head.S | 12 ++--
1624 arch/xtensa/kernel/irq.c | 5 ++
1625 arch/xtensa/kernel/traps.c | 4 +-
1626 arch/xtensa/kernel/vectors.S | 22 ++++----
1627 arch/xtensa/kernel/vmlinux.lds.S | 1 +
1628 12 files changed, 139 insertions(+), 125 deletions(-)
1629 Merging ceph/for-next
1630 $ git merge ceph/for-next
1631 Auto-merging fs/ceph/caps.c
1632 Auto-merging fs/ceph/super.h
1633 Auto-merging include/linux/ceph/libceph.h
1634 Merge made by recursive.
1635 drivers/block/rbd.c | 2 +-
1636 fs/ceph/addr.c | 192 +++++++++++++++++++++++++---------------
1637 fs/ceph/caps.c | 2 +-
1638 fs/ceph/ioctl.h | 55 +++++++++++-
1639 fs/ceph/mds_client.c | 11 ++-
1640 fs/ceph/super.c | 23 ++++--
1641 fs/ceph/super.h | 8 +-
1642 include/linux/ceph/libceph.h | 4 +-
1643 include/linux/ceph/messenger.h | 3 +-
1644 net/ceph/ceph_common.c | 47 +++++-----
1645 net/ceph/messenger.c | 16 +++-
1646 net/ceph/mon_client.c | 71 ++++++++-------
1647 net/ceph/msgpool.c | 42 ++++++---
1648 net/ceph/osd_client.c | 8 +-
1649 14 files changed, 318 insertions(+), 166 deletions(-)
1651 $ git merge cifs/master
1652 Merge made by recursive.
1653 fs/cifs/cifsencrypt.c | 54 ++++++++++---------------------------------------
1654 fs/cifs/cifsfs.c | 10 +++++---
1655 fs/cifs/cifssmb.c | 3 +-
1656 fs/cifs/connect.c | 4 +-
1657 4 files changed, 21 insertions(+), 50 deletions(-)
1658 Merging configfs/linux-next
1659 $ git merge configfs/linux-next
1661 Merging ecryptfs/next
1662 $ git merge ecryptfs/next
1664 Merging ext3/for_next
1665 $ git merge ext3/for_next
1668 $ git merge ext4/dev
1669 Auto-merging fs/ext4/ext4.h
1670 Auto-merging fs/ext4/inode.c
1671 Merge made by recursive.
1672 Documentation/filesystems/ext4.txt | 8 +++--
1673 fs/ext4/ext4.h | 6 ++-
1674 fs/ext4/inode.c | 7 ++++
1675 fs/ext4/namei.c | 8 ++--
1676 fs/ext4/super.c | 46 ++++++++++++++++-----------
1677 fs/jbd2/transaction.c | 59 ++++++++++++++++++++++++++++++++----
1678 include/linux/ext2_fs.h | 4 +-
1679 include/linux/ext3_fs.h | 4 +-
1680 8 files changed, 104 insertions(+), 38 deletions(-)
1681 Merging fatfs/master
1682 $ git merge fatfs/master
1684 Merging fuse/for-next
1685 $ git merge fuse/for-next
1688 $ git merge gfs2/master
1689 Auto-merging fs/gfs2/acl.c
1690 Merge made by recursive.
1691 fs/gfs2/acl.c | 5 +-
1692 fs/gfs2/aops.c | 6 ---
1693 fs/gfs2/dir.c | 42 +++++---------------
1694 fs/gfs2/file.c | 50 ++++++++++++++++++------
1695 fs/gfs2/glops.c | 29 +++++++++++---
1696 fs/gfs2/incore.h | 1 +
1697 fs/gfs2/inode.c | 85 +++++++++++++++--------------------------
1698 fs/gfs2/inode.h | 2 +-
1699 fs/gfs2/quota.c | 13 +-----
1700 fs/gfs2/super.c | 111 +++++++++++++++++++++++++++++++++++-------------------
1701 fs/gfs2/xattr.c | 5 +-
1702 11 files changed, 182 insertions(+), 167 deletions(-)
1703 Merging hfsplus/for-next
1704 $ git merge hfsplus/for-next
1707 $ git merge jfs/next
1709 Merging logfs/master
1710 $ git merge logfs/master
1711 Auto-merging fs/logfs/logfs.h
1712 Merge made by recursive.
1713 fs/logfs/dev_mtd.c | 26 ++++++++++++--------------
1714 fs/logfs/logfs.h | 1 +
1715 fs/logfs/readwrite.c | 4 ++++
1716 fs/logfs/segment.c | 14 ++++++++++----
1717 fs/logfs/super.c | 1 +
1718 5 files changed, 28 insertions(+), 18 deletions(-)
1719 Merging nfs/linux-next
1720 $ git merge nfs/linux-next
1721 Merge made by recursive.
1722 fs/nfs/nfs4_fs.h | 8 +++++---
1723 fs/nfs/nfs4proc.c | 20 ++++++++++++++------
1724 fs/nfs/nfs4renewd.c | 12 +++++++++---
1725 fs/nfs/nfs4state.c | 6 ++++++
1726 4 files changed, 34 insertions(+), 12 deletions(-)
1727 Merging nfsd/nfsd-next
1728 $ git merge nfsd/nfsd-next
1729 Auto-merging fs/compat.c
1730 Auto-merging fs/nfs/nfs4_fs.h
1731 Auto-merging include/linux/fs.h
1732 Removing include/linux/nfsd/const.h
1733 Removing include/linux/nfsd/syscall.h
1734 Merge made by recursive.
1735 arch/alpha/include/asm/fcntl.h | 2 -
1737 fs/lockd/svc.c | 2 +-
1738 fs/locks.c | 125 +++++++-----
1739 fs/nfs/callback.c | 4 +-
1740 fs/nfs/nfs4_fs.h | 24 ---
1741 fs/nfsd/export.c | 1 -
1742 fs/nfsd/nfs4proc.c | 42 +++--
1743 fs/nfsd/nfs4recover.c | 53 ++++-
1744 fs/nfsd/nfs4state.c | 448 ++++++++++++++++------------------------
1745 fs/nfsd/nfs4xdr.c | 33 ++--
1746 fs/nfsd/nfsctl.c | 1 -
1747 fs/nfsd/nfsd.h | 26 +++
1748 fs/nfsd/nfsfh.c | 39 ++--
1749 fs/nfsd/state.h | 18 +-
1750 fs/nfsd/vfs.c | 11 +-
1751 fs/nfsd/vfs.h | 27 ++--
1752 fs/nfsd/xdr4.h | 2 +-
1753 include/asm-generic/fcntl.h | 5 -
1754 include/linux/fs.h | 8 +-
1755 include/linux/nfs4.h | 16 ++
1756 include/linux/nfsd/Kbuild | 2 -
1757 include/linux/nfsd/const.h | 55 -----
1758 include/linux/nfsd/nfsfh.h | 7 +-
1759 include/linux/nfsd/syscall.h | 116 -----------
1760 include/linux/sunrpc/svc.h | 2 +-
1761 net/sunrpc/svc.c | 33 +++-
1762 27 files changed, 474 insertions(+), 629 deletions(-)
1763 delete mode 100644 include/linux/nfsd/const.h
1764 delete mode 100644 include/linux/nfsd/syscall.h
1765 Merging nilfs2/for-next
1766 $ git merge nilfs2/for-next
1768 Merging ocfs2/linux-next
1769 $ git merge ocfs2/linux-next
1770 Auto-merging fs/ocfs2/file.c
1771 Auto-merging fs/ocfs2/move_extents.c
1772 Merge made by recursive.
1773 fs/ocfs2/aops.c | 69 +++++++++++++--
1774 fs/ocfs2/aops.h | 14 +++
1775 fs/ocfs2/cluster/heartbeat.c | 194 ++++++++++++++++++++++++++----------------
1776 fs/ocfs2/cluster/netdebug.c | 102 +++++++++++++++-------
1777 fs/ocfs2/cluster/tcp.c | 138 ++++++++++++++++--------------
1778 fs/ocfs2/cluster/tcp.h | 2 +
1779 fs/ocfs2/dir.c | 3 +-
1780 fs/ocfs2/dlm/dlmcommon.h | 56 +++----------
1781 fs/ocfs2/dlm/dlmdomain.c | 44 +++++-----
1782 fs/ocfs2/dlm/dlmlock.c | 54 ++++++------
1783 fs/ocfs2/dlm/dlmmaster.c | 175 +++++++++++++++++++-------------------
1784 fs/ocfs2/dlm/dlmrecovery.c | 164 ++++++++++++++++++------------------
1785 fs/ocfs2/dlm/dlmthread.c | 16 ++--
1786 fs/ocfs2/dlmglue.c | 21 +++--
1787 fs/ocfs2/extent_map.c | 96 +++++++++++++++++++++
1788 fs/ocfs2/extent_map.h | 2 +
1789 fs/ocfs2/file.c | 93 ++++++++++++++++++++-
1790 fs/ocfs2/inode.h | 3 +
1791 fs/ocfs2/ioctl.c | 8 +-
1792 fs/ocfs2/journal.c | 23 +++++-
1793 fs/ocfs2/mmap.c | 53 +++++------
1794 fs/ocfs2/move_extents.c | 2 +-
1795 fs/ocfs2/ocfs2.h | 4 +-
1796 fs/ocfs2/quota_local.c | 13 ++-
1797 fs/ocfs2/slot_map.c | 4 +-
1798 fs/ocfs2/stack_o2cb.c | 71 ++++++++++++++--
1799 fs/ocfs2/super.c | 23 +++--
1800 fs/ocfs2/xattr.c | 9 ++-
1801 28 files changed, 932 insertions(+), 524 deletions(-)
1802 Merging omfs/for-next
1803 $ git merge omfs/for-next
1805 Merging squashfs/master
1806 $ git merge squashfs/master
1808 Merging udf/for_next
1809 $ git merge udf/for_next
1811 Merging v9fs/for-next
1812 $ git merge v9fs/for-next
1813 Recorded preimage for 'net/9p/trans_virtio.c'
1814 Auto-merging include/net/9p/9p.h
1815 Auto-merging net/9p/trans_virtio.c
1816 CONFLICT (content): Merge conflict in net/9p/trans_virtio.c
1817 Automatic merge failed; fix conflicts and then commit the result.
1819 Recorded resolution for 'net/9p/trans_virtio.c'.
1820 [master e156d3b] Merge remote-tracking branch 'v9fs/for-next'
1821 $ git diff -M --stat --summary HEAD^..
1822 fs/9p/vfs_dir.c | 14 +-
1823 include/net/9p/9p.h | 14 +-
1824 include/net/9p/client.h | 6 +-
1825 include/net/9p/transport.h | 10 +-
1826 include/trace/events/9p.h | 186 ++++++++++++++++++
1827 net/9p/client.c | 456 +++++++++++++++++++++++++++++++-------------
1828 net/9p/protocol.c | 99 ++---------
1829 net/9p/protocol.h | 4 +-
1830 net/9p/trans_common.c | 53 ++----
1831 net/9p/trans_common.h | 21 +--
1832 net/9p/trans_virtio.c | 319 ++++++++++++++++++-------------
1833 11 files changed, 748 insertions(+), 434 deletions(-)
1834 create mode 100644 include/trace/events/9p.h
1835 Merging ubifs/linux-next
1836 $ git merge ubifs/linux-next
1839 $ git merge xfs/master
1840 Resolved 'fs/xfs/xfs_super.c' using previous resolution.
1841 Auto-merging fs/xfs/xfs_iops.c
1842 Auto-merging fs/xfs/xfs_super.c
1843 CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
1844 Automatic merge failed; fix conflicts and then commit the result.
1846 [master 170ead0] Merge remote-tracking branch 'xfs/master'
1847 $ git diff -M --stat --summary HEAD^..
1848 fs/xfs/xfs_aops.c | 87 ++++++++++---------------------------
1849 fs/xfs/xfs_aops.h | 4 +-
1850 fs/xfs/xfs_attr.c | 9 ++--
1851 fs/xfs/xfs_buf.c | 108 +++++++++++++++------------------------------
1852 fs/xfs/xfs_buf.h | 14 +++---
1853 fs/xfs/xfs_buf_item.c | 4 +-
1854 fs/xfs/xfs_dquot.c | 6 ++-
1855 fs/xfs/xfs_file.c | 93 +++++++++++++++++++++++++++++-----------
1856 fs/xfs/xfs_fsops.c | 40 +++++++++--------
1857 fs/xfs/xfs_iget.c | 2 -
1858 fs/xfs/xfs_inode.c | 6 ++-
1859 fs/xfs/xfs_inode.h | 1 -
1860 fs/xfs/xfs_iops.c | 8 ++--
1861 fs/xfs/xfs_log_recover.c | 18 +++++---
1862 fs/xfs/xfs_mount.c | 2 +-
1863 fs/xfs/xfs_qm.c | 3 +-
1864 fs/xfs/xfs_rw.c | 2 +-
1865 fs/xfs/xfs_super.c | 7 +---
1866 fs/xfs/xfs_sync.c | 14 +++---
1867 fs/xfs/xfs_trace.h | 1 -
1868 fs/xfs/xfs_trans_buf.c | 5 +-
1869 fs/xfs/xfs_vnodeops.c | 4 +-
1870 22 files changed, 202 insertions(+), 236 deletions(-)
1871 Merging vfs/for-next
1872 $ git merge vfs/for-next
1874 Merging vfs-scale/vfs-scale-working
1875 $ git merge vfs-scale/vfs-scale-working
1877 Merging pci/linux-next
1878 $ git merge pci/linux-next
1880 Merging hid/for-next
1881 $ git merge hid/for-next
1882 Resolved 'drivers/hid/hid-core.c' using previous resolution.
1883 Resolved 'drivers/hid/hid-ids.h' using previous resolution.
1884 Auto-merging drivers/hid/Kconfig
1885 Auto-merging drivers/hid/hid-apple.c
1886 Auto-merging drivers/hid/hid-core.c
1887 CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
1888 Auto-merging drivers/hid/hid-ids.h
1889 CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h
1890 Auto-merging drivers/hid/usbhid/hid-quirks.c
1891 Automatic merge failed; fix conflicts and then commit the result.
1893 [master 2e41d47] Merge remote-tracking branch 'hid/for-next'
1894 $ git diff -M --stat --summary HEAD^..
1895 .../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 7 +
1896 drivers/hid/Kconfig | 19 +-
1897 drivers/hid/Makefile | 2 +-
1898 drivers/hid/hid-apple.c | 9 +
1899 drivers/hid/hid-axff.c | 36 ++-
1900 drivers/hid/hid-core.c | 56 +++-
1901 drivers/hid/hid-debug.c | 5 +
1902 drivers/hid/hid-ids.h | 7 +
1903 drivers/hid/hid-lg.c | 29 +-
1904 drivers/hid/hid-lg.h | 4 +-
1905 drivers/hid/hid-lg4ff.c | 403 ++++++++++++++++++--
1906 drivers/hid/hid-lgff.c | 13 -
1907 drivers/hid/hid-multitouch.c | 15 +
1908 drivers/hid/hid-prodikeys.c | 8 +-
1909 drivers/hid/hid-sjoy.c | 68 ++--
1910 drivers/hid/hid-zydacron.c | 4 +-
1911 drivers/hid/usbhid/hid-quirks.c | 1 -
1912 include/linux/hid.h | 2 +
1913 18 files changed, 573 insertions(+), 115 deletions(-)
1914 create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
1916 $ git merge quilt/i2c
1917 Merge made by recursive.
1918 drivers/i2c/busses/Kconfig | 2 +-
1919 1 files changed, 1 insertions(+), 1 deletions(-)
1920 Merging bjdooks-i2c/next-i2c
1921 $ git merge bjdooks-i2c/next-i2c
1922 Auto-merging drivers/i2c/busses/i2c-omap.c
1923 Merge made by recursive.
1924 arch/arm/plat-omap/i2c.c | 27 +++++++++++
1925 drivers/i2c/busses/i2c-omap.c | 99 ++++++++++++++++++++++------------------
1926 include/linux/i2c-omap.h | 2 +
1927 3 files changed, 83 insertions(+), 45 deletions(-)
1928 Merging quilt/jdelvare-hwmon
1929 $ git merge quilt/jdelvare-hwmon
1930 Merge made by recursive.
1931 drivers/hwmon/Kconfig | 15 ++++-
1932 drivers/hwmon/ibmaem.c | 60 ++++++++++--------
1933 drivers/hwmon/lm90.c | 146 +++++++++++++++++++++----------------------
1934 drivers/hwmon/smsc47b397.c | 13 +++--
1935 4 files changed, 126 insertions(+), 108 deletions(-)
1936 Merging hwmon-staging/hwmon-next
1937 $ git merge hwmon-staging/hwmon-next
1938 Auto-merging drivers/hwmon/pmbus/ucd9000.c
1939 Auto-merging drivers/hwmon/pmbus/ucd9200.c
1940 Merge made by recursive.
1941 Documentation/hwmon/adm1275 | 40 ++++++----
1942 drivers/hwmon/pmbus/Kconfig | 5 +-
1943 drivers/hwmon/pmbus/adm1275.c | 159 +++++++++++++++++++++++++++++++++----
1944 drivers/hwmon/pmbus/lm25066.c | 5 +-
1945 drivers/hwmon/pmbus/max16064.c | 3 +-
1946 drivers/hwmon/pmbus/max34440.c | 3 +-
1947 drivers/hwmon/pmbus/max8688.c | 3 +-
1948 drivers/hwmon/pmbus/pmbus.c | 5 +-
1949 drivers/hwmon/pmbus/pmbus.h | 20 ++++-
1950 drivers/hwmon/pmbus/pmbus_core.c | 3 +-
1951 drivers/hwmon/pmbus/ucd9000.c | 5 +-
1952 drivers/hwmon/pmbus/ucd9200.c | 5 +-
1953 drivers/hwmon/w83627ehf.c | 62 +++++++++++++++
1954 13 files changed, 264 insertions(+), 54 deletions(-)
1955 Merging quilt/kernel-doc
1956 $ git merge quilt/kernel-doc
1957 Merge made by recursive.
1958 Documentation/CodingStyle | 4 ++--
1959 Documentation/cgroups/cgroups.txt | 4 ++--
1960 Documentation/filesystems/hfs.txt | 9 ++++-----
1961 Documentation/filesystems/inotify.txt | 3 ++-
1962 Documentation/laptops/thinkpad-acpi.txt | 4 ++--
1963 Documentation/networking/dmfe.txt | 3 ++-
1964 Documentation/serial/computone.txt | 2 --
1965 7 files changed, 14 insertions(+), 15 deletions(-)
1966 Merging docs/docs-move
1967 $ git merge docs/docs-move
1968 Merge made by recursive.
1969 Documentation/DocBook/drm.tmpl | 308 +++++++++++++++++++++------------------
1970 drivers/gpu/drm/i915/i915_drv.c | 4 +-
1971 2 files changed, 170 insertions(+), 142 deletions(-)
1972 Merging v4l-dvb/master
1973 $ git merge v4l-dvb/master
1975 Merging kbuild/for-next
1976 $ git merge kbuild/for-next
1977 Merge made by recursive.
1978 scripts/kconfig/Makefile | 28 ++--------------------------
1979 scripts/kconfig/menu.c | 13 +++++--------
1980 scripts/kconfig/nconf.c | 2 --
1981 scripts/kconfig/streamline_config.pl | 22 +++++++++++++++++++---
1982 4 files changed, 26 insertions(+), 39 deletions(-)
1983 Merging kconfig/for-next
1984 $ git merge kconfig/for-next
1986 Merge made by recursive.
1988 $ git merge ide/master
1991 $ git merge libata/NEXT
1992 Merge made by recursive.
1993 drivers/ata/libata-eh.c | 5 ++---
1994 drivers/ata/sata_sil24.c | 4 ++--
1995 2 files changed, 4 insertions(+), 5 deletions(-)
1996 Merging infiniband/for-next
1997 $ git merge infiniband/for-next
2000 $ git merge acpi/test
2001 Auto-merging Documentation/kernel-parameters.txt
2002 Merge made by recursive.
2003 Documentation/kernel-parameters.txt | 9 ++++++---
2004 drivers/acpi/acpica/acconfig.h | 2 +-
2005 drivers/acpi/acpica/hwxface.c | 3 +--
2006 drivers/acpi/apei/Kconfig | 1 +
2007 drivers/acpi/apei/apei-base.c | 2 +-
2008 drivers/acpi/reboot.c | 3 +--
2009 drivers/acpi/scan.c | 3 +--
2010 7 files changed, 12 insertions(+), 11 deletions(-)
2011 Merging idle-test/idle-test
2012 $ git merge idle-test/idle-test
2014 Merging powertools/tools-test
2015 $ git merge powertools/tools-test
2017 Merging cpupowerutils/master
2018 $ git merge cpupowerutils/master
2020 Merging ieee1394/for-next
2021 $ git merge ieee1394/for-next
2023 Merging ubi/linux-next
2024 $ git merge ubi/linux-next
2027 $ git merge dlm/next
2029 Merging swiotlb/master
2030 $ git merge swiotlb/master
2031 Merge made by recursive.
2033 $ git merge ibft/master
2034 Merge made by recursive.
2036 $ git merge scsi/master
2037 Auto-merging drivers/scsi/fcoe/fcoe.c
2038 Merge made by recursive.
2039 Documentation/ABI/testing/sysfs-block | 13 +
2040 arch/s390/include/asm/qdio.h | 5 +
2041 block/genhd.c | 71 +
2042 drivers/infiniband/ulp/iser/iscsi_iser.c | 80 +-
2043 drivers/message/fusion/mptbase.c | 92 ++-
2044 drivers/message/fusion/mptbase.h | 72 +-
2045 drivers/message/fusion/mptsas.c | 47 +-
2046 drivers/message/fusion/mptscsih.c | 15 +-
2047 drivers/message/fusion/mptscsih.h | 1 +
2048 drivers/s390/cio/qdio_main.c | 11 +-
2049 drivers/s390/cio/qdio_setup.c | 1 +
2050 drivers/s390/scsi/zfcp_dbf.c | 36 +
2051 drivers/s390/scsi/zfcp_def.h | 7 +
2052 drivers/s390/scsi/zfcp_ext.h | 1 +
2053 drivers/s390/scsi/zfcp_fsf.c | 80 +-
2054 drivers/s390/scsi/zfcp_qdio.c | 58 +-
2055 drivers/s390/scsi/zfcp_qdio.h | 66 +-
2056 drivers/s390/scsi/zfcp_scsi.c | 15 +-
2057 drivers/scsi/Kconfig | 14 +-
2058 drivers/scsi/Makefile | 1 +
2059 drivers/scsi/be2iscsi/be_iscsi.c | 60 +-
2060 drivers/scsi/be2iscsi/be_iscsi.h | 2 +
2061 drivers/scsi/be2iscsi/be_main.c | 101 +-
2062 drivers/scsi/be2iscsi/be_main.h | 3 +
2063 drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
2064 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 186 ++-
2065 drivers/scsi/bnx2fc/bnx2fc_hwi.c | 10 +-
2066 drivers/scsi/bnx2fc/bnx2fc_io.c | 7 -
2067 drivers/scsi/bnx2fc/bnx2fc_tgt.c | 27 +-
2068 drivers/scsi/bnx2i/bnx2i_iscsi.c | 80 +-
2069 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 20 +-
2070 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 20 +-
2071 drivers/scsi/cxgbi/libcxgbi.c | 56 +
2072 drivers/scsi/cxgbi/libcxgbi.h | 1 +
2073 drivers/scsi/device_handler/scsi_dh.c | 61 +-
2074 drivers/scsi/device_handler/scsi_dh_alua.c | 92 +-
2075 drivers/scsi/fcoe/fcoe.c | 66 +-
2076 drivers/scsi/fcoe/fcoe.h | 10 -
2077 drivers/scsi/fcoe/fcoe_transport.c | 72 +
2078 drivers/scsi/ipr.c | 2 +-
2079 drivers/scsi/isci/task.c | 29 +-
2080 drivers/scsi/iscsi_tcp.c | 83 +-
2081 drivers/scsi/libiscsi.c | 9 -
2082 drivers/scsi/libsas/sas_init.c | 30 +-
2083 drivers/scsi/libsas/sas_scsi_host.c | 101 +-
2084 drivers/scsi/lpfc/lpfc_attr.c | 42 +-
2085 drivers/scsi/lpfc/lpfc_els.c | 11 +-
2086 drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
2087 drivers/scsi/lpfc/lpfc_hw4.h | 2 +
2088 drivers/scsi/lpfc/lpfc_init.c | 63 +-
2089 drivers/scsi/lpfc/lpfc_scsi.c | 11 +-
2090 drivers/scsi/lpfc/lpfc_sli.c | 13 +-
2091 drivers/scsi/lpfc/lpfc_version.h | 2 +-
2092 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 +
2093 drivers/scsi/mvsas/mv_sas.c | 29 +-
2094 drivers/scsi/mvumi.c | 2018 +++++++++++++++++++++++++
2095 drivers/scsi/mvumi.h | 505 +++++++
2096 drivers/scsi/pm8001/pm8001_sas.c | 38 +-
2097 drivers/scsi/qla2xxx/qla_attr.c | 111 +-
2098 drivers/scsi/qla2xxx/qla_bsg.c | 152 ++
2099 drivers/scsi/qla2xxx/qla_bsg.h | 42 +
2100 drivers/scsi/qla2xxx/qla_dbg.c | 6 +-
2101 drivers/scsi/qla2xxx/qla_def.h | 9 +-
2102 drivers/scsi/qla2xxx/qla_gbl.h | 18 +
2103 drivers/scsi/qla2xxx/qla_init.c | 36 +-
2104 drivers/scsi/qla2xxx/qla_isr.c | 5 +
2105 drivers/scsi/qla2xxx/qla_mbx.c | 127 ++
2106 drivers/scsi/qla2xxx/qla_nx.c | 970 ++++++++++++-
2107 drivers/scsi/qla2xxx/qla_nx.h | 255 ++++-
2108 drivers/scsi/qla2xxx/qla_os.c | 46 +-
2109 drivers/scsi/qla4xxx/Makefile | 2 +-
2110 drivers/scsi/qla4xxx/ql4_attr.c | 76 +
2111 drivers/scsi/qla4xxx/ql4_bsg.c | 513 +++++++
2112 drivers/scsi/qla4xxx/ql4_bsg.h | 19 +
2113 drivers/scsi/qla4xxx/ql4_def.h | 201 ++-
2114 drivers/scsi/qla4xxx/ql4_fw.h | 192 +++-
2115 drivers/scsi/qla4xxx/ql4_glbl.h | 71 +-
2116 drivers/scsi/qla4xxx/ql4_init.c | 786 ++---------
2117 drivers/scsi/qla4xxx/ql4_iocb.c | 68 +-
2118 drivers/scsi/qla4xxx/ql4_isr.c | 83 +-
2119 drivers/scsi/qla4xxx/ql4_mbx.c | 752 +++++++++--
2120 drivers/scsi/qla4xxx/ql4_nvram.c | 21 +
2121 drivers/scsi/qla4xxx/ql4_nx.c | 9 +
2122 drivers/scsi/qla4xxx/ql4_os.c | 2199 ++++++++++++++++++++++++----
2123 drivers/scsi/scsi_error.c | 12 +-
2124 drivers/scsi/scsi_sysfs.c | 38 +
2125 drivers/scsi/scsi_transport_iscsi.c | 683 ++++++++--
2126 drivers/scsi/sd.c | 7 +-
2127 include/linux/genhd.h | 4 +
2128 include/scsi/iscsi_if.h | 134 ++-
2129 include/scsi/libfcoe.h | 3 +
2130 include/scsi/libsas.h | 26 +-
2131 include/scsi/scsi_bsg_iscsi.h | 110 ++
2132 include/scsi/scsi_device.h | 6 +
2133 include/scsi/scsi_host.h | 16 +-
2134 include/scsi/scsi_transport_iscsi.h | 45 +-
2135 96 files changed, 10171 insertions(+), 2235 deletions(-)
2136 create mode 100644 drivers/scsi/mvumi.c
2137 create mode 100644 drivers/scsi/mvumi.h
2138 create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.c
2139 create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.h
2140 create mode 100644 include/scsi/scsi_bsg_iscsi.h
2141 Merging iscsi-target/for-next
2142 $ git merge iscsi-target/for-next
2144 Merging slave-dma/next
2145 $ git merge slave-dma/next
2146 Merge made by recursive.
2147 arch/arm/include/asm/hardware/pl080.h | 4 +
2148 drivers/dma/amba-pl08x.c | 455 ++++++++++++++-------------------
2149 drivers/dma/at_hdmac.c | 159 +++++++++---
2150 drivers/dma/at_hdmac_regs.h | 24 ++
2151 drivers/dma/dmatest.c | 23 ++-
2152 drivers/dma/imx-sdma.c | 47 +++-
2153 drivers/dma/mxs-dma.c | 45 ++--
2154 include/linux/amba/pl08x.h | 14 +-
2155 include/linux/dmaengine.h | 13 +-
2156 9 files changed, 456 insertions(+), 328 deletions(-)
2157 Merging async_tx/next
2158 $ git merge async_tx/next
2161 $ git merge net/master
2162 Auto-merging MAINTAINERS
2163 CONFLICT (content): Merge conflict in MAINTAINERS
2164 Auto-merging arch/mips/Kconfig
2165 Auto-merging arch/powerpc/Kconfig
2166 CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
2167 Auto-merging arch/powerpc/configs/ppc40x_defconfig
2168 Auto-merging arch/powerpc/platforms/40x/Kconfig
2169 Auto-merging arch/s390/include/asm/qdio.h
2170 Auto-merging drivers/bcma/main.c
2171 Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c
2172 Removing drivers/net/arm/Kconfig
2173 Removing drivers/net/arm/Makefile
2174 Removing drivers/net/benet/Kconfig
2175 Removing drivers/net/bna/bfi_ctreg.h
2176 Removing drivers/net/bna/bfi_ll.h
2177 Removing drivers/net/bna/bna_ctrl.c
2178 Removing drivers/net/bna/bna_hw.h
2179 Removing drivers/net/bna/bna_txrx.c
2180 Auto-merging drivers/net/cris/eth_v10.c
2181 Auto-merging drivers/net/ethernet/3com/3c501.c
2182 Auto-merging drivers/net/ethernet/3com/3c509.c
2183 Auto-merging drivers/net/ethernet/3com/3c515.c
2184 Auto-merging drivers/net/ethernet/3com/3c574_cs.c
2185 Auto-merging drivers/net/ethernet/3com/3c589_cs.c
2186 Auto-merging drivers/net/ethernet/3com/3c59x.c
2187 Auto-merging drivers/net/ethernet/3com/typhoon.c
2188 Auto-merging drivers/net/ethernet/8390/3c503.c
2189 Auto-merging drivers/net/ethernet/8390/8390.c
2190 Auto-merging drivers/net/ethernet/8390/8390p.c
2191 Auto-merging drivers/net/ethernet/8390/ac3200.c
2192 Auto-merging drivers/net/ethernet/8390/ax88796.c
2193 Auto-merging drivers/net/ethernet/8390/axnet_cs.c
2194 Auto-merging drivers/net/ethernet/8390/e2100.c
2195 Auto-merging drivers/net/ethernet/8390/etherh.c
2196 Auto-merging drivers/net/ethernet/8390/hp-plus.c
2197 Auto-merging drivers/net/ethernet/8390/hydra.c
2198 Auto-merging drivers/net/ethernet/8390/mac8390.c
2199 Auto-merging drivers/net/ethernet/8390/ne-h8300.c
2200 Auto-merging drivers/net/ethernet/8390/ne2k-pci.c
2201 Auto-merging drivers/net/ethernet/8390/pcnet_cs.c
2202 Auto-merging drivers/net/ethernet/8390/smc-mca.c
2203 Auto-merging drivers/net/ethernet/8390/smc-ultra.c
2204 Auto-merging drivers/net/ethernet/8390/smc-ultra32.c
2205 Auto-merging drivers/net/ethernet/8390/wd.c
2206 Auto-merging drivers/net/ethernet/8390/zorro8390.c
2207 Auto-merging drivers/net/ethernet/adaptec/starfire.c
2208 Auto-merging drivers/net/ethernet/adi/bfin_mac.c
2209 Auto-merging drivers/net/ethernet/aeroflex/greth.c
2210 Auto-merging drivers/net/ethernet/alteon/acenic.c
2211 Auto-merging drivers/net/ethernet/amd/a2065.c
2212 Auto-merging drivers/net/ethernet/amd/am79c961a.c
2213 Auto-merging drivers/net/ethernet/amd/amd8111e.c
2214 Auto-merging drivers/net/ethernet/amd/ariadne.c
2215 Auto-merging drivers/net/ethernet/amd/atarilance.c
2216 Auto-merging drivers/net/ethernet/amd/au1000_eth.c
2217 Auto-merging drivers/net/ethernet/amd/declance.c
2218 Auto-merging drivers/net/ethernet/amd/depca.c
2219 Auto-merging drivers/net/ethernet/amd/hplance.c
2220 Auto-merging drivers/net/ethernet/amd/lance.c
2221 Auto-merging drivers/net/ethernet/amd/mvme147.c
2222 Auto-merging drivers/net/ethernet/amd/ni65.c
2223 Auto-merging drivers/net/ethernet/amd/nmclan_cs.c
2224 Auto-merging drivers/net/ethernet/amd/pcnet32.c
2225 Auto-merging drivers/net/ethernet/amd/sun3lance.c
2226 Auto-merging drivers/net/ethernet/amd/sunlance.c
2227 Auto-merging drivers/net/ethernet/apple/bmac.c
2228 Auto-merging drivers/net/ethernet/apple/cs89x0.c
2229 Auto-merging drivers/net/ethernet/apple/mac89x0.c
2230 Auto-merging drivers/net/ethernet/apple/mace.c
2231 Auto-merging drivers/net/ethernet/apple/macmace.c
2232 Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c
2233 Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e_main.c
2234 Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
2235 Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c
2236 Auto-merging drivers/net/ethernet/broadcom/b44.c
2237 Auto-merging drivers/net/ethernet/broadcom/bcm63xx_enet.c
2238 Auto-merging drivers/net/ethernet/broadcom/bnx2.c
2239 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
2240 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
2241 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
2242 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
2243 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
2244 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
2245 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
2246 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
2247 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
2248 Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
2249 Auto-merging drivers/net/ethernet/broadcom/cnic.c
2250 Auto-merging drivers/net/ethernet/broadcom/cnic.h
2251 Auto-merging drivers/net/ethernet/broadcom/cnic_defs.h
2252 Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c
2253 Auto-merging drivers/net/ethernet/broadcom/tg3.c
2254 Auto-merging drivers/net/ethernet/broadcom/tg3.h
2255 Auto-merging drivers/net/ethernet/brocade/bna/Makefile
2256 Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c
2257 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h
2258 Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
2259 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c
2260 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h
2261 Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
2262 Auto-merging drivers/net/ethernet/brocade/bna/bfi.h
2263 Auto-merging drivers/net/ethernet/brocade/bna/bna.h
2264 Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h
2265 Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
2266 Auto-merging drivers/net/ethernet/brocade/bna/bnad.h
2267 Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c
2268 Auto-merging drivers/net/ethernet/brocade/bna/cna.h
2269 Auto-merging drivers/net/ethernet/cadence/at91_ether.c
2270 Auto-merging drivers/net/ethernet/cadence/macb.c
2271 Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c
2272 Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
2273 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
2274 Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
2275 Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c
2276 Auto-merging drivers/net/ethernet/davicom/dm9000.c
2277 Auto-merging drivers/net/ethernet/dec/ewrk3.c
2278 Auto-merging drivers/net/ethernet/dec/tulip/Kconfig
2279 Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c
2280 Auto-merging drivers/net/ethernet/dec/tulip/de4x5.c
2281 Auto-merging drivers/net/ethernet/dec/tulip/dmfe.c
2282 Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
2283 Auto-merging drivers/net/ethernet/dec/tulip/uli526x.c
2284 Auto-merging drivers/net/ethernet/dec/tulip/winbond-840.c
2285 Auto-merging drivers/net/ethernet/dlink/de620.c
2286 Auto-merging drivers/net/ethernet/dlink/dl2k.c
2287 Auto-merging drivers/net/ethernet/dlink/dl2k.h
2288 Auto-merging drivers/net/ethernet/dlink/sundance.c
2289 Auto-merging drivers/net/ethernet/emulex/benet/be.h
2290 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c
2291 Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
2292 Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c
2293 Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h
2294 Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
2295 Auto-merging drivers/net/ethernet/ethoc.c
2296 Auto-merging drivers/net/ethernet/fealnx.c
2297 Auto-merging drivers/net/ethernet/freescale/fec.c
2298 Auto-merging drivers/net/ethernet/freescale/fec_mpc52xx.c
2299 Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig
2300 Auto-merging drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
2301 Auto-merging drivers/net/ethernet/freescale/gianfar.c
2302 Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
2303 Auto-merging drivers/net/ethernet/fujitsu/at1700.c
2304 Auto-merging drivers/net/ethernet/fujitsu/eth16i.c
2305 Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c
2306 Auto-merging drivers/net/ethernet/hp/hp100.c
2307 Auto-merging drivers/net/ethernet/i825xx/3c505.c
2308 Auto-merging drivers/net/ethernet/i825xx/3c523.c
2309 Auto-merging drivers/net/ethernet/i825xx/3c527.c
2310 Auto-merging drivers/net/ethernet/i825xx/82596.c
2311 Auto-merging drivers/net/ethernet/i825xx/eepro.c
2312 Auto-merging drivers/net/ethernet/i825xx/eexpress.c
2313 Auto-merging drivers/net/ethernet/i825xx/ether1.c
2314 Auto-merging drivers/net/ethernet/i825xx/lib82596.c
2315 Auto-merging drivers/net/ethernet/i825xx/lp486e.c
2316 Auto-merging drivers/net/ethernet/i825xx/ni52.c
2317 Auto-merging drivers/net/ethernet/i825xx/sun3_82586.c
2318 Auto-merging drivers/net/ethernet/i825xx/znet.c
2319 Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c
2320 Auto-merging drivers/net/ethernet/ibm/emac/Kconfig
2321 Auto-merging drivers/net/ethernet/ibm/emac/core.c
2322 Auto-merging drivers/net/ethernet/ibm/emac/core.h
2323 Auto-merging drivers/net/ethernet/ibm/emac/debug.h
2324 Auto-merging drivers/net/ethernet/ibm/emac/mal.c
2325 Auto-merging drivers/net/ethernet/ibm/emac/mal.h
2326 Auto-merging drivers/net/ethernet/ibm/emac/rgmii.h
2327 Auto-merging drivers/net/ethernet/ibm/emac/tah.h
2328 Auto-merging drivers/net/ethernet/ibm/emac/zmii.h
2329 Auto-merging drivers/net/ethernet/ibm/ibmveth.c
2330 Auto-merging drivers/net/ethernet/ibm/iseries_veth.c
2331 Auto-merging drivers/net/ethernet/icplus/ipg.c
2332 Auto-merging drivers/net/ethernet/intel/e100.c
2333 Auto-merging drivers/net/ethernet/intel/e1000/e1000.h
2334 Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
2335 Auto-merging drivers/net/ethernet/intel/e1000e/80003es2lan.c
2336 Auto-merging drivers/net/ethernet/intel/e1000e/82571.c
2337 Auto-merging drivers/net/ethernet/intel/e1000e/Makefile
2338 Auto-merging drivers/net/ethernet/intel/e1000e/e1000.h
2339 Auto-merging drivers/net/ethernet/intel/e1000e/ethtool.c
2340 Auto-merging drivers/net/ethernet/intel/e1000e/ich8lan.c
2341 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
2342 Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
2343 Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c
2344 Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c
2345 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe.h
2346 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
2347 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
2348 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
2349 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
2350 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
2351 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
2352 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
2353 Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
2354 Auto-merging drivers/net/ethernet/intel/ixgbevf/ethtool.c
2355 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
2356 Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
2357 Auto-merging drivers/net/ethernet/jme.c
2358 Auto-merging drivers/net/ethernet/korina.c
2359 Auto-merging drivers/net/ethernet/lantiq_etop.c
2360 Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c
2361 Auto-merging drivers/net/ethernet/marvell/skge.c
2362 Auto-merging drivers/net/ethernet/marvell/sky2.c
2363 Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
2364 Auto-merging drivers/net/ethernet/micrel/ks8695net.c
2365 Auto-merging drivers/net/ethernet/microchip/enc28j60.c
2366 Auto-merging drivers/net/ethernet/mipsnet.c
2367 Auto-merging drivers/net/ethernet/myricom/myri10ge/myri10ge.c
2368 Auto-merging drivers/net/ethernet/natsemi/ibmlana.c
2369 Auto-merging drivers/net/ethernet/natsemi/jazzsonic.c
2370 Auto-merging drivers/net/ethernet/natsemi/macsonic.c
2371 Auto-merging drivers/net/ethernet/natsemi/natsemi.c
2372 Auto-merging drivers/net/ethernet/natsemi/ns83820.c
2373 Auto-merging drivers/net/ethernet/natsemi/xtsonic.c
2374 Auto-merging drivers/net/ethernet/neterion/s2io.c
2375 Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
2376 Auto-merging drivers/net/ethernet/netx-eth.c
2377 Auto-merging drivers/net/ethernet/nuvoton/w90p910_ether.c
2378 Auto-merging drivers/net/ethernet/nvidia/forcedeth.c
2379 Auto-merging drivers/net/ethernet/octeon/Kconfig
2380 Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
2381 Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
2382 Auto-merging drivers/net/ethernet/packetengines/hamachi.c
2383 Auto-merging drivers/net/ethernet/packetengines/yellowfin.c
2384 Auto-merging drivers/net/ethernet/pasemi/pasemi_mac.c
2385 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h
2386 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
2387 Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
2388 Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
2389 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
2390 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
2391 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
2392 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
2393 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
2394 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
2395 Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
2396 Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c
2397 Auto-merging drivers/net/ethernet/racal/ni5010.c
2398 Auto-merging drivers/net/ethernet/rdc/r6040.c
2399 Auto-merging drivers/net/ethernet/realtek/8139cp.c
2400 Auto-merging drivers/net/ethernet/realtek/8139too.c
2401 Auto-merging drivers/net/ethernet/realtek/atp.c
2402 Auto-merging drivers/net/ethernet/realtek/r8169.c
2403 Auto-merging drivers/net/ethernet/realtek/sc92031.c
2404 Auto-merging drivers/net/ethernet/renesas/sh_eth.c
2405 Auto-merging drivers/net/ethernet/seeq/ether3.c
2406 Auto-merging drivers/net/ethernet/seeq/seeq8005.c
2407 Auto-merging drivers/net/ethernet/seeq/sgiseeq.c
2408 Auto-merging drivers/net/ethernet/sfc/Kconfig
2409 Auto-merging drivers/net/ethernet/sfc/efx.c
2410 Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c
2411 Auto-merging drivers/net/ethernet/sis/sis190.c
2412 Auto-merging drivers/net/ethernet/sis/sis900.c
2413 Auto-merging drivers/net/ethernet/smsc/epic100.c
2414 Auto-merging drivers/net/ethernet/smsc/smc911x.c
2415 Auto-merging drivers/net/ethernet/smsc/smc9194.c
2416 Auto-merging drivers/net/ethernet/smsc/smc91c92_cs.c
2417 Auto-merging drivers/net/ethernet/smsc/smc91x.c
2418 Auto-merging drivers/net/ethernet/smsc/smsc911x.c
2419 Auto-merging drivers/net/ethernet/smsc/smsc9420.c
2420 Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
2421 Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
2422 Auto-merging drivers/net/ethernet/sun/cassini.c
2423 Auto-merging drivers/net/ethernet/sun/niu.c
2424 Auto-merging drivers/net/ethernet/sun/sunbmac.c
2425 Auto-merging drivers/net/ethernet/sun/sunbmac.h
2426 Auto-merging drivers/net/ethernet/sun/sungem.c
2427 Auto-merging drivers/net/ethernet/sun/sunhme.c
2428 Auto-merging drivers/net/ethernet/sun/sunqe.c
2429 Auto-merging drivers/net/ethernet/sun/sunvnet.c
2430 Auto-merging drivers/net/ethernet/tehuti/tehuti.c
2431 Auto-merging drivers/net/ethernet/ti/cpmac.c
2432 Auto-merging drivers/net/ethernet/ti/davinci_emac.c
2433 Auto-merging drivers/net/ethernet/ti/tlan.c
2434 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
2435 Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
2436 Auto-merging drivers/net/ethernet/toshiba/spider_net.c
2437 Auto-merging drivers/net/ethernet/toshiba/spider_net.h
2438 Auto-merging drivers/net/ethernet/toshiba/tc35815.c
2439 Auto-merging drivers/net/ethernet/tundra/tsi108_eth.c
2440 Auto-merging drivers/net/ethernet/via/via-rhine.c
2441 Auto-merging drivers/net/ethernet/via/via-velocity.c
2442 Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c
2443 Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c
2444 Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig
2445 Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
2446 Auto-merging drivers/net/fddi/defxx.c
2447 Auto-merging drivers/net/fddi/skfp/h/cmtdef.h
2448 Auto-merging drivers/net/fddi/skfp/h/hwmtm.h
2449 Auto-merging drivers/net/fddi/skfp/h/sba.h
2450 Auto-merging drivers/net/fddi/skfp/h/skfbiinc.h
2451 Auto-merging drivers/net/fddi/skfp/h/smc.h
2452 Auto-merging drivers/net/fddi/skfp/h/targethw.h
2453 Auto-merging drivers/net/fddi/skfp/h/targetos.h
2454 Auto-merging drivers/net/fddi/skfp/skfddi.c
2455 Removing drivers/net/ibm_newemac/Makefile
2456 Removing drivers/net/octeon/Makefile
2457 Removing drivers/net/pci-skeleton.c
2458 Removing drivers/net/pcmcia/Kconfig
2459 Removing drivers/net/pcmcia/Makefile
2460 Auto-merging drivers/net/slip/slip.c
2461 Auto-merging drivers/net/slip/slip.h
2462 Auto-merging drivers/net/tokenring/ibmtr_cs.c
2463 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2464 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.c
2465 Auto-merging drivers/net/wireless/ath/ath9k/main.c
2466 Auto-merging drivers/net/wireless/ath/carl9170/main.c
2467 Auto-merging drivers/net/wireless/iwlegacy/iwl-3945-rs.c
2468 Auto-merging drivers/net/wireless/wl12xx/main.c
2469 Auto-merging drivers/s390/cio/qdio_main.c
2470 Auto-merging drivers/s390/cio/qdio_setup.c
2471 Auto-merging drivers/scsi/bnx2fc/bnx2fc.h
2472 Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c
2473 Auto-merging drivers/scsi/fcoe/fcoe.c
2474 Auto-merging drivers/scsi/fcoe/fcoe_transport.c
2475 Removing drivers/staging/ath6kl/Kconfig
2476 Removing drivers/staging/ath6kl/Makefile
2477 Removing drivers/staging/ath6kl/TODO
2478 Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h
2479 Removing drivers/staging/ath6kl/bmi/src/bmi.c
2480 Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h
2481 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
2482 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
2483 Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
2484 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c
2485 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h
2486 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
2487 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
2488 Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
2489 Removing drivers/staging/ath6kl/htc2/htc.c
2490 Removing drivers/staging/ath6kl/htc2/htc_debug.h
2491 Removing drivers/staging/ath6kl/htc2/htc_internal.h
2492 Removing drivers/staging/ath6kl/htc2/htc_recv.c
2493 Removing drivers/staging/ath6kl/htc2/htc_send.c
2494 Removing drivers/staging/ath6kl/htc2/htc_services.c
2495 Removing drivers/staging/ath6kl/include/a_config.h
2496 Removing drivers/staging/ath6kl/include/a_debug.h
2497 Removing drivers/staging/ath6kl/include/a_drv.h
2498 Removing drivers/staging/ath6kl/include/a_drv_api.h
2499 Removing drivers/staging/ath6kl/include/a_osapi.h
2500 Removing drivers/staging/ath6kl/include/aggr_recv_api.h
2501 Removing drivers/staging/ath6kl/include/ar3kconfig.h
2502 Removing drivers/staging/ath6kl/include/ar6000_api.h
2503 Removing drivers/staging/ath6kl/include/ar6000_diag.h
2504 Removing drivers/staging/ath6kl/include/ar6kap_common.h
2505 Removing drivers/staging/ath6kl/include/athbtfilter.h
2506 Removing drivers/staging/ath6kl/include/bmi.h
2507 Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
2508 Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h
2509 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
2510 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
2511 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
2512 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
2513 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
2514 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
2515 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
2516 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
2517 Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
2518 Removing drivers/staging/ath6kl/include/common/athdefs.h
2519 Removing drivers/staging/ath6kl/include/common/bmi_msg.h
2520 Removing drivers/staging/ath6kl/include/common/cnxmgmt.h
2521 Removing drivers/staging/ath6kl/include/common/dbglog.h
2522 Removing drivers/staging/ath6kl/include/common/dbglog_id.h
2523 Removing drivers/staging/ath6kl/include/common/discovery.h
2524 Removing drivers/staging/ath6kl/include/common/epping_test.h
2525 Removing drivers/staging/ath6kl/include/common/gmboxif.h
2526 Removing drivers/staging/ath6kl/include/common/gpio_reg.h
2527 Removing drivers/staging/ath6kl/include/common/htc.h
2528 Removing drivers/staging/ath6kl/include/common/htc_services.h
2529 Removing drivers/staging/ath6kl/include/common/pkt_log.h
2530 Removing drivers/staging/ath6kl/include/common/roaming.h
2531 Removing drivers/staging/ath6kl/include/common/targaddrs.h
2532 Removing drivers/staging/ath6kl/include/common/testcmd.h
2533 Removing drivers/staging/ath6kl/include/common/tlpm.h
2534 Removing drivers/staging/ath6kl/include/common/wlan_defs.h
2535 Removing drivers/staging/ath6kl/include/common/wmi.h
2536 Removing drivers/staging/ath6kl/include/common/wmix.h
2537 Removing drivers/staging/ath6kl/include/common_drv.h
2538 Removing drivers/staging/ath6kl/include/dbglog_api.h
2539 Removing drivers/staging/ath6kl/include/dl_list.h
2540 Removing drivers/staging/ath6kl/include/dset_api.h
2541 Removing drivers/staging/ath6kl/include/hci_transport_api.h
2542 Removing drivers/staging/ath6kl/include/hif.h
2543 Removing drivers/staging/ath6kl/include/host_version.h
2544 Removing drivers/staging/ath6kl/include/htc_api.h
2545 Removing drivers/staging/ath6kl/include/htc_packet.h
2546 Removing drivers/staging/ath6kl/include/wlan_api.h
2547 Removing drivers/staging/ath6kl/include/wmi_api.h
2548 Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c
2549 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
2550 Removing drivers/staResolved 'MAINTAINERS' using previous resolution.
2551 ging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
2552 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
2553 Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
2554 Removing drivers/staging/ath6kl/miscdrv/common_drv.c
2555 Removing drivers/staging/ath6kl/miscdrv/credit_dist.c
2556 Removing drivers/staging/ath6kl/miscdrv/miscdrv.h
2557 Removing drivers/staging/ath6kl/os/linux/ar6000_drv.c
2558 Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c
2559 Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
2560 Removing drivers/staging/ath6kl/os/linux/cfg80211.c
2561 Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c
2562 Removing drivers/staging/ath6kl/os/linux/hci_bridge.c
2563 Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
2564 Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
2565 Removing drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
2566 Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
2567 Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h
2568 Removing drivers/staging/ath6kl/os/linux/include/config_linux.h
2569 Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h
2570 Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
2571 Removing drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
2572 Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h
2573 Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h
2574 Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
2575 Removing drivers/staging/ath6kl/os/linux/netbuf.c
2576 Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h
2577 Removing drivers/staging/ath6kl/reorder/rcv_aggr.c
2578 Removing drivers/staging/ath6kl/wlan/include/ieee80211.h
2579 Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h
2580 Removing drivers/staging/ath6kl/wlan/src/wlan_node.c
2581 Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
2582 Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c
2583 Removing drivers/staging/ath6kl/wmi/wmi.c
2584 Removing drivers/staging/ath6kl/wmi/wmi_host.h
2585 Auto-merging include/linux/sungem_phy.h
2586 Auto-merging include/net/cfg80211.h
2587 Auto-merging net/core/neighbour.c
2588 Auto-merging net/core/netpoll.c
2589 Auto-merging net/ipv4/igmp.c
2590 Auto-merging net/ipv6/raw.c
2591 Auto-merging net/ipv6/udp.c
2592 Auto-merging net/mac80211/main.c
2593 Auto-merging net/socket.c
2594 Automatic merge failed; fix conflicts and then commit the result.
2595 $ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
2596 MAINTAINERS: needs merge
2597 arch/powerpc/configs/40x/hcu4_defconfig: needs merge
2598 rm 'arch/powerpc/configs/40x/hcu4_defconfig'
2600 [master aca4274] Merge remote-tracking branch 'net/master'
2601 $ git diff -M --stat --summary HEAD^..
2602 Documentation/ABI/testing/sysfs-class-net-mesh | 8 +
2603 .../devicetree/bindings/net/can/fsl-flexcan.txt | 63 +-
2604 Documentation/devicetree/bindings/net/smsc911x.txt | 38 +
2605 Documentation/networking/netdevices.txt | 4 +-
2606 MAINTAINERS | 198 +-
2607 arch/ia64/hp/sim/simeth.c | 2 +-
2608 arch/mips/Kconfig | 8 +-
2609 arch/mips/bcm47xx/Kconfig | 31 +
2610 arch/mips/bcm47xx/Makefile | 3 +-
2611 arch/mips/bcm47xx/gpio.c | 82 +-
2612 arch/mips/bcm47xx/irq.c | 12 +
2613 arch/mips/bcm47xx/nvram.c | 29 +-
2614 arch/mips/bcm47xx/serial.c | 46 +-
2615 arch/mips/bcm47xx/setup.c | 90 +-
2616 arch/mips/bcm47xx/time.c | 16 +-
2617 arch/mips/bcm47xx/wgt634u.c | 14 +-
2618 arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 26 +-
2619 arch/mips/include/asm/mach-bcm47xx/gpio.h | 108 +-
2620 arch/mips/pci/pci-bcm47xx.c | 6 +
2621 arch/powerpc/Kconfig | 2 +
2622 arch/powerpc/boot/dts/p1010rdb.dts | 10 +-
2623 arch/powerpc/boot/dts/p1010si.dtsi | 10 +-
2624 arch/powerpc/configs/40x/acadia_defconfig | 11 +-
2625 arch/powerpc/configs/40x/ep405_defconfig | 5 +-
2626 arch/powerpc/configs/40x/kilauea_defconfig | 9 +-
2627 arch/powerpc/configs/40x/makalu_defconfig | 9 +-
2628 arch/powerpc/configs/40x/walnut_defconfig | 5 +-
2629 arch/powerpc/configs/44x/arches_defconfig | 9 +-
2630 arch/powerpc/configs/44x/bamboo_defconfig | 5 +-
2631 arch/powerpc/configs/44x/bluestone_defconfig | 9 +-
2632 arch/powerpc/configs/44x/canyonlands_defconfig | 9 +-
2633 arch/powerpc/configs/44x/ebony_defconfig | 5 +-
2634 arch/powerpc/configs/44x/eiger_defconfig | 9 +-
2635 arch/powerpc/configs/44x/icon_defconfig | 5 +-
2636 arch/powerpc/configs/44x/katmai_defconfig | 5 +-
2637 arch/powerpc/configs/44x/redwood_defconfig | 11 +-
2638 arch/powerpc/configs/44x/sam440ep_defconfig | 5 +-
2639 arch/powerpc/configs/44x/sequoia_defconfig | 5 +-
2640 arch/powerpc/configs/44x/taishan_defconfig | 5 +-
2641 arch/powerpc/configs/44x/warp_defconfig | 5 +-
2642 arch/powerpc/configs/ppc40x_defconfig | 5 +-
2643 arch/powerpc/configs/ppc44x_defconfig | 5 +-
2644 arch/powerpc/platforms/40x/Kconfig | 12 +-
2645 arch/powerpc/platforms/44x/Kconfig | 54 +-
2646 arch/powerpc/platforms/cell/Kconfig | 8 +-
2647 arch/s390/include/asm/qdio.h | 78 +-
2648 arch/um/drivers/net_kern.c | 2 +-
2649 arch/xtensa/platforms/iss/network.c | 2 +-
2650 drivers/atm/eni.c | 3 +-
2651 drivers/bcma/Kconfig | 13 +
2652 drivers/bcma/Makefile | 2 +
2653 drivers/bcma/bcma_private.h | 16 +
2654 drivers/bcma/core.c | 2 +
2655 drivers/bcma/driver_chipcommon.c | 53 +
2656 drivers/bcma/driver_chipcommon_pmu.c | 153 +-
2657 drivers/bcma/driver_mips.c | 256 +
2658 drivers/bcma/driver_pci.c | 16 +-
2659 drivers/bcma/host_soc.c | 183 +
2660 drivers/bcma/main.c | 70 +-
2661 drivers/bcma/scan.c | 348 +-
2662 drivers/bcma/sprom.c | 6 +
2663 drivers/infiniband/hw/amso1100/c2.c | 8 +-
2664 drivers/infiniband/hw/cxgb3/Makefile | 2 +-
2665 drivers/infiniband/hw/cxgb4/Makefile | 2 +-
2666 drivers/infiniband/hw/mlx4/Kconfig | 3 +-
2667 drivers/infiniband/hw/nes/nes_nic.c | 23 +-
2668 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 5 +-
2669 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 5 +-
2670 drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +-
2671 drivers/media/dvb/dvb-core/dvb_net.c | 2 +-
2672 drivers/net/Kconfig | 3447 +----------
2673 drivers/net/Makefile | 326 +-
2674 drivers/net/appletalk/cops.c | 2 +-
2675 drivers/net/appletalk/ltpc.c | 2 +-
2676 drivers/net/arcnet/Kconfig | 14 +-
2677 drivers/net/arcnet/Makefile | 1 +
2678 drivers/net/arcnet/com20020.c | 2 +-
2679 drivers/net/{pcmcia => arcnet}/com20020_cs.c | 0
2680 drivers/net/arm/Kconfig | 74 -
2681 drivers/net/arm/Makefile | 14 -
2682 drivers/net/benet/Kconfig | 6 -
2683 drivers/net/bna/bfi_ctreg.h | 646 --
2684 drivers/net/bna/bfi_ll.h | 438 --
2685 drivers/net/bna/bna_ctrl.c | 3076 ----------
2686 drivers/net/bna/bna_hw.h | 1490 -----
2687 drivers/net/bna/bna_txrx.c | 4185 -------------
2688 drivers/net/bonding/bond_main.c | 55 +-
2689 drivers/net/bonding/bonding.h | 1 -
2690 drivers/net/caif/caif_hsi.c | 9 +-
2691 drivers/net/caif/caif_spi.c | 4 -
2692 drivers/net/can/flexcan.c | 189 +-
2693 drivers/net/can/mscan/mscan.c | 26 +-
2694 drivers/net/cris/eth_v10.c | 2 +-
2695 drivers/net/dummy.c | 2 +-
2696 drivers/net/{ => ethernet/3com}/3c501.c | 2 +-
2697 drivers/net/{ => ethernet/3com}/3c501.h | 0
2698 drivers/net/{ => ethernet/3com}/3c509.c | 2 +-
2699 drivers/net/{ => ethernet/3com}/3c515.c | 2 +-
2700 drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c | 2 +-
2701 drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c | 2 +-
2702 drivers/net/{ => ethernet/3com}/3c59x.c | 11 +-
2703 drivers/net/ethernet/3com/Kconfig | 121 +
2704 drivers/net/ethernet/3com/Makefile | 11 +
2705 drivers/net/{ => ethernet/3com}/typhoon.c | 2 +-
2706 drivers/net/{ => ethernet/3com}/typhoon.h | 0
2707 drivers/net/{ => ethernet/8390}/3c503.c | 2 +-
2708 drivers/net/{ => ethernet/8390}/3c503.h | 0
2709 drivers/net/{ => ethernet/8390}/8390.c | 2 +-
2710 drivers/net/{ => ethernet/8390}/8390.h | 0
2711 drivers/net/{ => ethernet/8390}/8390p.c | 2 +-
2712 drivers/net/ethernet/8390/Kconfig | 337 +
2713 drivers/net/ethernet/8390/Makefile | 29 +
2714 drivers/net/{ => ethernet/8390}/ac3200.c | 2 +-
2715 drivers/net/{ => ethernet/8390}/apne.c | 0
2716 drivers/net/{ => ethernet/8390}/ax88796.c | 2 +-
2717 drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c | 4 +-
2718 drivers/net/{ => ethernet/8390}/e2100.c | 2 +-
2719 drivers/net/{ => ethernet/8390}/es3210.c | 0
2720 drivers/net/{arm => ethernet/8390}/etherh.c | 4 +-
2721 drivers/net/{ => ethernet/8390}/hp-plus.c | 2 +-
2722 drivers/net/{ => ethernet/8390}/hp.c | 0
2723 drivers/net/{ => ethernet/8390}/hydra.c | 2 +-
2724 drivers/net/{ => ethernet/8390}/lib8390.c | 0
2725 drivers/net/{ => ethernet/8390}/lne390.c | 0
2726 drivers/net/{ => ethernet/8390}/mac8390.c | 2 +-
2727 drivers/net/{ => ethernet/8390}/ne-h8300.c | 2 +-
2728 drivers/net/{ => ethernet/8390}/ne.c | 0
2729 drivers/net/{ => ethernet/8390}/ne2.c | 0
2730 drivers/net/{ => ethernet/8390}/ne2k-pci.c | 2 +-
2731 drivers/net/{ => ethernet/8390}/ne3210.c | 0
2732 drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c | 4 +-
2733 drivers/net/{ => ethernet/8390}/smc-mca.c | 2 +-
2734 drivers/net/{ => ethernet/8390}/smc-ultra.c | 2 +-
2735 drivers/net/{ => ethernet/8390}/smc-ultra32.c | 2 +-
2736 drivers/net/{ => ethernet/8390}/stnic.c | 0
2737 drivers/net/{ => ethernet/8390}/wd.c | 2 +-
2738 drivers/net/{ => ethernet/8390}/zorro8390.c | 2 +-
2739 drivers/net/ethernet/Kconfig | 173 +
2740 drivers/net/ethernet/Makefile | 74 +
2741 drivers/net/ethernet/adaptec/Kconfig | 35 +
2742 drivers/net/ethernet/adaptec/Makefile | 5 +
2743 drivers/net/{ => ethernet/adaptec}/starfire.c | 2 +-
2744 drivers/net/ethernet/adi/Kconfig | 68 +
2745 drivers/net/ethernet/adi/Makefile | 5 +
2746 drivers/net/{ => ethernet/adi}/bfin_mac.c | 2 +-
2747 drivers/net/{ => ethernet/adi}/bfin_mac.h | 0
2748 drivers/net/ethernet/aeroflex/Kconfig | 11 +
2749 drivers/net/ethernet/aeroflex/Makefile | 5 +
2750 drivers/net/{ => ethernet/aeroflex}/greth.c | 14 +-
2751 drivers/net/{ => ethernet/aeroflex}/greth.h | 0
2752 drivers/net/ethernet/alteon/Kconfig | 48 +
2753 drivers/net/ethernet/alteon/Makefile | 5 +
2754 drivers/net/{ => ethernet/alteon}/acenic.c | 8 +-
2755 drivers/net/{ => ethernet/alteon}/acenic.h | 0
2756 drivers/net/{ => ethernet/amd}/7990.c | 0
2757 drivers/net/{ => ethernet/amd}/7990.h | 0
2758 drivers/net/ethernet/amd/Kconfig | 193 +
2759 drivers/net/ethernet/amd/Makefile | 20 +
2760 drivers/net/{ => ethernet/amd}/a2065.c | 2 +-
2761 drivers/net/{ => ethernet/amd}/a2065.h | 0
2762 drivers/net/{arm => ethernet/amd}/am79c961a.c | 2 +-
2763 drivers/net/{arm => ethernet/amd}/am79c961a.h | 0
2764 drivers/net/{ => ethernet/amd}/amd8111e.c | 2 +-
2765 drivers/net/{ => ethernet/amd}/amd8111e.h | 0
2766 drivers/net/{ => ethernet/amd}/ariadne.c | 2 +-
2767 drivers/net/{ => ethernet/amd}/ariadne.h | 0
2768 drivers/net/{ => ethernet/amd}/atarilance.c | 2 +-
2769 drivers/net/{ => ethernet/amd}/au1000_eth.c | 2 +-
2770 drivers/net/{ => ethernet/amd}/au1000_eth.h | 0
2771 drivers/net/{ => ethernet/amd}/declance.c | 2 +-
2772 drivers/net/{ => ethernet/amd}/depca.c | 2 +-
2773 drivers/net/{ => ethernet/amd}/depca.h | 0
2774 drivers/net/{ => ethernet/amd}/hplance.c | 2 +-
2775 drivers/net/{ => ethernet/amd}/hplance.h | 0
2776 drivers/net/{ => ethernet/amd}/lance.c | 2 +-
2777 drivers/net/{ => ethernet/amd}/mvme147.c | 2 +-
2778 drivers/net/{ => ethernet/amd}/ni65.c | 2 +-
2779 drivers/net/{ => ethernet/amd}/ni65.h | 0
2780 drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c | 2 +-
2781 drivers/net/{ => ethernet/amd}/pcnet32.c | 2 +-
2782 drivers/net/{ => ethernet/amd}/sun3lance.c | 2 +-
2783 drivers/net/{ => ethernet/amd}/sunlance.c | 2 +-
2784 drivers/net/ethernet/apple/Kconfig | 97 +
2785 drivers/net/ethernet/apple/Makefile | 9 +
2786 drivers/net/{ => ethernet/apple}/bmac.c | 2 +-
2787 drivers/net/{ => ethernet/apple}/bmac.h | 0
2788 drivers/net/{ => ethernet/apple}/cs89x0.c | 2 +-
2789 drivers/net/{ => ethernet/apple}/cs89x0.h | 0
2790 drivers/net/{ => ethernet/apple}/mac89x0.c | 2 +-
2791 drivers/net/{ => ethernet/apple}/mace.c | 2 +-
2792 drivers/net/{ => ethernet/apple}/mace.h | 0
2793 drivers/net/{ => ethernet/apple}/macmace.c | 2 +-
2794 drivers/net/ethernet/atheros/Kconfig | 66 +
2795 drivers/net/ethernet/atheros/Makefile | 8 +
2796 drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
2797 drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
2798 .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
2799 .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
2800 .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
2801 .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 11 +-
2802 drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
2803 drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
2804 .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
2805 .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
2806 .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
2807 .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 13 +-
2808 .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
2809 drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
2810 drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 7 +-
2811 drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
2812 drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 2 +-
2813 drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
2814 drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
2815 drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
2816 drivers/net/ethernet/broadcom/Kconfig | 120 +
2817 drivers/net/ethernet/broadcom/Makefile | 11 +
2818 drivers/net/{ => ethernet/broadcom}/b44.c | 2 +-
2819 drivers/net/{ => ethernet/broadcom}/b44.h | 0
2820 drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c | 2 +-
2821 drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h | 0
2822 drivers/net/{ => ethernet/broadcom}/bnx2.c | 10 +-
2823 drivers/net/{ => ethernet/broadcom}/bnx2.h | 0
2824 drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0
2825 drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile | 0
2826 drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 67 +-
2827 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 53 +-
2828 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 10 +-
2829 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 5 +-
2830 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0
2831 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h | 0
2832 .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c | 23 +-
2833 .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h | 0
2834 .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0
2835 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 2 +
2836 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h | 0
2837 .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h | 0
2838 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c | 154 +-
2839 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h | 0
2840 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c | 79 +-
2841 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0
2842 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c | 67 +-
2843 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h | 0
2844 .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c | 46 +-
2845 .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h | 0
2846 drivers/net/{ => ethernet/broadcom}/cnic.c | 35 +-
2847 drivers/net/{ => ethernet/broadcom}/cnic.h | 4 +-
2848 drivers/net/{ => ethernet/broadcom}/cnic_defs.h | 1 +
2849 drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0
2850 drivers/net/{ => ethernet/broadcom}/sb1250-mac.c | 2 +-
2851 drivers/net/{ => ethernet/broadcom}/tg3.c | 420 +-
2852 drivers/net/{ => ethernet/broadcom}/tg3.h | 3 +
2853 drivers/net/ethernet/brocade/Kconfig | 23 +
2854 drivers/net/ethernet/brocade/Makefile | 5 +
2855 drivers/net/ethernet/brocade/bna/Kconfig | 17 +
2856 drivers/net/{ => ethernet/brocade}/bna/Makefile | 5 +-
2857 drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c | 3 -
2858 drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h | 0
2859 drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h | 0
2860 drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h | 25 +-
2861 .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h | 0
2862 .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h | 28 +-
2863 .../{ => ethernet/brocade}/bna/bfa_defs_status.h | 0
2864 drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c | 405 +-
2865 drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h | 45 +-
2866 .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c | 157 +-
2867 drivers/net/ethernet/brocade/bna/bfa_msgq.c | 669 ++
2868 drivers/net/ethernet/brocade/bna/bfa_msgq.h | 130 +
2869 drivers/net/{ => ethernet/brocade}/bna/bfi.h | 195 +-
2870 drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h | 0
2871 drivers/net/ethernet/brocade/bna/bfi_enet.h | 901 +++
2872 drivers/net/ethernet/brocade/bna/bfi_reg.h | 452 ++
2873 drivers/net/{ => ethernet/brocade}/bna/bna.h | 337 +-
2874 drivers/net/ethernet/brocade/bna/bna_enet.c | 2129 +++++++
2875 drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 413 ++
2876 drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 3787 ++++++++++++
2877 drivers/net/{ => ethernet/brocade}/bna/bna_types.h | 654 +--
2878 drivers/net/{ => ethernet/brocade}/bna/bnad.c | 652 ++-
2879 drivers/net/{ => ethernet/brocade}/bna/bnad.h | 38 +-
2880 .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c | 384 +--
2881 drivers/net/{ => ethernet/brocade}/bna/cna.h | 31 +-
2882 drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c | 0
2883 drivers/net/ethernet/cadence/Kconfig | 44 +
2884 drivers/net/ethernet/cadence/Makefile | 6 +
2885 drivers/net/{arm => ethernet/cadence}/at91_ether.c | 2 +-
2886 drivers/net/{arm => ethernet/cadence}/at91_ether.h | 0
2887 drivers/net/{ => ethernet/cadence}/macb.c | 2 +-
2888 drivers/net/{ => ethernet/cadence}/macb.h | 0
2889 drivers/net/ethernet/chelsio/Kconfig | 107 +
2890 drivers/net/ethernet/chelsio/Makefile | 8 +
2891 .../{chelsio => ethernet/chelsio/cxgb}/Makefile | 0
2892 .../{chelsio => ethernet/chelsio/cxgb}/common.h | 0
2893 .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0
2894 .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h | 0
2895 .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c | 2 +-
2896 .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h | 0
2897 .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c | 0
2898 .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h | 0
2899 .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h | 0
2900 .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0
2901 .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c | 0
2902 .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h | 0
2903 .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c | 0
2904 .../{chelsio => ethernet/chelsio/cxgb}/my3126.c | 0
2905 .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c | 0
2906 .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h | 0
2907 .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c | 0
2908 .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h | 0
2909 .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c | 0
2910 .../chelsio/cxgb}/suni1x10gexp_regs.h | 0
2911 .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c | 0
2912 .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h | 0
2913 .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c | 0
2914 .../chelsio/cxgb}/vsc7326_reg.h | 0
2915 drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile | 0
2916 drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h | 0
2917 drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c | 0
2918 drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0
2919 drivers/net/{ => ethernet/chelsio}/cxgb3/common.h | 0
2920 .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h | 0
2921 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0
2922 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h | 0
2923 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 2 +-
2924 .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c | 0
2925 .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h | 0
2926 .../chelsio}/cxgb3/firmware_exports.h | 0
2927 drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0
2928 drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0
2929 drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0
2930 drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h | 0
2931 drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c | 0
2932 .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0
2933 drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0
2934 drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0
2935 drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0
2936 drivers/net/{ => ethernet/chelsio}/cxgb3/version.h | 0
2937 drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0
2938 drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0
2939 drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile | 0
2940 drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0
2941 .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 3 +
2942 .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0
2943 drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0
2944 drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0
2945 drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c | 0
2946 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0
2947 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0
2948 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0
2949 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0
2950 .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0
2951 .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile | 0
2952 .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0
2953 .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c | 2 +
2954 drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0
2955 .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h | 0
2956 .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h | 0
2957 .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0
2958 drivers/net/ethernet/cirrus/Kconfig | 29 +
2959 drivers/net/ethernet/cirrus/Makefile | 5 +
2960 drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c | 0
2961 drivers/net/ethernet/cisco/Kconfig | 23 +
2962 drivers/net/ethernet/cisco/Makefile | 5 +
2963 drivers/net/ethernet/cisco/enic/Kconfig | 9 +
2964 drivers/net/{ => ethernet/cisco}/enic/Makefile | 0
2965 drivers/net/{ => ethernet/cisco}/enic/cq_desc.h | 0
2966 .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h | 0
2967 drivers/net/{ => ethernet/cisco}/enic/enic.h | 0
2968 drivers/net/{ => ethernet/cisco}/enic/enic_dev.c | 0
2969 drivers/net/{ => ethernet/cisco}/enic/enic_dev.h | 0
2970 drivers/net/{ => ethernet/cisco}/enic/enic_main.c | 19 +-
2971 drivers/net/{ => ethernet/cisco}/enic/enic_pp.c | 0
2972 drivers/net/{ => ethernet/cisco}/enic/enic_pp.h | 0
2973 drivers/net/{ => ethernet/cisco}/enic/enic_res.c | 0
2974 drivers/net/{ => ethernet/cisco}/enic/enic_res.h | 0
2975 .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h | 0
2976 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c | 0
2977 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h | 0
2978 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c | 0
2979 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h | 0
2980 .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h | 0
2981 drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h | 0
2982 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c | 0
2983 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h | 0
2984 drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h | 0
2985 .../net/{ => ethernet/cisco}/enic/vnic_resource.h | 0
2986 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c | 0
2987 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h | 0
2988 drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h | 0
2989 drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h | 0
2990 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c | 0
2991 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h | 0
2992 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c | 0
2993 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h | 0
2994 .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h | 0
2995 drivers/net/ethernet/davicom/Kconfig | 23 +
2996 drivers/net/ethernet/davicom/Makefile | 5 +
2997 drivers/net/{ => ethernet/davicom}/dm9000.c | 13 +-
2998 drivers/net/{ => ethernet/davicom}/dm9000.h | 0
2999 drivers/net/ethernet/dec/Kconfig | 37 +
3000 drivers/net/ethernet/dec/Makefile | 6 +
3001 drivers/net/{ => ethernet/dec}/ewrk3.c | 2 +-
3002 drivers/net/{ => ethernet/dec}/ewrk3.h | 0
3003 drivers/net/{ => ethernet/dec}/tulip/21142.c | 0
3004 drivers/net/{ => ethernet/dec}/tulip/Kconfig | 20 +-
3005 drivers/net/{ => ethernet/dec}/tulip/Makefile | 0
3006 drivers/net/{ => ethernet/dec}/tulip/de2104x.c | 2 +-
3007 drivers/net/{ => ethernet/dec}/tulip/de4x5.c | 2 +-
3008 drivers/net/{ => ethernet/dec}/tulip/de4x5.h | 0
3009 drivers/net/{ => ethernet/dec}/tulip/dmfe.c | 2 +-
3010 drivers/net/{ => ethernet/dec}/tulip/eeprom.c | 0
3011 drivers/net/{ => ethernet/dec}/tulip/interrupt.c | 0
3012 drivers/net/{ => ethernet/dec}/tulip/media.c | 0
3013 drivers/net/{ => ethernet/dec}/tulip/pnic.c | 0
3014 drivers/net/{ => ethernet/dec}/tulip/pnic2.c | 0
3015 drivers/net/{ => ethernet/dec}/tulip/timer.c | 0
3016 drivers/net/{ => ethernet/dec}/tulip/tulip.h | 0
3017 drivers/net/{ => ethernet/dec}/tulip/tulip_core.c | 2 +-
3018 drivers/net/{ => ethernet/dec}/tulip/uli526x.c | 2 +-
3019 drivers/net/{ => ethernet/dec}/tulip/winbond-840.c | 2 +-
3020 drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c | 0
3021 drivers/net/ethernet/dlink/Kconfig | 85 +
3022 drivers/net/ethernet/dlink/Makefile | 8 +
3023 drivers/net/{ => ethernet/dlink}/de600.c | 0
3024 drivers/net/{ => ethernet/dlink}/de600.h | 0
3025 drivers/net/{ => ethernet/dlink}/de620.c | 2 +-
3026 drivers/net/{ => ethernet/dlink}/de620.h | 0
3027 drivers/net/{ => ethernet/dlink}/dl2k.c | 107 +-
3028 drivers/net/{ => ethernet/dlink}/dl2k.h | 110 +-
3029 drivers/net/{ => ethernet/dlink}/sundance.c | 2 +-
3030 drivers/net/{ => ethernet}/dnet.c | 0
3031 drivers/net/{ => ethernet}/dnet.h | 0
3032 drivers/net/ethernet/emulex/Kconfig | 23 +
3033 drivers/net/ethernet/emulex/Makefile | 5 +
3034 drivers/net/ethernet/emulex/benet/Kconfig | 6 +
3035 drivers/net/{ => ethernet/emulex}/benet/Makefile | 0
3036 drivers/net/{ => ethernet/emulex}/benet/be.h | 125 +-
3037 drivers/net/{ => ethernet/emulex}/benet/be_cmds.c | 164 +-
3038 drivers/net/{ => ethernet/emulex}/benet/be_cmds.h | 91 +-
3039 .../net/{ => ethernet/emulex}/benet/be_ethtool.c | 154 +-
3040 drivers/net/{ => ethernet/emulex}/benet/be_hw.h | 21 +-
3041 drivers/net/{ => ethernet/emulex}/benet/be_main.c | 543 +-
3042 drivers/net/{ => ethernet}/ethoc.c | 2 +-
3043 drivers/net/ethernet/faraday/Kconfig | 39 +
3044 drivers/net/ethernet/faraday/Makefile | 6 +
3045 drivers/net/{ => ethernet/faraday}/ftgmac100.c | 0
3046 drivers/net/{ => ethernet/faraday}/ftgmac100.h | 0
3047 drivers/net/{ => ethernet/faraday}/ftmac100.c | 0
3048 drivers/net/{ => ethernet/faraday}/ftmac100.h | 0
3049 drivers/net/{ => ethernet}/fealnx.c | 2 +-
3050 drivers/net/ethernet/freescale/Kconfig | 89 +
3051 drivers/net/ethernet/freescale/Makefile | 18 +
3052 drivers/net/{ => ethernet/freescale}/fec.c | 2 +-
3053 drivers/net/{ => ethernet/freescale}/fec.h | 0
3054 drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c | 2 +-
3055 drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h | 0
3056 .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c | 0
3057 .../net/{ => ethernet/freescale}/fs_enet/Kconfig | 2 +-
3058 .../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
3059 drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
3060 .../freescale}/fs_enet/fs_enet-main.c | 2 +-
3061 .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
3062 .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
3063 .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
3064 .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
3065 .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
3066 .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
3067 drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
3068 drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
3069 drivers/net/{ => ethernet/freescale}/gianfar.c | 12 +-
3070 drivers/net/{ => ethernet/freescale}/gianfar.h | 0
3071 .../net/{ => ethernet/freescale}/gianfar_ethtool.c | 0
3072 drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
3073 .../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
3074 drivers/net/{ => ethernet/freescale}/ucc_geth.c | 12 +-
3075 drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
3076 .../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
3077 drivers/net/ethernet/fujitsu/Kconfig | 54 +
3078 drivers/net/ethernet/fujitsu/Makefile | 7 +
3079 drivers/net/{ => ethernet/fujitsu}/at1700.c | 2 +-
3080 drivers/net/{ => ethernet/fujitsu}/eth16i.c | 2 +-
3081 .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c | 2 +-
3082 drivers/net/ethernet/hp/Kconfig | 32 +
3083 drivers/net/ethernet/hp/Makefile | 5 +
3084 drivers/net/{ => ethernet/hp}/hp100.c | 4 +-
3085 drivers/net/{ => ethernet/hp}/hp100.h | 0
3086 drivers/net/{ => ethernet/i825xx}/3c505.c | 2 +-
3087 drivers/net/{ => ethernet/i825xx}/3c505.h | 0
3088 drivers/net/{ => ethernet/i825xx}/3c507.c | 0
3089 drivers/net/{ => ethernet/i825xx}/3c523.c | 2 +-
3090 drivers/net/{ => ethernet/i825xx}/3c523.h | 0
3091 drivers/net/{ => ethernet/i825xx}/3c527.c | 2 +-
3092 drivers/net/{ => ethernet/i825xx}/3c527.h | 0
3093 drivers/net/{ => ethernet/i825xx}/82596.c | 2 +-
3094 drivers/net/ethernet/i825xx/Kconfig | 183 +
3095 drivers/net/ethernet/i825xx/Makefile | 20 +
3096 drivers/net/{ => ethernet/i825xx}/eepro.c | 2 +-
3097 drivers/net/{ => ethernet/i825xx}/eexpress.c | 2 +-
3098 drivers/net/{ => ethernet/i825xx}/eexpress.h | 0
3099 drivers/net/{arm => ethernet/i825xx}/ether1.c | 2 +-
3100 drivers/net/{arm => ethernet/i825xx}/ether1.h | 0
3101 drivers/net/{ => ethernet/i825xx}/lasi_82596.c | 0
3102 drivers/net/{ => ethernet/i825xx}/lib82596.c | 2 +-
3103 drivers/net/{ => ethernet/i825xx}/lp486e.c | 2 +-
3104 drivers/net/{ => ethernet/i825xx}/ni52.c | 2 +-
3105 drivers/net/{ => ethernet/i825xx}/ni52.h | 0
3106 drivers/net/{ => ethernet/i825xx}/sni_82596.c | 0
3107 drivers/net/{ => ethernet/i825xx}/sun3_82586.c | 2 +-
3108 drivers/net/{ => ethernet/i825xx}/sun3_82586.h | 0
3109 drivers/net/{ => ethernet/i825xx}/znet.c | 2 +-
3110 drivers/net/ethernet/ibm/Kconfig | 48 +
3111 drivers/net/ethernet/ibm/Makefile | 8 +
3112 drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
3113 drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
3114 drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
3115 drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
3116 drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 2 +-
3117 drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
3118 drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
3119 drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
3120 drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
3121 .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig | 40 +-
3122 drivers/net/ethernet/ibm/emac/Makefile | 11 +
3123 .../net/{ibm_newemac => ethernet/ibm/emac}/core.c | 16 +-
3124 .../net/{ibm_newemac => ethernet/ibm/emac}/core.h | 16 +-
3125 .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c | 0
3126 .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h | 2 +-
3127 .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h | 0
3128 .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c | 6 +-
3129 .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h | 4 +-
3130 .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c | 0
3131 .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h | 0
3132 .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c | 0
3133 .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h | 4 +-
3134 .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c | 0
3135 .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h | 4 +-
3136 .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c | 0
3137 .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h | 4 +-
3138 drivers/net/{ => ethernet/ibm}/ibmveth.c | 2 +-
3139 drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
3140 drivers/net/{ => ethernet/ibm}/iseries_veth.c | 2 +-
3141 drivers/net/ethernet/icplus/Kconfig | 13 +
3142 drivers/net/ethernet/icplus/Makefile | 5 +
3143 drivers/net/{ => ethernet/icplus}/ipg.c | 199 +-
3144 drivers/net/{ => ethernet/icplus}/ipg.h | 0
3145 drivers/net/ethernet/intel/Kconfig | 221 +
3146 drivers/net/ethernet/intel/Makefile | 12 +
3147 drivers/net/{ => ethernet/intel}/e100.c | 2 +-
3148 drivers/net/{ => ethernet/intel}/e1000/Makefile | 0
3149 drivers/net/{ => ethernet/intel}/e1000/e1000.h | 2 +
3150 .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c | 0
3151 drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c | 0
3152 drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h | 0
3153 .../net/{ => ethernet/intel}/e1000/e1000_main.c | 36 +-
3154 .../net/{ => ethernet/intel}/e1000/e1000_osdep.h | 0
3155 .../net/{ => ethernet/intel}/e1000/e1000_param.c | 0
3156 .../intel/e1000e/80003es2lan.c} | 1 -
3157 drivers/net/{ => ethernet/intel}/e1000e/82571.c | 5 -
3158 drivers/net/{ => ethernet/intel}/e1000e/Makefile | 2 +-
3159 drivers/net/{ => ethernet/intel}/e1000e/defines.h | 0
3160 drivers/net/{ => ethernet/intel}/e1000e/e1000.h | 6 +-
3161 drivers/net/{ => ethernet/intel}/e1000e/ethtool.c | 97 +-
3162 drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0
3163 drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c | 5 -
3164 drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0
3165 drivers/net/{ => ethernet/intel}/e1000e/netdev.c | 257 +-
3166 drivers/net/{ => ethernet/intel}/e1000e/param.c | 0
3167 drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0
3168 drivers/net/{ => ethernet/intel}/igb/Makefile | 0
3169 drivers/net/{ => ethernet/intel}/igb/e1000_82575.c | 0
3170 drivers/net/{ => ethernet/intel}/igb/e1000_82575.h | 0
3171 .../net/{ => ethernet/intel}/igb/e1000_defines.h | 0
3172 drivers/net/{ => ethernet/intel}/igb/e1000_hw.h | 0
3173 drivers/net/{ => ethernet/intel}/igb/e1000_mac.c | 0
3174 drivers/net/{ => ethernet/intel}/igb/e1000_mac.h | 0
3175 drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c | 0
3176 drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h | 0
3177 drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c | 0
3178 drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h | 0
3179 drivers/net/{ => ethernet/intel}/igb/e1000_phy.c | 0
3180 drivers/net/{ => ethernet/intel}/igb/e1000_phy.h | 0
3181 drivers/net/{ => ethernet/intel}/igb/e1000_regs.h | 0
3182 drivers/net/{ => ethernet/intel}/igb/igb.h | 0
3183 drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c | 0
3184 drivers/net/{ => ethernet/intel}/igb/igb_main.c | 9 +-
3185 drivers/net/{ => ethernet/intel}/igbvf/Makefile | 0
3186 drivers/net/{ => ethernet/intel}/igbvf/defines.h | 0
3187 drivers/net/{ => ethernet/intel}/igbvf/ethtool.c | 0
3188 drivers/net/{ => ethernet/intel}/igbvf/igbvf.h | 0
3189 drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0
3190 drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0
3191 drivers/net/{ => ethernet/intel}/igbvf/netdev.c | 7 +-
3192 drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0
3193 drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0
3194 drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0
3195 drivers/net/{ => ethernet/intel}/ixgb/Makefile | 0
3196 drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 0
3197 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 0
3198 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 0
3199 .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 0
3200 drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 0
3201 drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 0
3202 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0
3203 drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c | 8 +-
3204 drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h | 0
3205 drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c | 0
3206 drivers/net/{ => ethernet/intel}/ixgbe/Makefile | 0
3207 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h | 35 +-
3208 .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 0
3209 .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 87 -
3210 .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c | 9 +-
3211 .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h | 0
3212 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 0
3213 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 0
3214 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c | 0
3215 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h | 0
3216 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c | 4 +-
3217 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h | 0
3218 .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 48 +-
3219 .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c | 10 +-
3220 .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 10 +-
3221 .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0
3222 .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c | 802 ++--
3223 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0
3224 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0
3225 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 0
3226 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0
3227 .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 0
3228 .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 0
3229 .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h | 1 +
3230 .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 0
3231 drivers/net/{ => ethernet/intel}/ixgbevf/Makefile | 0
3232 drivers/net/{ => ethernet/intel}/ixgbevf/defines.h | 0
3233 drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c | 46 -
3234 drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h | 8 +-
3235 .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c | 95 +-
3236 drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c | 0
3237 drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h | 0
3238 drivers/net/{ => ethernet/intel}/ixgbevf/regs.h | 0
3239 drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0
3240 drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0
3241 drivers/net/{ => ethernet}/jme.c | 2 +-
3242 drivers/net/{ => ethernet}/jme.h | 0
3243 drivers/net/{ => ethernet}/korina.c | 3 +-
3244 drivers/net/{ => ethernet}/lantiq_etop.c | 2 +-
3245 drivers/net/ethernet/marvell/Kconfig | 111 +
3246 drivers/net/ethernet/marvell/Makefile | 8 +
3247 drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 2 +
3248 drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0
3249 drivers/net/{ => ethernet/marvell}/skge.c | 2 +-
3250 drivers/net/{ => ethernet/marvell}/skge.h | 0
3251 drivers/net/{ => ethernet/marvell}/sky2.c | 4 +-
3252 drivers/net/{ => ethernet/marvell}/sky2.h | 0
3253 drivers/net/ethernet/mellanox/Kconfig | 23 +
3254 drivers/net/ethernet/mellanox/Makefile | 5 +
3255 drivers/net/ethernet/mellanox/mlx4/Kconfig | 27 +
3256 drivers/net/{ => ethernet/mellanox}/mlx4/Makefile | 0
3257 drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c | 0
3258 drivers/net/{ => ethernet/mellanox}/mlx4/catas.c | 0
3259 drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c | 0
3260 drivers/net/{ => ethernet/mellanox}/mlx4/cq.c | 0
3261 drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c | 0
3262 .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c | 0
3263 drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c | 0
3264 .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c | 2 +-
3265 drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c | 0
3266 drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h | 0
3267 .../{ => ethernet/mellanox}/mlx4/en_resources.c | 0
3268 drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c | 0
3269 .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c | 0
3270 drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c | 0
3271 drivers/net/{ => ethernet/mellanox}/mlx4/eq.c | 0
3272 drivers/net/{ => ethernet/mellanox}/mlx4/fw.c | 0
3273 drivers/net/{ => ethernet/mellanox}/mlx4/fw.h | 0
3274 drivers/net/{ => ethernet/mellanox}/mlx4/icm.c | 0
3275 drivers/net/{ => ethernet/mellanox}/mlx4/icm.h | 0
3276 drivers/net/{ => ethernet/mellanox}/mlx4/intf.c | 0
3277 drivers/net/{ => ethernet/mellanox}/mlx4/main.c | 0
3278 drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c | 0
3279 drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h | 0
3280 drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h | 0
3281 drivers/net/{ => ethernet/mellanox}/mlx4/mr.c | 0
3282 drivers/net/{ => ethernet/mellanox}/mlx4/pd.c | 0
3283 drivers/net/{ => ethernet/mellanox}/mlx4/port.c | 0
3284 drivers/net/{ => ethernet/mellanox}/mlx4/profile.c | 0
3285 drivers/net/{ => ethernet/mellanox}/mlx4/qp.c | 0
3286 drivers/net/{ => ethernet/mellanox}/mlx4/reset.c | 0
3287 drivers/net/{ => ethernet/mellanox}/mlx4/sense.c | 0
3288 drivers/net/{ => ethernet/mellanox}/mlx4/srq.c | 0
3289 drivers/net/ethernet/micrel/Kconfig | 65 +
3290 drivers/net/ethernet/micrel/Makefile | 9 +
3291 drivers/net/{arm => ethernet/micrel}/ks8695net.c | 2 +-
3292 drivers/net/{arm => ethernet/micrel}/ks8695net.h | 0
3293 drivers/net/{ => ethernet/micrel}/ks8842.c | 0
3294 drivers/net/{ => ethernet/micrel}/ks8851.c | 0
3295 drivers/net/{ => ethernet/micrel}/ks8851.h | 0
3296 drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
3297 drivers/net/{ => ethernet/micrel}/ksz884x.c | 0
3298 drivers/net/ethernet/microchip/Kconfig | 38 +
3299 drivers/net/ethernet/microchip/Makefile | 5 +
3300 drivers/net/{ => ethernet/microchip}/enc28j60.c | 2 +-
3301 drivers/net/{ => ethernet/microchip}/enc28j60_hw.h | 0
3302 drivers/net/{ => ethernet}/mipsnet.c | 2 +-
3303 drivers/net/ethernet/myricom/Kconfig | 47 +
3304 drivers/net/ethernet/myricom/Makefile | 5 +
3305 .../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
3306 .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 2 +-
3307 .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
3308 .../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
3309 drivers/net/ethernet/natsemi/Kconfig | 83 +
3310 drivers/net/ethernet/natsemi/Makefile | 10 +
3311 drivers/net/{ => ethernet/natsemi}/ibmlana.c | 2 +-
3312 drivers/net/{ => ethernet/natsemi}/ibmlana.h | 0
3313 drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 2 +-
3314 drivers/net/{ => ethernet/natsemi}/macsonic.c | 2 +-
3315 drivers/net/{ => ethernet/natsemi}/natsemi.c | 2 +-
3316 drivers/net/{ => ethernet/natsemi}/ns83820.c | 2 +-
3317 drivers/net/{ => ethernet/natsemi}/sonic.c | 0
3318 drivers/net/{ => ethernet/natsemi}/sonic.h | 0
3319 drivers/net/{ => ethernet/natsemi}/xtsonic.c | 2 +-
3320 drivers/net/ethernet/neterion/Kconfig | 55 +
3321 drivers/net/ethernet/neterion/Makefile | 6 +
3322 drivers/net/{ => ethernet/neterion}/s2io-regs.h | 0
3323 drivers/net/{ => ethernet/neterion}/s2io.c | 2 +-
3324 drivers/net/{ => ethernet/neterion}/s2io.h | 0
3325 drivers/net/{ => ethernet/neterion}/vxge/Makefile | 0
3326 .../net/{ => ethernet/neterion}/vxge/vxge-config.c | 0
3327 .../net/{ => ethernet/neterion}/vxge/vxge-config.h | 0
3328 .../{ => ethernet/neterion}/vxge/vxge-ethtool.c | 0
3329 .../{ => ethernet/neterion}/vxge/vxge-ethtool.h | 0
3330 .../net/{ => ethernet/neterion}/vxge/vxge-main.c | 2 +-
3331 .../net/{ => ethernet/neterion}/vxge/vxge-main.h | 0
3332 .../net/{ => ethernet/neterion}/vxge/vxge-reg.h | 0
3333 .../{ => ethernet/neterion}/vxge/vxge-traffic.c | 0
3334 .../{ => ethernet/neterion}/vxge/vxge-traffic.h | 0
3335 .../{ => ethernet/neterion}/vxge/vxge-version.h | 0
3336 drivers/net/{ => ethernet}/netx-eth.c | 2 +-
3337 drivers/net/ethernet/nuvoton/Kconfig | 30 +
3338 drivers/net/ethernet/nuvoton/Makefile | 5 +
3339 .../net/{arm => ethernet/nuvoton}/w90p910_ether.c | 2 +-
3340 drivers/net/ethernet/nvidia/Kconfig | 32 +
3341 drivers/net/ethernet/nvidia/Makefile | 5 +
3342 drivers/net/{ => ethernet/nvidia}/forcedeth.c | 18 +-
3343 drivers/net/{ => ethernet}/octeon/Kconfig | 6 +-
3344 drivers/net/ethernet/octeon/Makefile | 5 +
3345 drivers/net/{ => ethernet}/octeon/octeon_mgmt.c | 4 +-
3346 drivers/net/ethernet/oki-semi/Kconfig | 23 +
3347 drivers/net/ethernet/oki-semi/Makefile | 5 +
3348 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 20 +
3349 .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile | 0
3350 .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h | 0
3351 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c | 0
3352 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h | 0
3353 .../oki-semi}/pch_gbe/pch_gbe_ethtool.c | 0
3354 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c | 2 +-
3355 .../oki-semi}/pch_gbe/pch_gbe_param.c | 0
3356 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c | 0
3357 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h | 0
3358 drivers/net/ethernet/packetengines/Kconfig | 46 +
3359 drivers/net/ethernet/packetengines/Makefile | 6 +
3360 drivers/net/{ => ethernet/packetengines}/hamachi.c | 2 +-
3361 .../net/{ => ethernet/packetengines}/yellowfin.c | 2 +-
3362 drivers/net/ethernet/pasemi/Kconfig | 30 +
3363 drivers/net/ethernet/pasemi/Makefile | 5 +
3364 drivers/net/{ => ethernet/pasemi}/pasemi_mac.c | 2 +-
3365 drivers/net/{ => ethernet/pasemi}/pasemi_mac.h | 0
3366 .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c | 0
3367 drivers/net/ethernet/qlogic/Kconfig | 54 +
3368 drivers/net/ethernet/qlogic/Makefile | 8 +
3369 drivers/net/{ => ethernet/qlogic}/netxen/Makefile | 0
3370 .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h | 6 +
3371 .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c | 0
3372 .../qlogic}/netxen/netxen_nic_ethtool.c | 0
3373 .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h | 0
3374 .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c | 0
3375 .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h | 0
3376 .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c | 8 +-
3377 .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c | 105 +-
3378 drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 3 +-
3379 drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0
3380 drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile | 0
3381 drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 19 +-
3382 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 116 +-
3383 .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c | 47 +-
3384 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 4 +-
3385 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 4 +-
3386 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c | 21 +-
3387 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c | 166 +-
3388 drivers/net/{ => ethernet/qlogic}/qlge/Makefile | 0
3389 drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0
3390 drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0
3391 .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0
3392 drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c | 2 +-
3393 drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0
3394 drivers/net/ethernet/racal/Kconfig | 33 +
3395 drivers/net/ethernet/racal/Makefile | 5 +
3396 drivers/net/{ => ethernet/racal}/ni5010.c | 2 +-
3397 drivers/net/{ => ethernet/racal}/ni5010.h | 0
3398 drivers/net/ethernet/rdc/Kconfig | 34 +
3399 drivers/net/ethernet/rdc/Makefile | 5 +
3400 drivers/net/{ => ethernet/rdc}/r6040.c | 2 +-
3401 drivers/net/{ => ethernet/realtek}/8139cp.c | 5 +-
3402 drivers/net/{ => ethernet/realtek}/8139too.c | 2 +-
3403 drivers/net/ethernet/realtek/Kconfig | 127 +
3404 drivers/net/ethernet/realtek/Makefile | 9 +
3405 drivers/net/{ => ethernet/realtek}/atp.c | 2 +-
3406 drivers/net/{ => ethernet/realtek}/atp.h | 0
3407 drivers/net/{ => ethernet/realtek}/r8169.c | 2 +-
3408 drivers/net/{ => ethernet/realtek}/sc92031.c | 2 +-
3409 drivers/net/ethernet/renesas/Kconfig | 18 +
3410 drivers/net/ethernet/renesas/Makefile | 5 +
3411 drivers/net/{ => ethernet/renesas}/sh_eth.c | 2 +-
3412 drivers/net/{ => ethernet/renesas}/sh_eth.h | 0
3413 drivers/net/{ => ethernet}/s6gmac.c | 0
3414 drivers/net/ethernet/seeq/Kconfig | 46 +
3415 drivers/net/ethernet/seeq/Makefile | 7 +
3416 drivers/net/{arm => ethernet/seeq}/ether3.c | 2 +-
3417 drivers/net/{arm => ethernet/seeq}/ether3.h | 0
3418 drivers/net/{ => ethernet/seeq}/seeq8005.c | 2 +-
3419 drivers/net/{ => ethernet/seeq}/seeq8005.h | 0
3420 drivers/net/{ => ethernet/seeq}/sgiseeq.c | 2 +-
3421 drivers/net/{ => ethernet/seeq}/sgiseeq.h | 0
3422 drivers/net/{ => ethernet}/sfc/Kconfig | 4 +-
3423 drivers/net/{ => ethernet}/sfc/Makefile | 0
3424 drivers/net/{ => ethernet}/sfc/bitfield.h | 0
3425 drivers/net/{ => ethernet}/sfc/efx.c | 2 +-
3426 drivers/net/{ => ethernet}/sfc/efx.h | 0
3427 drivers/net/{ => ethernet}/sfc/enum.h | 0
3428 drivers/net/{ => ethernet}/sfc/ethtool.c | 0
3429 drivers/net/{ => ethernet}/sfc/falcon.c | 0
3430 drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0
3431 drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0
3432 drivers/net/{ => ethernet}/sfc/filter.c | 0
3433 drivers/net/{ => ethernet}/sfc/filter.h | 0
3434 drivers/net/{ => ethernet}/sfc/io.h | 0
3435 drivers/net/{ => ethernet}/sfc/mac.h | 0
3436 drivers/net/{ => ethernet}/sfc/mcdi.c | 0
3437 drivers/net/{ => ethernet}/sfc/mcdi.h | 0
3438 drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0
3439 drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0
3440 drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0
3441 drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0
3442 drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0
3443 drivers/net/{ => ethernet}/sfc/mtd.c | 0
3444 drivers/net/{ => ethernet}/sfc/net_driver.h | 0
3445 drivers/net/{ => ethernet}/sfc/nic.c | 0
3446 drivers/net/{ => ethernet}/sfc/nic.h | 0
3447 drivers/net/{ => ethernet}/sfc/phy.h | 0
3448 drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0
3449 drivers/net/{ => ethernet}/sfc/regs.h | 0
3450 drivers/net/{ => ethernet}/sfc/rx.c | 0
3451 drivers/net/{ => ethernet}/sfc/selftest.c | 0
3452 drivers/net/{ => ethernet}/sfc/selftest.h | 0
3453 drivers/net/{ => ethernet}/sfc/siena.c | 0
3454 drivers/net/{ => ethernet}/sfc/spi.h | 0
3455 drivers/net/{ => ethernet}/sfc/tenxpress.c | 0
3456 drivers/net/{ => ethernet}/sfc/tx.c | 0
3457 drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0
3458 drivers/net/{ => ethernet}/sfc/workarounds.h | 0
3459 drivers/net/ethernet/sgi/Kconfig | 35 +
3460 drivers/net/ethernet/sgi/Makefile | 6 +
3461 drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 2 +-
3462 drivers/net/{ => ethernet/sgi}/meth.c | 0
3463 drivers/net/{ => ethernet/sgi}/meth.h | 0
3464 drivers/net/ethernet/sis/Kconfig | 51 +
3465 drivers/net/ethernet/sis/Makefile | 6 +
3466 drivers/net/{ => ethernet/sis}/sis190.c | 2 +-
3467 drivers/net/{ => ethernet/sis}/sis900.c | 2 +-
3468 drivers/net/{ => ethernet/sis}/sis900.h | 0
3469 drivers/net/ethernet/smsc/Kconfig | 132 +
3470 drivers/net/ethernet/smsc/Makefile | 11 +
3471 drivers/net/{ => ethernet/smsc}/epic100.c | 2 +-
3472 drivers/net/{ => ethernet/smsc}/smc911x.c | 2 +-
3473 drivers/net/{ => ethernet/smsc}/smc911x.h | 0
3474 drivers/net/{ => ethernet/smsc}/smc9194.c | 2 +-
3475 drivers/net/{ => ethernet/smsc}/smc9194.h | 0
3476 .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c | 2 +-
3477 drivers/net/{ => ethernet/smsc}/smc91x.c | 2 +-
3478 drivers/net/{ => ethernet/smsc}/smc91x.h | 0
3479 drivers/net/{ => ethernet/smsc}/smsc911x.c | 87 +-
3480 drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
3481 drivers/net/{ => ethernet/smsc}/smsc9420.c | 2 +-
3482 drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
3483 drivers/net/ethernet/stmicro/Kconfig | 23 +
3484 drivers/net/ethernet/stmicro/Makefile | 5 +
3485 drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig | 14 +-
3486 drivers/net/{ => ethernet/stmicro}/stmmac/Makefile | 0
3487 drivers/net/{ => ethernet/stmicro}/stmmac/common.h | 0
3488 drivers/net/{ => ethernet/stmicro}/stmmac/descs.h | 0
3489 .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h | 0
3490 .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h | 0
3491 .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c | 0
3492 .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c | 0
3493 .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c | 0
3494 .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c | 0
3495 .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h | 0
3496 .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c | 0
3497 .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c | 0
3498 .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c | 0
3499 drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h | 0
3500 .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c | 0
3501 .../{ => ethernet/stmicro}/stmmac/stmmac_main.c | 13 +-
3502 .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c | 0
3503 .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c | 0
3504 .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h | 0
3505 drivers/net/ethernet/sun/Kconfig | 88 +
3506 drivers/net/ethernet/sun/Makefile | 11 +
3507 drivers/net/{ => ethernet/sun}/cassini.c | 17 +-
3508 drivers/net/{ => ethernet/sun}/cassini.h | 0
3509 drivers/net/{ => ethernet/sun}/niu.c | 5 +-
3510 drivers/net/{ => ethernet/sun}/niu.h | 0
3511 drivers/net/{ => ethernet/sun}/sunbmac.c | 33 +-
3512 drivers/net/{ => ethernet/sun}/sunbmac.h | 17 -
3513 drivers/net/{ => ethernet/sun}/sungem.c | 6 +-
3514 drivers/net/{ => ethernet/sun}/sungem.h | 0
3515 drivers/net/{ => ethernet/sun}/sunhme.c | 2 +-
3516 drivers/net/{ => ethernet/sun}/sunhme.h | 0
3517 drivers/net/{ => ethernet/sun}/sunqe.c | 2 +-
3518 drivers/net/{ => ethernet/sun}/sunqe.h | 0
3519 drivers/net/{ => ethernet/sun}/sunvnet.c | 2 +-
3520 drivers/net/{ => ethernet/sun}/sunvnet.h | 0
3521 drivers/net/ethernet/tehuti/Kconfig | 27 +
3522 drivers/net/ethernet/tehuti/Makefile | 5 +
3523 drivers/net/{ => ethernet/tehuti}/tehuti.c | 2 +-
3524 drivers/net/{ => ethernet/tehuti}/tehuti.h | 0
3525 drivers/net/ethernet/ti/Kconfig | 77 +
3526 drivers/net/ethernet/ti/Makefile | 9 +
3527 drivers/net/{ => ethernet/ti}/cpmac.c | 2 +-
3528 drivers/net/{ => ethernet/ti}/davinci_cpdma.c | 0
3529 drivers/net/{ => ethernet/ti}/davinci_cpdma.h | 0
3530 drivers/net/{ => ethernet/ti}/davinci_emac.c | 2 +-
3531 drivers/net/{ => ethernet/ti}/davinci_mdio.c | 0
3532 drivers/net/{ => ethernet/ti}/tlan.c | 2 +-
3533 drivers/net/{ => ethernet/ti}/tlan.h | 0
3534 drivers/net/ethernet/tile/Kconfig | 15 +
3535 drivers/net/{ => ethernet}/tile/Makefile | 0
3536 drivers/net/{ => ethernet}/tile/tilepro.c | 0
3537 drivers/net/ethernet/toshiba/Kconfig | 57 +
3538 drivers/net/ethernet/toshiba/Makefile | 10 +
3539 drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c | 2 +-
3540 drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h | 0
3541 .../{ => ethernet/toshiba}/ps3_gelic_wireless.c | 2 +-
3542 .../{ => ethernet/toshiba}/ps3_gelic_wireless.h | 0
3543 drivers/net/{ => ethernet/toshiba}/spider_net.c | 6 +-
3544 drivers/net/{ => ethernet/toshiba}/spider_net.h | 2 +-
3545 .../{ => ethernet/toshiba}/spider_net_ethtool.c | 0
3546 drivers/net/{ => ethernet/toshiba}/tc35815.c | 2 +-
3547 drivers/net/ethernet/tundra/Kconfig | 29 +
3548 drivers/net/ethernet/tundra/Makefile | 5 +
3549 drivers/net/{ => ethernet/tundra}/tsi108_eth.c | 2 +-
3550 drivers/net/{ => ethernet/tundra}/tsi108_eth.h | 0
3551 drivers/net/ethernet/via/Kconfig | 57 +
3552 drivers/net/ethernet/via/Makefile | 6 +
3553 drivers/net/{ => ethernet/via}/via-rhine.c | 2 +-
3554 drivers/net/{ => ethernet/via}/via-velocity.c | 148 +-
3555 drivers/net/{ => ethernet/via}/via-velocity.h | 0
3556 drivers/net/ethernet/xilinx/Kconfig | 36 +
3557 drivers/net/ethernet/xilinx/Makefile | 7 +
3558 drivers/net/{ => ethernet/xilinx}/ll_temac.h | 0
3559 drivers/net/{ => ethernet/xilinx}/ll_temac_main.c | 1 -
3560 drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c | 0
3561 .../net/{ => ethernet/xilinx}/xilinx_emaclite.c | 0
3562 drivers/net/ethernet/xircom/Kconfig | 31 +
3563 drivers/net/ethernet/xircom/Makefile | 5 +
3564 .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c | 2 +-
3565 drivers/net/ethernet/xscale/Kconfig | 32 +
3566 drivers/net/ethernet/xscale/Makefile | 6 +
3567 drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig | 2 +-
3568 drivers/net/{ => ethernet/xscale}/ixp2000/Makefile | 0
3569 drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c | 0
3570 drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h | 0
3571 .../net/{ => ethernet/xscale}/ixp2000/enp2611.c | 0
3572 .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c | 0
3573 .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h | 0
3574 .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc | 0
3575 .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode | 0
3576 .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc | 0
3577 .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode | 0
3578 drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c | 0
3579 drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h | 0
3580 .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h | 0
3581 drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c | 0
3582 drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h | 0
3583 drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c | 2 +-
3584 drivers/net/fddi/Kconfig | 77 +
3585 drivers/net/fddi/Makefile | 6 +
3586 drivers/net/{ => fddi}/defxx.c | 2 +-
3587 drivers/net/{ => fddi}/defxx.h | 0
3588 drivers/net/{ => fddi}/skfp/Makefile | 0
3589 drivers/net/{ => fddi}/skfp/cfm.c | 0
3590 drivers/net/{ => fddi}/skfp/drvfbi.c | 0
3591 drivers/net/{ => fddi}/skfp/ecm.c | 0
3592 drivers/net/{ => fddi}/skfp/ess.c | 0
3593 drivers/net/{ => fddi}/skfp/fplustm.c | 0
3594 drivers/net/{ => fddi}/skfp/h/cmtdef.h | 4 +-
3595 drivers/net/{ => fddi}/skfp/h/fddi.h | 0
3596 drivers/net/{ => fddi}/skfp/h/fddimib.h | 0
3597 drivers/net/{ => fddi}/skfp/h/fplustm.h | 0
3598 drivers/net/{ => fddi}/skfp/h/hwmtm.h | 2 +-
3599 drivers/net/{ => fddi}/skfp/h/mbuf.h | 0
3600 drivers/net/{ => fddi}/skfp/h/osdef1st.h | 0
3601 drivers/net/{ => fddi}/skfp/h/sba.h | 4 +-
3602 drivers/net/{ => fddi}/skfp/h/sba_def.h | 0
3603 drivers/net/{ => fddi}/skfp/h/skfbi.h | 0
3604 drivers/net/{ => fddi}/skfp/h/skfbiinc.h | 2 +-
3605 drivers/net/{ => fddi}/skfp/h/smc.h | 14 +-
3606 drivers/net/{ => fddi}/skfp/h/smt.h | 0
3607 drivers/net/{ => fddi}/skfp/h/smt_p.h | 0
3608 drivers/net/{ => fddi}/skfp/h/smtstate.h | 0
3609 drivers/net/{ => fddi}/skfp/h/supern_2.h | 0
3610 drivers/net/{ => fddi}/skfp/h/targethw.h | 6 +-
3611 drivers/net/{ => fddi}/skfp/h/targetos.h | 2 +-
3612 drivers/net/{ => fddi}/skfp/h/types.h | 0
3613 drivers/net/{ => fddi}/skfp/hwmtm.c | 0
3614 drivers/net/{ => fddi}/skfp/hwt.c | 0
3615 drivers/net/{ => fddi}/skfp/pcmplc.c | 0
3616 drivers/net/{ => fddi}/skfp/pmf.c | 0
3617 drivers/net/{ => fddi}/skfp/queue.c | 0
3618 drivers/net/{ => fddi}/skfp/rmt.c | 0
3619 drivers/net/{ => fddi}/skfp/skfddi.c | 2 +-
3620 drivers/net/{ => fddi}/skfp/smt.c | 0
3621 drivers/net/{ => fddi}/skfp/smtdef.c | 0
3622 drivers/net/{ => fddi}/skfp/smtinit.c | 0
3623 drivers/net/{ => fddi}/skfp/smttimer.c | 0
3624 drivers/net/{ => fddi}/skfp/srf.c | 0
3625 drivers/net/hippi/Kconfig | 39 +
3626 drivers/net/hippi/Makefile | 5 +
3627 drivers/net/{ => hippi}/rrunner.c | 0
3628 drivers/net/{ => hippi}/rrunner.h | 0
3629 drivers/net/ibm_newemac/Makefile | 11 -
3630 drivers/net/macvlan.c | 2 +-
3631 drivers/net/octeon/Makefile | 2 -
3632 drivers/net/pci-skeleton.c | 1923 ------
3633 drivers/net/pcmcia/Kconfig | 123 -
3634 drivers/net/pcmcia/Makefile | 16 -
3635 drivers/net/phy/Kconfig | 2 +-
3636 drivers/net/plip/Kconfig | 38 +
3637 drivers/net/plip/Makefile | 5 +
3638 drivers/net/{ => plip}/plip.c | 0
3639 drivers/net/ppp/Kconfig | 175 +
3640 drivers/net/ppp/Makefile | 13 +
3641 drivers/net/{ => ppp}/bsd_comp.c | 0
3642 drivers/net/{ => ppp}/ppp_async.c | 0
3643 drivers/net/{ => ppp}/ppp_deflate.c | 0
3644 drivers/net/{ => ppp}/ppp_generic.c | 0
3645 drivers/net/{ => ppp}/ppp_mppe.c | 0
3646 drivers/net/{ => ppp}/ppp_mppe.h | 0
3647 drivers/net/{ => ppp}/ppp_synctty.c | 0
3648 drivers/net/{ => ppp}/pppoe.c | 0
3649 drivers/net/{ => ppp}/pppox.c | 0
3650 drivers/net/{ => ppp}/pptp.c | 0
3651 drivers/net/slip/Kconfig | 79 +
3652 drivers/net/slip/Makefile | 6 +
3653 drivers/net/{ => slip}/slhc.c | 0
3654 drivers/net/{ => slip}/slip.c | 29 +-
3655 drivers/net/{ => slip}/slip.h | 9 -
3656 drivers/net/sungem_phy.c | 7 +-
3657 drivers/net/tokenring/3c359.c | 2 +-
3658 drivers/net/tokenring/Kconfig | 15 +-
3659 drivers/net/tokenring/Makefile | 21 +-
3660 drivers/net/tokenring/ibmtr.c | 2 +-
3661 drivers/net/{pcmcia => tokenring}/ibmtr_cs.c | 2 +-
3662 drivers/net/tokenring/lanstreamer.c | 2 +-
3663 drivers/net/tokenring/olympic.c | 2 +-
3664 drivers/net/tokenring/smctr.c | 2 +-
3665 drivers/net/tokenring/tms380tr.c | 2 +-
3666 drivers/net/tun.c | 2 +-
3667 drivers/net/usb/asix.c | 6 +-
3668 drivers/net/usb/catc.c | 2 +-
3669 drivers/net/usb/dm9601.c | 2 +-
3670 drivers/net/usb/int51x1.c | 2 +-
3671 drivers/net/usb/kaweth.c | 2 +-
3672 drivers/net/usb/lg-vl600.c | 19 +
3673 drivers/net/usb/mcs7830.c | 2 +-
3674 drivers/net/usb/pegasus.c | 2 +-
3675 drivers/net/usb/rtl8150.c | 2 +-
3676 drivers/net/usb/smsc75xx.c | 2 +-
3677 drivers/net/usb/smsc95xx.c | 2 +-
3678 drivers/net/virtio_net.c | 1 +
3679 drivers/net/vmxnet3/vmxnet3_drv.c | 2 +-
3680 drivers/net/wan/hdlc_ppp.c | 14 +-
3681 drivers/net/wan/sbni.c | 2 +-
3682 drivers/net/wireless/airo.c | 4 +-
3683 drivers/net/wireless/ath/Kconfig | 1 +
3684 drivers/net/wireless/ath/Makefile | 1 +
3685 drivers/net/wireless/ath/ath5k/ahb.c | 4 +-
3686 drivers/net/wireless/ath/ath5k/ani.c | 1 -
3687 drivers/net/wireless/ath/ath5k/ani.h | 4 +
3688 drivers/net/wireless/ath/ath5k/ath5k.h | 98 +-
3689 drivers/net/wireless/ath/ath5k/attach.c | 18 +-
3690 drivers/net/wireless/ath/ath5k/base.c | 31 +-
3691 drivers/net/wireless/ath/ath5k/base.h | 55 +-
3692 drivers/net/wireless/ath/ath5k/caps.c | 2 +-
3693 drivers/net/wireless/ath/ath5k/debug.c | 15 +-
3694 drivers/net/wireless/ath/ath5k/desc.c | 1 -
3695 drivers/net/wireless/ath/ath5k/dma.c | 1 -
3696 drivers/net/wireless/ath/ath5k/eeprom.c | 10 +-
3697 drivers/net/wireless/ath/ath5k/gpio.c | 1 -
3698 drivers/net/wireless/ath/ath5k/initvals.c | 1 -
3699 drivers/net/wireless/ath/ath5k/led.c | 1 -
3700 drivers/net/wireless/ath/ath5k/mac80211-ops.c | 5 +-
3701 drivers/net/wireless/ath/ath5k/pci.c | 4 +-
3702 drivers/net/wireless/ath/ath5k/pcu.c | 5 +-
3703 drivers/net/wireless/ath/ath5k/phy.c | 91 +-
3704 drivers/net/wireless/ath/ath5k/qcu.c | 10 +-
3705 drivers/net/wireless/ath/ath5k/reset.c | 79 +-
3706 drivers/net/wireless/ath/ath5k/rfkill.c | 2 +-
3707 drivers/net/wireless/ath/ath5k/sysfs.c | 1 -
3708 drivers/net/wireless/ath/ath5k/trace.h | 3 +-
3709 drivers/net/wireless/ath/ath6kl/Kconfig | 15 +
3710 drivers/net/wireless/ath/ath6kl/Makefile | 35 +
3711 drivers/net/wireless/ath/ath6kl/bmi.c | 692 +++
3712 drivers/net/wireless/ath/ath6kl/bmi.h | 250 +
3713 drivers/net/wireless/ath/ath6kl/cfg80211.c | 1538 +++++
3714 drivers/net/wireless/ath/ath6kl/cfg80211.h | 39 +
3715 drivers/net/wireless/ath/ath6kl/common.h | 180 +
3716 drivers/net/wireless/ath/ath6kl/core.h | 544 ++
3717 drivers/net/wireless/ath/ath6kl/debug.c | 150 +
3718 drivers/net/wireless/ath/ath6kl/debug.h | 105 +
3719 drivers/net/wireless/ath/ath6kl/hif-ops.h | 72 +
3720 drivers/net/wireless/ath/ath6kl/hif.h | 207 +
3721 drivers/net/wireless/ath/ath6kl/htc.c | 2457 ++++++++
3722 drivers/net/wireless/ath/ath6kl/htc.h | 607 ++
3723 drivers/net/wireless/ath/ath6kl/htc_hif.c | 641 ++
3724 drivers/net/wireless/ath/ath6kl/htc_hif.h | 92 +
3725 drivers/net/wireless/ath/ath6kl/init.c | 1303 ++++
3726 drivers/net/wireless/ath/ath6kl/main.c | 1337 ++++
3727 drivers/net/wireless/ath/ath6kl/node.c | 234 +
3728 drivers/net/wireless/ath/ath6kl/sdio.c | 912 +++
3729 drivers/net/wireless/ath/ath6kl/target.h | 331 +
3730 drivers/net/wireless/ath/ath6kl/txrx.c | 1457 +++++
3731 drivers/net/wireless/ath/ath6kl/wmi.c | 2743 +++++++++
3732 drivers/net/wireless/ath/ath6kl/wmi.h | 2018 ++++++
3733 drivers/net/wireless/ath/ath9k/ahb.c | 2 +-
3734 drivers/net/wireless/ath/ath9k/ar9002_hw.c | 8 +-
3735 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 192 +-
3736 drivers/net/wireless/ath/ath9k/ar9003_calib.c | 15 -
3737 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 150 +-
3738 drivers/net/wireless/ath/ath9k/ar9003_hw.c | 89 +-
3739 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 47 +-
3740 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 8 +-
3741 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 -
3742 .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 1673 +++++
3743 drivers/net/wireless/ath/ath9k/ath9k.h | 10 +-
3744 drivers/net/wireless/ath/ath9k/beacon.c | 18 +-
3745 drivers/net/wireless/ath/ath9k/calib.c | 18 +-
3746 drivers/net/wireless/ath/ath9k/calib.h | 1 +
3747 drivers/net/wireless/ath/ath9k/common.c | 26 +
3748 drivers/net/wireless/ath/ath9k/common.h | 1 +
3749 drivers/net/wireless/ath/ath9k/debug.c | 115 +
3750 drivers/net/wireless/ath/ath9k/eeprom.h | 2 +
3751 drivers/net/wireless/ath/ath9k/eeprom_4k.c | 135 +-
3752 drivers/net/wireless/ath/ath9k/eeprom_9287.c | 122 +-
3753 drivers/net/wireless/ath/ath9k/eeprom_def.c | 150 +-
3754 drivers/net/wireless/ath/ath9k/gpio.c | 2 +
3755 drivers/net/wireless/ath/ath9k/htc.h | 3 -
3756 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 22 +-
3757 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 17 +
3758 drivers/net/wireless/ath/ath9k/hw-ops.h | 8 +-
3759 drivers/net/wireless/ath/ath9k/hw.c | 21 +-
3760 drivers/net/wireless/ath/ath9k/hw.h | 17 +-
3761 drivers/net/wireless/ath/ath9k/init.c | 35 +-
3762 drivers/net/wireless/ath/ath9k/mac.c | 35 +-
3763 drivers/net/wireless/ath/ath9k/mac.h | 2 +-
3764 drivers/net/wireless/ath/ath9k/main.c | 64 +-
3765 drivers/net/wireless/ath/ath9k/pci.c | 52 +-
3766 drivers/net/wireless/ath/ath9k/rc.c | 38 +-
3767 drivers/net/wireless/ath/ath9k/rc.h | 6 -
3768 drivers/net/wireless/ath/ath9k/recv.c | 22 +-
3769 drivers/net/wireless/ath/ath9k/reg.h | 14 +
3770 drivers/net/wireless/ath/ath9k/xmit.c | 56 +-
3771 drivers/net/wireless/ath/carl9170/Kconfig | 14 +
3772 drivers/net/wireless/ath/carl9170/carl9170.h | 24 +
3773 drivers/net/wireless/ath/carl9170/cmd.c | 34 +
3774 drivers/net/wireless/ath/carl9170/cmd.h | 1 +
3775 drivers/net/wireless/ath/carl9170/fw.c | 3 +
3776 drivers/net/wireless/ath/carl9170/fwcmd.h | 11 +
3777 drivers/net/wireless/ath/carl9170/main.c | 229 +-
3778 drivers/net/wireless/ath/carl9170/phy.c | 16 +-
3779 drivers/net/wireless/ath/carl9170/version.h | 4 +-
3780 drivers/net/wireless/ath/regd.h | 2 +-
3781 drivers/net/wireless/ath/regd_common.h | 2 +-
3782 drivers/net/wireless/b43/Kconfig | 16 +-
3783 drivers/net/wireless/b43/b43.h | 23 +-
3784 drivers/net/wireless/b43/dma.c | 126 +-
3785 drivers/net/wireless/b43/dma.h | 13 +-
3786 drivers/net/wireless/b43/main.c | 68 +-
3787 drivers/net/wireless/b43/phy_common.c | 32 +
3788 drivers/net/wireless/b43/phy_common.h | 2 +
3789 drivers/net/wireless/b43/phy_ht.c | 203 +
3790 drivers/net/wireless/b43/phy_ht.h | 19 +
3791 drivers/net/wireless/b43/phy_lcn.c | 211 +-
3792 drivers/net/wireless/b43/phy_lcn.h | 16 +-
3793 drivers/net/wireless/b43/phy_n.c | 40 +-
3794 drivers/net/wireless/b43/pio.c | 12 +-
3795 drivers/net/wireless/b43/tables_phy_ht.c | 84 +
3796 drivers/net/wireless/b43/tables_phy_ht.h | 4 +
3797 drivers/net/wireless/b43/tables_phy_lcn.c | 432 ++
3798 drivers/net/wireless/b43/tables_phy_lcn.h | 16 +
3799 drivers/net/wireless/b43/xmit.c | 120 +-
3800 drivers/net/wireless/b43/xmit.h | 62 +-
3801 drivers/net/wireless/b43legacy/b43legacy.h | 5 -
3802 drivers/net/wireless/b43legacy/dma.c | 374 +-
3803 drivers/net/wireless/b43legacy/dma.h | 107 -
3804 drivers/net/wireless/b43legacy/main.c | 8 +-
3805 drivers/net/wireless/hostap/hostap_main.c | 6 +-
3806 drivers/net/wireless/ipw2x00/ipw2200.c | 3 +-
3807 drivers/net/wireless/iwlegacy/iwl-3945-led.c | 1 -
3808 drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 1 -
3809 drivers/net/wireless/iwlegacy/iwl-3945.c | 1 -
3810 drivers/net/wireless/iwlegacy/iwl-4965-led.c | 1 -
3811 drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 1 -
3812 drivers/net/wireless/iwlegacy/iwl-4965.c | 1 -
3813 drivers/net/wireless/iwlegacy/iwl-led.c | 1 -
3814 drivers/net/wireless/iwlegacy/iwl3945-base.c | 1 -
3815 drivers/net/wireless/iwlegacy/iwl4965-base.c | 1 -
3816 drivers/net/wireless/iwlwifi/Kconfig | 17 -
3817 drivers/net/wireless/iwlwifi/iwl-1000.c | 16 +-
3818 drivers/net/wireless/iwlwifi/iwl-2000.c | 24 +-
3819 drivers/net/wireless/iwlwifi/iwl-5000.c | 13 +-
3820 drivers/net/wireless/iwlwifi/iwl-6000.c | 20 +-
3821 drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 69 +-
3822 drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +-
3823 drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 47 +-
3824 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 1 -
3825 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 23 +-
3826 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 30 +-
3827 drivers/net/wireless/iwlwifi/iwl-agn.c | 388 +-
3828 drivers/net/wireless/iwlwifi/iwl-agn.h | 1 +
3829 drivers/net/wireless/iwlwifi/iwl-commands.h | 34 +-
3830 drivers/net/wireless/iwlwifi/iwl-core.c | 5 +
3831 drivers/net/wireless/iwlwifi/iwl-core.h | 5 +
3832 drivers/net/wireless/iwlwifi/iwl-dev.h | 29 +-
3833 drivers/net/wireless/iwlwifi/iwl-led.c | 1 -
3834 drivers/net/wireless/iwlwifi/iwl-scan.c | 19 +-
3835 drivers/net/wireless/iwlwifi/iwl-trans.c | 10 +-
3836 drivers/net/wireless/libertas/README | 25 -
3837 drivers/net/wireless/libertas/cfg.c | 69 +-
3838 drivers/net/wireless/libertas/cfg.h | 1 +
3839 drivers/net/wireless/libertas/cmd.c | 6 +-
3840 drivers/net/wireless/libertas/decl.h | 4 +
3841 drivers/net/wireless/libertas/dev.h | 28 +-
3842 drivers/net/wireless/libertas/ethtool.c | 1 +
3843 drivers/net/wireless/libertas/if_sdio.c | 277 +-
3844 drivers/net/wireless/libertas/if_spi.c | 4 -
3845 drivers/net/wireless/libertas/if_usb.c | 13 +-
3846 drivers/net/wireless/libertas/main.c | 182 +-
3847 drivers/net/wireless/libertas/mesh.c | 79 +-
3848 drivers/net/wireless/libertas/mesh.h | 27 +-
3849 drivers/net/wireless/libertas/rx.c | 1 +
3850 drivers/net/wireless/libertas/tx.c | 1 +
3851 drivers/net/wireless/mac80211_hwsim.c | 6 +
3852 drivers/net/wireless/mwifiex/cfg80211.c | 209 +-
3853 drivers/net/wireless/mwifiex/fw.h | 15 +-
3854 drivers/net/wireless/mwifiex/init.c | 21 -
3855 drivers/net/wireless/mwifiex/ioctl.h | 5 +-
3856 drivers/net/wireless/mwifiex/join.c | 32 -
3857 drivers/net/wireless/mwifiex/main.c | 6 +-
3858 drivers/net/wireless/mwifiex/main.h | 55 +-
3859 drivers/net/wireless/mwifiex/scan.c | 1578 +----
3860 drivers/net/wireless/mwifiex/sta_event.c | 9 +-
3861 drivers/net/wireless/mwifiex/sta_ioctl.c | 230 +-
3862 drivers/net/wireless/mwl8k.c | 3 -
3863 drivers/net/wireless/orinoco/main.c | 2 +-
3864 drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
3865 drivers/net/wireless/orinoco/wext.c | 1 +
3866 drivers/net/wireless/p54/eeprom.c | 26 +-
3867 drivers/net/wireless/p54/fwio.c | 2 +
3868 drivers/net/wireless/p54/main.c | 113 +-
3869 drivers/net/wireless/p54/p54.h | 18 +
3870 drivers/net/wireless/p54/txrx.c | 66 +
3871 drivers/net/wireless/ray_cs.c | 2 +-
3872 drivers/net/wireless/rndis_wlan.c | 4 +-
3873 drivers/net/wireless/rt2x00/rt2400pci.c | 39 +-
3874 drivers/net/wireless/rt2x00/rt2500pci.c | 39 +-
3875 drivers/net/wireless/rt2x00/rt2800pci.c | 46 +-
3876 drivers/net/wireless/rt2x00/rt2x00dev.c | 1 -
3877 drivers/net/wireless/rt2x00/rt61pci.c | 34 +-
3878 drivers/net/wireless/rtlwifi/base.c | 161 +
3879 drivers/net/wireless/rtlwifi/base.h | 2 +
3880 drivers/net/wireless/rtlwifi/debug.c | 6 +-
3881 drivers/net/wireless/rtlwifi/pci.c | 37 +-
3882 drivers/net/wireless/rtlwifi/pci.h | 26 -
3883 drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 139 -
3884 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 30 +-
3885 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 116 +-
3886 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 8 +-
3887 drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 4 +-
3888 drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 8 +-
3889 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 +-
3890 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 28 +-
3891 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 23 +-
3892 drivers/net/wireless/rtlwifi/rtl8192de/def.h | 35 -
3893 drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 30 +-
3894 drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 121 +-
3895 drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 8 +-
3896 drivers/net/wireless/rtlwifi/rtl8192se/def.h | 39 +-
3897 drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 30 +-
3898 drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 124 +-
3899 drivers/net/wireless/rtlwifi/wifi.h | 35 +
3900 drivers/net/wireless/wl1251/cmd.h | 2 +-
3901 drivers/net/wireless/wl1251/wl12xx_80211.h | 2 +-
3902 drivers/net/wireless/wl12xx/cmd.h | 4 +-
3903 drivers/net/wireless/wl12xx/main.c | 2 +-
3904 drivers/net/wireless/wl12xx/scan.h | 6 +-
3905 drivers/net/wireless/wl12xx/wl12xx.h | 4 +-
3906 drivers/net/wireless/wl12xx/wl12xx_80211.h | 2 +-
3907 drivers/net/wireless/zd1201.c | 2 +-
3908 drivers/nfc/pn533.c | 17 +-
3909 drivers/s390/cio/qdio.h | 38 +-
3910 drivers/s390/cio/qdio_debug.c | 3 +
3911 drivers/s390/cio/qdio_main.c | 208 +-
3912 drivers/s390/cio/qdio_setup.c | 83 +-
3913 drivers/s390/cio/qdio_thinint.c | 88 +-
3914 drivers/s390/net/lcs.c | 2 +-
3915 drivers/s390/net/qeth_core.h | 50 +-
3916 drivers/s390/net/qeth_core_main.c | 777 ++-
3917 drivers/s390/net/qeth_l2_main.c | 4 +-
3918 drivers/s390/net/qeth_l3.h | 4 +
3919 drivers/s390/net/qeth_l3_main.c | 92 +-
3920 drivers/s390/net/qeth_l3_sys.c | 110 +-
3921 drivers/scsi/bnx2fc/Kconfig | 3 +-
3922 drivers/scsi/bnx2fc/bnx2fc.h | 4 +-
3923 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
3924 drivers/scsi/bnx2i/Kconfig | 3 +-
3925 drivers/scsi/bnx2i/bnx2i.h | 2 +-
3926 drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +-
3927 drivers/scsi/cxgbi/cxgb3i/Kconfig | 3 +-
3928 drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +-
3929 drivers/scsi/cxgbi/cxgb4i/Kconfig | 3 +-
3930 drivers/scsi/fcoe/fcoe.c | 2 +-
3931 drivers/scsi/fcoe/fcoe_transport.c | 5 +-
3932 drivers/ssb/main.c | 24 +-
3933 drivers/staging/Kconfig | 2 -
3934 drivers/staging/Makefile | 1 -
3935 drivers/staging/ath6kl/Kconfig | 158 -
3936 drivers/staging/ath6kl/Makefile | 122 -
3937 drivers/staging/ath6kl/TODO | 25 -
3938 drivers/staging/ath6kl/bmi/include/bmi_internal.h | 54 -
3939 drivers/staging/ath6kl/bmi/src/bmi.c | 1010 ---
3940 .../staging/ath6kl/hif/common/hif_sdio_common.h | 87 -
3941 .../hif/sdio/linux_sdio/include/hif_internal.h | 131 -
3942 .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 1273 ----
3943 .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 393 --
3944 drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 1479 -----
3945 drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 401 --
3946 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 783 ---
3947 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 755 ---
3948 .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 1284 ----
3949 drivers/staging/ath6kl/htc2/htc.c | 575 --
3950 drivers/staging/ath6kl/htc2/htc_debug.h | 38 -
3951 drivers/staging/ath6kl/htc2/htc_internal.h | 211 -
3952 drivers/staging/ath6kl/htc2/htc_recv.c | 1572 -----
3953 drivers/staging/ath6kl/htc2/htc_send.c | 1018 ---
3954 drivers/staging/ath6kl/htc2/htc_services.c | 450 --
3955 drivers/staging/ath6kl/include/a_config.h | 31 -
3956 drivers/staging/ath6kl/include/a_debug.h | 195 -
3957 drivers/staging/ath6kl/include/a_drv.h | 32 -
3958 drivers/staging/ath6kl/include/a_drv_api.h | 204 -
3959 drivers/staging/ath6kl/include/a_osapi.h | 32 -
3960 drivers/staging/ath6kl/include/aggr_recv_api.h | 140 -
3961 drivers/staging/ath6kl/include/ar3kconfig.h | 65 -
3962 drivers/staging/ath6kl/include/ar6000_api.h | 32 -
3963 drivers/staging/ath6kl/include/ar6000_diag.h | 48 -
3964 drivers/staging/ath6kl/include/ar6kap_common.h | 44 -
3965 drivers/staging/ath6kl/include/athbtfilter.h | 135 -
3966 drivers/staging/ath6kl/include/bmi.h | 134 -
3967 .../ath6kl/include/common/AR6002/AR6K_version.h | 52 -
3968 .../staging/ath6kl/include/common/AR6002/addrs.h | 90 -
3969 .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h | 40 -
3970 .../include/common/AR6002/hw4.0/hw/apb_map.h | 40 -
3971 .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 24 -
3972 .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 552 --
3973 .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h | 471 --
3974 .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h | 589 --
3975 .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 187 -
3976 .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h | 162 -
3977 .../include/common/AR6002/hw4.0/hw/uart_reg.h | 40 -
3978 drivers/staging/ath6kl/include/common/athdefs.h | 75 -
3979 drivers/staging/ath6kl/include/common/bmi_msg.h | 233 -
3980 drivers/staging/ath6kl/include/common/cnxmgmt.h | 36 -
3981 drivers/staging/ath6kl/include/common/dbglog.h | 126 -
3982 drivers/staging/ath6kl/include/common/dbglog_id.h | 558 --
3983 drivers/staging/ath6kl/include/common/discovery.h | 75 -
3984 .../staging/ath6kl/include/common/epping_test.h | 111 -
3985 drivers/staging/ath6kl/include/common/gmboxif.h | 70 -
3986 drivers/staging/ath6kl/include/common/gpio_reg.h | 9 -
3987 drivers/staging/ath6kl/include/common/htc.h | 227 -
3988 .../staging/ath6kl/include/common/htc_services.h | 52 -
3989 drivers/staging/ath6kl/include/common/pkt_log.h | 45 -
3990 drivers/staging/ath6kl/include/common/roaming.h | 41 -
3991 drivers/staging/ath6kl/include/common/targaddrs.h | 395 --
3992 drivers/staging/ath6kl/include/common/testcmd.h | 185 -
3993 drivers/staging/ath6kl/include/common/tlpm.h | 38 -
3994 drivers/staging/ath6kl/include/common/wlan_defs.h | 79 -
3995 drivers/staging/ath6kl/include/common/wmi.h | 3220 ----------
3996 drivers/staging/ath6kl/include/common/wmix.h | 271 -
3997 drivers/staging/ath6kl/include/common_drv.h | 104 -
3998 drivers/staging/ath6kl/include/dbglog_api.h | 52 -
3999 drivers/staging/ath6kl/include/dl_list.h | 153 -
4000 drivers/staging/ath6kl/include/dset_api.h | 65 -
4001 drivers/staging/ath6kl/include/hci_transport_api.h | 259 -
4002 drivers/staging/ath6kl/include/hif.h | 456 --
4003 drivers/staging/ath6kl/include/host_version.h | 52 -
4004 drivers/staging/ath6kl/include/htc_api.h | 575 --
4005 drivers/staging/ath6kl/include/htc_packet.h | 227 -
4006 drivers/staging/ath6kl/include/wlan_api.h | 128 -
4007 drivers/staging/ath6kl/include/wmi_api.h | 441 --
4008 drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 565 --
4009 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 572 --
4010 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 75 -
4011 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 969 ---
4012 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 113 -
4013 drivers/staging/ath6kl/miscdrv/common_drv.c | 910 ---
4014 drivers/staging/ath6kl/miscdrv/credit_dist.c | 417 --
4015 drivers/staging/ath6kl/miscdrv/miscdrv.h | 42 -
4016 drivers/staging/ath6kl/os/linux/ar6000_drv.c | 6267 -------------------
4017 drivers/staging/ath6kl/os/linux/ar6000_pm.c | 626 --
4018 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 455 --
4019 drivers/staging/ath6kl/os/linux/cfg80211.c | 1892 ------
4020 .../staging/ath6kl/os/linux/export_hci_transport.c | 124 -
4021 drivers/staging/ath6kl/os/linux/hci_bridge.c | 1141 ----
4022 .../staging/ath6kl/os/linux/include/ar6000_drv.h | 776 ---
4023 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h | 36 -
4024 .../ath6kl/os/linux/include/ar6xapi_linux.h | 190 -
4025 .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
4026 drivers/staging/ath6kl/os/linux/include/cfg80211.h | 61 -
4027 .../staging/ath6kl/os/linux/include/config_linux.h | 51 -
4028 .../staging/ath6kl/os/linux/include/debug_linux.h | 50 -
4029 .../ath6kl/os/linux/include/export_hci_transport.h | 76 -
4030 .../ath6kl/os/linux/include/ieee80211_ioctl.h | 177 -
4031 .../staging/ath6kl/os/linux/include/osapi_linux.h | 339 -
4032 .../staging/ath6kl/os/linux/include/wlan_config.h | 108 -
4033 .../ath6kl/os/linux/include/wmi_filter_linux.h | 300 -
4034 drivers/staging/ath6kl/os/linux/netbuf.c | 231 -
4035 drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 117 -
4036 drivers/staging/ath6kl/reorder/rcv_aggr.c | 661 --
4037 drivers/staging/ath6kl/wlan/include/ieee80211.h | 397 --
4038 .../staging/ath6kl/wlan/include/ieee80211_node.h | 93 -
4039 drivers/staging/ath6kl/wlan/src/wlan_node.c | 636 --
4040 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 199 -
4041 drivers/staging/ath6kl/wlan/src/wlan_utils.c | 58 -
4042 drivers/staging/ath6kl/wmi/wmi.c | 6444 --------------------
4043 drivers/staging/ath6kl/wmi/wmi_host.h | 102 -
4044 drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 +-
4045 drivers/staging/et131x/et131x_netdev.c | 2 +-
4046 drivers/staging/hv/netvsc_drv.c | 2 +-
4047 drivers/staging/octeon/ethernet.c | 12 +-
4048 drivers/staging/rtl8187se/r8180_core.c | 2 +-
4049 drivers/staging/rtl8192e/r8192E_core.c | 2 +-
4050 drivers/staging/rtl8192u/r8192U_core.c | 2 +-
4051 drivers/staging/slicoss/slicoss.c | 2 +-
4052 drivers/staging/vt6655/device_main.c | 2 +-
4053 drivers/staging/vt6656/main_usb.c | 2 +-
4054 drivers/staging/wlags49_h2/wl_netdev.c | 2 +-
4055 drivers/staging/wlan-ng/p80211netdev.c | 2 +-
4056 drivers/watchdog/bcm47xx_wdt.c | 27 +-
4057 include/linux/atalk.h | 3 +-
4058 include/linux/ax25.h | 2 +-
4059 include/linux/bcma/bcma.h | 9 +-
4060 include/linux/bcma/bcma_driver_chipcommon.h | 85 +
4061 include/linux/bcma/bcma_driver_mips.h | 51 +
4062 include/linux/bcma/bcma_soc.h | 16 +
4063 include/linux/caif/caif_socket.h | 7 +-
4064 include/linux/can.h | 2 +-
4065 include/linux/can/bcm.h | 1 +
4066 include/linux/ethtool.h | 144 +-
4067 include/linux/ieee80211.h | 59 +-
4068 include/linux/if.h | 1 +
4069 include/linux/if_ether.h | 1 +
4070 include/linux/if_packet.h | 119 +
4071 include/linux/if_pppol2tp.h | 2 +-
4072 include/linux/if_pppox.h | 9 +-
4073 include/linux/in.h | 2 +-
4074 include/linux/ipx.h | 2 +-
4075 include/linux/irda.h | 9 +-
4076 include/linux/l2tp.h | 7 +-
4077 include/linux/llc.h | 10 +-
4078 include/linux/netdevice.h | 10 +-
4079 include/linux/netfilter/xt_connlimit.h | 1 +
4080 include/linux/netfilter/xt_conntrack.h | 1 +
4081 include/linux/netfilter/xt_iprange.h | 1 +
4082 include/linux/netfilter_arp/arp_tables.h | 14 +-
4083 include/linux/netfilter_decnet.h | 3 +
4084 include/linux/netfilter_ipv4.h | 3 +
4085 include/linux/netfilter_ipv4/ip_tables.h | 20 +-
4086 include/linux/netfilter_ipv6.h | 3 +
4087 include/linux/netfilter_ipv6/ip6_tables.h | 22 +-
4088 include/linux/netlink.h | 2 +-
4089 include/linux/netrom.h | 2 +
4090 include/linux/nfc.h | 2 +
4091 include/linux/nl80211.h | 93 +-
4092 include/linux/phonet.h | 5 +-
4093 include/linux/rose.h | 7 +-
4094 include/linux/skbuff.h | 181 +-
4095 include/linux/ssb/ssb_regs.h | 40 +
4096 {drivers/net => include/linux}/sungem_phy.h | 2 +-
4097 include/linux/tcp.h | 4 +
4098 include/linux/tipc_config.h | 4 +
4099 include/linux/un.h | 4 +-
4100 include/linux/x25.h | 3 +-
4101 include/net/addrconf.h | 2 +-
4102 include/net/cfg80211-wext.h | 55 +
4103 include/net/cfg80211.h | 287 +-
4104 include/net/dst.h | 9 +-
4105 include/net/if_inet6.h | 1 +
4106 include/net/iucv/af_iucv.h | 52 +
4107 include/net/iucv/iucv.h | 36 +-
4108 include/net/lib80211.h | 3 -
4109 include/net/mac80211.h | 13 +-
4110 include/net/nfc.h | 7 +-
4111 include/net/regulatory.h | 16 +-
4112 include/net/scm.h | 22 +-
4113 include/net/sctp/structs.h | 1 +
4114 include/net/sock.h | 15 +-
4115 net/802/garp.c | 4 +-
4116 net/802/stp.c | 4 +-
4117 net/8021q/vlan.c | 2 +-
4118 net/8021q/vlan_dev.c | 1 -
4119 net/atm/lec.c | 2 +-
4120 net/batman-adv/aggregation.h | 3 +-
4121 net/batman-adv/bat_sysfs.c | 2 +
4122 net/batman-adv/bitarray.c | 6 +-
4123 net/batman-adv/gateway_client.c | 10 +-
4124 net/batman-adv/hard-interface.c | 34 +-
4125 net/batman-adv/hard-interface.h | 1 +
4126 net/batman-adv/hash.h | 25 +-
4127 net/batman-adv/main.c | 2 +-
4128 net/batman-adv/main.h | 6 +-
4129 net/batman-adv/originator.c | 2 +-
4130 net/batman-adv/packet.h | 1 +
4131 net/batman-adv/routing.c | 77 +-
4132 net/batman-adv/send.c | 10 +-
4133 net/batman-adv/soft-interface.c | 13 +-
4134 net/batman-adv/translation-table.c | 199 +-
4135 net/batman-adv/translation-table.h | 21 +-
4136 net/batman-adv/types.h | 5 +-
4137 net/batman-adv/unicast.c | 6 +-
4138 net/batman-adv/unicast.h | 2 +-
4139 net/batman-adv/vis.c | 6 +-
4140 net/bluetooth/bnep/netdev.c | 2 +-
4141 net/bridge/br_device.c | 2 +-
4142 net/bridge/netfilter/ebtable_broute.c | 4 +-
4143 net/caif/cfcnfg.c | 15 +-
4144 net/caif/cfctrl.c | 23 +-
4145 net/caif/cfdbgl.c | 7 +-
4146 net/caif/cfdgml.c | 7 +-
4147 net/caif/cffrml.c | 7 +-
4148 net/caif/cfmuxl.c | 6 +-
4149 net/caif/cfrfml.c | 7 +-
4150 net/caif/cfserl.c | 7 +-
4151 net/caif/cfsrvl.c | 8 +-
4152 net/caif/cfutill.c | 7 +-
4153 net/caif/cfveil.c | 7 +-
4154 net/caif/cfvidl.c | 7 +-
4155 net/can/af_can.c | 4 +-
4156 net/core/datagram.c | 8 +-
4157 net/core/dev.c | 120 +-
4158 net/core/dev_addr_lists.c | 4 +-
4159 net/core/dst.c | 15 +-
4160 net/core/fib_rules.c | 4 +-
4161 net/core/filter.c | 2 +-
4162 net/core/kmap_skb.h | 2 +-
4163 net/core/neighbour.c | 40 +-
4164 net/core/net-sysfs.c | 8 +-
4165 net/core/netpoll.c | 4 +-
4166 net/core/pktgen.c | 3 +-
4167 net/core/rtnetlink.c | 1 -
4168 net/core/skbuff.c | 31 +-
4169 net/core/sock.c | 16 +-
4170 net/core/user_dma.c | 2 +-
4171 net/dccp/ccids/ccid2.c | 84 +-
4172 net/dccp/ccids/ccid2.h | 6 +
4173 net/dccp/dccp.h | 1 +
4174 net/dccp/feat.c | 202 +-
4175 net/dccp/feat.h | 1 +
4176 net/dccp/proto.c | 1 -
4177 net/decnet/dn_dev.c | 6 +-
4178 net/dsa/slave.c | 3 -
4179 net/ieee802154/6lowpan.c | 885 +++
4180 net/ieee802154/6lowpan.h | 212 +
4181 net/ieee802154/Kconfig | 6 +
4182 net/ieee802154/Makefile | 8 +-
4183 net/ipv4/devinet.c | 6 +-
4184 net/ipv4/fib_trie.c | 12 +-
4185 net/ipv4/gre.c | 4 +-
4186 net/ipv4/igmp.c | 12 +-
4187 net/ipv4/inet_lro.c | 2 +-
4188 net/ipv4/ip_output.c | 7 +-
4189 net/ipv4/ipip.c | 10 +-
4190 net/ipv4/ipmr.c | 8 +-
4191 net/ipv4/netfilter/nf_nat_amanda.c | 4 +-
4192 net/ipv4/netfilter/nf_nat_core.c | 24 +-
4193 net/ipv4/netfilter/nf_nat_ftp.c | 4 +-
4194 net/ipv4/netfilter/nf_nat_h323.c | 36 +-
4195 net/ipv4/netfilter/nf_nat_irc.c | 4 +-
4196 net/ipv4/netfilter/nf_nat_pptp.c | 16 +-
4197 net/ipv4/netfilter/nf_nat_sip.c | 28 +-
4198 net/ipv4/netfilter/nf_nat_snmp_basic.c | 4 +-
4199 net/ipv4/netfilter/nf_nat_standalone.c | 6 +-
4200 net/ipv4/netfilter/nf_nat_tftp.c | 4 +-
4201 net/ipv4/route.c | 6 +-
4202 net/ipv4/tcp.c | 3 +-
4203 net/ipv4/tcp_input.c | 58 +-
4204 net/ipv4/tcp_ipv4.c | 6 +-
4205 net/ipv4/tcp_output.c | 9 +-
4206 net/ipv4/udp.c | 11 +-
4207 net/ipv6/addrconf.c | 73 +-
4208 net/ipv6/exthdrs.c | 7 +-
4209 net/ipv6/icmp.c | 25 +-
4210 net/ipv6/inet6_connection_sock.c | 9 +-
4211 net/ipv6/ip6_output.c | 7 +-
4212 net/ipv6/ip6_tunnel.c | 37 +-
4213 net/ipv6/ndisc.c | 31 +-
4214 net/ipv6/raw.c | 8 +-
4215 net/ipv6/sit.c | 12 +-
4216 net/ipv6/tcp_ipv6.c | 6 +-
4217 net/ipv6/udp.c | 4 +-
4218 net/irda/irlan/irlan_eth.c | 2 +-
4219 net/iucv/Kconfig | 14 +-
4220 net/iucv/af_iucv.c | 868 +++-
4221 net/iucv/iucv.c | 23 +
4222 net/mac80211/Kconfig | 13 +
4223 net/mac80211/agg-rx.c | 4 +-
4224 net/mac80211/agg-tx.c | 20 +-
4225 net/mac80211/cfg.c | 66 +-
4226 net/mac80211/debugfs_netdev.c | 8 +-
4227 net/mac80211/driver-ops.h | 31 -
4228 net/mac80211/ibss.c | 6 +-
4229 net/mac80211/ieee80211_i.h | 65 +-
4230 net/mac80211/iface.c | 6 +-
4231 net/mac80211/main.c | 1 +
4232 net/mac80211/mesh.c | 259 +-
4233 net/mac80211/mesh.h | 36 +-
4234 net/mac80211/mesh_hwmp.c | 137 +-
4235 net/mac80211/mesh_pathtbl.c | 309 +-
4236 net/mac80211/mesh_plink.c | 241 +-
4237 net/mac80211/mlme.c | 59 +-
4238 net/mac80211/rc80211_minstrel_ht.c | 8 +-
4239 net/mac80211/rx.c | 48 +-
4240 net/mac80211/sta_info.c | 337 +-
4241 net/mac80211/sta_info.h | 30 +-
4242 net/mac80211/status.c | 21 +-
4243 net/mac80211/tx.c | 34 +-
4244 net/mac80211/util.c | 168 +-
4245 net/netfilter/core.c | 4 +-
4246 net/netfilter/nf_conntrack_core.c | 12 +-
4247 net/netfilter/nf_conntrack_ecache.c | 8 +-
4248 net/netfilter/nf_conntrack_extend.c | 4 +-
4249 net/netfilter/nf_conntrack_helper.c | 6 +-
4250 net/netfilter/nf_conntrack_netlink.c | 6 +-
4251 net/netfilter/nf_log.c | 10 +-
4252 net/netfilter/nf_queue.c | 6 +-
4253 net/netfilter/nfnetlink.c | 6 +-
4254 net/netlabel/netlabel_domainhash.c | 6 +-
4255 net/netlabel/netlabel_unlabeled.c | 6 +-
4256 net/netlink/af_netlink.c | 2 +-
4257 net/nfc/core.c | 6 +-
4258 net/nfc/rawsock.c | 13 +-
4259 net/packet/af_packet.c | 944 +++-
4260 net/phonet/af_phonet.c | 4 +-
4261 net/phonet/pn_dev.c | 6 +-
4262 net/phonet/socket.c | 6 +-
4263 net/sched/sch_sfb.c | 13 +-
4264 net/sctp/associola.c | 1 +
4265 net/sctp/outqueue.c | 4 +
4266 net/sctp/sm_make_chunk.c | 1 +
4267 net/sctp/sm_statefuns.c | 5 +
4269 net/sunrpc/auth_gss/auth_gss.c | 4 +-
4270 net/unix/af_unix.c | 45 +-
4271 net/wireless/lib80211.c | 15 +-
4272 net/wireless/mesh.c | 3 +
4273 net/wireless/nl80211.c | 128 +-
4274 net/wireless/reg.c | 14 +-
4275 net/wireless/scan.c | 1 +
4276 net/wireless/util.c | 168 +
4277 net/wireless/wext-compat.c | 137 +-
4278 net/wireless/wext-compat.h | 8 +
4279 net/wireless/wext-sme.c | 3 +-
4280 net/xfrm/xfrm_ipcomp.c | 11 +-
4281 net/xfrm/xfrm_user.c | 4 +-
4282 1680 files changed, 52661 insertions(+), 77143 deletions(-)
4283 create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
4284 create mode 100644 arch/mips/bcm47xx/Kconfig
4285 create mode 100644 drivers/bcma/driver_mips.c
4286 create mode 100644 drivers/bcma/host_soc.c
4287 rename drivers/net/{pcmcia => arcnet}/com20020_cs.c (100%)
4288 delete mode 100644 drivers/net/arm/Kconfig
4289 delete mode 100644 drivers/net/arm/Makefile
4290 delete mode 100644 drivers/net/benet/Kconfig
4291 delete mode 100644 drivers/net/bna/bfi_ctreg.h
4292 delete mode 100644 drivers/net/bna/bfi_ll.h
4293 delete mode 100644 drivers/net/bna/bna_ctrl.c
4294 delete mode 100644 drivers/net/bna/bna_hw.h
4295 delete mode 100644 drivers/net/bna/bna_txrx.c
4296 rename drivers/net/{ => ethernet/3com}/3c501.c (99%)
4297 rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
4298 rename drivers/net/{ => ethernet/3com}/3c509.c (99%)
4299 rename drivers/net/{ => ethernet/3com}/3c515.c (99%)
4300 rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (99%)
4301 rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (99%)
4302 rename drivers/net/{ => ethernet/3com}/3c59x.c (99%)
4303 create mode 100644 drivers/net/ethernet/3com/Kconfig
4304 create mode 100644 drivers/net/ethernet/3com/Makefile
4305 rename drivers/net/{ => ethernet/3com}/typhoon.c (99%)
4306 rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
4307 rename drivers/net/{ => ethernet/8390}/3c503.c (99%)
4308 rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
4309 rename drivers/net/{ => ethernet/8390}/8390.c (97%)
4310 rename drivers/net/{ => ethernet/8390}/8390.h (100%)
4311 rename drivers/net/{ => ethernet/8390}/8390p.c (97%)
4312 create mode 100644 drivers/net/ethernet/8390/Kconfig
4313 create mode 100644 drivers/net/ethernet/8390/Makefile
4314 rename drivers/net/{ => ethernet/8390}/ac3200.c (99%)
4315 rename drivers/net/{ => ethernet/8390}/apne.c (100%)
4316 rename drivers/net/{ => ethernet/8390}/ax88796.c (99%)
4317 rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
4318 rename drivers/net/{ => ethernet/8390}/e2100.c (99%)
4319 rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
4320 rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
4321 rename drivers/net/{ => ethernet/8390}/hp-plus.c (99%)
4322 rename drivers/net/{ => ethernet/8390}/hp.c (100%)
4323 rename drivers/net/{ => ethernet/8390}/hydra.c (99%)
4324 rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
4325 rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
4326 rename drivers/net/{ => ethernet/8390}/mac8390.c (99%)
4327 rename drivers/net/{ => ethernet/8390}/ne-h8300.c (99%)
4328 rename drivers/net/{ => ethernet/8390}/ne.c (100%)
4329 rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
4330 rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (99%)
4331 rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
4332 rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
4333 rename drivers/net/{ => ethernet/8390}/smc-mca.c (99%)
4334 rename drivers/net/{ => ethernet/8390}/smc-ultra.c (99%)
4335 rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (99%)
4336 rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
4337 rename drivers/net/{ => ethernet/8390}/wd.c (99%)
4338 rename drivers/net/{ => ethernet/8390}/zorro8390.c (99%)
4339 create mode 100644 drivers/net/ethernet/Kconfig
4340 create mode 100644 drivers/net/ethernet/Makefile
4341 create mode 100644 drivers/net/ethernet/adaptec/Kconfig
4342 create mode 100644 drivers/net/ethernet/adaptec/Makefile
4343 rename drivers/net/{ => ethernet/adaptec}/starfire.c (99%)
4344 create mode 100644 drivers/net/ethernet/adi/Kconfig
4345 create mode 100644 drivers/net/ethernet/adi/Makefile
4346 rename drivers/net/{ => ethernet/adi}/bfin_mac.c (99%)
4347 rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
4348 create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
4349 create mode 100644 drivers/net/ethernet/aeroflex/Makefile
4350 rename drivers/net/{ => ethernet/aeroflex}/greth.c (99%)
4351 rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
4352 create mode 100644 drivers/net/ethernet/alteon/Kconfig
4353 create mode 100644 drivers/net/ethernet/alteon/Makefile
4354 rename drivers/net/{ => ethernet/alteon}/acenic.c (99%)
4355 rename drivers/net/{ => ethernet/alteon}/acenic.h (100%)
4356 rename drivers/net/{ => ethernet/amd}/7990.c (100%)
4357 rename drivers/net/{ => ethernet/amd}/7990.h (100%)
4358 create mode 100644 drivers/net/ethernet/amd/Kconfig
4359 create mode 100644 drivers/net/ethernet/amd/Makefile
4360 rename drivers/net/{ => ethernet/amd}/a2065.c (99%)
4361 rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
4362 rename drivers/net/{arm => ethernet/amd}/am79c961a.c (99%)
4363 rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
4364 rename drivers/net/{ => ethernet/amd}/amd8111e.c (99%)
4365 rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
4366 rename drivers/net/{ => ethernet/amd}/ariadne.c (99%)
4367 rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
4368 rename drivers/net/{ => ethernet/amd}/atarilance.c (99%)
4369 rename drivers/net/{ => ethernet/amd}/au1000_eth.c (99%)
4370 rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
4371 rename drivers/net/{ => ethernet/amd}/declance.c (99%)
4372 rename drivers/net/{ => ethernet/amd}/depca.c (99%)
4373 rename drivers/net/{ => ethernet/amd}/depca.h (100%)
4374 rename drivers/net/{ => ethernet/amd}/hplance.c (99%)
4375 rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
4376 rename drivers/net/{ => ethernet/amd}/lance.c (99%)
4377 rename drivers/net/{ => ethernet/amd}/mvme147.c (99%)
4378 rename drivers/net/{ => ethernet/amd}/ni65.c (99%)
4379 rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
4380 rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (99%)
4381 rename drivers/net/{ => ethernet/amd}/pcnet32.c (99%)
4382 rename drivers/net/{ => ethernet/amd}/sun3lance.c (99%)
4383 rename drivers/net/{ => ethernet/amd}/sunlance.c (99%)
4384 create mode 100644 drivers/net/ethernet/apple/Kconfig
4385 create mode 100644 drivers/net/ethernet/apple/Makefile
4386 rename drivers/net/{ => ethernet/apple}/bmac.c (99%)
4387 rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
4388 rename drivers/net/{ => ethernet/apple}/cs89x0.c (99%)
4389 rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
4390 rename drivers/net/{ => ethernet/apple}/mac89x0.c (99%)
4391 rename drivers/net/{ => ethernet/apple}/mace.c (99%)
4392 rename drivers/net/{ => ethernet/apple}/mace.h (100%)
4393 rename drivers/net/{ => ethernet/apple}/macmace.c (99%)
4394 create mode 100644 drivers/net/ethernet/atheros/Kconfig
4395 create mode 100644 drivers/net/ethernet/atheros/Makefile
4396 rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
4397 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
4398 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
4399 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
4400 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
4401 rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (99%)
4402 rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
4403 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
4404 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
4405 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
4406 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
4407 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (99%)
4408 rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
4409 rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
4410 rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (99%)
4411 rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
4412 rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (99%)
4413 rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
4414 rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
4415 rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
4416 create mode 100644 drivers/net/ethernet/broadcom/Kconfig
4417 create mode 100644 drivers/net/ethernet/broadcom/Makefile
4418 rename drivers/net/{ => ethernet/broadcom}/b44.c (99%)
4419 rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
4420 rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (99%)
4421 rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
4422 rename drivers/net/{ => ethernet/broadcom}/bnx2.c (99%)
4423 rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
4424 rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
4425 rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
4426 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (98%)
4427 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (98%)
4428 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (99%)
4429 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (99%)
4430 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
4431 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
4432 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (99%)
4433 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
4434 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
4435 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (99%)
4436 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
4437 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
4438 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (99%)
4439 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
4440 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (99%)
4441 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
4442 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (98%)
4443 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
4444 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (98%)
4445 rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
4446 rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
4447 rename drivers/net/{ => ethernet/broadcom}/cnic.h (99%)
4448 rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (99%)
4449 rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
4450 rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (99%)
4451 rename drivers/net/{ => ethernet/broadcom}/tg3.c (98%)
4452 rename drivers/net/{ => ethernet/broadcom}/tg3.h (99%)
4453 create mode 100644 drivers/net/ethernet/brocade/Kconfig
4454 create mode 100644 drivers/net/ethernet/brocade/Makefile
4455 create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
4456 rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%)
4457 rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (98%)
4458 rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
4459 rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
4460 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (92%)
4461 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
4462 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (89%)
4463 rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
4464 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (87%)
4465 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (88%)
4466 rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (76%)
4467 create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c
4468 create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h
4469 rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (70%)
4470 rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
4471 create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h
4472 create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h
4473 rename drivers/net/{ => ethernet/brocade}/bna/bna.h (67%)
4474 create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c
4475 create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h
4476 create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c
4477 rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%)
4478 rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (85%)
4479 rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (89%)
4480 rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (67%)
4481 rename drivers/net/{ => ethernet/brocade}/bna/cna.h (68%)
4482 rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
4483 create mode 100644 drivers/net/ethernet/cadence/Kconfig
4484 create mode 100644 drivers/net/ethernet/cadence/Makefile
4485 rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (99%)
4486 rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
4487 rename drivers/net/{ => ethernet/cadence}/macb.c (99%)
4488 rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
4489 create mode 100644 drivers/net/ethernet/chelsio/Kconfig
4490 create mode 100644 drivers/net/ethernet/chelsio/Makefile
4491 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
4492 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
4493 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
4494 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
4495 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (99%)
4496 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
4497 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
4498 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
4499 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
4500 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
4501 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
4502 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
4503 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
4504 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
4505 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
4506 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
4507 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%)
4508 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
4509 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
4510 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
4511 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
4512 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
4513 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
4514 rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
4515 rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
4516 rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
4517 rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
4518 rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
4519 rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
4520 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
4521 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
4522 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
4523 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (99%)
4524 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
4525 rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
4526 rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
4527 rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
4528 rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
4529 rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
4530 rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
4531 rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%)
4532 rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
4533 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
4534 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
4535 rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
4536 rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
4537 rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
4538 rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
4539 rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
4540 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
4541 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (99%)
4542 rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
4543 rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
4544 rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
4545 rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
4546 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
4547 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
4548 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
4549 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
4550 rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
4551 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
4552 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
4553 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (99%)
4554 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
4555 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
4556 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
4557 rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
4558 create mode 100644 drivers/net/ethernet/cirrus/Kconfig
4559 create mode 100644 drivers/net/ethernet/cirrus/Makefile
4560 rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
4561 create mode 100644 drivers/net/ethernet/cisco/Kconfig
4562 create mode 100644 drivers/net/ethernet/cisco/Makefile
4563 create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
4564 rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
4565 rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
4566 rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
4567 rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
4568 rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
4569 rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
4570 rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (99%)
4571 rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
4572 rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
4573 rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
4574 rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
4575 rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
4576 rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
4577 rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
4578 rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
4579 rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
4580 rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
4581 rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
4582 rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
4583 rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
4584 rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
4585 rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
4586 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
4587 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
4588 rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
4589 rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
4590 rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
4591 rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
4592 rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
4593 rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
4594 rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
4595 create mode 100644 drivers/net/ethernet/davicom/Kconfig
4596 create mode 100644 drivers/net/ethernet/davicom/Makefile
4597 rename drivers/net/{ => ethernet/davicom}/dm9000.c (99%)
4598 rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
4599 create mode 100644 drivers/net/ethernet/dec/Kconfig
4600 create mode 100644 drivers/net/ethernet/dec/Makefile
4601 rename drivers/net/{ => ethernet/dec}/ewrk3.c (99%)
4602 rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
4603 rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
4604 rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%)
4605 rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
4606 rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (99%)
4607 rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (99%)
4608 rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (100%)
4609 rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (99%)
4610 rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
4611 rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
4612 rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
4613 rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
4614 rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
4615 rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
4616 rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
4617 rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (99%)
4618 rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (99%)
4619 rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (99%)
4620 rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
4621 create mode 100644 drivers/net/ethernet/dlink/Kconfig
4622 create mode 100644 drivers/net/ethernet/dlink/Makefile
4623 rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
4624 rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
4625 rename drivers/net/{ => ethernet/dlink}/de620.c (99%)
4626 rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
4627 rename drivers/net/{ => ethernet/dlink}/dl2k.c (95%)
4628 rename drivers/net/{ => ethernet/dlink}/dl2k.h (81%)
4629 rename drivers/net/{ => ethernet/dlink}/sundance.c (99%)
4630 rename drivers/net/{ => ethernet}/dnet.c (100%)
4631 rename drivers/net/{ => ethernet}/dnet.h (100%)
4632 create mode 100644 drivers/net/ethernet/emulex/Kconfig
4633 create mode 100644 drivers/net/ethernet/emulex/Makefile
4634 create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
4635 rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
4636 rename drivers/net/{ => ethernet/emulex}/benet/be.h (84%)
4637 rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (94%)
4638 rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%)
4639 rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (85%)
4640 rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%)
4641 rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (90%)
4642 rename drivers/net/{ => ethernet}/ethoc.c (99%)
4643 create mode 100644 drivers/net/ethernet/faraday/Kconfig
4644 create mode 100644 drivers/net/ethernet/faraday/Makefile
4645 rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
4646 rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
4647 rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
4648 rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
4649 rename drivers/net/{ => ethernet}/fealnx.c (99%)
4650 create mode 100644 drivers/net/ethernet/freescale/Kconfig
4651 create mode 100644 drivers/net/ethernet/freescale/Makefile
4652 rename drivers/net/{ => ethernet/freescale}/fec.c (99%)
4653 rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
4654 rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (99%)
4655 rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
4656 rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
4657 rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
4658 rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
4659 rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
4660 rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (99%)
4661 rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
4662 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
4663 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
4664 rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
4665 rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
4666 rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
4667 rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
4668 rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
4669 rename drivers/net/{ => ethernet/freescale}/gianfar.c (99%)
4670 rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
4671 rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
4672 rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
4673 rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
4674 rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%)
4675 rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
4676 rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
4677 create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
4678 create mode 100644 drivers/net/ethernet/fujitsu/Makefile
4679 rename drivers/net/{ => ethernet/fujitsu}/at1700.c (99%)
4680 rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (99%)
4681 rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (99%)
4682 create mode 100644 drivers/net/ethernet/hp/Kconfig
4683 create mode 100644 drivers/net/ethernet/hp/Makefile
4684 rename drivers/net/{ => ethernet/hp}/hp100.c (99%)
4685 rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
4686 rename drivers/net/{ => ethernet/i825xx}/3c505.c (99%)
4687 rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
4688 rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
4689 rename drivers/net/{ => ethernet/i825xx}/3c523.c (99%)
4690 rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
4691 rename drivers/net/{ => ethernet/i825xx}/3c527.c (99%)
4692 rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
4693 rename drivers/net/{ => ethernet/i825xx}/82596.c (99%)
4694 create mode 100644 drivers/net/ethernet/i825xx/Kconfig
4695 create mode 100644 drivers/net/ethernet/i825xx/Makefile
4696 rename drivers/net/{ => ethernet/i825xx}/eepro.c (99%)
4697 rename drivers/net/{ => ethernet/i825xx}/eexpress.c (99%)
4698 rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
4699 rename drivers/net/{arm => ethernet/i825xx}/ether1.c (99%)
4700 rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
4701 rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
4702 rename drivers/net/{ => ethernet/i825xx}/lib82596.c (99%)
4703 rename drivers/net/{ => ethernet/i825xx}/lp486e.c (99%)
4704 rename drivers/net/{ => ethernet/i825xx}/ni52.c (99%)
4705 rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
4706 rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
4707 rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (99%)
4708 rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
4709 rename drivers/net/{ => ethernet/i825xx}/znet.c (99%)
4710 create mode 100644 drivers/net/ethernet/ibm/Kconfig
4711 create mode 100644 drivers/net/ethernet/ibm/Makefile
4712 rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
4713 rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
4714 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
4715 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
4716 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (99%)
4717 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
4718 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
4719 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
4720 rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
4721 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
4722 create mode 100644 drivers/net/ethernet/ibm/emac/Makefile
4723 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (99%)
4724 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (97%)
4725 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
4726 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (98%)
4727 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
4728 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (99%)
4729 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (99%)
4730 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
4731 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
4732 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
4733 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (96%)
4734 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
4735 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (97%)
4736 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
4737 rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (96%)
4738 rename drivers/net/{ => ethernet/ibm}/ibmveth.c (99%)
4739 rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
4740 rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (99%)
4741 create mode 100644 drivers/net/ethernet/icplus/Kconfig
4742 create mode 100644 drivers/net/ethernet/icplus/Makefile
4743 rename drivers/net/{ => ethernet/icplus}/ipg.c (92%)
4744 rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
4745 create mode 100644 drivers/net/ethernet/intel/Kconfig
4746 create mode 100644 drivers/net/ethernet/intel/Makefile
4747 rename drivers/net/{ => ethernet/intel}/e100.c (99%)
4748 rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
4749 rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (99%)
4750 rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
4751 rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
4752 rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
4753 rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (99%)
4754 rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
4755 rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
4756 rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (99%)
4757 rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (99%)
4758 rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
4759 rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
4760 rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (99%)
4761 rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (96%)
4762 rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
4763 rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (99%)
4764 rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
4765 rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (96%)
4766 rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
4767 rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
4768 rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
4769 rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
4770 rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
4771 rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
4772 rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
4773 rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%)
4774 rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
4775 rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
4776 rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
4777 rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
4778 rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
4779 rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%)
4780 rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
4781 rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
4782 rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%)
4783 rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%)
4784 rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (99%)
4785 rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
4786 rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
4787 rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
4788 rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
4789 rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
4790 rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
4791 rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (99%)
4792 rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
4793 rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
4794 rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
4795 rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
4796 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%)
4797 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%)
4798 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%)
4799 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%)
4800 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%)
4801 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%)
4802 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
4803 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (99%)
4804 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%)
4805 rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%)
4806 rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
4807 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (96%)
4808 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%)
4809 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (96%)
4810 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (99%)
4811 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%)
4812 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%)
4813 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%)
4814 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%)
4815 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
4816 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (99%)
4817 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%)
4818 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (95%)
4819 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (99%)
4820 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (99%)
4821 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
4822 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (94%)
4823 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
4824 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
4825 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%)
4826 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
4827 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%)
4828 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%)
4829 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (99%)
4830 rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%)
4831 rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
4832 rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
4833 rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (94%)
4834 rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (98%)
4835 rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (97%)
4836 rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
4837 rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
4838 rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
4839 rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
4840 rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
4841 rename drivers/net/{ => ethernet}/jme.c (99%)
4842 rename drivers/net/{ => ethernet}/jme.h (100%)
4843 rename drivers/net/{ => ethernet}/korina.c (99%)
4844 rename drivers/net/{ => ethernet}/lantiq_etop.c (99%)
4845 create mode 100644 drivers/net/ethernet/marvell/Kconfig
4846 create mode 100644 drivers/net/ethernet/marvell/Makefile
4847 rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (99%)
4848 rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
4849 rename drivers/net/{ => ethernet/marvell}/skge.c (99%)
4850 rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
4851 rename drivers/net/{ => ethernet/marvell}/sky2.c (99%)
4852 rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
4853 create mode 100644 drivers/net/ethernet/mellanox/Kconfig
4854 create mode 100644 drivers/net/ethernet/mellanox/Makefile
4855 create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
4856 rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
4857 rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
4858 rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
4859 rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
4860 rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
4861 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
4862 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
4863 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
4864 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (99%)
4865 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
4866 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
4867 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
4868 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
4869 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
4870 rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
4871 rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
4872 rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
4873 rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
4874 rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
4875 rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
4876 rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
4877 rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
4878 rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
4879 rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
4880 rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
4881 rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
4882 rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
4883 rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
4884 rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
4885 rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
4886 rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
4887 rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
4888 rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
4889 create mode 100644 drivers/net/ethernet/micrel/Kconfig
4890 create mode 100644 drivers/net/ethernet/micrel/Makefile
4891 rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (99%)
4892 rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
4893 rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
4894 rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
4895 rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
4896 rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
4897 rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
4898 create mode 100644 drivers/net/ethernet/microchip/Kconfig
4899 create mode 100644 drivers/net/ethernet/microchip/Makefile
4900 rename drivers/net/{ => ethernet/microchip}/enc28j60.c (99%)
4901 rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
4902 rename drivers/net/{ => ethernet}/mipsnet.c (99%)
4903 create mode 100644 drivers/net/ethernet/myricom/Kconfig
4904 create mode 100644 drivers/net/ethernet/myricom/Makefile
4905 rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
4906 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (99%)
4907 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
4908 rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
4909 create mode 100644 drivers/net/ethernet/natsemi/Kconfig
4910 create mode 100644 drivers/net/ethernet/natsemi/Makefile
4911 rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (99%)
4912 rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%)
4913 rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (99%)
4914 rename drivers/net/{ => ethernet/natsemi}/macsonic.c (99%)
4915 rename drivers/net/{ => ethernet/natsemi}/natsemi.c (99%)
4916 rename drivers/net/{ => ethernet/natsemi}/ns83820.c (99%)
4917 rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
4918 rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
4919 rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (99%)
4920 create mode 100644 drivers/net/ethernet/neterion/Kconfig
4921 create mode 100644 drivers/net/ethernet/neterion/Makefile
4922 rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
4923 rename drivers/net/{ => ethernet/neterion}/s2io.c (99%)
4924 rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
4925 rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
4926 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
4927 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
4928 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
4929 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
4930 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (99%)
4931 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
4932 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
4933 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
4934 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
4935 rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
4936 rename drivers/net/{ => ethernet}/netx-eth.c (99%)
4937 create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
4938 create mode 100644 drivers/net/ethernet/nuvoton/Makefile
4939 rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (99%)
4940 create mode 100644 drivers/net/ethernet/nvidia/Kconfig
4941 create mode 100644 drivers/net/ethernet/nvidia/Makefile
4942 rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (99%)
4943 rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
4944 create mode 100644 drivers/net/ethernet/octeon/Makefile
4945 rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (99%)
4946 create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
4947 create mode 100644 drivers/net/ethernet/oki-semi/Makefile
4948 create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
4949 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
4950 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
4951 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
4952 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
4953 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
4954 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (99%)
4955 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
4956 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
4957 rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
4958 create mode 100644 drivers/net/ethernet/packetengines/Kconfig
4959 create mode 100644 drivers/net/ethernet/packetengines/Makefile
4960 rename drivers/net/{ => ethernet/packetengines}/hamachi.c (99%)
4961 rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (99%)
4962 create mode 100644 drivers/net/ethernet/pasemi/Kconfig
4963 create mode 100644 drivers/net/ethernet/pasemi/Makefile
4964 rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (99%)
4965 rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
4966 rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
4967 create mode 100644 drivers/net/ethernet/qlogic/Kconfig
4968 create mode 100644 drivers/net/ethernet/qlogic/Makefile
4969 rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
4970 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%)
4971 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
4972 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
4973 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
4974 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
4975 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
4976 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%)
4977 rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (96%)
4978 rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%)
4979 rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
4980 rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
4981 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (98%)
4982 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (92%)
4983 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (96%)
4984 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (99%)
4985 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%)
4986 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (98%)
4987 rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (96%)
4988 rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
4989 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
4990 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
4991 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
4992 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (99%)
4993 rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
4994 create mode 100644 drivers/net/ethernet/racal/Kconfig
4995 create mode 100644 drivers/net/ethernet/racal/Makefile
4996 rename drivers/net/{ => ethernet/racal}/ni5010.c (99%)
4997 rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
4998 create mode 100644 drivers/net/ethernet/rdc/Kconfig
4999 create mode 100644 drivers/net/ethernet/rdc/Makefile
5000 rename drivers/net/{ => ethernet/rdc}/r6040.c (99%)
5001 rename drivers/net/{ => ethernet/realtek}/8139cp.c (99%)
5002 rename drivers/net/{ => ethernet/realtek}/8139too.c (99%)
5003 create mode 100644 drivers/net/ethernet/realtek/Kconfig
5004 create mode 100644 drivers/net/ethernet/realtek/Makefile
5005 rename drivers/net/{ => ethernet/realtek}/atp.c (99%)
5006 rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
5007 rename drivers/net/{ => ethernet/realtek}/r8169.c (99%)
5008 rename drivers/net/{ => ethernet/realtek}/sc92031.c (99%)
5009 create mode 100644 drivers/net/ethernet/renesas/Kconfig
5010 create mode 100644 drivers/net/ethernet/renesas/Makefile
5011 rename drivers/net/{ => ethernet/renesas}/sh_eth.c (99%)
5012 rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
5013 rename drivers/net/{ => ethernet}/s6gmac.c (100%)
5014 create mode 100644 drivers/net/ethernet/seeq/Kconfig
5015 create mode 100644 drivers/net/ethernet/seeq/Makefile
5016 rename drivers/net/{arm => ethernet/seeq}/ether3.c (99%)
5017 rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
5018 rename drivers/net/{ => ethernet/seeq}/seeq8005.c (99%)
5019 rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
5020 rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (99%)
5021 rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
5022 rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
5023 rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
5024 rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
5025 rename drivers/net/{ => ethernet}/sfc/efx.c (99%)
5026 rename drivers/net/{ => ethernet}/sfc/efx.h (100%)
5027 rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
5028 rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%)
5029 rename drivers/net/{ => ethernet}/sfc/falcon.c (100%)
5030 rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
5031 rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
5032 rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
5033 rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
5034 rename drivers/net/{ => ethernet}/sfc/io.h (100%)
5035 rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
5036 rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
5037 rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
5038 rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
5039 rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
5040 rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
5041 rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
5042 rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
5043 rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
5044 rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
5045 rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
5046 rename drivers/net/{ => ethernet}/sfc/nic.h (100%)
5047 rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
5048 rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
5049 rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
5050 rename drivers/net/{ => ethernet}/sfc/rx.c (100%)
5051 rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
5052 rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
5053 rename drivers/net/{ => ethernet}/sfc/siena.c (100%)
5054 rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
5055 rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
5056 rename drivers/net/{ => ethernet}/sfc/tx.c (100%)
5057 rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
5058 rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
5059 create mode 100644 drivers/net/ethernet/sgi/Kconfig
5060 create mode 100644 drivers/net/ethernet/sgi/Makefile
5061 rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (99%)
5062 rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
5063 rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
5064 create mode 100644 drivers/net/ethernet/sis/Kconfig
5065 create mode 100644 drivers/net/ethernet/sis/Makefile
5066 rename drivers/net/{ => ethernet/sis}/sis190.c (99%)
5067 rename drivers/net/{ => ethernet/sis}/sis900.c (99%)
5068 rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
5069 create mode 100644 drivers/net/ethernet/smsc/Kconfig
5070 create mode 100644 drivers/net/ethernet/smsc/Makefile
5071 rename drivers/net/{ => ethernet/smsc}/epic100.c (99%)
5072 rename drivers/net/{ => ethernet/smsc}/smc911x.c (99%)
5073 rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
5074 rename drivers/net/{ => ethernet/smsc}/smc9194.c (99%)
5075 rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
5076 rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (99%)
5077 rename drivers/net/{ => ethernet/smsc}/smc91x.c (99%)
5078 rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
5079 rename drivers/net/{ => ethernet/smsc}/smsc911x.c (97%)
5080 rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
5081 rename drivers/net/{ => ethernet/smsc}/smsc9420.c (99%)
5082 rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
5083 create mode 100644 drivers/net/ethernet/stmicro/Kconfig
5084 create mode 100644 drivers/net/ethernet/stmicro/Makefile
5085 rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (93%)
5086 rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
5087 rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
5088 rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
5089 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
5090 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
5091 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
5092 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
5093 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
5094 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
5095 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
5096 rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
5097 rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
5098 rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
5099 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
5100 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
5101 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (99%)
5102 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
5103 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
5104 rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
5105 create mode 100644 drivers/net/ethernet/sun/Kconfig
5106 create mode 100644 drivers/net/ethernet/sun/Makefile
5107 rename drivers/net/{ => ethernet/sun}/cassini.c (99%)
5108 rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
5109 rename drivers/net/{ => ethernet/sun}/niu.c (99%)
5110 rename drivers/net/{ => ethernet/sun}/niu.h (100%)
5111 rename drivers/net/{ => ethernet/sun}/sunbmac.c (97%)
5112 rename drivers/net/{ => ethernet/sun}/sunbmac.h (95%)
5113 rename drivers/net/{ => ethernet/sun}/sungem.c (99%)
5114 rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
5115 rename drivers/net/{ => ethernet/sun}/sunhme.c (99%)
5116 rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
5117 rename drivers/net/{ => ethernet/sun}/sunqe.c (99%)
5118 rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
5119 rename drivers/net/{ => ethernet/sun}/sunvnet.c (99%)
5120 rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
5121 create mode 100644 drivers/net/ethernet/tehuti/Kconfig
5122 create mode 100644 drivers/net/ethernet/tehuti/Makefile
5123 rename drivers/net/{ => ethernet/tehuti}/tehuti.c (99%)
5124 rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
5125 create mode 100644 drivers/net/ethernet/ti/Kconfig
5126 create mode 100644 drivers/net/ethernet/ti/Makefile
5127 rename drivers/net/{ => ethernet/ti}/cpmac.c (99%)
5128 rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
5129 rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
5130 rename drivers/net/{ => ethernet/ti}/davinci_emac.c (99%)
5131 rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
5132 rename drivers/net/{ => ethernet/ti}/tlan.c (99%)
5133 rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
5134 create mode 100644 drivers/net/ethernet/tile/Kconfig
5135 rename drivers/net/{ => ethernet}/tile/Makefile (100%)
5136 rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
5137 create mode 100644 drivers/net/ethernet/toshiba/Kconfig
5138 create mode 100644 drivers/net/ethernet/toshiba/Makefile
5139 rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (99%)
5140 rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
5141 rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (99%)
5142 rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
5143 rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%)
5144 rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
5145 rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
5146 rename drivers/net/{ => ethernet/toshiba}/tc35815.c (99%)
5147 create mode 100644 drivers/net/ethernet/tundra/Kconfig
5148 create mode 100644 drivers/net/ethernet/tundra/Makefile
5149 rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (99%)
5150 rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
5151 create mode 100644 drivers/net/ethernet/via/Kconfig
5152 create mode 100644 drivers/net/ethernet/via/Makefile
5153 rename drivers/net/{ => ethernet/via}/via-rhine.c (99%)
5154 rename drivers/net/{ => ethernet/via}/via-velocity.c (97%)
5155 rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
5156 create mode 100644 drivers/net/ethernet/xilinx/Kconfig
5157 create mode 100644 drivers/net/ethernet/xilinx/Makefile
5158 rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
5159 rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (99%)
5160 rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
5161 rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
5162 create mode 100644 drivers/net/ethernet/xircom/Kconfig
5163 create mode 100644 drivers/net/ethernet/xircom/Makefile
5164 rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (99%)
5165 create mode 100644 drivers/net/ethernet/xscale/Kconfig
5166 create mode 100644 drivers/net/ethernet/xscale/Makefile
5167 rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%)
5168 rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
5169 rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
5170 rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
5171 rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
5172 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
5173 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
5174 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
5175 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
5176 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
5177 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
5178 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
5179 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
5180 rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
5181 rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
5182 rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
5183 rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (99%)
5184 create mode 100644 drivers/net/fddi/Kconfig
5185 create mode 100644 drivers/net/fddi/Makefile
5186 rename drivers/net/{ => fddi}/defxx.c (99%)
5187 rename drivers/net/{ => fddi}/defxx.h (100%)
5188 rename drivers/net/{ => fddi}/skfp/Makefile (100%)
5189 rename drivers/net/{ => fddi}/skfp/cfm.c (100%)
5190 rename drivers/net/{ => fddi}/skfp/drvfbi.c (100%)
5191 rename drivers/net/{ => fddi}/skfp/ecm.c (100%)
5192 rename drivers/net/{ => fddi}/skfp/ess.c (100%)
5193 rename drivers/net/{ => fddi}/skfp/fplustm.c (100%)
5194 rename drivers/net/{ => fddi}/skfp/h/cmtdef.h (99%)
5195 rename drivers/net/{ => fddi}/skfp/h/fddi.h (100%)
5196 rename drivers/net/{ => fddi}/skfp/h/fddimib.h (100%)
5197 rename drivers/net/{ => fddi}/skfp/h/fplustm.h (100%)
5198 rename drivers/net/{ => fddi}/skfp/h/hwmtm.h (99%)
5199 rename drivers/net/{ => fddi}/skfp/h/mbuf.h (100%)
5200 rename drivers/net/{ => fddi}/skfp/h/osdef1st.h (100%)
5201 rename drivers/net/{ => fddi}/skfp/h/sba.h (98%)
5202 rename drivers/net/{ => fddi}/skfp/h/sba_def.h (100%)
5203 rename drivers/net/{ => fddi}/skfp/h/skfbi.h (100%)
5204 rename drivers/net/{ => fddi}/skfp/h/skfbiinc.h (99%)
5205 rename drivers/net/{ => fddi}/skfp/h/smc.h (98%)
5206 rename drivers/net/{ => fddi}/skfp/h/smt.h (100%)
5207 rename drivers/net/{ => fddi}/skfp/h/smt_p.h (100%)
5208 rename drivers/net/{ => fddi}/skfp/h/smtstate.h (100%)
5209 rename drivers/net/{ => fddi}/skfp/h/supern_2.h (100%)
5210 rename drivers/net/{ => fddi}/skfp/h/targethw.h (98%)
5211 rename drivers/net/{ => fddi}/skfp/h/targetos.h (99%)
5212 rename drivers/net/{ => fddi}/skfp/h/types.h (100%)
5213 rename drivers/net/{ => fddi}/skfp/hwmtm.c (100%)
5214 rename drivers/net/{ => fddi}/skfp/hwt.c (100%)
5215 rename drivers/net/{ => fddi}/skfp/pcmplc.c (100%)
5216 rename drivers/net/{ => fddi}/skfp/pmf.c (100%)
5217 rename drivers/net/{ => fddi}/skfp/queue.c (100%)
5218 rename drivers/net/{ => fddi}/skfp/rmt.c (100%)
5219 rename drivers/net/{ => fddi}/skfp/skfddi.c (99%)
5220 rename drivers/net/{ => fddi}/skfp/smt.c (100%)
5221 rename drivers/net/{ => fddi}/skfp/smtdef.c (100%)
5222 rename drivers/net/{ => fddi}/skfp/smtinit.c (100%)
5223 rename drivers/net/{ => fddi}/skfp/smttimer.c (100%)
5224 rename drivers/net/{ => fddi}/skfp/srf.c (100%)
5225 create mode 100644 drivers/net/hippi/Kconfig
5226 create mode 100644 drivers/net/hippi/Makefile
5227 rename drivers/net/{ => hippi}/rrunner.c (100%)
5228 rename drivers/net/{ => hippi}/rrunner.h (100%)
5229 delete mode 100644 drivers/net/ibm_newemac/Makefile
5230 delete mode 100644 drivers/net/octeon/Makefile
5231 delete mode 100644 drivers/net/pci-skeleton.c
5232 delete mode 100644 drivers/net/pcmcia/Kconfig
5233 delete mode 100644 drivers/net/pcmcia/Makefile
5234 create mode 100644 drivers/net/plip/Kconfig
5235 create mode 100644 drivers/net/plip/Makefile
5236 rename drivers/net/{ => plip}/plip.c (100%)
5237 create mode 100644 drivers/net/ppp/Kconfig
5238 create mode 100644 drivers/net/ppp/Makefile
5239 rename drivers/net/{ => ppp}/bsd_comp.c (100%)
5240 rename drivers/net/{ => ppp}/ppp_async.c (100%)
5241 rename drivers/net/{ => ppp}/ppp_deflate.c (100%)
5242 rename drivers/net/{ => ppp}/ppp_generic.c (100%)
5243 rename drivers/net/{ => ppp}/ppp_mppe.c (100%)
5244 rename drivers/net/{ => ppp}/ppp_mppe.h (100%)
5245 rename drivers/net/{ => ppp}/ppp_synctty.c (100%)
5246 rename drivers/net/{ => ppp}/pppoe.c (100%)
5247 rename drivers/net/{ => ppp}/pppox.c (100%)
5248 rename drivers/net/{ => ppp}/pptp.c (100%)
5249 create mode 100644 drivers/net/slip/Kconfig
5250 create mode 100644 drivers/net/slip/Makefile
5251 rename drivers/net/{ => slip}/slhc.c (100%)
5252 rename drivers/net/{ => slip}/slip.c (98%)
5253 rename drivers/net/{ => slip}/slip.h (94%)
5254 rename drivers/net/{pcmcia => tokenring}/ibmtr_cs.c (99%)
5255 create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig
5256 create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile
5257 create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c
5258 create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h
5259 create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c
5260 create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h
5261 create mode 100644 drivers/net/wireless/ath/ath6kl/common.h
5262 create mode 100644 drivers/net/wireless/ath/ath6kl/core.h
5263 create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c
5264 create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h
5265 create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h
5266 create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h
5267 create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c
5268 create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h
5269 create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c
5270 create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
5271 create mode 100644 drivers/net/wireless/ath/ath6kl/init.c
5272 create mode 100644 drivers/net/wireless/ath/ath6kl/main.c
5273 create mode 100644 drivers/net/wireless/ath/ath6kl/node.c
5274 create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c
5275 create mode 100644 drivers/net/wireless/ath/ath6kl/target.h
5276 create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c
5277 create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c
5278 create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h
5279 create mode 100644 drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
5280 delete mode 100644 drivers/staging/ath6kl/Kconfig
5281 delete mode 100644 drivers/staging/ath6kl/Makefile
5282 delete mode 100644 drivers/staging/ath6kl/TODO
5283 delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
5284 delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
5285 delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
5286 delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
5287 delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
5288 delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
5289 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
5290 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
5291 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
5292 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
5293 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
5294 delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
5295 delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
5296 delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
5297 delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
5298 delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
5299 delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
5300 delete mode 100644 drivers/staging/ath6kl/include/a_config.h
5301 delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
5302 delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
5303 delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
5304 delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
5305 delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
5306 delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
5307 delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
5308 delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
5309 delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
5310 delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
5311 delete mode 100644 drivers/staging/ath6kl/include/bmi.h
5312 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
5313 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
5314 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
5315 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
5316 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
5317 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
5318 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
5319 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
5320 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
5321 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
5322 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
5323 delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
5324 delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
5325 delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
5326 delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
5327 delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
5328 delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
5329 delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
5330 delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
5331 delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
5332 delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
5333 delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
5334 delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
5335 delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
5336 delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
5337 delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
5338 delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
5339 delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
5340 delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
5341 delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
5342 delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
5343 delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
5344 delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
5345 delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
5346 delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
5347 delete mode 100644 drivers/staging/ath6kl/include/hif.h
5348 delete mode 100644 drivers/staging/ath6kl/include/host_version.h
5349 delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
5350 delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
5351 delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
5352 delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
5353 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
5354 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
5355 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
5356 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
5357 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
5358 delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
5359 delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
5360 delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
5361 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
5362 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
5363 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
5364 delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
5365 delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
5366 delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
5367 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
5368 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
5369 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
5370 delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
5371 delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
5372 delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
5373 delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
5374 delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
5375 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
5376 delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
5377 delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
5378 delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
5379 delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
5380 delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
5381 delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
5382 delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
5383 delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
5384 delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
5385 delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
5386 delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
5387 delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
5388 delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h
5389 create mode 100644 include/linux/bcma/bcma_driver_mips.h
5390 create mode 100644 include/linux/bcma/bcma_soc.h
5391 rename {drivers/net => include/linux}/sungem_phy.h (98%)
5392 create mode 100644 include/net/cfg80211-wext.h
5393 create mode 100644 net/ieee802154/6lowpan.c
5394 create mode 100644 net/ieee802154/6lowpan.h
5395 Merging wireless/master
5396 $ git merge wireless/master
5397 Resolved 'drivers/net/wireless/iwlwifi/iwl-pci.c' using previous resolution.
5398 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
5399 Auto-merging drivers/net/wireless/ath/ath9k/main.c
5400 Auto-merging drivers/net/wireless/b43/dma.c
5401 Auto-merging drivers/net/wireless/iwlwifi/iwl-pci.c
5402 CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-pci.c
5403 Auto-merging drivers/net/wireless/wl12xx/acx.c
5404 Auto-merging drivers/net/wireless/wl12xx/main.c
5405 Auto-merging drivers/net/wireless/wl12xx/sdio.c
5406 Auto-merging include/net/cfg80211.h
5407 Auto-merging net/mac80211/mesh_pathtbl.c
5408 Automatic merge failed; fix conflicts and then commit the result.
5410 [master e5da9b6] Merge remote-tracking branch 'wireless/master'
5411 $ git diff -M --stat --summary HEAD^..
5412 drivers/net/wireless/ath/ath.h | 48 +-
5413 drivers/net/wireless/ath/ath9k/ani.c | 2 +-
5414 drivers/net/wireless/ath/ath9k/ani.h | 5 +-
5415 drivers/net/wireless/ath/ath9k/ar9002_mac.c | 2 +-
5416 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +-
5417 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +-
5418 drivers/net/wireless/ath/ath9k/ath9k.h | 7 +-
5419 drivers/net/wireless/ath/ath9k/debug.c | 312 ++++-
5420 drivers/net/wireless/ath/ath9k/debug.h | 47 +
5421 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1 +
5422 drivers/net/wireless/ath/ath9k/hw.c | 13 +-
5423 drivers/net/wireless/ath/ath9k/hw.h | 2 +-
5424 drivers/net/wireless/ath/ath9k/init.c | 1 +
5425 drivers/net/wireless/ath/ath9k/mac.h | 3 +-
5426 drivers/net/wireless/ath/ath9k/main.c | 2 +
5427 drivers/net/wireless/ath/ath9k/recv.c | 24 +-
5428 drivers/net/wireless/ath/ath9k/reg.h | 2 +
5429 drivers/net/wireless/ath/ath9k/xmit.c | 234 ++--
5430 drivers/net/wireless/ath/main.c | 8 +-
5431 drivers/net/wireless/b43/Kconfig | 6 +-
5432 drivers/net/wireless/b43/dma.c | 31 +-
5433 drivers/net/wireless/b43/dma.h | 3 +-
5434 drivers/net/wireless/b43/main.c | 5 +-
5435 drivers/net/wireless/iwlwifi/iwl-1000.c | 42 +-
5436 drivers/net/wireless/iwlwifi/iwl-2000.c | 51 +-
5437 drivers/net/wireless/iwlwifi/iwl-5000.c | 72 +-
5438 drivers/net/wireless/iwlwifi/iwl-6000.c | 60 +-
5439 drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 43 +-
5440 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 6 +-
5441 drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 13 -
5442 drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 676 +--------
5443 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 93 +-
5444 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 65 +-
5445 drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 84 +-
5446 drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 68 +-
5447 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 913 ++++++------
5448 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 52 +-
5449 drivers/net/wireless/iwlwifi/iwl-agn.c | 938 ++++--------
5450 drivers/net/wireless/iwlwifi/iwl-agn.h | 63 +-
5451 drivers/net/wireless/iwlwifi/iwl-bus.h | 34 +-
5452 drivers/net/wireless/iwlwifi/iwl-commands.h | 6 +-
5453 drivers/net/wireless/iwlwifi/iwl-core.c | 284 ++---
5454 drivers/net/wireless/iwlwifi/iwl-core.h | 118 +--
5455 drivers/net/wireless/iwlwifi/iwl-debug.h | 40 +-
5456 drivers/net/wireless/iwlwifi/iwl-debugfs.c | 412 +-----
5457 drivers/net/wireless/iwlwifi/iwl-dev.h | 329 +----
5458 drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +
5459 drivers/net/wireless/iwlwifi/iwl-eeprom.c | 62 +-
5460 drivers/net/wireless/iwlwifi/iwl-eeprom.h | 1 -
5461 drivers/net/wireless/iwlwifi/iwl-fh.h | 20 +-
5462 drivers/net/wireless/iwlwifi/iwl-helpers.h | 91 +--
5463 drivers/net/wireless/iwlwifi/iwl-io.c | 192 ++--
5464 drivers/net/wireless/iwlwifi/iwl-io.h | 61 +-
5465 drivers/net/wireless/iwlwifi/iwl-led.c | 11 +-
5466 drivers/net/wireless/iwlwifi/iwl-pci.c | 41 +-
5467 drivers/net/wireless/iwlwifi/iwl-pci.h | 116 ++
5468 drivers/net/wireless/iwlwifi/iwl-power.c | 19 +-
5469 drivers/net/wireless/iwlwifi/iwl-prph.h | 4 +-
5470 drivers/net/wireless/iwlwifi/iwl-rx.c | 42 +-
5471 drivers/net/wireless/iwlwifi/iwl-scan.c | 97 +-
5472 drivers/net/wireless/iwlwifi/iwl-shared.h | 430 ++++++
5473 drivers/net/wireless/iwlwifi/iwl-sta.c | 106 +-
5474 drivers/net/wireless/iwlwifi/iwl-sta.h | 4 +-
5475 drivers/net/wireless/iwlwifi/iwl-sv-open.c | 21 +-
5476 drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h | 314 ++++-
5477 drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c | 862 +++++++++---
5478 drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c | 506 +++++--
5479 drivers/net/wireless/iwlwifi/iwl-trans.c | 1615 ++++++++++++++++-----
5480 drivers/net/wireless/iwlwifi/iwl-trans.h | 216 ++-
5481 drivers/net/wireless/p54/p54spi.c | 2 +-
5482 drivers/net/wireless/p54/txrx.c | 12 +-
5483 drivers/net/wireless/wl12xx/acx.c | 322 ++---
5484 drivers/net/wireless/wl12xx/acx.h | 394 ++----
5485 drivers/net/wireless/wl12xx/boot.c | 43 +-
5486 drivers/net/wireless/wl12xx/boot.h | 3 +-
5487 drivers/net/wireless/wl12xx/cmd.c | 793 ++++++++---
5488 drivers/net/wireless/wl12xx/cmd.h | 329 +++--
5489 drivers/net/wireless/wl12xx/conf.h | 352 ++---
5490 drivers/net/wireless/wl12xx/debugfs.c | 17 +-
5491 drivers/net/wireless/wl12xx/event.c | 6 +-
5492 drivers/net/wireless/wl12xx/event.h | 80 +-
5493 drivers/net/wireless/wl12xx/init.c | 91 +-
5494 drivers/net/wireless/wl12xx/io.h | 1 -
5495 drivers/net/wireless/wl12xx/main.c | 961 ++++++++-----
5496 drivers/net/wireless/wl12xx/ps.c | 4 +-
5497 drivers/net/wireless/wl12xx/reg.h | 75 -
5498 drivers/net/wireless/wl12xx/rx.c | 60 +-
5499 drivers/net/wireless/wl12xx/rx.h | 18 +-
5500 drivers/net/wireless/wl12xx/scan.c | 38 +-
5501 drivers/net/wireless/wl12xx/scan.h | 25 +-
5502 drivers/net/wireless/wl12xx/sdio.c | 4 +-
5503 drivers/net/wireless/wl12xx/sdio_test.c | 2 +-
5504 drivers/net/wireless/wl12xx/spi.c | 4 +-
5505 drivers/net/wireless/wl12xx/tx.c | 136 ++-
5506 drivers/net/wireless/wl12xx/tx.h | 16 +-
5507 drivers/net/wireless/wl12xx/wl12xx.h | 153 +-
5508 drivers/net/wireless/wl12xx/wl12xx_80211.h | 25 -
5509 include/net/cfg80211.h | 1 +
5510 net/mac80211/debugfs.c | 14 +-
5511 net/mac80211/mesh_pathtbl.c | 8 +-
5512 100 files changed, 7669 insertions(+), 6377 deletions(-)
5513 create mode 100644 drivers/net/wireless/iwlwifi/iwl-pci.h
5514 create mode 100644 drivers/net/wireless/iwlwifi/iwl-shared.h
5515 Merging bluetooth/master
5516 $ git merge bluetooth/master
5517 Merge made by recursive.
5518 drivers/bluetooth/btusb.c | 3 +-
5519 include/net/bluetooth/hci_core.h | 23 +++-
5520 include/net/bluetooth/l2cap.h | 3 +-
5521 include/net/bluetooth/mgmt.h | 11 ++
5522 net/bluetooth/af_bluetooth.c | 30 ++++-
5523 net/bluetooth/bnep/core.c | 5 +-
5524 net/bluetooth/cmtp/core.c | 5 +-
5525 net/bluetooth/hci_conn.c | 14 +-
5526 net/bluetooth/hci_core.c | 43 +++---
5527 net/bluetooth/hci_event.c | 4 +-
5528 net/bluetooth/hci_sock.c | 18 +++-
5529 net/bluetooth/hidp/core.c | 10 +-
5530 net/bluetooth/l2cap_core.c | 271 ++++++++++++++------------------------
5531 net/bluetooth/mgmt.c | 80 ++++++++++--
5532 net/bluetooth/rfcomm/core.c | 5 +-
5533 net/bluetooth/smp.c | 59 +++++---
5534 16 files changed, 334 insertions(+), 250 deletions(-)
5536 $ git merge mtd/master
5538 Merging l2-mtd/master
5539 $ git merge l2-mtd/master
5540 Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution.
5541 Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
5542 Auto-merging arch/arm/mach-at91/board-cam60.c
5543 Auto-merging arch/arm/mach-at91/board-cap9adk.c
5544 Auto-merging arch/arm/mach-at91/board-kb9202.c
5545 Auto-merging arch/arm/mach-at91/board-neocore926.c
5546 Auto-merging arch/arm/mach-at91/board-qil-a9260.c
5547 Auto-merging arch/arm/mach-at91/board-rm9200dk.c
5548 Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
5549 Auto-merging arch/arm/mach-at91/board-sam9260ek.c
5550 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
5551 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
5552 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
5553 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
5554 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
5555 CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
5556 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
5557 Auto-merging arch/arm/mach-at91/board-yl-9200.c
5558 Auto-merging arch/arm/mach-at91/include/mach/board.h
5559 Auto-merging arch/arm/mach-davinci/board-da830-evm.c
5560 Auto-merging arch/arm/mach-davinci/board-da850-evm.c
5561 Auto-merging arch/arm/mach-davinci/board-dm355-evm.c
5562 Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c
5563 Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
5564 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
5565 Auto-merging arch/arm/mach-davinci/board-mityomapl138.c
5566 Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c
5567 Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c
5568 Auto-merging arch/arm/mach-ep93xx/ts72xx.c
5569 Auto-merging arch/arm/mach-mmp/aspenite.c
5570 Auto-merging arch/arm/mach-orion5x/ts78xx-setup.c
5571 Auto-merging arch/arm/mach-pxa/cm-x300.c
5572 Auto-merging arch/arm/mach-pxa/littleton.c
5573 Auto-merging arch/arm/mach-pxa/raumfeld.c
5574 Auto-merging arch/arm/mach-pxa/zylonite.c
5575 Removing drivers/mtd/maps/ceiva.c
5576 Removing drivers/mtd/maps/edb7312.c
5577 Auto-merging drivers/mtd/maps/lantiq-flash.c
5578 CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
5579 Removing drivers/mtd/nand/edb7312.c
5580 Auto-merging drivers/mtd/onenand/omap2.c
5581 Automatic merge failed; fix conflicts and then commit the result.
5582 $ git rm -f arch/arm/mach-at91/board-usb-a9260.c
5583 arch/arm/mach-at91/board-usb-a9260.c: needs merge
5584 drivers/mtd/maps/lantiq-flash.c: needs merge
5585 rm 'arch/arm/mach-at91/board-usb-a9260.c'
5587 [master 86b3c7d] Merge remote-tracking branch 'l2-mtd/master'
5588 $ git diff -M --stat --summary HEAD^..
5589 Documentation/DocBook/mtdnand.tmpl | 19 +-
5590 .../devicetree/bindings/mtd/atmel-dataflash.txt | 14 +
5591 arch/arm/mach-at91/board-afeb-9260v1.c | 9 +-
5592 arch/arm/mach-at91/board-cam60.c | 9 +-
5593 arch/arm/mach-at91/board-cap9adk.c | 9 +-
5594 arch/arm/mach-at91/board-kb9202.c | 9 +-
5595 arch/arm/mach-at91/board-neocore926.c | 9 +-
5596 arch/arm/mach-at91/board-qil-a9260.c | 9 +-
5597 arch/arm/mach-at91/board-rm9200dk.c | 9 +-
5598 arch/arm/mach-at91/board-sam9-l9260.c | 9 +-
5599 arch/arm/mach-at91/board-sam9260ek.c | 9 +-
5600 arch/arm/mach-at91/board-sam9261ek.c | 9 +-
5601 arch/arm/mach-at91/board-sam9263ek.c | 9 +-
5602 arch/arm/mach-at91/board-sam9g20ek.c | 9 +-
5603 arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +-
5604 arch/arm/mach-at91/board-sam9rlek.c | 9 +-
5605 arch/arm/mach-at91/board-snapper9260.c | 10 +-
5606 arch/arm/mach-at91/board-usb-a926x.c | 9 +-
5607 arch/arm/mach-at91/board-yl-9200.c | 9 +-
5608 arch/arm/mach-at91/include/mach/board.h | 3 +-
5609 arch/arm/mach-davinci/board-da830-evm.c | 2 +-
5610 arch/arm/mach-davinci/board-da850-evm.c | 2 +-
5611 arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
5612 arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
5613 arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
5614 arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
5615 arch/arm/mach-davinci/board-mityomapl138.c | 3 +-
5616 arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
5617 arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +-
5618 arch/arm/mach-davinci/include/mach/nand.h | 4 +-
5619 arch/arm/mach-ep93xx/ts72xx.c | 23 +-
5620 arch/arm/mach-mmp/aspenite.c | 5 +-
5621 arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
5622 arch/arm/mach-pxa/cm-x300.c | 5 +-
5623 arch/arm/mach-pxa/colibri-pxa3xx.c | 5 +-
5624 arch/arm/mach-pxa/littleton.c | 5 +-
5625 arch/arm/mach-pxa/mxm8x10.c | 9 +-
5626 arch/arm/mach-pxa/raumfeld.c | 5 +-
5627 arch/arm/mach-pxa/zylonite.c | 5 +-
5628 arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 20 +-
5629 arch/avr32/boards/atngw100/setup.c | 8 +-
5630 arch/avr32/boards/atstk1000/atstk1002.c | 9 +-
5631 arch/avr32/mach-at32ap/include/mach/board.h | 3 +-
5632 arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +-
5633 arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +-
5634 drivers/mtd/Kconfig | 16 +-
5635 drivers/mtd/Makefile | 2 +-
5636 drivers/mtd/afs.c | 4 +-
5637 drivers/mtd/ar7part.c | 2 +-
5638 drivers/mtd/chips/cfi_cmdset_0002.c | 31 +-
5639 drivers/mtd/chips/fwh_lock.h | 3 +-
5640 drivers/mtd/chips/jedec_probe.c | 34 +-
5641 drivers/mtd/cmdlinepart.c | 7 +-
5642 drivers/mtd/devices/doc2000.c | 13 +-
5643 drivers/mtd/devices/doc2001.c | 7 +-
5644 drivers/mtd/devices/doc2001plus.c | 7 +-
5645 drivers/mtd/devices/docecc.c | 2 +-
5646 drivers/mtd/devices/lart.c | 18 +-
5647 drivers/mtd/devices/m25p80.c | 84 +-
5648 drivers/mtd/devices/mtd_dataflash.c | 91 +-
5649 drivers/mtd/devices/sst25l.c | 42 +-
5650 drivers/mtd/ftl.c | 40 +-
5651 drivers/mtd/inftlcore.c | 59 +-
5652 drivers/mtd/inftlmount.c | 116 +-
5653 drivers/mtd/maps/Kconfig | 22 -
5654 drivers/mtd/maps/Makefile | 2 -
5655 drivers/mtd/maps/bfin-async-flash.c | 16 +-
5656 drivers/mtd/maps/ceiva.c | 341 ----
5657 drivers/mtd/maps/dc21285.c | 9 +-
5658 drivers/mtd/maps/edb7312.c | 134 --
5659 drivers/mtd/maps/gpio-addr-flash.c | 16 +-
5660 drivers/mtd/maps/h720x-flash.c | 23 +-
5661 drivers/mtd/maps/impa7.c | 28 +-
5662 drivers/mtd/maps/intel_vr_nor.c | 7 +-
5663 drivers/mtd/maps/ixp2000.c | 11 +-
5664 drivers/mtd/maps/ixp4xx.c | 29 +-
5665 drivers/mtd/maps/lantiq-flash.c | 17 +-
5666 drivers/mtd/maps/latch-addr-flash.c | 24 +-
5667 drivers/mtd/maps/pcmciamtd.c | 124 +-
5668 drivers/mtd/maps/physmap.c | 38 +-
5669 drivers/mtd/maps/physmap_of.c | 80 +-
5670 drivers/mtd/maps/plat-ram.c | 23 +-
5671 drivers/mtd/maps/pxa2xx-flash.c | 20 +-
5672 drivers/mtd/maps/rbtx4939-flash.c | 24 +-
5673 drivers/mtd/maps/sa1100-flash.c | 30 +-
5674 drivers/mtd/maps/solutionengine.c | 30 +-
5675 drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +-
5676 drivers/mtd/mtdblock.c | 18 +-
5677 drivers/mtd/mtdchar.c | 45 +-
5678 drivers/mtd/mtdconcat.c | 2 +-
5679 drivers/mtd/mtdcore.c | 70 +-
5680 drivers/mtd/mtdcore.h | 3 +
5681 drivers/mtd/mtdpart.c | 52 +-
5682 drivers/mtd/mtdsuper.c | 20 +-
5683 drivers/mtd/mtdswap.c | 5 +-
5684 drivers/mtd/nand/Kconfig | 27 +-
5685 drivers/mtd/nand/Makefile | 2 +-
5686 drivers/mtd/nand/atmel_nand.c | 74 +-
5687 drivers/mtd/nand/au1550nd.c | 29 +-
5688 drivers/mtd/nand/autcpu12.c | 4 +-
5689 drivers/mtd/nand/bcm_umi_nand.c | 57 +-
5690 drivers/mtd/nand/cafe_nand.c | 21 +-
5691 drivers/mtd/nand/cmx270_nand.c | 23 +-
5692 drivers/mtd/nand/cs553x_nand.c | 15 +-
5693 drivers/mtd/nand/davinci_nand.c | 39 +-
5694 drivers/mtd/nand/denali.c | 6 +-
5695 drivers/mtd/nand/diskonchip.c | 6 +-
5696 drivers/mtd/nand/edb7312.c | 203 ---
5697 drivers/mtd/nand/fsl_elbc_nand.c | 75 +-
5698 drivers/mtd/nand/fsl_upm.c | 16 +-
5699 drivers/mtd/nand/fsmc_nand.c | 77 +-
5700 drivers/mtd/nand/gpmi-nand/Makefile | 3 +
5701 drivers/mtd/nand/gpmi-nand/bch-regs.h | 84 +
5702 drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 1056 ++++++++++++
5703 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 1674 ++++++++++++++++++++
5704 drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 274 ++++
5705 drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 168 ++
5706 drivers/mtd/nand/h1910.c | 19 +-
5707 drivers/mtd/nand/jz4740_nand.c | 18 +-
5708 drivers/mtd/nand/mpc5121_nfc.c | 22 +-
5709 drivers/mtd/nand/mxc_nand.c | 35 +-
5710 drivers/mtd/nand/nand_base.c | 996 ++++++------
5711 drivers/mtd/nand/nand_bbt.c | 516 +++----
5712 drivers/mtd/nand/nand_bch.c | 4 +-
5713 drivers/mtd/nand/nand_ecc.c | 10 +-
5714 drivers/mtd/nand/nandsim.c | 4 +-
5715 drivers/mtd/nand/ndfc.c | 22 +-
5716 drivers/mtd/nand/nomadik_nand.c | 1 +
5717 drivers/mtd/nand/nuc900_nand.c | 1 +
5718 drivers/mtd/nand/omap2.c | 22 +-
5719 drivers/mtd/nand/orion_nand.c | 16 +-
5720 drivers/mtd/nand/pasemi_nand.c | 3 +-
5721 drivers/mtd/nand/plat_nand.c | 25 +-
5722 drivers/mtd/nand/ppchameleonevb.c | 47 +-
5723 drivers/mtd/nand/pxa3xx_nand.c | 471 ++++---
5724 drivers/mtd/nand/rtc_from4.c | 5 +-
5725 drivers/mtd/nand/s3c2410.c | 27 +-
5726 drivers/mtd/nand/sharpsl.c | 13 +-
5727 drivers/mtd/nand/socrates_nand.c | 28 +-
5728 drivers/mtd/nand/tmio_nand.c | 17 +-
5729 drivers/mtd/nand/txx9ndfmc.c | 8 +-
5730 drivers/mtd/nftlcore.c | 27 +-
5731 drivers/mtd/nftlmount.c | 26 +-
5732 drivers/mtd/ofpart.c | 112 ++-
5733 drivers/mtd/onenand/generic.c | 14 +-
5734 drivers/mtd/onenand/omap2.c | 16 +-
5735 drivers/mtd/onenand/onenand_base.c | 62 +-
5736 drivers/mtd/onenand/onenand_bbt.c | 6 +-
5737 drivers/mtd/onenand/samsung.c | 13 +-
5738 drivers/mtd/redboot.c | 13 +-
5739 drivers/mtd/sm_ftl.c | 18 +-
5740 drivers/mtd/ssfdc.c | 44 +-
5741 drivers/mtd/tests/mtd_readtest.c | 3 +-
5742 fs/jffs2/scan.c | 4 +-
5743 fs/jffs2/wbuf.c | 3 +-
5744 include/linux/mtd/bbm.h | 39 +-
5745 include/linux/mtd/mtd.h | 54 +-
5746 include/linux/mtd/nand.h | 80 +-
5747 include/linux/mtd/onenand.h | 4 +
5748 include/linux/mtd/partitions.h | 46 +-
5749 include/linux/mtd/physmap.h | 17 -
5750 include/mtd/mtd-abi.h | 7 +-
5751 162 files changed, 5404 insertions(+), 3662 deletions(-)
5752 create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
5753 delete mode 100644 drivers/mtd/maps/ceiva.c
5754 delete mode 100644 drivers/mtd/maps/edb7312.c
5755 delete mode 100644 drivers/mtd/nand/edb7312.c
5756 create mode 100644 drivers/mtd/nand/gpmi-nand/Makefile
5757 create mode 100644 drivers/mtd/nand/gpmi-nand/bch-regs.h
5758 create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-lib.c
5759 create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.c
5760 create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.h
5761 create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-regs.h
5762 Merging crypto/master
5763 $ git merge crypto/master
5764 Merge made by recursive.
5765 .../devicetree/bindings/crypto/picochip-spacc.txt | 23 +
5766 arch/x86/crypto/Makefile | 8 +
5767 arch/x86/crypto/sha1_ssse3_asm.S | 558 ++++++++++++++++++++
5768 arch/x86/crypto/sha1_ssse3_glue.c | 240 +++++++++
5769 arch/x86/include/asm/cpufeature.h | 3 +
5770 crypto/Kconfig | 10 +
5771 crypto/cryptd.c | 2 +-
5772 crypto/sha1_generic.c | 9 +-
5773 drivers/crypto/n2_core.c | 4 +-
5774 drivers/crypto/padlock-aes.c | 4 +-
5775 drivers/crypto/picoxcell_crypto.c | 121 ++---
5776 include/crypto/sha.h | 5 +
5777 12 files changed, 915 insertions(+), 72 deletions(-)
5778 create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt
5779 create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S
5780 create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c
5781 Merging sound/for-next
5782 $ git merge sound/for-next
5783 Removing sound/pci/hda/alc268_quirks.c
5784 Removing sound/pci/hda/alc269_quirks.c
5785 Removing sound/pci/hda/alc662_quirks.c
5786 Removing sound/pci/hda/alc680_quirks.c
5787 Removing sound/pci/hda/alc861_quirks.c
5788 Removing sound/pci/hda/alc861vd_quirks.c
5789 Merge made by recursive.
5790 .../bindings/sound/soc/codecs/fsl-sgtl5000.txt | 11 +
5791 Documentation/devicetree/bindings/sound/wm8510.txt | 18 +
5792 Documentation/devicetree/bindings/sound/wm8523.txt | 16 +
5793 Documentation/devicetree/bindings/sound/wm8580.txt | 16 +
5794 Documentation/devicetree/bindings/sound/wm8711.txt | 18 +
5795 Documentation/devicetree/bindings/sound/wm8728.txt | 18 +
5796 Documentation/devicetree/bindings/sound/wm8731.txt | 18 +
5797 Documentation/devicetree/bindings/sound/wm8737.txt | 18 +
5798 Documentation/devicetree/bindings/sound/wm8741.txt | 18 +
5799 Documentation/devicetree/bindings/sound/wm8750.txt | 18 +
5800 Documentation/devicetree/bindings/sound/wm8753.txt | 18 +
5801 Documentation/sound/alsa/ALSA-Configuration.txt | 5 +
5802 Documentation/sound/alsa/HD-Audio-Models.txt | 67 +-
5803 Documentation/sound/alsa/HD-Audio.txt | 48 +
5804 arch/mips/alchemy/devboards/db1200/platform.c | 16 +
5805 arch/mips/alchemy/devboards/db1x00/platform.c | 48 +
5806 include/linux/mfd/wm8994/registers.h | 84 ++
5807 include/sound/adau1373.h | 34 +
5808 include/sound/soc-dapm.h | 2 +
5809 include/sound/soc.h | 10 +
5810 sound/core/control.c | 4 +-
5811 sound/firewire/isight.c | 1 -
5812 sound/mips/Kconfig | 5 +-
5813 sound/pci/ctxfi/ctpcm.c | 2 +-
5814 sound/pci/ctxfi/ctsrc.c | 2 +-
5815 sound/pci/ctxfi/ctvmem.h | 2 +-
5816 sound/pci/hda/Makefile | 3 +
5817 sound/pci/hda/alc260_quirks.c | 304 -----
5818 sound/pci/hda/alc262_quirks.c | 508 +-------
5819 sound/pci/hda/alc268_quirks.c | 636 ---------
5820 sound/pci/hda/alc269_quirks.c | 674 ----------
5821 sound/pci/hda/alc662_quirks.c | 1408 -------------------
5822 sound/pci/hda/alc680_quirks.c | 222 ---
5823 sound/pci/hda/alc861_quirks.c | 725 ----------
5824 sound/pci/hda/alc861vd_quirks.c | 605 ---------
5825 sound/pci/hda/hda_codec.c | 71 +-
5826 sound/pci/hda/hda_intel.c | 68 +-
5827 sound/pci/hda/hda_local.h | 24 +-
5828 sound/pci/hda/hda_trace.h | 117 ++
5829 sound/pci/hda/patch_conexant.c | 93 +-
5830 sound/pci/hda/patch_realtek.c | 946 +++++++++-----
5831 sound/pci/oxygen/xonar_pcm179x.c | 1 +
5832 sound/pci/rme9652/hdspm.c | 139 +-
5833 sound/soc/Kconfig | 3 +
5834 sound/soc/Makefile | 1 +
5835 sound/soc/au1x/Kconfig | 28 +
5836 sound/soc/au1x/Makefile | 10 +
5837 sound/soc/au1x/ac97c.c | 363 +++++
5838 sound/soc/au1x/db1000.c | 75 +
5839 sound/soc/au1x/db1200.c | 64 +-
5840 sound/soc/au1x/dbdma2.c | 91 +-
5841 sound/soc/au1x/dma.c | 377 ++++++
5842 sound/soc/au1x/i2sc.c | 346 +++++
5843 sound/soc/au1x/psc-ac97.c | 48 +-
5844 sound/soc/au1x/psc-i2s.c | 42 +-
5845 sound/soc/au1x/psc.h | 16 +-
5846 sound/soc/blackfin/Kconfig | 13 +
5847 sound/soc/blackfin/Makefile | 2 +
5848 sound/soc/blackfin/bfin-eval-adau1373.c | 202 +++
5849 sound/soc/codecs/Kconfig | 4 +
5850 sound/soc/codecs/Makefile | 2 +
5851 sound/soc/codecs/adau1373.c | 1414 ++++++++++++++++++++
5852 sound/soc/codecs/adau1373.h | 29 +
5853 sound/soc/codecs/sgtl5000.c | 8 +
5854 sound/soc/codecs/sta32x.c | 21 +-
5855 sound/soc/codecs/wm1250-ev1.c | 20 +-
5856 sound/soc/codecs/wm8510.c | 8 +
5857 sound/soc/codecs/wm8523.c | 35 +-
5858 sound/soc/codecs/wm8580.c | 9 +-
5859 sound/soc/codecs/wm8711.c | 13 +-
5860 sound/soc/codecs/wm8728.c | 13 +-
5861 sound/soc/codecs/wm8731.c | 10 +
5862 sound/soc/codecs/wm8737.c | 10 +
5863 sound/soc/codecs/wm8741.c | 135 ++-
5864 sound/soc/codecs/wm8750.c | 14 +-
5865 sound/soc/codecs/wm8753.c | 13 +-
5866 sound/soc/codecs/wm8962.c | 187 +++-
5867 sound/soc/codecs/wm8993.c | 7 +-
5868 sound/soc/codecs/wm8994-tables.c | 16 +-
5869 sound/soc/codecs/wm8994.c | 270 +++-
5870 sound/soc/codecs/wm8994.h | 2 +
5871 sound/soc/codecs/wm8996.c | 12 +-
5872 sound/soc/codecs/wm_hubs.c | 48 +-
5873 sound/soc/codecs/wm_hubs.h | 3 +-
5874 sound/soc/fsl/fsl_dma.c | 1 -
5875 sound/soc/fsl/fsl_ssi.c | 61 +-
5876 sound/soc/fsl/mpc5200_dma.c | 6 +-
5877 sound/soc/mxs/Kconfig | 20 +
5878 sound/soc/mxs/Makefile | 10 +
5879 sound/soc/mxs/mxs-pcm.c | 359 +++++
5880 sound/soc/mxs/mxs-pcm.h | 43 +
5881 sound/soc/mxs/mxs-saif.c | 680 ++++++++++
5882 sound/soc/mxs/mxs-saif.h | 130 ++
5883 sound/soc/mxs/mxs-sgtl5000.c | 173 +++
5884 sound/soc/nuc900/nuc900-pcm.c | 1 -
5885 sound/soc/pxa/spitz.c | 2 +-
5886 sound/soc/pxa/z2.c | 2 +-
5887 sound/soc/s6000/s6000-pcm.c | 1 -
5888 sound/soc/samsung/Kconfig | 6 +-
5889 sound/soc/samsung/jive_wm8750.c | 2 +-
5890 sound/soc/samsung/smartq_wm8987.c | 2 +-
5891 sound/soc/samsung/smdk_wm8580.c | 6 +-
5892 sound/soc/samsung/smdk_wm8580pcm.c | 4 +-
5893 sound/soc/samsung/speyside.c | 5 +-
5894 sound/soc/samsung/speyside_wm8962.c | 4 +-
5895 sound/soc/soc-cache.c | 7 -
5896 sound/soc/soc-core.c | 6 +-
5897 sound/soc/soc-dapm.c | 12 +-
5898 sound/soc/soc-io.c | 357 +-----
5899 sound/soc/soc-pcm.c | 2 -
5900 sound/usb/midi.c | 27 +
5901 sound/usb/mixer.c | 13 +-
5902 sound/usb/quirks-table.h | 11 +
5903 sound/usb/quirks.c | 1 +
5904 sound/usb/usbaudio.h | 1 +
5905 115 files changed, 6742 insertions(+), 6258 deletions(-)
5906 create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
5907 create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
5908 create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
5909 create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
5910 create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
5911 create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
5912 create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
5913 create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
5914 create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
5915 create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
5916 create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
5917 create mode 100644 include/sound/adau1373.h
5918 delete mode 100644 sound/pci/hda/alc268_quirks.c
5919 delete mode 100644 sound/pci/hda/alc269_quirks.c
5920 delete mode 100644 sound/pci/hda/alc662_quirks.c
5921 delete mode 100644 sound/pci/hda/alc680_quirks.c
5922 delete mode 100644 sound/pci/hda/alc861_quirks.c
5923 delete mode 100644 sound/pci/hda/alc861vd_quirks.c
5924 create mode 100644 sound/pci/hda/hda_trace.h
5925 create mode 100644 sound/soc/au1x/ac97c.c
5926 create mode 100644 sound/soc/au1x/db1000.c
5927 create mode 100644 sound/soc/au1x/dma.c
5928 create mode 100644 sound/soc/au1x/i2sc.c
5929 create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
5930 create mode 100644 sound/soc/codecs/adau1373.c
5931 create mode 100644 sound/soc/codecs/adau1373.h
5932 create mode 100644 sound/soc/mxs/Kconfig
5933 create mode 100644 sound/soc/mxs/Makefile
5934 create mode 100644 sound/soc/mxs/mxs-pcm.c
5935 create mode 100644 sound/soc/mxs/mxs-pcm.h
5936 create mode 100644 sound/soc/mxs/mxs-saif.c
5937 create mode 100644 sound/soc/mxs/mxs-saif.h
5938 create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
5939 Merging sound-asoc/for-next
5940 $ git merge sound-asoc/for-next
5941 Merge made by recursive.
5942 sound/soc/codecs/wm8996.c | 9 +++++++++
5943 sound/soc/davinci/davinci-mcasp.c | 20 +++++++++++++-------
5944 2 files changed, 22 insertions(+), 7 deletions(-)
5945 Merging cpufreq/next
5946 $ git merge cpufreq/next
5947 Merge made by recursive.
5948 Documentation/cpu-freq/governors.txt | 2 +-
5949 drivers/cpufreq/cpufreq_ondemand.c | 2 +-
5950 drivers/cpufreq/db8500-cpufreq.c | 7 +-
5951 drivers/cpufreq/e_powersaver.c | 135 +++++++++++++++++++++++++++++++---
5952 drivers/cpufreq/exynos4210-cpufreq.c | 129 +++++++++++++++++++++++++++++++-
5953 5 files changed, 254 insertions(+), 21 deletions(-)
5955 $ git merge quilt/rr
5956 Auto-merging drivers/net/virtio_net.c
5957 Merge made by recursive.
5958 arch/x86/lguest/boot.c | 10 ++++++++++
5959 drivers/char/virtio_console.c | 10 ++++------
5960 drivers/lguest/core.c | 2 +-
5961 drivers/net/virtio_net.c | 14 +++++---------
5962 include/linux/virtio.h | 4 ++--
5963 include/linux/virtio_config.h | 3 +++
5964 include/linux/virtio_ring.h | 6 +++---
5965 7 files changed, 28 insertions(+), 21 deletions(-)
5967 $ git merge input/next
5968 Auto-merging drivers/input/misc/Kconfig
5969 Auto-merging drivers/input/misc/Makefile
5970 Auto-merging drivers/input/misc/ad714x-i2c.c
5971 Auto-merging include/linux/input.h
5972 Merge made by recursive.
5973 Documentation/input/multi-touch-protocol.txt | 14 +
5974 drivers/input/input-mt.c | 1 +
5975 drivers/input/input-polldev.c | 6 +-
5976 drivers/input/misc/Kconfig | 45 ++-
5977 drivers/input/misc/Makefile | 4 +-
5978 drivers/input/misc/ad714x-i2c.c | 4 +-
5979 drivers/input/misc/bma150.c | 691 ++++++++++++++++++++++++++
5980 drivers/input/misc/pm8xxx-vibrator.c | 296 +++++++++++
5981 drivers/input/mouse/synaptics.c | 527 ++++++++++++++++++--
5982 drivers/input/mouse/synaptics.h | 27 +-
5983 drivers/input/touchscreen/tsc2007.c | 194 ++++----
5984 drivers/input/touchscreen/wacom_w8001.c | 29 +-
5985 include/linux/bma150.h | 46 ++
5986 include/linux/input.h | 1 +
5987 14 files changed, 1722 insertions(+), 163 deletions(-)
5988 create mode 100644 drivers/input/misc/bma150.c
5989 create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
5990 create mode 100644 include/linux/bma150.h
5991 Merging input-mt/next
5992 $ git merge input-mt/next
5994 Merging lsm/for-next
5995 $ git merge lsm/for-next
5997 Merging block/for-next
5998 $ git merge block/for-next
5999 Auto-merging block/genhd.c
6000 Auto-merging fs/ext4/inode.c
6001 Auto-merging fs/ext4/namei.c
6002 Auto-merging fs/gfs2/quota.c
6003 Auto-merging include/linux/fs.h
6004 Auto-merging include/linux/genhd.h
6005 Merge made by recursive.
6006 .../ABI/testing/sysfs-bus-pci-devices-cciss | 7 +
6007 Documentation/blockdev/cciss.txt | 10 +
6008 block/blk-core.c | 15 +-
6009 block/blk-sysfs.c | 10 +-
6010 block/cfq-iosched.c | 20 +-
6011 block/genhd.c | 4 +-
6012 block/ioctl.c | 2 +-
6013 drivers/block/Kconfig | 2 +
6014 drivers/block/Makefile | 1 +
6015 drivers/block/cciss.c | 69 +-
6016 drivers/block/cciss.h | 1 +
6017 drivers/block/loop.c | 104 +-
6018 drivers/block/mtip32xx/Kconfig | 9 +
6019 drivers/block/mtip32xx/Makefile | 5 +
6020 drivers/block/mtip32xx/mtip32xx.c | 3581 ++++++++++++++++++++
6021 drivers/block/mtip32xx/mtip32xx.h | 445 +++
6022 drivers/block/nbd.c | 69 +-
6023 drivers/block/xen-blkback/common.h | 2 +-
6024 drivers/block/xen-blkback/xenbus.c | 6 +-
6025 drivers/mmc/card/block.c | 3 +
6026 fs/block_dev.c | 2 +-
6027 fs/ext3/inode.c | 4 +-
6028 fs/ext3/namei.c | 3 +-
6029 fs/ext4/inode.c | 4 +-
6030 fs/ext4/namei.c | 3 +-
6031 fs/gfs2/log.c | 4 +-
6032 fs/gfs2/meta_io.c | 6 +-
6033 fs/gfs2/ops_fstype.c | 2 +-
6034 fs/gfs2/quota.c | 2 +-
6035 include/linux/blk_types.h | 6 +-
6036 include/linux/blkdev.h | 1 -
6037 include/linux/fs.h | 2 -
6038 include/linux/genhd.h | 6 +-
6039 include/linux/loop.h | 1 +
6040 34 files changed, 4312 insertions(+), 99 deletions(-)
6041 create mode 100644 drivers/block/mtip32xx/Kconfig
6042 create mode 100644 drivers/block/mtip32xx/Makefile
6043 create mode 100644 drivers/block/mtip32xx/mtip32xx.c
6044 create mode 100644 drivers/block/mtip32xx/mtip32xx.h
6045 Merging quilt/device-mapper
6046 $ git merge quilt/device-mapper
6047 Merge made by recursive.
6048 Documentation/device-mapper/persistent-data.txt | 84 +
6049 Documentation/device-mapper/thin-provisioning.txt | 275 +++
6050 drivers/md/Kconfig | 9 +
6051 drivers/md/Makefile | 3 +
6052 drivers/md/dm-crypt.c | 1 +
6053 drivers/md/dm-flakey.c | 4 +-
6054 drivers/md/dm-kcopyd.c | 31 +-
6055 drivers/md/dm-raid.c | 2 +-
6056 drivers/md/dm-table.c | 84 +-
6057 drivers/md/dm-thin-metadata.c | 1406 ++++++++++++
6058 drivers/md/dm-thin-metadata.h | 168 ++
6059 drivers/md/dm-thin.c | 2280 ++++++++++++++++++++
6060 drivers/md/dm.c | 12 +-
6061 drivers/md/persistent-data/Kconfig | 7 +
6062 drivers/md/persistent-data/Makefile | 9 +
6063 drivers/md/persistent-data/dm-block-manager.c | 998 +++++++++
6064 drivers/md/persistent-data/dm-block-manager.h | 134 ++
6065 drivers/md/persistent-data/dm-btree-internal.h | 133 ++
6066 drivers/md/persistent-data/dm-btree-remove.c | 571 +++++
6067 drivers/md/persistent-data/dm-btree-spine.c | 222 ++
6068 drivers/md/persistent-data/dm-btree.c | 861 ++++++++
6069 drivers/md/persistent-data/dm-btree.h | 158 ++
6070 .../persistent-data/dm-persistent-data-internal.h | 20 +
6071 drivers/md/persistent-data/dm-space-map-common.h | 94 +
6072 drivers/md/persistent-data/dm-space-map-disk.c | 663 ++++++
6073 drivers/md/persistent-data/dm-space-map-disk.h | 25 +
6074 drivers/md/persistent-data/dm-space-map-metadata.c | 956 ++++++++
6075 drivers/md/persistent-data/dm-space-map-metadata.h | 33 +
6076 drivers/md/persistent-data/dm-space-map.h | 118 +
6077 .../md/persistent-data/dm-transaction-manager.c | 414 ++++
6078 .../md/persistent-data/dm-transaction-manager.h | 130 ++
6079 include/linux/device-mapper.h | 40 +-
6080 include/linux/dm-kcopyd.h | 4 +
6081 33 files changed, 9927 insertions(+), 22 deletions(-)
6082 create mode 100644 Documentation/device-mapper/persistent-data.txt
6083 create mode 100644 Documentation/device-mapper/thin-provisioning.txt
6084 create mode 100644 drivers/md/dm-thin-metadata.c
6085 create mode 100644 drivers/md/dm-thin-metadata.h
6086 create mode 100644 drivers/md/dm-thin.c
6087 create mode 100644 drivers/md/persistent-data/Kconfig
6088 create mode 100644 drivers/md/persistent-data/Makefile
6089 create mode 100644 drivers/md/persistent-data/dm-block-manager.c
6090 create mode 100644 drivers/md/persistent-data/dm-block-manager.h
6091 create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
6092 create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
6093 create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
6094 create mode 100644 drivers/md/persistent-data/dm-btree.c
6095 create mode 100644 drivers/md/persistent-data/dm-btree.h
6096 create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
6097 create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
6098 create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
6099 create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
6100 create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
6101 create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
6102 create mode 100644 drivers/md/persistent-data/dm-space-map.h
6103 create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
6104 create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
6105 Merging embedded/master
6106 $ git merge embedded/master
6108 Merging firmware/master
6109 $ git merge firmware/master
6111 Merging pcmcia/master
6112 $ git merge pcmcia/master
6114 Merging battery/master
6115 $ git merge battery/master
6116 Merge made by recursive.
6117 .../bindings/power_supply/olpc_battery.txt | 5 +
6118 drivers/power/ds2780_battery.c | 2 +-
6119 drivers/power/max17042_battery.c | 17 ++--
6120 drivers/power/max8903_charger.c | 2 +-
6121 drivers/power/max8997_charger.c | 1 +
6122 drivers/power/max8998_charger.c | 2 +
6123 drivers/power/olpc_battery.c | 79 ++++++++++++++-----
6124 drivers/power/pda_power.c | 74 ++++++++++++++++--
6125 drivers/power/power_supply_sysfs.c | 4 +-
6126 drivers/power/wm831x_power.c | 44 +++++++----
6127 drivers/power/z2_battery.c | 2 +-
6128 include/linux/pda_power.h | 2 +
6129 12 files changed, 175 insertions(+), 59 deletions(-)
6130 create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
6132 $ git merge leds/for-mm
6133 Resolved 'drivers/leds/Kconfig' using previous resolution.
6134 Auto-merging drivers/leds/Kconfig
6135 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
6136 Automatic merge failed; fix conflicts and then commit the result.
6138 [master fbb0a04c] Merge remote-tracking branch 'leds/for-mm'
6139 $ git diff -M --stat --summary HEAD^..
6140 Merging backlight/for-mm
6141 $ git merge backlight/for-mm
6143 Merging mmc/mmc-next
6144 $ git merge mmc/mmc-next
6145 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
6146 Auto-merging arch/arm/mach-shmobile/board-ag5evm.c
6147 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
6148 Auto-merging drivers/mmc/card/block.c
6149 Auto-merging drivers/mmc/host/sdhci-tegra.c
6150 Merge made by recursive.
6151 .../devicetree/bindings/mmc/nvidia-sdhci.txt | 27 +
6152 Documentation/fault-injection/fault-injection.txt | 8 +-
6153 arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
6154 arch/arm/mach-msm/devices-msm7x00.c | 24 -
6155 arch/arm/mach-msm/devices-qsd8x50.c | 24 -
6156 arch/arm/mach-msm/include/mach/mmc.h | 9 +-
6157 arch/arm/mach-shmobile/board-ag5evm.c | 6 +
6158 arch/arm/mach-shmobile/board-mackerel.c | 6 +
6159 drivers/mmc/card/block.c | 4 +-
6160 drivers/mmc/card/queue.c | 2 +-
6161 drivers/mmc/core/core.c | 78 ++-
6162 drivers/mmc/core/debugfs.c | 25 +
6163 drivers/mmc/core/host.c | 23 +-
6164 drivers/mmc/core/host.h | 8 +-
6165 drivers/mmc/core/mmc_ops.c | 4 +-
6166 drivers/mmc/core/sd.c | 81 ++-
6167 drivers/mmc/core/sd_ops.c | 8 +-
6168 drivers/mmc/core/sdio_ops.c | 2 +-
6169 drivers/mmc/host/Kconfig | 12 +-
6170 drivers/mmc/host/at91_mci.c | 6 +-
6171 drivers/mmc/host/atmel-mci-regs.h | 220 +++---
6172 drivers/mmc/host/atmel-mci.c | 823 +++++++++++++-------
6173 drivers/mmc/host/dw_mmc.c | 36 +-
6174 drivers/mmc/host/dw_mmc.h | 2 +-
6175 drivers/mmc/host/msm_sdcc.c | 78 ++-
6176 drivers/mmc/host/msm_sdcc.h | 6 +-
6177 drivers/mmc/host/sdhci-esdhc-imx.c | 45 +-
6178 drivers/mmc/host/sdhci-s3c.c | 2 +
6179 drivers/mmc/host/sdhci-tegra.c | 54 +-
6180 drivers/mmc/host/sh_mobile_sdhi.c | 102 ++-
6181 drivers/mmc/host/tmio_mmc.h | 7 +
6182 drivers/mmc/host/tmio_mmc_pio.c | 149 +++--
6183 include/linux/atmel-mci.h | 4 +-
6184 include/linux/atmel_pdc.h | 2 +
6185 include/linux/mmc/host.h | 5 +
6186 include/linux/mmc/sh_mobile_sdhi.h | 4 +
6187 lib/Kconfig.debug | 11 +
6188 lib/fault-inject.c | 2 +
6189 38 files changed, 1296 insertions(+), 615 deletions(-)
6190 create mode 100644 Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
6191 Merging kgdb/kgdb-next
6192 $ git merge kgdb/kgdb-next
6193 Merge made by recursive.
6194 Merging slab/for-next
6195 $ git merge slab/for-next
6196 Merge made by recursive.
6197 include/linux/mm_types.h | 14 ++-
6198 include/linux/slub_def.h | 4 +
6199 mm/slub.c | 509 ++++++++++++++++++++++++++++++++++------------
6200 tools/slub/slabinfo.c | 8 +
6201 4 files changed, 406 insertions(+), 129 deletions(-)
6202 Merging uclinux/for-next
6203 $ git merge uclinux/for-next
6206 $ git merge md/for-next
6207 Auto-merging fs/block_dev.c
6208 Merge made by recursive.
6209 drivers/md/bitmap.c | 71 +++++++++++++++++++++++++++-----------------------
6210 drivers/md/md.c | 12 +++++++-
6211 drivers/md/raid1.c | 14 ++++++---
6212 drivers/md/raid10.c | 47 +++++++++++++++++----------------
6213 fs/block_dev.c | 7 +++-
6214 5 files changed, 86 insertions(+), 65 deletions(-)
6215 Merging mfd/for-next
6216 $ git merge mfd/for-next
6217 Recorded preimage for 'drivers/rtc/rtc-twl.c'
6218 Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
6219 Auto-merging drivers/rtc/rtc-twl.c
6220 CONFLICT (content): Merge conflict in drivers/rtc/rtc-twl.c
6221 Automatic merge failed; fix conflicts and then commit the result.
6223 Recorded resolution for 'drivers/rtc/rtc-twl.c'.
6224 [master 86fe492] Merge remote-tracking branch 'mfd/for-next'
6225 $ git diff -M --stat --summary HEAD^..
6226 arch/arm/mach-omap2/board-omap3beagle.c | 9 +-
6227 drivers/leds/leds-asic3.c | 35 +++-
6228 drivers/mfd/Kconfig | 1 +
6229 drivers/mfd/ab3550-core.c | 10 +-
6230 drivers/mfd/ab8500-gpadc.c | 56 ++++--
6231 drivers/mfd/asic3.c | 26 ++-
6232 drivers/mfd/max8997.c | 32 +++-
6233 drivers/mfd/omap-usb-host.c | 2 +-
6234 drivers/mfd/pcf50633-core.c | 114 +++-------
6235 drivers/mfd/tc3589x.c | 2 +
6236 drivers/mfd/timberdale.c | 9 +-
6237 drivers/mfd/tps65910-irq.c | 2 +
6238 drivers/mfd/twl4030-irq.c | 342 ++++++++++++-------------------
6239 drivers/mfd/twl4030-madc.c | 27 +++-
6240 drivers/mfd/twl6030-irq.c | 18 +-
6241 drivers/mfd/wm831x-irq.c | 2 -
6242 drivers/mfd/wm8350-gpio.c | 4 +-
6243 drivers/mfd/wm8994-core.c | 53 +++++
6244 include/linux/i2c/twl4030-madc.h | 4 +
6245 include/linux/mfd/ab8500/gpadc.h | 5 +-
6246 include/linux/mfd/max8997-private.h | 1 -
6247 include/linux/mfd/pcf50633/core.h | 3 +-
6248 include/linux/mfd/wm8994/core.h | 2 +
6249 include/linux/mfd/wm8994/pdata.h | 9 +-
6250 24 files changed, 432 insertions(+), 336 deletions(-)
6251 Merging hdlc/hdlc-next
6252 $ git merge hdlc/hdlc-next
6254 Merging drm/drm-next
6255 $ git merge drm/drm-next
6257 Merging fbdev/fbdev-next
6258 $ git merge fbdev/fbdev-next
6259 Auto-merging MAINTAINERS
6260 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
6261 Auto-merging drivers/video/atmel_lcdfb.c
6262 Auto-merging drivers/video/backlight/adp8870_bl.c
6263 Removing drivers/video/sh_mobile_meram.h
6264 Merge made by recursive.
6265 Documentation/fb/udlfb.txt | 39 +-
6267 arch/arm/mach-shmobile/board-mackerel.c | 1 +
6268 arch/powerpc/platforms/512x/mpc512x_shared.c | 22 +-
6269 arch/powerpc/platforms/85xx/p1022_ds.c | 47 +-
6270 arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 55 +-
6271 arch/powerpc/sysdev/fsl_soc.h | 25 +-
6272 drivers/staging/xgifb/XGI_main_26.c | 22 +-
6273 drivers/video/68328fb.c | 4 +-
6274 drivers/video/Kconfig | 34 +-
6275 drivers/video/Makefile | 2 +
6276 drivers/video/acornfb.c | 5 +-
6277 drivers/video/arkfb.c | 9 +-
6278 drivers/video/atmel_lcdfb.c | 15 +-
6279 drivers/video/aty/radeon_base.c | 10 +-
6280 drivers/video/au1200fb.c | 299 ++---
6281 drivers/video/backlight/adp8860_bl.c | 1 -
6282 drivers/video/backlight/adp8870_bl.c | 1 -
6283 drivers/video/carminefb.c | 6 +-
6284 drivers/video/controlfb.c | 2 +-
6285 drivers/video/da8xx-fb.c | 155 ++-
6286 drivers/video/fb-puv3.c | 4 +-
6287 drivers/video/fb_defio.c | 3 +-
6288 drivers/video/fbmem.c | 3 -
6289 drivers/video/fbmon.c | 21 +-
6290 drivers/video/fbsysfs.c | 3 +
6291 drivers/video/fsl-diu-fb.c | 74 +-
6292 drivers/video/g364fb.c | 5 +-
6293 drivers/video/grvga.c | 579 ++++++++
6294 drivers/video/gxt4500.c | 4 +-
6295 drivers/video/hgafb.c | 4 +-
6296 drivers/video/imsttfb.c | 2 +-
6297 drivers/video/intelfb/intelfbhw.c | 6 +-
6298 drivers/video/mb862xx/mb862xx-i2c.c | 2 +-
6299 drivers/video/mb862xx/mb862xxfbdrv.c | 2 +-
6300 drivers/video/msm/mdp.c | 4 +-
6301 drivers/video/mx3fb.c | 6 +-
6302 drivers/video/mxsfb.c | 1 +
6303 drivers/video/neofb.c | 4 +-
6304 drivers/video/nuc900fb.c | 1 -
6305 drivers/video/platinumfb.c | 2 +-
6306 drivers/video/pm2fb.c | 6 +-
6307 drivers/video/pm3fb.c | 6 +-
6308 drivers/video/pxa3xx-gcu.c | 2 -
6309 drivers/video/s3c-fb.c | 90 ++-
6310 drivers/video/s3c2410fb.c | 1 -
6311 drivers/video/s3fb.c | 9 +-
6312 drivers/video/savage/savagefb_driver.c | 16 +-
6313 drivers/video/sh_mobile_hdmi.c | 47 +-
6314 drivers/video/sh_mobile_lcdcfb.c | 1160 ++++++++--------
6315 drivers/video/sh_mobile_lcdcfb.h | 12 +-
6316 drivers/video/sh_mobile_meram.c | 208 +++-
6317 drivers/video/sh_mobile_meram.h | 41 -
6318 drivers/video/sis/sis_main.c | 30 +-
6319 drivers/video/skeletonfb.c | 2 +-
6320 drivers/video/sm501fb.c | 6 +-
6321 drivers/video/smscufx.c | 1994 ++++++++++++++++++++++++++
6322 drivers/video/tridentfb.c | 4 +-
6323 drivers/video/udlfb.c | 187 ++-
6324 drivers/video/valkyriefb.c | 2 +-
6325 drivers/video/vfb.c | 4 +-
6326 drivers/video/vga16fb.c | 2 +-
6327 drivers/video/via/via_modesetting.h | 5 +
6328 drivers/video/via/viafbdev.c | 16 +-
6329 drivers/video/vt8500lcdfb.c | 4 +-
6330 drivers/video/vt8623fb.c | 9 +-
6331 drivers/video/xilinxfb.c | 1 -
6332 include/video/sh_mobile_lcdc.h | 135 ++-
6333 include/video/udlfb.h | 1 +
6334 69 files changed, 4293 insertions(+), 1197 deletions(-)
6335 create mode 100644 drivers/video/grvga.c
6336 delete mode 100644 drivers/video/sh_mobile_meram.h
6337 create mode 100644 drivers/video/smscufx.c
6338 Merging viafb/viafb-next
6339 $ git merge viafb/viafb-next
6340 Merge made by recursive.
6341 drivers/video/via/dvi.c | 34 +--
6342 drivers/video/via/dvi.h | 3 +-
6343 drivers/video/via/global.c | 2 +
6344 drivers/video/via/global.h | 2 +
6345 drivers/video/via/hw.c | 544 ++++++-----------------------------
6346 drivers/video/via/hw.h | 285 +------------------
6347 drivers/video/via/lcd.c | 53 ++--
6348 drivers/video/via/lcd.h | 7 +-
6349 drivers/video/via/share.h | 23 +--
6350 drivers/video/via/via-core.c | 2 +-
6351 drivers/video/via/via_modesetting.c | 104 +++++++
6352 drivers/video/via/via_modesetting.h | 18 ++
6353 drivers/video/via/viafbdev.c | 166 ++++++------
6354 drivers/video/via/viamode.c | 60 +++-
6355 drivers/video/via/viamode.h | 4 +-
6356 15 files changed, 391 insertions(+), 916 deletions(-)
6357 Merging omap_dss2/for-next
6358 $ git merge omap_dss2/for-next
6360 Merging voltage/for-next
6361 $ git merge voltage/for-next
6362 Merge made by recursive.
6363 drivers/regulator/88pm8607.c | 2 +-
6364 drivers/regulator/aat2870-regulator.c | 1 +
6365 drivers/regulator/core.c | 41 +++++++
6366 drivers/regulator/max8649.c | 2 +-
6367 drivers/regulator/max8952.c | 3 -
6368 drivers/regulator/tps65023-regulator.c | 190 +++++++++++++++++++++++++++----
6369 drivers/regulator/tps6507x-regulator.c | 8 +-
6370 drivers/regulator/tps6586x-regulator.c | 32 +++++-
6371 drivers/regulator/tps65912-regulator.c | 2 -
6372 include/linux/mfd/tps6586x.h | 16 +++
6373 10 files changed, 257 insertions(+), 40 deletions(-)
6374 Merging security/next
6375 $ git merge security/next
6376 Resolved 'fs/ocfs2/xattr.c' using previous resolution.
6377 Auto-merging Documentation/kernel-parameters.txt
6378 Auto-merging MAINTAINERS
6379 Auto-merging fs/gfs2/inode.c
6380 Auto-merging fs/ocfs2/xattr.c
6381 CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
6382 Auto-merging fs/xfs/xfs_iops.c
6383 Auto-merging kernel/cred.c
6384 Removing security/integrity/ima/ima_iint.c
6385 Automatic merge failed; fix conflicts and then commit the result.
6387 [master 4b8f7b9] Merge remote-tracking branch 'security/next'
6388 $ git diff -M --stat --summary HEAD^..
6389 Documentation/ABI/testing/evm | 23 ++
6390 Documentation/kernel-parameters.txt | 6 +
6392 drivers/char/tpm/tpm.c | 3 +
6394 fs/btrfs/xattr.c | 50 +++---
6395 fs/cifs/xattr.c | 40 ++--
6396 fs/ext2/xattr_security.c | 34 ++--
6397 fs/ext3/xattr_security.c | 36 ++--
6398 fs/ext4/xattr_security.c | 36 ++--
6399 fs/gfs2/inode.c | 38 ++--
6400 fs/jffs2/security.c | 35 ++--
6401 fs/jfs/xattr.c | 57 +++---
6402 fs/ocfs2/xattr.c | 41 +++--
6403 fs/reiserfs/xattr_security.c | 4 +-
6404 fs/xattr.c | 63 ++++++-
6405 fs/xfs/xfs_iops.c | 39 ++--
6406 include/linux/evm.h | 92 +++++++++
6407 include/linux/ima.h | 13 --
6408 include/linux/integrity.h | 38 ++++
6409 include/linux/security.h | 28 ++-
6410 include/linux/xattr.h | 14 ++-
6411 kernel/cred.c | 18 ++-
6413 security/Kconfig | 2 +-
6414 security/Makefile | 4 +-
6415 security/commoncap.c | 16 +-
6416 security/integrity/Kconfig | 7 +
6417 security/integrity/Makefile | 12 +
6418 security/integrity/evm/Kconfig | 14 ++
6419 security/integrity/evm/Makefile | 6 +
6420 security/integrity/evm/evm.h | 38 ++++
6421 security/integrity/evm/evm_crypto.c | 216 +++++++++++++++++++
6422 security/integrity/evm/evm_main.c | 384 ++++++++++++++++++++++++++++++++++
6423 security/integrity/evm/evm_secfs.c | 108 ++++++++++
6424 security/integrity/iint.c | 171 ++++++++++++++++
6425 security/integrity/ima/Kconfig | 1 +
6426 security/integrity/ima/Makefile | 2 +-
6427 security/integrity/ima/ima.h | 29 +--
6428 security/integrity/ima/ima_api.c | 7 +-
6429 security/integrity/ima/ima_iint.c | 169 ---------------
6430 security/integrity/ima/ima_main.c | 12 +-
6431 security/integrity/integrity.h | 47 +++++
6432 security/keys/gc.c | 386 +++++++++++++++++++++++++----------
6433 security/keys/internal.h | 4 +
6434 security/keys/key.c | 121 +-----------
6435 security/keys/keyring.c | 3 +-
6436 security/keys/process_keys.c | 16 ++-
6437 security/security.c | 71 ++++++-
6438 security/tomoyo/gc.c | 2 +-
6439 50 files changed, 1899 insertions(+), 671 deletions(-)
6440 create mode 100644 Documentation/ABI/testing/evm
6441 create mode 100644 include/linux/evm.h
6442 create mode 100644 include/linux/integrity.h
6443 create mode 100644 security/integrity/Kconfig
6444 create mode 100644 security/integrity/Makefile
6445 create mode 100644 security/integrity/evm/Kconfig
6446 create mode 100644 security/integrity/evm/Makefile
6447 create mode 100644 security/integrity/evm/evm.h
6448 create mode 100644 security/integrity/evm/evm_crypto.c
6449 create mode 100644 security/integrity/evm/evm_main.c
6450 create mode 100644 security/integrity/evm/evm_secfs.c
6451 create mode 100644 security/integrity/iint.c
6452 delete mode 100644 security/integrity/ima/ima_iint.c
6453 create mode 100644 security/integrity/integrity.h
6454 Merging selinux/master
6455 $ git merge selinux/master
6457 Merging lblnet/master
6458 $ git merge lblnet/master
6460 Merging agp/agp-next
6461 $ git merge agp/agp-next
6462 Merge made by recursive.
6463 Merging watchdog/master
6464 $ git merge watchdog/master
6465 Merge made by recursive.
6466 drivers/watchdog/hpwdt.c | 9 +++++----
6467 drivers/watchdog/watchdog_dev.c | 14 +++++++-------
6468 2 files changed, 12 insertions(+), 11 deletions(-)
6470 $ git merge bdev/master
6472 Merging dwmw2-iommu/master
6473 $ git merge dwmw2-iommu/master
6476 $ git merge iommu/next
6477 Auto-merging arch/arm/plat-omap/include/plat/iopgtable.h
6478 Auto-merging drivers/iommu/omap-iommu-debug.c
6479 Auto-merging drivers/iommu/omap-iommu.c
6480 Auto-merging drivers/iommu/omap-iovmm.c
6481 Merge made by recursive.
6482 arch/arm/mach-omap2/iommu2.c | 31 +-
6483 arch/arm/plat-omap/Kconfig | 12 -
6484 arch/arm/plat-omap/Makefile | 2 -
6485 arch/arm/plat-omap/include/plat/iommu.h | 77 ++--
6486 arch/arm/plat-omap/include/plat/iommu2.h | 4 +-
6487 arch/arm/plat-omap/{ => include/plat}/iopgtable.h | 20 +-
6488 arch/arm/plat-omap/include/plat/iovmm.h | 30 +-
6489 drivers/iommu/Kconfig | 19 +
6490 drivers/iommu/Makefile | 3 +
6491 .../iommu/omap-iommu-debug.c | 36 +-
6492 .../iommu.c => drivers/iommu/omap-iommu.c | 517 +++++++++++++-------
6493 .../iovmm.c => drivers/iommu/omap-iovmm.c | 338 +++----------
6494 drivers/media/video/Kconfig | 2 +-
6495 drivers/media/video/omap3isp/isp.c | 45 ++-
6496 drivers/media/video/omap3isp/isp.h | 5 +-
6497 drivers/media/video/omap3isp/ispccdc.c | 25 +-
6498 drivers/media/video/omap3isp/ispstat.c | 11 +-
6499 drivers/media/video/omap3isp/ispvideo.c | 4 +-
6500 lib/dma-debug.c | 68 +++-
6501 19 files changed, 677 insertions(+), 572 deletions(-)
6502 rename arch/arm/plat-omap/{ => include/plat}/iopgtable.h (82%)
6503 rename arch/arm/plat-omap/iommu-debug.c => drivers/iommu/omap-iommu-debug.c (91%)
6504 rename arch/arm/plat-omap/iommu.c => drivers/iommu/omap-iommu.c (61%)
6505 rename arch/arm/plat-omap/iovmm.c => drivers/iommu/omap-iovmm.c (63%)
6506 Merging cputime/cputime
6507 $ git merge cputime/cputime
6509 Merging osd/linux-next
6510 $ git merge osd/linux-next
6511 Merge made by recursive.
6512 fs/exofs/exofs.h | 3 --
6513 fs/exofs/super.c | 57 ++++++++++++++++++-----------------------------
6514 include/scsi/osd_ore.h | 2 +
6515 3 files changed, 24 insertions(+), 38 deletions(-)
6516 Merging jc_docs/docs-next
6517 $ git merge jc_docs/docs-next
6519 Merging nommu/master
6520 $ git merge nommu/master
6522 Merging trivial/for-next
6523 $ git merge trivial/for-next
6524 Auto-merging fs/eventpoll.c
6525 Auto-merging lib/Kconfig.debug
6526 Auto-merging lib/idr.c
6527 Auto-merging mm/vmscan.c
6528 Merge made by recursive.
6529 Documentation/ABI/removed/o2cb | 2 +-
6530 Documentation/ABI/testing/sysfs-bus-bcma | 8 ++++----
6531 .../testing/sysfs-class-backlight-driver-adp8870 | 16 ++++++++--------
6532 drivers/usb/serial/mos7720.c | 1 -
6533 drivers/usb/serial/mos7840.c | 1 -
6534 fs/eventpoll.c | 2 +-
6535 lib/Kconfig.debug | 2 +-
6538 9 files changed, 17 insertions(+), 19 deletions(-)
6539 Merging audit/for-next
6540 $ git merge audit/for-next
6542 Merging pm/linux-next
6543 $ git merge pm/linux-next
6544 Resolved 'arch/arm/mach-shmobile/board-ap4evb.c' using previous resolution.
6545 Resolved 'arch/s390/include/asm/thread_info.h' using previous resolution.
6546 Resolved 'drivers/mfd/twl4030-irq.c' using previous resolution.
6547 Auto-merging arch/alpha/include/asm/thread_info.h
6548 Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
6549 CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
6550 Auto-merging arch/arm/mach-shmobile/board-mackerel.c
6551 Auto-merging arch/arm/mach-shmobile/include/mach/sh7372.h
6552 Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
6553 Auto-merging arch/s390/Kconfig
6554 Auto-merging arch/s390/include/asm/thread_info.h
6555 CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
6556 Auto-merging drivers/bluetooth/btusb.c
6557 Auto-merging drivers/mfd/twl4030-irq.c
6558 CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c
6559 Auto-merging drivers/mfd/twl6030-irq.c
6560 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
6561 Auto-merging drivers/usb/core/hcd.c
6562 Auto-merging fs/ext4/super.c
6563 Auto-merging fs/gfs2/log.c
6564 Auto-merging fs/gfs2/quota.c
6565 Auto-merging fs/xfs/xfs_buf.c
6566 Auto-merging include/linux/netdevice.h
6567 Removing include/linux/pm_qos_params.h
6568 Auto-merging kernel/power/qos.c
6569 Auto-merging net/mac80211/main.c
6570 Auto-merging net/mac80211/mlme.c
6571 Automatic merge failed; fix conflicts and then commit the result.
6573 [master 1910ab1] Merge remote-tracking branch 'pm/linux-next'
6574 $ git diff -M --stat --summary HEAD^..
6575 Documentation/power/basic-pm-debugging.txt | 24 ++
6576 Documentation/power/freezing-of-tasks.txt | 14 +-
6577 Documentation/power/runtime_pm.txt | 1 +
6578 Documentation/usb/power-management.txt | 8 +-
6579 arch/alpha/include/asm/thread_info.h | 2 -
6580 arch/arm/include/asm/thread_info.h | 2 -
6581 arch/arm/mach-msm/clock.c | 2 +-
6582 arch/arm/mach-omap1/pm_bus.c | 1 +
6583 arch/arm/mach-shmobile/board-ap4evb.c | 1 +
6584 arch/arm/mach-shmobile/board-mackerel.c | 2 +-
6585 arch/arm/mach-shmobile/include/mach/sh7372.h | 3 +
6586 arch/arm/mach-shmobile/pm-sh7372.c | 57 +---
6587 arch/arm/mach-shmobile/pm_runtime.c | 1 +
6588 arch/arm/mach-shmobile/setup-sh7372.c | 3 +
6589 arch/avr32/include/asm/thread_info.h | 2 -
6590 arch/blackfin/include/asm/thread_info.h | 2 -
6591 arch/cris/include/asm/thread_info.h | 2 -
6592 arch/frv/include/asm/thread_info.h | 2 -
6593 arch/h8300/include/asm/thread_info.h | 2 -
6594 arch/ia64/include/asm/thread_info.h | 2 -
6595 arch/m32r/include/asm/thread_info.h | 2 -
6596 arch/m68k/include/asm/thread_info.h | 1 -
6597 arch/microblaze/include/asm/thread_info.h | 2 -
6598 arch/mips/include/asm/thread_info.h | 2 -
6599 arch/mn10300/include/asm/thread_info.h | 2 -
6600 arch/parisc/include/asm/thread_info.h | 2 -
6601 arch/powerpc/include/asm/thread_info.h | 2 -
6602 arch/s390/Kconfig | 1 +
6603 arch/s390/include/asm/thread_info.h | 2 -
6604 arch/s390/kernel/suspend.c | 118 ++++++++
6605 arch/s390/kernel/swsusp_asm64.S | 3 +
6606 arch/sh/include/asm/thread_info.h | 2 -
6607 arch/sparc/include/asm/thread_info_32.h | 2 -
6608 arch/sparc/include/asm/thread_info_64.h | 2 -
6609 arch/um/include/asm/thread_info.h | 2 -
6610 arch/unicore32/include/asm/thread_info.h | 2 -
6611 arch/x86/include/asm/thread_info.h | 2 -
6612 arch/xtensa/include/asm/thread_info.h | 2 -
6613 drivers/acpi/processor_idle.c | 2 +-
6614 drivers/base/power/Makefile | 4 +-
6615 drivers/base/power/clock_ops.c | 122 ++++-----
6616 drivers/base/power/common.c | 86 ++++++
6617 drivers/base/power/domain.c | 346 +++++++++++++----------
6618 drivers/base/power/main.c | 34 ++-
6619 drivers/base/power/qos.c | 399 ++++++++++++++++++++++++++
6620 drivers/base/power/runtime.c | 15 +-
6621 drivers/bluetooth/btmrvl_main.c | 2 -
6622 drivers/bluetooth/btusb.c | 2 +-
6623 drivers/cpuidle/cpuidle.c | 2 +-
6624 drivers/cpuidle/governors/ladder.c | 2 +-
6625 drivers/cpuidle/governors/menu.c | 2 +-
6626 drivers/hid/hid-picolcd.c | 2 +-
6627 drivers/hid/usbhid/hid-core.c | 7 +-
6628 drivers/media/video/via-camera.c | 4 +-
6629 drivers/mfd/twl6030-irq.c | 2 -
6630 drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
6631 drivers/net/irda/stir4200.c | 2 +-
6632 drivers/net/usb/usbnet.c | 2 +-
6633 drivers/net/wimax/i2400m/usb.c | 4 +-
6634 drivers/net/wireless/ipw2x00/ipw2100.c | 4 +-
6635 drivers/platform/x86/thinkpad_acpi.c | 15 +-
6636 drivers/staging/rts_pstor/rtsx.c | 2 -
6637 drivers/usb/class/cdc-acm.c | 2 +-
6638 drivers/usb/class/cdc-wdm.c | 6 +-
6639 drivers/usb/core/driver.c | 9 +-
6640 drivers/usb/core/hcd.c | 4 +-
6641 drivers/usb/core/hub.c | 10 +-
6642 drivers/usb/serial/sierra.c | 2 +-
6643 drivers/usb/serial/usb_wwan.c | 2 +-
6644 fs/btrfs/async-thread.c | 2 +-
6645 fs/btrfs/disk-io.c | 8 +-
6646 fs/ext4/super.c | 3 +-
6647 fs/fs-writeback.c | 4 +-
6648 fs/gfs2/log.c | 4 +-
6649 fs/gfs2/quota.c | 4 +-
6650 fs/jbd/journal.c | 2 +-
6651 fs/jbd2/journal.c | 2 +-
6652 fs/jfs/jfs_logmgr.c | 2 +-
6653 fs/jfs/jfs_txnmgr.c | 4 +-
6654 fs/nilfs2/segment.c | 2 +-
6655 fs/xfs/xfs_buf.c | 2 +-
6656 include/linux/device.h | 5 +
6657 include/linux/freezer.h | 78 ++---
6658 include/linux/kthread.h | 1 +
6659 include/linux/netdevice.h | 4 +-
6660 include/linux/pm.h | 32 ++-
6661 include/linux/pm_clock.h | 71 +++++
6662 include/linux/pm_domain.h | 18 +-
6663 include/linux/pm_qos.h | 147 ++++++++++
6664 include/linux/pm_qos_params.h | 38 ---
6665 include/linux/pm_runtime.h | 42 ---
6666 include/linux/sched.h | 3 +-
6667 include/linux/suspend.h | 86 ++++++
6668 include/sound/pcm.h | 4 +-
6669 kernel/Makefile | 2 +-
6670 kernel/cgroup_freezer.c | 51 ++--
6671 kernel/exit.c | 8 +-
6673 kernel/freezer.c | 179 +++++++-----
6674 kernel/kthread.c | 25 ++
6675 kernel/power/Kconfig | 3 +
6676 kernel/power/Makefile | 2 +-
6677 kernel/power/hibernate.c | 15 +-
6678 kernel/power/main.c | 102 +++++++
6679 kernel/power/process.c | 65 ++---
6680 kernel/{pm_qos_params.c => power/qos.c} | 273 +++++++++---------
6681 kernel/power/snapshot.c | 18 ++
6682 kernel/power/suspend.c | 17 +-
6683 kernel/power/user.c | 4 +-
6684 mm/backing-dev.c | 8 +-
6685 net/mac80211/main.c | 2 +-
6686 net/mac80211/mlme.c | 2 +-
6687 net/mac80211/scan.c | 2 +-
6688 sound/core/pcm_native.c | 2 +-
6689 sound/usb/card.c | 2 +-
6690 115 files changed, 1875 insertions(+), 859 deletions(-)
6691 create mode 100644 drivers/base/power/common.c
6692 create mode 100644 drivers/base/power/qos.c
6693 create mode 100644 include/linux/pm_clock.h
6694 create mode 100644 include/linux/pm_qos.h
6695 delete mode 100644 include/linux/pm_qos_params.h
6696 rename kernel/{pm_qos_params.c => power/qos.c} (71%)
6697 Merging apm/for-next
6698 $ git merge apm/for-next
6699 Auto-merging drivers/char/apm-emulation.c
6700 Merge made by recursive.
6701 drivers/char/apm-emulation.c | 16 ++++++----------
6702 1 files changed, 6 insertions(+), 10 deletions(-)
6703 Merging fsnotify/for-next
6704 $ git merge fsnotify/for-next
6705 Auto-merging fs/cachefiles/namei.c
6706 Auto-merging fs/nfsd/vfs.c
6707 Auto-merging fs/notify/fanotify/fanotify_user.c
6708 Auto-merging fs/notify/group.c
6709 Auto-merging fs/notify/mark.c
6710 Auto-merging include/linux/fsnotify_backend.h
6711 Merge made by recursive.
6712 fs/cachefiles/namei.c | 1 -
6713 fs/cachefiles/xattr.c | 1 -
6715 fs/notify/dnotify/dnotify.c | 15 +++---
6716 fs/notify/fanotify/fanotify.c | 24 +++++----
6717 fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++-----------
6718 fs/notify/group.c | 1 +
6719 fs/notify/mark.c | 36 +++++--------
6720 include/linux/fanotify.h | 5 ++-
6721 include/linux/fsnotify_backend.h | 14 ++++-
6722 10 files changed, 121 insertions(+), 80 deletions(-)
6723 Merging irda/for-next
6724 $ git merge irda/for-next
6726 Merging i7core_edac/linux_next
6727 $ git merge i7core_edac/linux_next
6728 Auto-merging drivers/edac/i7core_edac.c
6729 Merge made by recursive.
6730 drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++---
6731 1 files changed, 20 insertions(+), 3 deletions(-)
6732 Merging i7300_edac/linux_next
6733 $ git merge i7300_edac/linux_next
6734 Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
6735 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
6736 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
6737 Removing drivers/edac/edac_mce.c
6738 Auto-merging drivers/edac/i7core_edac.c
6739 Auto-merging include/linux/edac.h
6740 Removing include/linux/edac_mce.h
6741 Automatic merge failed; fix conflicts and then commit the result.
6743 [master 0ef20cc] Merge remote-tracking branch 'i7300_edac/linux_next'
6744 $ git diff -M --stat --summary HEAD^..
6745 arch/x86/kernel/cpu/mcheck/mce.c | 18 +--
6746 drivers/edac/Kconfig | 8 +-
6747 drivers/edac/Makefile | 1 -
6748 drivers/edac/edac_core.h | 350 +----------------------------------
6749 drivers/edac/edac_mce.c | 61 ------
6750 drivers/edac/i7core_edac.c | 385 ++++++++++++++++++++++++++++++++++----
6751 include/linux/edac.h | 350 ++++++++++++++++++++++++++++++++++
6752 include/linux/edac_mce.h | 31 ---
6753 8 files changed, 709 insertions(+), 495 deletions(-)
6754 delete mode 100644 drivers/edac/edac_mce.c
6755 delete mode 100644 include/linux/edac_mce.h
6756 Merging devicetree/devicetree/next
6757 $ git merge devicetree/devicetree/next
6758 Resolved 'drivers/of/base.c' using previous resolution.
6759 Auto-merging drivers/of/base.c
6760 CONFLICT (content): Merge conflict in drivers/of/base.c
6761 Automatic merge failed; fix conflicts and then commit the result.
6763 [master fabc2a8] Merge remote-tracking branch 'devicetree/devicetree/next'
6764 $ git diff -M --stat --summary HEAD^..
6765 Merging spi/spi/next
6766 $ git merge spi/spi/next
6768 Merging gpio/gpio/next
6769 $ git merge gpio/gpio/next
6771 Merging tip/auto-latest
6772 $ git merge tip/auto-latest
6773 Resolved 'arch/x86/mm/fault.c' using previous resolution.
6774 Auto-merging Documentation/kernel-parameters.txt
6775 Auto-merging arch/x86/mm/fault.c
6776 CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
6777 Auto-merging arch/x86/xen/mmu.c
6778 Automatic merge failed; fix conflicts and then commit the result.
6780 [master 036d58b] Merge remote-tracking branch 'tip/auto-latest'
6781 $ git diff -M --stat --summary HEAD^..
6782 Documentation/kernel-parameters.txt | 18 ++++
6783 Documentation/x86/entry_64.txt | 3 -
6784 arch/x86/Kconfig | 9 ++
6785 arch/x86/include/asm/archrandom.h | 75 +++++++++++++++++
6786 arch/x86/include/asm/cmpxchg_32.h | 21 +++++
6787 arch/x86/include/asm/cmpxchg_64.h | 26 ++++++
6788 arch/x86/include/asm/elf.h | 31 +++++++
6789 arch/x86/include/asm/pgtable_types.h | 1 -
6790 arch/x86/include/asm/spinlock.h | 140 +++++++++++---------------------
6791 arch/x86/include/asm/spinlock_types.h | 22 +++++-
6792 arch/x86/include/asm/x86_init.h | 12 ---
6793 arch/x86/kernel/cpu/Makefile | 1 +
6794 arch/x86/kernel/cpu/amd.c | 47 +++++++----
6795 arch/x86/kernel/cpu/common.c | 5 +
6796 arch/x86/kernel/cpu/cpu.h | 1 +
6797 arch/x86/kernel/cpu/rdrand.c | 73 ++++++++++++++++
6798 arch/x86/kernel/sys_x86_64.c | 77 +++++++++++++++++-
6799 arch/x86/kernel/x86_init.c | 4 -
6800 arch/x86/mm/fault.c | 2 +-
6801 arch/x86/mm/init.c | 147 ++++++++++++++++++++++++---------
6802 arch/x86/mm/mmap.c | 20 +----
6803 arch/x86/vdso/vma.c | 9 ++
6804 arch/x86/xen/mmu.c | 15 ----
6805 drivers/char/random.c | 23 +++++-
6806 include/linux/random.h | 13 +++
6807 25 files changed, 588 insertions(+), 207 deletions(-)
6808 create mode 100644 arch/x86/include/asm/archrandom.h
6809 create mode 100644 arch/x86/kernel/cpu/rdrand.c
6810 $ git revert -m 1 6f8fa39c81f1
6811 [master 9f518a5] Revert "Merge branch 'x86/spinlocks' into auto-latest"
6812 4 files changed, 109 insertions(+), 128 deletions(-)
6813 rewrite arch/x86/include/asm/spinlock_types.h (60%)
6814 Merging rcu/rcu/next
6815 $ git merge rcu/rcu/next
6816 Auto-merging Documentation/RCU/NMI-RCU.txt
6817 Auto-merging include/linux/rcupdate.h
6818 Auto-merging include/linux/sched.h
6819 Auto-merging init/Kconfig
6820 Auto-merging kernel/lockdep.c
6821 Auto-merging kernel/pid.c
6822 Auto-merging kernel/rcupdate.c
6823 Auto-merging kernel/rcutorture.c
6824 Auto-merging kernel/rcutree_trace.c
6825 Auto-merging kernel/rtmutex.c
6826 Auto-merging kernel/sched.c
6827 Merge made by recursive.
6828 Documentation/RCU/NMI-RCU.txt | 2 +-
6829 Documentation/RCU/lockdep-splat.txt | 110 +++++++++
6830 Documentation/RCU/lockdep.txt | 34 ++-
6831 Documentation/RCU/torture.txt | 137 ++++++++---
6832 Documentation/RCU/trace.txt | 38 ++--
6833 include/linux/lockdep.h | 2 +-
6834 include/linux/rcupdate.h | 303 +++++++++++-------------
6835 include/linux/rcutiny.h | 20 ++-
6836 include/linux/rcutree.h | 2 +
6837 include/linux/sched.h | 4 -
6838 include/linux/types.h | 10 +
6839 include/trace/events/rcu.h | 459 +++++++++++++++++++++++++++++++++++
6841 kernel/lockdep.c | 84 ++++---
6843 kernel/rcu.h | 85 +++++++
6844 kernel/rcupdate.c | 26 ++-
6845 kernel/rcutiny.c | 117 ++-------
6846 kernel/rcutiny_plugin.h | 135 +++++++----
6847 kernel/rcutorture.c | 77 +++----
6848 kernel/rcutree.c | 297 +++++++++++++++--------
6849 kernel/rcutree.h | 17 +-
6850 kernel/rcutree_plugin.h | 159 +++++++-----
6851 kernel/rcutree_trace.c | 13 +-
6852 kernel/rtmutex.c | 8 +
6853 kernel/sched.c | 13 +-
6854 kernel/time/tick-sched.c | 6 -
6855 27 files changed, 1508 insertions(+), 660 deletions(-)
6856 create mode 100644 Documentation/RCU/lockdep-splat.txt
6857 create mode 100644 include/trace/events/rcu.h
6858 create mode 100644 kernel/rcu.h
6859 Merging kvm/linux-next
6860 $ git merge kvm/linux-next
6861 Auto-merging Documentation/kernel-parameters.txt
6862 Merge made by recursive.
6863 Documentation/kernel-parameters.txt | 4 +
6864 Documentation/virtual/kvm/api.txt | 24 ++++-
6865 arch/x86/include/asm/kvm_host.h | 7 +-
6866 arch/x86/kvm/emulate.c | 95 +++++++++--------
6867 arch/x86/kvm/i8254.c | 6 +-
6868 arch/x86/kvm/i8259.c | 108 +++++++++++++++----
6869 arch/x86/kvm/irq.h | 4 +-
6870 arch/x86/kvm/kvm_cache_regs.h | 7 --
6871 arch/x86/kvm/mmu.c | 5 +-
6872 arch/x86/kvm/paging_tmpl.h | 24 +++--
6873 arch/x86/kvm/svm.c | 88 +++++----------
6874 arch/x86/kvm/trace.h | 118 ++++++++++++++++++--
6875 arch/x86/kvm/vmx.c | 94 +++++++----------
6876 arch/x86/kvm/x86.c | 205 ++++++++++++++++++++++-------------
6877 include/linux/kvm.h | 3 +-
6878 include/linux/kvm_host.h | 23 ++--
6879 virt/kvm/coalesced_mmio.c | 131 ++++++++++------------
6880 virt/kvm/coalesced_mmio.h | 7 +-
6881 virt/kvm/eventfd.c | 3 +-
6882 virt/kvm/ioapic.c | 3 +-
6883 virt/kvm/kvm_main.c | 112 +++++++++++++++++--
6884 21 files changed, 678 insertions(+), 393 deletions(-)
6885 Merging oprofile/for-next
6886 $ git merge oprofile/for-next
6888 Merging ptrace/ptrace
6889 $ git merge ptrace/ptrace
6890 Auto-merging arch/mips/kernel/signal.c
6891 Auto-merging arch/openrisc/kernel/signal.c
6892 Auto-merging arch/sparc/kernel/signal32.c
6893 Auto-merging arch/sparc/kernel/signal_32.c
6894 Auto-merging arch/sparc/kernel/signal_64.c
6895 Auto-merging include/linux/sched.h
6896 Auto-merging kernel/fork.c
6897 Merge made by recursive.
6898 arch/alpha/kernel/signal.c | 31 ++++++------------
6899 arch/arm/kernel/signal.c | 24 +++++---------
6900 arch/avr32/kernel/signal.c | 26 +++++----------
6901 arch/blackfin/kernel/signal.c | 17 ++--------
6902 arch/cris/arch-v10/kernel/signal.c | 34 +++++++-------------
6903 arch/cris/arch-v32/kernel/signal.c | 37 ++++++---------------
6904 arch/frv/kernel/signal.c | 32 ++++++-------------
6905 arch/h8300/kernel/signal.c | 33 +++++--------------
6906 arch/ia64/kernel/signal.c | 15 +--------
6907 arch/m32r/kernel/signal.c | 12 +------
6908 arch/m68k/kernel/signal_mm.c | 22 +++++--------
6909 arch/m68k/kernel/signal_no.c | 28 +++++-----------
6910 arch/microblaze/kernel/signal.c | 42 ++++++++++---------------
6911 arch/mips/kernel/signal.c | 27 +++-------------
6912 arch/mips/kernel/signal32.c | 20 ++---------
6913 arch/mips/kernel/signal_n32.c | 10 +-----
6914 arch/mn10300/kernel/signal.c | 32 ++++++-------------
6915 arch/openrisc/kernel/signal.c | 45 +++++++++++---------------
6916 arch/parisc/kernel/signal.c | 12 +------
6917 arch/powerpc/kernel/signal.c | 13 +------
6918 arch/powerpc/kernel/signal_32.c | 11 +++---
6919 arch/s390/kernel/compat_signal.c | 6 +---
6920 arch/s390/kernel/signal.c | 6 +---
6921 arch/score/kernel/signal.c | 13 ++------
6922 arch/sh/kernel/signal_32.c | 35 ++++++---------------
6923 arch/sh/kernel/signal_64.c | 40 ++++++-----------------
6924 arch/sparc/include/asm/signal.h | 3 +-
6925 arch/sparc/kernel/signal32.c | 17 ++--------
6926 arch/sparc/kernel/signal_32.c | 28 +++++-----------
6927 arch/sparc/kernel/signal_64.c | 29 ++++++-----------
6928 arch/tile/kernel/compat_signal.c | 5 +--
6929 arch/tile/kernel/signal.c | 13 +------
6930 arch/um/kernel/signal.c | 28 +++++-----------
6931 arch/um/sys-i386/signal.c | 12 +------
6932 arch/um/sys-x86_64/signal.c | 6 +---
6933 arch/unicore32/kernel/signal.c | 13 +------
6934 arch/x86/kernel/signal.c | 6 +---
6935 arch/xtensa/kernel/signal.c | 35 ++++++--------------
6936 fs/autofs4/waitq.c | 14 ++------
6937 fs/coda/upcall.c | 19 +++++------
6939 fs/exec.c | 18 +---------
6940 fs/ncpfs/sock.c | 15 +++------
6941 include/linux/sched.h | 3 +-
6942 include/linux/signal.h | 1 +
6943 kernel/fork.c | 61 +++++++++++++++++++++++-------------
6944 kernel/signal.c | 22 +++++++++++++
6945 47 files changed, 321 insertions(+), 651 deletions(-)
6946 Merging xen/upstream/xen
6947 $ git merge xen/upstream/xen
6948 Merge made by recursive.
6949 arch/x86/include/asm/atomic.h | 8 +-
6950 arch/x86/include/asm/atomic64_64.h | 6 +-
6951 arch/x86/include/asm/cmpxchg.h | 205 +++++++++++++++++++++++++++++++++
6952 arch/x86/include/asm/cmpxchg_32.h | 114 ------------------
6953 arch/x86/include/asm/cmpxchg_64.h | 131 ---------------------
6954 arch/x86/include/asm/rwsem.h | 8 +-
6955 arch/x86/include/asm/spinlock.h | 110 +++++-------------
6956 arch/x86/include/asm/spinlock_types.h | 22 +++-
6957 arch/x86/include/asm/uv/uv_bau.h | 6 +-
6958 arch/x86/xen/time.c | 5 +-
6959 10 files changed, 260 insertions(+), 355 deletions(-)
6960 Merging xen-two/linux-next
6961 $ git merge xen-two/linux-next
6962 Auto-merging arch/x86/xen/mmu.c
6963 Auto-merging drivers/block/xen-blkback/xenbus.c
6964 Merge made by recursive.
6965 arch/x86/xen/Kconfig | 8 -----
6966 arch/x86/xen/mmu.c | 38 ------------------------
6967 drivers/block/xen-blkback/blkback.c | 8 ++--
6968 drivers/block/xen-blkback/xenbus.c | 8 +++++
6969 drivers/block/xen-blkfront.c | 9 +++--
6970 drivers/pci/xen-pcifront.c | 4 +-
6971 drivers/xen/balloon.c | 15 ++++-----
6972 drivers/xen/events.c | 9 ++---
6973 drivers/xen/gntdev.c | 3 +-
6974 drivers/xen/grant-table.c | 2 +-
6975 drivers/xen/pci.c | 4 +-
6976 drivers/xen/swiotlb-xen.c | 42 ++++++++++++++++++--------
6977 drivers/xen/xen-balloon.c | 17 +++++------
6978 drivers/xen/xen-pciback/conf_space_header.c | 2 +-
6979 drivers/xen/xenbus/xenbus_probe.c | 7 ++--
6980 drivers/xen/xenbus/xenbus_probe.h | 3 +-
6981 16 files changed, 76 insertions(+), 103 deletions(-)
6982 Merging xen-pvhvm/linux-next
6983 $ git merge xen-pvhvm/linux-next
6985 Merging edac-amd/for-next
6986 $ git merge edac-amd/for-next
6987 Merge made by recursive.
6988 drivers/edac/amd64_edac.c | 6 ++----
6989 drivers/edac/mce_amd.c | 44 +++++++++++++-------------------------------
6990 drivers/edac/mce_amd.h | 6 +++---
6991 3 files changed, 18 insertions(+), 38 deletions(-)
6992 Merging percpu/for-next
6993 $ git merge percpu/for-next
6994 Merge made by recursive.
6995 mm/percpu-vm.c | 5 ++---
6996 mm/percpu.c | 17 +++++++++--------
6997 2 files changed, 11 insertions(+), 11 deletions(-)
6998 Merging workqueues/for-next
6999 $ git merge workqueues/for-next
7001 Merging sfi/sfi-test
7002 $ git merge sfi/sfi-test
7004 Merging asm-generic/next
7005 $ git merge asm-generic/next
7007 Merging drivers-x86/linux-next
7008 $ git merge drivers-x86/linux-next
7010 Merging hwpoison/hwpoison
7011 $ git merge hwpoison/hwpoison
7013 Merging sysctl/master
7014 $ git merge sysctl/master
7015 Auto-merging fs/proc/proc_sysctl.c
7016 Merge made by recursive.
7017 fs/proc/proc_sysctl.c | 14 ++------------
7018 1 files changed, 2 insertions(+), 12 deletions(-)
7019 Merging namespace/master
7020 $ git merge namespace/master
7021 Auto-merging fs/proc/inode.c
7022 Merge made by recursive.
7023 fs/proc/inode.c | 6 +-
7024 fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++-------
7025 2 files changed, 142 insertions(+), 24 deletions(-)
7026 Merging regmap/for-next
7027 $ git merge regmap/for-next
7028 Auto-merging drivers/base/regmap/regmap-spi.c
7029 Auto-merging drivers/base/regmap/regmap.c
7030 Auto-merging drivers/mfd/Kconfig
7031 Auto-merging drivers/mfd/wm8994-core.c
7032 Auto-merging include/linux/mfd/wm8994/core.h
7033 Merge made by recursive.
7034 drivers/base/regmap/Makefile | 1 +
7035 drivers/base/regmap/internal.h | 66 ++++++
7036 drivers/base/regmap/regmap-debugfs.c | 209 +++++++++++++++++
7037 drivers/base/regmap/regmap-i2c.c | 1 -
7038 drivers/base/regmap/regmap-spi.c | 1 -
7039 drivers/base/regmap/regmap.c | 139 +++++++++---
7040 drivers/mfd/Kconfig | 3 +
7041 drivers/mfd/wm831x-core.c | 424 +++++++++++++++++++++++++++++-----
7042 drivers/mfd/wm831x-i2c.c | 68 +-----
7043 drivers/mfd/wm831x-spi.c | 196 +++-------------
7044 drivers/mfd/wm8400-core.c | 106 +++------
7045 drivers/mfd/wm8994-core.c | 178 +++------------
7046 include/linux/mfd/wm831x/core.h | 9 +-
7047 include/linux/mfd/wm8400-private.h | 7 +-
7048 include/linux/mfd/wm8994/core.h | 9 +-
7049 include/linux/regmap.h | 47 ++++-
7050 include/trace/events/regmap.h | 112 +++++++++
7051 17 files changed, 1025 insertions(+), 551 deletions(-)
7052 create mode 100644 drivers/base/regmap/internal.h
7053 create mode 100644 drivers/base/regmap/regmap-debugfs.c
7054 create mode 100644 include/trace/events/regmap.h
7055 Merging driver-core/driver-core-next
7056 $ git merge driver-core/driver-core-next
7057 Resolved 'arch/arm/plat-mxc/devices.c' using previous resolution.
7058 Auto-merging MAINTAINERS
7059 Auto-merging arch/arm/plat-mxc/devices.c
7060 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
7061 Auto-merging arch/arm/plat-mxc/include/mach/devices-common.h
7062 Auto-merging drivers/base/platform.c
7063 Auto-merging include/linux/device.h
7064 Auto-merging include/linux/netdevice.h
7065 Auto-merging net/core/dev.c
7066 Automatic merge failed; fix conflicts and then commit the result.
7068 [master 6aa839d] Merge remote-tracking branch 'driver-core/driver-core-next'
7069 $ git diff -M --stat --summary HEAD^..
7070 Documentation/driver-model/binding.txt | 4 -
7071 Documentation/driver-model/device.txt | 65 +++++-----
7072 Documentation/filesystems/sysfs.txt | 10 ++-
7074 arch/arm/plat-mxc/devices.c | 53 -------
7075 arch/arm/plat-mxc/include/mach/devices-common.h | 16 ++-
7076 drivers/base/core.c | 5 +-
7077 drivers/base/platform.c | 54 +++++---
7078 drivers/misc/pch_phub.c | 10 +-
7079 drivers/uio/uio.c | 7 +-
7080 drivers/uio/uio_pci_generic.c | 5 -
7081 drivers/uio/uio_pdrv_genirq.c | 2 +-
7082 fs/debugfs/inode.c | 2 +-
7083 fs/sysfs/dir.c | 167 +++++++++++++++--------
7084 fs/sysfs/inode.c | 14 +--
7085 fs/sysfs/sysfs.h | 17 ++-
7086 include/linux/device.h | 5 +
7087 include/linux/dynamic_debug.h | 34 ++++--
7088 include/linux/netdevice.h | 10 +-
7089 include/linux/platform_device.h | 48 ++++++-
7090 lib/dynamic_debug.c | 158 +++++++++++++++------
7091 lib/kobject_uevent.c | 2 +-
7092 net/core/dev.c | 3 +-
7093 23 files changed, 432 insertions(+), 265 deletions(-)
7094 Merging tty/tty-next
7095 $ git merge tty/tty-next
7096 Auto-merging arch/arm/Kconfig
7097 Auto-merging arch/arm/plat-samsung/Makefile
7098 Removing arch/arm/plat-samsung/irq-uart.c
7099 Auto-merging arch/x86/platform/mrst/mrst.c
7100 Auto-merging drivers/tty/serial/8250.c
7101 Auto-merging drivers/tty/serial/atmel_serial.c
7102 Auto-merging drivers/tty/serial/bfin_uart.c
7103 Auto-merging drivers/tty/serial/mrst_max3110.c
7104 Auto-merging drivers/tty/serial/samsung.c
7105 Auto-merging drivers/tty/serial/serial_core.c
7106 Auto-merging include/linux/tty.h
7107 Merge made by recursive.
7108 .../bindings/tty/serial/snps-dw-apb-uart.txt | 25 +
7109 Documentation/serial/serial-rs485.txt | 3 +
7110 arch/arm/Kconfig | 1 -
7111 arch/arm/mach-s3c64xx/dev-uart.c | 60 +--
7112 arch/arm/mach-s3c64xx/include/mach/irqs.h | 30 -
7113 arch/arm/mach-s3c64xx/irq.c | 25 -
7114 arch/arm/plat-s5p/Kconfig | 1 -
7115 arch/arm/plat-s5p/dev-uart.c | 84 +--
7116 arch/arm/plat-s5p/include/plat/irqs.h | 35 -
7117 arch/arm/plat-s5p/irq.c | 34 -
7118 arch/arm/plat-samsung/Kconfig | 5 -
7119 arch/arm/plat-samsung/Makefile | 1 -
7120 arch/arm/plat-samsung/include/plat/regs-serial.h | 5 +
7121 arch/arm/plat-samsung/irq-uart.c | 96 ---
7122 arch/mips/pmc-sierra/msp71xx/msp_serial.c | 73 ++-
7123 arch/powerpc/include/asm/udbg.h | 1 +
7124 arch/powerpc/kernel/udbg.c | 2 +
7125 arch/x86/platform/mrst/mrst.c | 3 +
7126 drivers/isdn/i4l/isdn_tty.c | 2 +-
7127 drivers/tty/Kconfig | 34 +
7128 drivers/tty/Makefile | 1 +
7129 drivers/tty/amiserial.c | 10 +-
7130 drivers/tty/cyclades.c | 12 +-
7131 drivers/tty/ehv_bytechan.c | 884 ++++++++++++++++++++
7132 drivers/tty/hvc/hvc_console.c | 2 +-
7133 drivers/tty/hvc/hvcs.c | 2 +-
7134 drivers/tty/mxser.c | 13 +-
7135 drivers/tty/n_gsm.c | 9 +-
7136 drivers/tty/serial/8250.c | 108 +--
7137 drivers/tty/serial/8250_dw.c | 194 +++++
7138 drivers/tty/serial/Kconfig | 13 +-
7139 drivers/tty/serial/Makefile | 3 +-
7140 drivers/tty/serial/atmel_serial.c | 9 +-
7141 drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} | 61 +-
7142 drivers/tty/serial/imx.c | 10 +-
7143 drivers/tty/serial/jsm/jsm.h | 10 -
7144 drivers/tty/serial/jsm/jsm_driver.c | 19 -
7145 drivers/tty/serial/jsm/jsm_neo.c | 29 +-
7146 drivers/tty/serial/jsm/jsm_tty.c | 94 +--
7147 drivers/tty/serial/mfd.c | 47 +
7148 drivers/tty/serial/mrst_max3110.c | 115 ++--
7149 drivers/tty/serial/mrst_max3110.h | 1 +
7150 drivers/tty/serial/msm_serial.c | 2 -
7151 drivers/tty/serial/samsung.c | 107 +++-
7152 drivers/tty/serial/samsung.h | 1 +
7153 drivers/tty/serial/serial_core.c | 64 +--
7154 drivers/tty/synclink.c | 1 -
7155 drivers/tty/tty_ldisc.c | 1 -
7156 drivers/tty/tty_mutex.c | 12 -
7157 drivers/tty/tty_port.c | 2 +-
7158 drivers/tty/vt/selection.c | 4 +-
7159 drivers/tty/vt/vt.c | 2 +-
7160 include/linux/serial.h | 1 +
7161 include/linux/serial_8250.h | 2 +
7162 include/linux/serial_core.h | 6 +-
7163 include/linux/tty.h | 20 +-
7164 net/irda/ircomm/ircomm_tty.c | 2 +-
7165 57 files changed, 1619 insertions(+), 774 deletions(-)
7166 create mode 100644 Documentation/devicetree/bindings/tty/serial/snps-dw-apb-uart.txt
7167 delete mode 100644 arch/arm/plat-samsung/irq-uart.c
7168 create mode 100644 drivers/tty/ehv_bytechan.c
7169 create mode 100644 drivers/tty/serial/8250_dw.c
7170 rename drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} (97%)
7171 Merging usb/usb-next
7172 $ git merge usb/usb-next
7173 Auto-merging MAINTAINERS
7174 Auto-merging arch/arm/mach-mmp/pxa168.c
7175 Auto-merging drivers/usb/class/cdc-acm.c
7176 Auto-merging drivers/usb/class/cdc-wdm.c
7177 Auto-merging drivers/usb/core/hub.c
7178 Merge made by recursive.
7179 Documentation/usb/dwc3.txt | 53 +
7181 arch/arm/mach-mmp/include/mach/pxa168.h | 7 +
7182 arch/arm/mach-mmp/pxa168.c | 46 +
7183 drivers/usb/Kconfig | 3 +
7184 drivers/usb/Makefile | 2 +
7185 drivers/usb/class/cdc-acm.c | 6 +-
7186 drivers/usb/class/cdc-wdm.c | 2 +-
7187 drivers/usb/class/usbtmc.c | 5 +-
7188 drivers/usb/core/config.c | 8 +-
7189 drivers/usb/core/devices.c | 4 +-
7190 drivers/usb/core/endpoint.c | 2 +-
7191 drivers/usb/core/hub.c | 7 +-
7192 drivers/usb/core/urb.c | 2 +-
7193 drivers/usb/dwc3/Kconfig | 25 +
7194 drivers/usb/dwc3/Makefile | 36 +
7195 drivers/usb/dwc3/core.c | 467 +++++++
7196 drivers/usb/dwc3/core.h | 709 +++++++++++
7197 drivers/usb/dwc3/debug.h | 51 +
7198 drivers/usb/dwc3/debugfs.c | 534 ++++++++
7199 drivers/usb/dwc3/dwc3-omap.c | 410 ++++++
7200 drivers/usb/dwc3/dwc3-pci.c | 220 ++++
7201 drivers/usb/dwc3/ep0.c | 782 ++++++++++++
7202 drivers/usb/dwc3/gadget.c | 2062 +++++++++++++++++++++++++++++++
7203 drivers/usb/dwc3/gadget.h | 297 +++++
7204 drivers/usb/dwc3/io.h | 55 +
7205 drivers/usb/gadget/Kconfig | 21 +-
7206 drivers/usb/gadget/amd5536udc.c | 2 +-
7207 drivers/usb/gadget/at91_udc.c | 2 +-
7208 drivers/usb/gadget/atmel_usba_udc.c | 4 +-
7209 drivers/usb/gadget/ci13xxx_udc.c | 2 +-
7210 drivers/usb/gadget/composite.c | 2 +-
7211 drivers/usb/gadget/dummy_hcd.c | 4 +-
7212 drivers/usb/gadget/epautoconf.c | 2 +-
7213 drivers/usb/gadget/f_mass_storage.c | 3 +-
7214 drivers/usb/gadget/file_storage.c | 2 +-
7215 drivers/usb/gadget/fsl_qe_udc.c | 2 +-
7216 drivers/usb/gadget/fsl_udc_core.c | 2 +-
7217 drivers/usb/gadget/fusb300_udc.c | 2 +-
7218 drivers/usb/gadget/gadget_chips.h | 3 +
7219 drivers/usb/gadget/imx_udc.c | 2 +-
7220 drivers/usb/gadget/langwell_udc.c | 2 +-
7221 drivers/usb/gadget/m66592-udc.c | 4 +-
7222 drivers/usb/gadget/mv_udc_core.c | 2 +-
7223 drivers/usb/gadget/net2272.c | 2 +-
7224 drivers/usb/gadget/net2280.c | 4 +-
7225 drivers/usb/gadget/omap_udc.c | 7 +-
7226 drivers/usb/gadget/pch_udc.c | 6 +-
7227 drivers/usb/gadget/pxa25x_udc.c | 14 +-
7228 drivers/usb/gadget/pxa27x_udc.c | 2 +-
7229 drivers/usb/gadget/r8a66597-udc.c | 4 +-
7230 drivers/usb/gadget/s3c-hsotg.c | 2 +-
7231 drivers/usb/gadget/s3c-hsudc.c | 55 +-
7232 drivers/usb/gadget/s3c2410_udc.c | 2 +-
7233 drivers/usb/host/Kconfig | 13 +-
7234 drivers/usb/host/ehci-au1xxx.c | 2 +-
7235 drivers/usb/host/ehci-dbg.c | 17 +-
7236 drivers/usb/host/ehci-fsl.c | 4 +-
7237 drivers/usb/host/ehci-hcd.c | 30 +-
7238 drivers/usb/host/ehci-hub.c | 10 +-
7239 drivers/usb/host/ehci-pci.c | 2 +-
7240 drivers/usb/host/ehci-pxa168.c | 363 ++++++
7241 drivers/usb/host/ehci-q.c | 22 +-
7242 drivers/usb/host/ehci-s5p.c | 2 +-
7243 drivers/usb/host/ehci-sched.c | 11 +-
7244 drivers/usb/host/ehci-xls.c | 161 +++
7245 drivers/usb/host/ehci.h | 7 +
7246 drivers/usb/host/fhci-hcd.c | 5 +-
7247 drivers/usb/host/isp1362-hcd.c | 6 +-
7248 drivers/usb/host/isp1760-hcd.c | 401 ++++---
7249 drivers/usb/host/isp1760-hcd.h | 3 +-
7250 drivers/usb/host/ohci-hcd.c | 5 +
7251 drivers/usb/host/ohci-omap3.c | 2 +-
7252 drivers/usb/host/ohci-q.c | 4 +-
7253 drivers/usb/host/ohci-xls.c | 151 +++
7254 drivers/usb/host/r8a66597-hcd.c | 2 +-
7255 drivers/usb/host/uhci-q.c | 6 +-
7256 drivers/usb/host/xhci-mem.c | 10 +-
7257 drivers/usb/host/xhci-ring.c | 8 +-
7258 drivers/usb/host/xhci.c | 2 +-
7259 drivers/usb/misc/adutux.c | 14 +-
7260 drivers/usb/misc/ftdi-elan.c | 2 +-
7261 drivers/usb/misc/idmouse.c | 2 +-
7262 drivers/usb/misc/iowarrior.c | 2 +-
7263 drivers/usb/misc/ldusb.c | 4 +-
7264 drivers/usb/misc/legousbtower.c | 4 +-
7265 drivers/usb/misc/usblcd.c | 129 ++-
7266 drivers/usb/misc/usbled.c | 25 +-
7267 drivers/usb/misc/usbtest.c | 10 +-
7268 drivers/usb/musb/musb_gadget.c | 2 +-
7269 drivers/usb/musb/musb_host.c | 2 +-
7270 drivers/usb/otg/twl6030-usb.c | 16 -
7271 drivers/usb/renesas_usbhs/pipe.c | 2 +-
7272 drivers/usb/serial/Kconfig | 1 +
7273 drivers/usb/serial/ftdi_sio.c | 2 +-
7274 drivers/usb/serial/io_edgeport.c | 4 +-
7275 drivers/usb/serial/ipw.c | 33 +-
7276 drivers/usb/serial/opticon.c | 2 +-
7277 drivers/usb/serial/pl2303.c | 3 -
7278 drivers/usb/serial/symbolserial.c | 2 +-
7279 drivers/usb/serial/usb-serial.c | 8 +-
7280 drivers/usb/storage/realtek_cr.c | 35 +-
7281 drivers/usb/storage/usb.c | 16 +-
7282 drivers/usb/usb-skeleton.c | 2 +-
7283 drivers/usb/wusbcore/wa-hc.c | 2 +-
7284 include/linux/usb.h | 2 +-
7285 include/linux/usb/ch9.h | 17 +
7286 107 files changed, 7127 insertions(+), 429 deletions(-)
7287 create mode 100644 Documentation/usb/dwc3.txt
7288 create mode 100644 drivers/usb/dwc3/Kconfig
7289 create mode 100644 drivers/usb/dwc3/Makefile
7290 create mode 100644 drivers/usb/dwc3/core.c
7291 create mode 100644 drivers/usb/dwc3/core.h
7292 create mode 100644 drivers/usb/dwc3/debug.h
7293 create mode 100644 drivers/usb/dwc3/debugfs.c
7294 create mode 100644 drivers/usb/dwc3/dwc3-omap.c
7295 create mode 100644 drivers/usb/dwc3/dwc3-pci.c
7296 create mode 100644 drivers/usb/dwc3/ep0.c
7297 create mode 100644 drivers/usb/dwc3/gadget.c
7298 create mode 100644 drivers/usb/dwc3/gadget.h
7299 create mode 100644 drivers/usb/dwc3/io.h
7300 create mode 100644 drivers/usb/host/ehci-pxa168.c
7301 create mode 100644 drivers/usb/host/ehci-xls.c
7302 create mode 100644 drivers/usb/host/ohci-xls.c
7303 Merging staging/staging-next
7304 $ git merge staging/staging-next
7305 Resolved 'drivers/staging/xgifb/XGI_main_26.c' using previous resolution.
7306 Auto-merging MAINTAINERS
7307 Removing drivers/char/scc.h
7308 Auto-merging drivers/staging/Kconfig
7309 Auto-merging drivers/staging/Makefile
7310 Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c
7311 Removing drivers/staging/brcm80211/brcmsmac/bmac.c
7312 Removing drivers/staging/brcm80211/brcmsmac/bmac.h
7313 Auto-merging drivers/staging/et131x/et131x_netdev.c
7314 Removing drivers/staging/hv/blkvsc_drv.c
7315 Removing drivers/staging/hv/hyperv_storage.h
7316 Auto-merging drivers/staging/hv/netvsc_drv.c
7317 Removing drivers/staging/hv/storvsc.c
7318 Removing drivers/staging/iio/accel/accel.h
7319 Removing drivers/staging/iio/accel/inclinometer.h
7320 Removing drivers/staging/iio/adc/adc.h
7321 Removing drivers/staging/iio/gyro/gyro.h
7322 Removing drivers/staging/iio/magnetometer/magnet.h
7323 Removing drivers/staging/rtl8192e/ieee80211/dot11d.c
7324 Removing drivers/staging/rtl8192e/ieee80211/dot11d.h
7325 Removing drivers/staging/rtl8192e/ieee80211/ieee80211.h
7326 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
7327 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
7328 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
7329 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
7330 Removing drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
7331 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
7332 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
7333 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
7334 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
7335 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
7336 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
7337 Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
7338 Removing drivers/staging/rtl8192e/r8180_93cx6.c
7339 Removing drivers/staging/rtl8192e/r8180_93cx6.h
7340 Removing drivers/staging/rtl8192e/r8190_rtl8256.c
7341 Removing drivers/staging/rtl8192e/r8190_rtl8256.h
7342 Removing drivers/staging/rtl8192e/r8192E.h
7343 CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
7344 Removing drivers/staging/rtl8192e/r8192E_dm.c
7345 Removing drivers/staging/rtl8192e/r8192E_dm.h
7346 Removing drivers/staging/rtl8192e/r8192E_wx.c
7347 Removing drivers/staging/rtl8192e/r8192E_wx.h
7348 Removing drivers/staging/rtl8192e/r8192_pm.c
7349 Removing drivers/staging/rtl8192e/r8192_pm.h
7350 Removing drivers/staging/rtl8192e/r819xE_cmdpkt.c
7351 Removing drivers/staging/rtl8192e/r819xE_cmdpkt.h
7352 Removing drivers/staging/rtl8192e/r819xE_firmware.c
7353 Removing drivers/staging/rtl8192e/r819xE_phy.c
7354 Removing drivers/staging/rtl8192e/r819xE_phy.h
7355 Auto-merging drivers/staging/rtl8192e/rtl_crypto.h
7356 Auto-merging drivers/staging/rtl8192e/rtllib_crypt.c
7357 Auto-merging drivers/staging/rtl8192e/rtllib_crypt.h
7358 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
7359 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_tkip.c
7360 Auto-merging drivers/staging/rtl8192e/rtllib_crypt_wep.c
7361 Auto-merging drivers/staging/rtl8192e/rtllib_softmac_wx.c
7362 Auto-merging drivers/staging/vt6655/device_main.c
7363 Auto-merging drivers/staging/vt6656/main_usb.c
7364 Auto-merging drivers/staging/xgifb/XGI_main_26.c
7365 CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
7366 Automatic merge failed; fix conflicts and then commit the result.
7367 $ git rm -f drivers/staging/rtl8192e/r8192E_core.c
7368 drivers/staging/rtl8192e/r8192E_core.c: needs merge
7369 drivers/staging/xgifb/XGI_main_26.c: needs merge
7370 rm 'drivers/staging/rtl8192e/r8192E_core.c'
7372 [master 0233ebd] Merge remote-tracking branch 'staging/staging-next'
7373 $ git diff -M --stat --summary HEAD^..
7375 arch/x86/include/asm/hyperv.h | 1 +
7376 drivers/char/scc.h | 613 -
7377 drivers/staging/Kconfig | 2 +
7378 drivers/staging/Makefile | 1 +
7379 drivers/staging/altera-stapl/altera.c | 3 +-
7380 drivers/staging/bcm/Bcmchar.c | 3170 ++--
7381 drivers/staging/bcm/Macros.h | 337 +-
7382 drivers/staging/bcm/headers.h | 2 +
7383 drivers/staging/bcm/nvm.c | 13 +-
7384 drivers/staging/brcm80211/Kconfig | 7 +-
7385 drivers/staging/brcm80211/Makefile | 1 -
7386 drivers/staging/brcm80211/TODO | 4 -
7387 drivers/staging/brcm80211/brcmfmac/Makefile | 5 -
7388 drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 549 +-
7389 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 994 +-
7390 drivers/staging/brcm80211/brcmfmac/dhd.h | 228 +-
7391 drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 7 +-
7392 drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 66 +-
7393 drivers/staging/brcm80211/brcmfmac/dhd_common.c | 338 +-
7394 drivers/staging/brcm80211/brcmfmac/dhd_dbg.h | 46 +-
7395 drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 448 +-
7396 drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 5 -
7397 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 2440 +--
7398 drivers/staging/brcm80211/brcmfmac/sdio_host.h | 278 +-
7399 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 301 +-
7400 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 14 +-
7401 drivers/staging/brcm80211/brcmsmac/Makefile | 8 -
7402 drivers/staging/brcm80211/brcmsmac/aiutils.c | 774 +-
7403 drivers/staging/brcm80211/brcmsmac/aiutils.h | 75 +-
7404 drivers/staging/brcm80211/brcmsmac/alloc.c | 9 +-
7405 drivers/staging/brcm80211/brcmsmac/ampdu.c | 230 +-
7406 drivers/staging/brcm80211/brcmsmac/antsel.c | 25 +-
7407 drivers/staging/brcm80211/brcmsmac/bmac.c | 3593 ---
7408 drivers/staging/brcm80211/brcmsmac/bmac.h | 174 -
7409 drivers/staging/brcm80211/brcmsmac/channel.c | 400 +-
7410 drivers/staging/brcm80211/brcmsmac/channel.h | 25 +-
7411 drivers/staging/brcm80211/brcmsmac/d11.h | 645 +-
7412 drivers/staging/brcm80211/brcmsmac/dma.c | 1078 +-
7413 drivers/staging/brcm80211/brcmsmac/dma.h | 186 +-
7414 drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 184 +-
7415 drivers/staging/brcm80211/brcmsmac/mac80211_if.h | 20 +-
7416 drivers/staging/brcm80211/brcmsmac/main.c | 4876 ++++-
7417 drivers/staging/brcm80211/brcmsmac/main.h | 852 +-
7418 drivers/staging/brcm80211/brcmsmac/nicpci.c | 75 +-
7419 drivers/staging/brcm80211/brcmsmac/nicpci.h | 30 +-
7420 drivers/staging/brcm80211/brcmsmac/otp.c | 154 +-
7421 drivers/staging/brcm80211/brcmsmac/otp.h | 15 +-
7422 drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 1035 +-
7423 drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h | 85 +-
7424 drivers/staging/brcm80211/brcmsmac/phy/phy_int.h | 208 +-
7425 drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c | 5653 +++---
7426 drivers/staging/brcm80211/brcmsmac/phy/phy_n.c |23096 ++++++++++----------
7427 drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c | 172 +-
7428 .../staging/brcm80211/brcmsmac/phy/phytbl_lcn.c | 1168 +-
7429 drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c | 3 +-
7430 drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h | 24 +-
7431 drivers/staging/brcm80211/brcmsmac/phy_shim.c | 24 +-
7432 drivers/staging/brcm80211/brcmsmac/phy_shim.h | 69 +-
7433 drivers/staging/brcm80211/brcmsmac/pmu.c | 54 +-
7434 drivers/staging/brcm80211/brcmsmac/pub.h | 280 +-
7435 drivers/staging/brcm80211/brcmsmac/rate.c | 163 +-
7436 drivers/staging/brcm80211/brcmsmac/rate.h | 186 +-
7437 drivers/staging/brcm80211/brcmsmac/scb.h | 36 +-
7438 drivers/staging/brcm80211/brcmsmac/srom.c | 126 +-
7439 drivers/staging/brcm80211/brcmsmac/srom.h | 4 +-
7440 drivers/staging/brcm80211/brcmsmac/stf.c | 100 +-
7441 drivers/staging/brcm80211/brcmsmac/stf.h | 6 +-
7442 drivers/staging/brcm80211/brcmsmac/types.h | 283 +-
7443 drivers/staging/brcm80211/brcmutil/utils.c | 110 +-
7444 drivers/staging/brcm80211/brcmutil/wifi.c | 37 +-
7445 drivers/staging/brcm80211/include/brcmu_utils.h | 25 +-
7446 drivers/staging/brcm80211/include/brcmu_wifi.h | 145 +-
7447 drivers/staging/brcm80211/include/chipcommon.h | 13 +-
7448 drivers/staging/brcm80211/include/defs.h | 24 +-
7449 drivers/staging/brcm80211/include/soc.h | 9 +-
7450 drivers/staging/comedi/Kconfig | 18 +-
7451 drivers/staging/comedi/comedi_fops.c | 2 +-
7452 drivers/staging/comedi/drivers/Makefile | 1 +
7453 drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +-
7454 drivers/staging/comedi/drivers/ni_labpc.c | 20 +-
7455 drivers/staging/comedi/drivers/ni_pcidio.c | 2 +-
7456 drivers/staging/comedi/drivers/usbduxsigma.c | 2880 +++
7457 drivers/staging/cxd2099/Makefile | 6 +-
7458 drivers/staging/dt3155v4l/dt3155v4l.c | 1 +
7459 drivers/staging/easycap/easycap_ioctl.c | 30 +-
7460 drivers/staging/easycap/easycap_main.c | 4 +-
7461 drivers/staging/et131x/Makefile | 1 +
7462 drivers/staging/et131x/et1310_address_map.h | 6 +-
7463 drivers/staging/et131x/et1310_eeprom.c | 32 +-
7464 drivers/staging/et131x/et1310_mac.c | 379 +-
7465 drivers/staging/et131x/et1310_phy.c | 601 +-
7466 drivers/staging/et131x/et1310_phy.h | 4 +-
7467 drivers/staging/et131x/et1310_pm.c | 48 +-
7468 drivers/staging/et131x/et1310_rx.c | 628 +-
7469 drivers/staging/et131x/et1310_rx.h | 62 +-
7470 drivers/staging/et131x/et1310_tx.c | 464 +-
7471 drivers/staging/et131x/et131x.h | 78 +-
7472 drivers/staging/et131x/et131x_adapter.h | 97 +-
7473 drivers/staging/et131x/et131x_ethtool.c | 71 +
7474 drivers/staging/et131x/et131x_initpci.c | 404 +-
7475 drivers/staging/et131x/et131x_isr.c | 63 +-
7476 drivers/staging/et131x/et131x_netdev.c | 144 +-
7477 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 10 +
7478 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 8 +-
7479 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 3 +-
7480 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 24 +-
7481 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 4 +-
7482 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2 +-
7483 drivers/staging/gma500/accel_2d.c | 14 +-
7484 drivers/staging/gma500/cdv_device.c | 1 -
7485 drivers/staging/gma500/framebuffer.c | 7 +-
7486 drivers/staging/gma500/gem.c | 5 +-
7487 drivers/staging/gma500/gtt.c | 30 +-
7488 drivers/staging/gma500/intel_opregion.c | 1 +
7489 drivers/staging/gma500/mdfld_intel_display.c | 12 +-
7490 drivers/staging/gma500/mrst_crtc.c | 16 +-
7491 drivers/staging/gma500/power.c | 8 +-
7492 drivers/staging/gma500/psb_device.c | 32 -
7493 drivers/staging/gma500/psb_drv.c | 47 +-
7494 drivers/staging/gma500/psb_drv.h | 4 +
7495 drivers/staging/gma500/psb_intel_display.c | 4 -
7496 drivers/staging/gma500/psb_intel_lvds.c | 61 +-
7497 drivers/staging/gma500/psb_irq.c | 71 +-
7498 drivers/staging/gma500/psb_lid.c | 2 -
7499 drivers/staging/go7007/Makefile | 8 +-
7500 drivers/staging/go7007/wis-tw2804.c | 6 +-
7501 drivers/staging/hv/Kconfig | 7 -
7502 drivers/staging/hv/Makefile | 4 +-
7503 drivers/staging/hv/blkvsc_drv.c | 1026 -
7504 drivers/staging/hv/channel.c | 120 +-
7505 drivers/staging/hv/channel_mgmt.c | 50 +-
7506 drivers/staging/hv/connection.c | 40 +-
7507 drivers/staging/hv/hv.c | 21 +-
7508 drivers/staging/hv/hv_mouse.c | 330 +-
7509 drivers/staging/hv/hv_util.c | 98 +-
7510 drivers/staging/hv/hyperv.h | 45 +-
7511 drivers/staging/hv/hyperv_net.h | 3 +-
7512 drivers/staging/hv/hyperv_storage.h | 334 -
7513 drivers/staging/hv/hyperv_vmbus.h | 8 +-
7514 drivers/staging/hv/netvsc.c | 166 +-
7515 drivers/staging/hv/netvsc_drv.c | 60 +-
7516 drivers/staging/hv/ring_buffer.c | 9 +-
7517 drivers/staging/hv/rndis_filter.c | 49 +-
7518 drivers/staging/hv/storvsc.c | 564 -
7519 drivers/staging/hv/storvsc_drv.c | 894 +-
7520 drivers/staging/hv/tools/hv_kvp_daemon.c | 19 +-
7521 drivers/staging/hv/vmbus_drv.c | 284 +-
7522 drivers/staging/iio/Documentation/sysfs-bus-iio | 23 +-
7523 .../iio/Documentation/sysfs-bus-iio-adc-ad7280a | 21 +
7524 .../sysfs-bus-iio-impedance-analyzer-ad5933 | 30 +
7525 drivers/staging/iio/Kconfig | 1 +
7526 drivers/staging/iio/Makefile | 1 +
7527 drivers/staging/iio/accel/accel.h | 87 -
7528 drivers/staging/iio/accel/adis16201_core.c | 5 +-
7529 drivers/staging/iio/accel/adis16201_ring.c | 19 +-
7530 drivers/staging/iio/accel/adis16201_trigger.c | 13 +-
7531 drivers/staging/iio/accel/adis16203_core.c | 4 +-
7532 drivers/staging/iio/accel/adis16203_ring.c | 12 +-
7533 drivers/staging/iio/accel/adis16203_trigger.c | 14 +-
7534 drivers/staging/iio/accel/adis16204_core.c | 48 +-
7535 drivers/staging/iio/accel/adis16204_ring.c | 12 +-
7536 drivers/staging/iio/accel/adis16204_trigger.c | 14 +-
7537 drivers/staging/iio/accel/adis16209_core.c | 4 +-
7538 drivers/staging/iio/accel/adis16209_ring.c | 12 +-
7539 drivers/staging/iio/accel/adis16209_trigger.c | 14 +-
7540 drivers/staging/iio/accel/adis16220_core.c | 343 +-
7541 drivers/staging/iio/accel/adis16240_core.c | 3 +-
7542 drivers/staging/iio/accel/adis16240_ring.c | 12 +-
7543 drivers/staging/iio/accel/adis16240_trigger.c | 14 +-
7544 drivers/staging/iio/accel/inclinometer.h | 25 -
7545 drivers/staging/iio/accel/kxsd9.c | 269 +-
7546 drivers/staging/iio/accel/lis3l02dq_core.c | 27 +-
7547 drivers/staging/iio/accel/lis3l02dq_ring.c | 18 +-
7548 drivers/staging/iio/accel/sca3000_core.c | 20 +-
7549 drivers/staging/iio/accel/sca3000_ring.c | 71 -
7550 drivers/staging/iio/adc/Kconfig | 24 +
7551 drivers/staging/iio/adc/Makefile | 2 +
7552 drivers/staging/iio/adc/ad7150.c | 11 +-
7553 drivers/staging/iio/adc/ad7152.c | 1 +
7554 drivers/staging/iio/adc/ad7192.c | 1184 +
7555 drivers/staging/iio/adc/ad7192.h | 47 +
7556 drivers/staging/iio/adc/ad7280a.c | 992 +
7557 drivers/staging/iio/adc/ad7280a.h | 38 +
7558 drivers/staging/iio/adc/ad7291.c | 1 +
7559 drivers/staging/iio/adc/ad7298_core.c | 2 +-
7560 drivers/staging/iio/adc/ad7298_ring.c | 12 +-
7561 drivers/staging/iio/adc/ad7314.c | 1 +
7562 drivers/staging/iio/adc/ad7476_core.c | 2 +-
7563 drivers/staging/iio/adc/ad7476_ring.c | 12 +-
7564 drivers/staging/iio/adc/ad7606_core.c | 2 +-
7565 drivers/staging/iio/adc/ad7606_ring.c | 12 +-
7566 drivers/staging/iio/adc/ad7745.c | 1 +
7567 drivers/staging/iio/adc/ad7780.c | 2 +-
7568 drivers/staging/iio/adc/ad7793.c | 10 +-
7569 drivers/staging/iio/adc/ad7816.c | 3 +-
7570 drivers/staging/iio/adc/ad7887_core.c | 3 +-
7571 drivers/staging/iio/adc/ad7887_ring.c | 13 +-
7572 drivers/staging/iio/adc/ad799x_core.c | 14 +-
7573 drivers/staging/iio/adc/ad799x_ring.c | 13 +-
7574 drivers/staging/iio/adc/adc.h | 42 -
7575 drivers/staging/iio/adc/adt7310.c | 1 +
7576 drivers/staging/iio/adc/adt7410.c | 1 +
7577 drivers/staging/iio/adc/adt75.c | 3 +-
7578 drivers/staging/iio/adc/max1363_core.c | 20 +-
7579 drivers/staging/iio/adc/max1363_ring.c | 13 +-
7580 drivers/staging/iio/addac/adt7316-i2c.c | 1 +
7581 drivers/staging/iio/addac/adt7316.c | 3 +-
7582 drivers/staging/iio/dac/ad5446.c | 1 +
7583 drivers/staging/iio/dac/ad5504.c | 5 +-
7584 drivers/staging/iio/dac/ad5624r_spi.c | 1 +
7585 drivers/staging/iio/dac/ad5686.c | 1 +
7586 drivers/staging/iio/dac/ad5791.c | 2 +-
7587 drivers/staging/iio/dds/ad5930.c | 1 +
7588 drivers/staging/iio/dds/ad9832.c | 1 +
7589 drivers/staging/iio/dds/ad9834.c | 1 +
7590 drivers/staging/iio/dds/ad9850.c | 1 +
7591 drivers/staging/iio/dds/ad9852.c | 2 +-
7592 drivers/staging/iio/dds/ad9910.c | 2 +-
7593 drivers/staging/iio/dds/ad9951.c | 2 +-
7594 drivers/staging/iio/gyro/adis16060_core.c | 116 +-
7595 drivers/staging/iio/gyro/adis16080_core.c | 93 +-
7596 drivers/staging/iio/gyro/adis16130_core.c | 145 +-
7597 drivers/staging/iio/gyro/adis16260_core.c | 3 +-
7598 drivers/staging/iio/gyro/adis16260_ring.c | 12 +-
7599 drivers/staging/iio/gyro/adis16260_trigger.c | 14 +-
7600 drivers/staging/iio/gyro/adxrs450_core.c | 253 +-
7601 drivers/staging/iio/gyro/gyro.h | 85 -
7602 drivers/staging/iio/iio.h | 91 +-
7603 drivers/staging/iio/iio_core.h | 48 +
7604 drivers/staging/iio/iio_core_trigger.h | 46 +
7605 drivers/staging/iio/impedance-analyzer/Kconfig | 16 +
7606 drivers/staging/iio/impedance-analyzer/Makefile | 5 +
7607 drivers/staging/iio/impedance-analyzer/ad5933.c | 818 +
7608 drivers/staging/iio/impedance-analyzer/ad5933.h | 28 +
7609 drivers/staging/iio/imu/adis16400_core.c | 73 +-
7610 drivers/staging/iio/imu/adis16400_ring.c | 12 +-
7611 drivers/staging/iio/imu/adis16400_trigger.c | 14 +-
7612 drivers/staging/iio/industrialio-core.c | 211 +-
7613 drivers/staging/iio/industrialio-ring.c | 1 +
7614 drivers/staging/iio/industrialio-trigger.c | 82 +-
7615 drivers/staging/iio/light/isl29018.c | 46 +
7616 drivers/staging/iio/light/tsl2563.c | 4 +-
7617 drivers/staging/iio/light/tsl2583.c | 221 +-
7618 drivers/staging/iio/magnetometer/ak8975.c | 214 +-
7619 drivers/staging/iio/magnetometer/hmc5843.c | 96 +-
7620 drivers/staging/iio/magnetometer/magnet.h | 31 -
7621 drivers/staging/iio/meter/ade7753.c | 1 +
7622 drivers/staging/iio/meter/ade7754.c | 1 +
7623 drivers/staging/iio/meter/ade7758_core.c | 1 +
7624 drivers/staging/iio/meter/ade7758_ring.c | 19 +-
7625 drivers/staging/iio/meter/ade7758_trigger.c | 16 +-
7626 drivers/staging/iio/meter/ade7759.c | 1 +
7627 drivers/staging/iio/meter/ade7854-i2c.c | 1 +
7628 drivers/staging/iio/meter/ade7854-spi.c | 1 +
7629 drivers/staging/iio/meter/ade7854.c | 3 +-
7630 drivers/staging/iio/resolver/ad2s120x.c | 1 +
7631 drivers/staging/iio/resolver/ad2s1210.c | 2 +-
7632 drivers/staging/iio/resolver/ad2s90.c | 2 +-
7633 drivers/staging/iio/sysfs.h | 79 +-
7634 drivers/staging/iio/trigger.h | 116 +-
7635 drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 6 +-
7636 drivers/staging/iio/trigger/iio-trig-gpio.c | 6 +-
7637 .../staging/iio/trigger/iio-trig-periodic-rtc.c | 7 +-
7638 drivers/staging/iio/trigger/iio-trig-sysfs.c | 13 +-
7639 drivers/staging/iio/trigger_consumer.h | 71 +-
7640 drivers/staging/keucr/scsiglue.c | 5 +-
7641 drivers/staging/keucr/smil.h | 6 +-
7642 drivers/staging/keucr/smilsub.c | 1574 +--
7643 drivers/staging/keucr/smscsi.c | 117 +-
7644 drivers/staging/mei/interrupt.c | 6 +
7645 drivers/staging/mei/main.c | 30 +-
7646 drivers/staging/nvec/nvec.c | 168 +-
7647 drivers/staging/nvec/nvec.h | 13 +-
7648 drivers/staging/nvec/nvec_kbd.c | 41 +-
7649 drivers/staging/nvec/nvec_ps2.c | 19 +-
7650 drivers/staging/olpc_dcon/olpc_dcon.c | 47 +-
7651 drivers/staging/pohmelfs/trans.c | 6 +-
7652 drivers/staging/rtl8187se/Makefile | 6 +-
7653 drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 +-
7654 .../rtl8187se/ieee80211/ieee80211_softmac.c | 14 +-
7655 drivers/staging/rtl8187se/r8180_rtl8225z2.c | 4 +-
7656 drivers/staging/rtl8192e/Makefile | 67 +-
7657 drivers/staging/rtl8192e/TODO | 2 +
7658 drivers/staging/rtl8192e/dot11d.c | 216 +
7659 drivers/staging/rtl8192e/dot11d.h | 113 +-
7660 drivers/staging/rtl8192e/ieee80211/dot11d.c | 218 -
7661 drivers/staging/rtl8192e/ieee80211/dot11d.h | 102 -
7662 drivers/staging/rtl8192e/ieee80211/ieee80211.h | 2636 ---
7663 .../staging/rtl8192e/ieee80211/ieee80211_module.c | 352 -
7664 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2676 ---
7665 .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3278 ---
7666 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 955 -
7667 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 872 -
7668 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h | 69 -
7669 .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 676 -
7670 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 483 -
7671 .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 1732 --
7672 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h | 582 -
7673 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h | 56 -
7674 .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 627 -
7675 drivers/staging/rtl8192e/license | 339 +
7676 drivers/staging/rtl8192e/r8180_93cx6.c | 141 -
7677 drivers/staging/rtl8192e/r8180_93cx6.h | 41 -
7678 drivers/staging/rtl8192e/r8190P_def.h | 410 +
7679 drivers/staging/rtl8192e/r8190P_rtl8256.c | 306 +
7680 drivers/staging/rtl8192e/r8190P_rtl8256.h | 31 +
7681 drivers/staging/rtl8192e/r8190_rtl8256.c | 677 -
7682 drivers/staging/rtl8192e/r8190_rtl8256.h | 29 -
7683 drivers/staging/rtl8192e/r8192E.h | 1148 -
7684 drivers/staging/rtl8192e/r8192E_cmdpkt.c | 420 +
7685 drivers/staging/rtl8192e/r8192E_cmdpkt.h | 159 +
7686 drivers/staging/rtl8192e/r8192E_core.c | 5039 -----
7687 drivers/staging/rtl8192e/r8192E_dev.c | 2413 ++
7688 drivers/staging/rtl8192e/r8192E_dev.h | 62 +
7689 drivers/staging/rtl8192e/r8192E_dm.c | 2554 ---
7690 drivers/staging/rtl8192e/r8192E_dm.h | 228 -
7691 drivers/staging/rtl8192e/r8192E_firmware.c | 348 +
7692 drivers/staging/rtl8192e/r8192E_firmware.h | 73 +
7693 drivers/staging/rtl8192e/r8192E_hw.h | 552 +-
7694 drivers/staging/rtl8192e/r8192E_hwimg.c | 3336 +++
7695 drivers/staging/rtl8192e/r8192E_hwimg.h | 51 +
7696 drivers/staging/rtl8192e/r8192E_phy.c | 1633 ++
7697 drivers/staging/rtl8192e/r8192E_phy.h | 144 +
7698 drivers/staging/rtl8192e/r8192E_phyreg.h | 852 +
7699 drivers/staging/rtl8192e/r8192E_wx.c | 1163 -
7700 drivers/staging/rtl8192e/r8192E_wx.h | 18 -
7701 drivers/staging/rtl8192e/r8192_pm.c | 123 -
7702 drivers/staging/rtl8192e/r8192_pm.h | 24 -
7703 drivers/staging/rtl8192e/r819xE_cmdpkt.c | 444 -
7704 drivers/staging/rtl8192e/r819xE_cmdpkt.h | 207 -
7705 drivers/staging/rtl8192e/r819xE_firmware.c | 351 -
7706 drivers/staging/rtl8192e/r819xE_phy.c | 2225 --
7707 drivers/staging/rtl8192e/r819xE_phy.h | 131 -
7708 drivers/staging/rtl8192e/rtl819x_BA.h | 77 +
7709 drivers/staging/rtl8192e/rtl819x_BAProc.c | 566 +
7710 drivers/staging/rtl8192e/rtl819x_HT.h | 475 +
7711 drivers/staging/rtl8192e/rtl819x_HTProc.c | 1075 +
7712 drivers/staging/rtl8192e/rtl819x_Qos.h | 444 +
7713 drivers/staging/rtl8192e/rtl819x_TS.h | 73 +
7714 drivers/staging/rtl8192e/rtl819x_TSProc.c | 549 +
7715 drivers/staging/rtl8192e/rtl_cam.c | 304 +
7716 drivers/staging/rtl8192e/rtl_cam.h | 46 +
7717 drivers/staging/rtl8192e/rtl_core.c | 3230 +++
7718 drivers/staging/rtl8192e/rtl_core.h | 1124 +
7719 .../staging/rtl8192e/{ieee80211 => }/rtl_crypto.h | 105 +-
7720 drivers/staging/rtl8192e/rtl_debug.c | 1108 +
7721 drivers/staging/rtl8192e/rtl_debug.h | 299 +
7722 drivers/staging/rtl8192e/rtl_dm.c | 2995 +++
7723 drivers/staging/rtl8192e/rtl_dm.h | 324 +
7724 drivers/staging/rtl8192e/rtl_eeprom.c | 139 +
7725 drivers/staging/rtl8192e/rtl_eeprom.h | 29 +
7726 drivers/staging/rtl8192e/rtl_ethtool.c | 53 +
7727 drivers/staging/rtl8192e/rtl_pci.c | 97 +
7728 drivers/staging/rtl8192e/rtl_pci.h | 104 +
7729 drivers/staging/rtl8192e/rtl_pm.c | 136 +
7730 drivers/staging/rtl8192e/rtl_pm.h | 35 +
7731 drivers/staging/rtl8192e/rtl_ps.c | 310 +
7732 drivers/staging/rtl8192e/rtl_ps.h | 47 +
7733 drivers/staging/rtl8192e/rtl_wx.c | 1332 ++
7734 drivers/staging/rtl8192e/rtl_wx.h | 31 +
7735 drivers/staging/rtl8192e/rtllib.h | 3112 +++
7736 .../ieee80211_crypt.c => rtllib_crypt.c} | 91 +-
7737 .../ieee80211_crypt.h => rtllib_crypt.h} | 32 +-
7738 .../ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} | 170 +-
7739 .../ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} | 310 +-
7740 .../ieee80211_crypt_wep.c => rtllib_crypt_wep.c} | 116 +-
7741 drivers/staging/rtl8192e/rtllib_endianfree.h | 160 +
7742 drivers/staging/rtl8192e/rtllib_module.c | 290 +
7743 drivers/staging/rtl8192e/rtllib_rx.c | 2722 +++
7744 drivers/staging/rtl8192e/rtllib_softmac.c | 3743 ++++
7745 .../ieee80211_softmac_wx.c => rtllib_softmac_wx.c} | 381 +-
7746 drivers/staging/rtl8192e/rtllib_tx.c | 967 +
7747 drivers/staging/rtl8192e/rtllib_wx.c | 876 +
7748 drivers/staging/rtl8192u/ieee80211/compress.c | 4 +-
7749 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +-
7750 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 14 +-
7751 drivers/staging/rtl8712/big_endian.h | 25 +
7752 drivers/staging/rtl8712/drv_types.h | 5 +
7753 drivers/staging/rtl8712/ethernet.h | 25 +
7754 drivers/staging/rtl8712/generic.h | 25 +
7755 drivers/staging/rtl8712/if_ether.h | 25 +
7756 drivers/staging/rtl8712/little_endian.h | 25 +
7757 drivers/staging/rtl8712/mlme_osdep.h | 25 +
7758 drivers/staging/rtl8712/mp_custom_oid.h | 25 +
7759 drivers/staging/rtl8712/os_intfs.c | 14 +
7760 drivers/staging/rtl8712/osdep_service.h | 1 -
7761 drivers/staging/rtl8712/recv_osdep.h | 25 +
7762 drivers/staging/rtl8712/rtl8712_bitdef.h | 21 +
7763 drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 19 +
7764 drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h | 19 +
7765 drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | 19 +
7766 drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h | 19 +
7767 .../staging/rtl8712/rtl8712_edcasetting_bitdef.h | 25 +
7768 .../staging/rtl8712/rtl8712_edcasetting_regdef.h | 19 +
7769 drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h | 19 +
7770 drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h | 19 +
7771 drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 25 +
7772 drivers/staging/rtl8712/rtl8712_gp_regdef.h | 25 +
7773 drivers/staging/rtl8712/rtl8712_hal.h | 25 +
7774 drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h | 19 +
7775 .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 19 +
7776 .../staging/rtl8712/rtl8712_macsetting_regdef.h | 19 +
7777 drivers/staging/rtl8712/rtl8712_powersave_bitdef.h | 19 +
7778 drivers/staging/rtl8712/rtl8712_powersave_regdef.h | 19 +
7779 drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h | 19 +
7780 drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 25 +
7781 drivers/staging/rtl8712/rtl8712_regdef.h | 25 +
7782 drivers/staging/rtl8712/rtl8712_security_bitdef.h | 19 +
7783 drivers/staging/rtl8712/rtl8712_spec.h | 25 +
7784 drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 25 +
7785 drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 25 +
7786 drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 19 +
7787 drivers/staging/rtl8712/rtl8712_timectrl_regdef.h | 19 +
7788 drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 25 +
7789 drivers/staging/rtl8712/rtl8712_wmac_regdef.h | 25 +
7790 drivers/staging/rtl8712/rtl871x_byteorder.h | 19 +
7791 drivers/staging/rtl8712/rtl871x_eeprom.h | 19 +
7792 drivers/staging/rtl8712/rtl871x_event.h | 25 +
7793 drivers/staging/rtl8712/rtl871x_ht.h | 25 +
7794 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 28 +-
7795 drivers/staging/rtl8712/rtl871x_ioctl_set.h | 25 +
7796 drivers/staging/rtl8712/rtl871x_mp.h | 25 +
7797 drivers/staging/rtl8712/rtl871x_pwrctrl.h | 25 +
7798 drivers/staging/rtl8712/rtl871x_rf.h | 25 +
7799 drivers/staging/rtl8712/rtl871x_security.h | 25 +
7800 drivers/staging/rtl8712/rtl871x_wlan_sme.h | 25 +
7801 drivers/staging/rtl8712/swab.h | 25 +
7802 drivers/staging/rtl8712/usb_ops.h | 25 +
7803 drivers/staging/rtl8712/usb_osintf.h | 25 +
7804 drivers/staging/rtl8712/usb_vendor_req.h | 25 +
7805 drivers/staging/rts5139/Kconfig | 16 +
7806 drivers/staging/rts5139/Makefile | 37 +
7807 drivers/staging/rts5139/TODO | 5 +
7808 drivers/staging/rts5139/debug.h | 46 +
7809 drivers/staging/rts5139/ms.c | 4191 ++++
7810 drivers/staging/rts5139/ms.h | 263 +
7811 drivers/staging/rts5139/ms_mg.c | 642 +
7812 drivers/staging/rts5139/ms_mg.h | 41 +
7813 drivers/staging/rts5139/rts51x.c | 967 +
7814 drivers/staging/rts5139/rts51x.h | 205 +
7815 drivers/staging/rts5139/rts51x_card.c | 986 +
7816 drivers/staging/rts5139/rts51x_card.h | 881 +
7817 drivers/staging/rts5139/rts51x_chip.c | 1167 +
7818 drivers/staging/rts5139/rts51x_chip.h | 904 +
7819 drivers/staging/rts5139/rts51x_fop.c | 298 +
7820 drivers/staging/rts5139/rts51x_fop.h | 62 +
7821 drivers/staging/rts5139/rts51x_scsi.c | 2234 ++
7822 drivers/staging/rts5139/rts51x_scsi.h | 162 +
7823 drivers/staging/rts5139/rts51x_sys.h | 54 +
7824 drivers/staging/rts5139/rts51x_transport.c | 1000 +
7825 drivers/staging/rts5139/rts51x_transport.h | 80 +
7826 drivers/staging/rts5139/sd.c | 3400 +++
7827 drivers/staging/rts5139/sd.h | 304 +
7828 drivers/staging/rts5139/sd_cprm.c | 1215 +
7829 drivers/staging/rts5139/sd_cprm.h | 54 +
7830 drivers/staging/rts5139/trace.h | 137 +
7831 drivers/staging/rts5139/xd.c | 2255 ++
7832 drivers/staging/rts5139/xd.h | 193 +
7833 drivers/staging/rts_pstor/Makefile | 2 +-
7834 drivers/staging/rts_pstor/rtsx_scsi.c | 2 +-
7835 drivers/staging/rts_pstor/sd.c | 4 +-
7836 drivers/staging/rts_pstor/spi.c | 2 +-
7837 drivers/staging/serqt_usb2/serqt_usb2.c | 37 +-
7838 drivers/staging/sm7xx/smtcfb.c | 2 +
7839 drivers/staging/spectra/ffsport.c | 15 +-
7840 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 +
7841 drivers/staging/tidspbridge/gen/gh.c | 2 +-
7842 drivers/staging/usbip/stub.h | 5 +
7843 drivers/staging/usbip/stub_dev.c | 7 +-
7844 drivers/staging/usbip/stub_main.c | 1 +
7845 drivers/staging/usbip/stub_rx.c | 5 +-
7846 drivers/staging/usbip/usbip_protocol.txt | 358 +
7847 .../staging/usbip/userspace/libsrc/vhci_driver.c | 2 +-
7848 drivers/staging/usbip/userspace/src/usbip_attach.c | 4 +-
7849 drivers/staging/usbip/userspace/src/utils.h | 1 +
7850 drivers/staging/usbip/vhci.h | 5 +
7851 drivers/staging/vme/bridges/vme_ca91cx42.c | 24 +
7852 drivers/staging/vme/bridges/vme_tsi148.c | 24 +
7853 drivers/staging/vme/devices/vme_user.c | 4 +-
7854 drivers/staging/vme/vme.c | 74 +-
7855 drivers/staging/vme/vme_bridge.h | 11 +-
7856 drivers/staging/vt6655/IEEE11h.c | 406 +-
7857 drivers/staging/vt6655/device_main.c | 10 +-
7858 drivers/staging/vt6655/dpc.c | 30 +-
7859 drivers/staging/vt6655/wmgr.c | 49 +-
7860 drivers/staging/vt6656/dpc.c | 30 +-
7861 drivers/staging/vt6656/main_usb.c | 11 +-
7862 drivers/staging/vt6656/wmgr.c | 49 +-
7863 drivers/staging/winbond/phy_calibration.c | 12 +-
7864 drivers/staging/xgifb/XGI_main.h | 128 +-
7865 drivers/staging/xgifb/XGI_main_26.c | 544 +-
7866 drivers/staging/xgifb/XGIfb.h | 12 -
7867 drivers/staging/xgifb/vb_def.h | 590 +-
7868 drivers/staging/xgifb/vb_ext.h | 20 -
7869 drivers/staging/xgifb/vb_setmode.c | 3 -
7870 drivers/staging/xgifb/vb_struct.h | 71 -
7871 drivers/staging/xgifb/vb_table.h | 729 -
7872 drivers/staging/xgifb/vgatypes.h | 5 -
7873 drivers/staging/zcache/zcache-main.c | 6 +-
7874 drivers/staging/zram/zram_drv.c | 36 +-
7875 drivers/staging/zram/zram_drv.h | 4 +-
7876 drivers/staging/zram/zram_sysfs.c | 4 +-
7877 include/linux/mod_devicetable.h | 9 +
7878 scripts/mod/file2alias.c | 25 +
7879 505 files changed, 100318 insertions(+), 71355 deletions(-)
7880 delete mode 100644 drivers/char/scc.h
7881 delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.c
7882 delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.h
7883 create mode 100644 drivers/staging/comedi/drivers/usbduxsigma.c
7884 create mode 100644 drivers/staging/et131x/et131x_ethtool.c
7885 delete mode 100644 drivers/staging/hv/blkvsc_drv.c
7886 delete mode 100644 drivers/staging/hv/hyperv_storage.h
7887 delete mode 100644 drivers/staging/hv/storvsc.c
7888 create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-adc-ad7280a
7889 create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933
7890 delete mode 100644 drivers/staging/iio/accel/accel.h
7891 delete mode 100644 drivers/staging/iio/accel/inclinometer.h
7892 create mode 100644 drivers/staging/iio/adc/ad7192.c
7893 create mode 100644 drivers/staging/iio/adc/ad7192.h
7894 create mode 100644 drivers/staging/iio/adc/ad7280a.c
7895 create mode 100644 drivers/staging/iio/adc/ad7280a.h
7896 delete mode 100644 drivers/staging/iio/adc/adc.h
7897 delete mode 100644 drivers/staging/iio/gyro/gyro.h
7898 create mode 100644 drivers/staging/iio/iio_core.h
7899 create mode 100644 drivers/staging/iio/iio_core_trigger.h
7900 create mode 100644 drivers/staging/iio/impedance-analyzer/Kconfig
7901 create mode 100644 drivers/staging/iio/impedance-analyzer/Makefile
7902 create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.c
7903 create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h
7904 delete mode 100644 drivers/staging/iio/magnetometer/magnet.h
7905 create mode 100644 drivers/staging/rtl8192e/TODO
7906 create mode 100644 drivers/staging/rtl8192e/dot11d.c
7907 delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.c
7908 delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.h
7909 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211.h
7910 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
7911 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
7912 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
7913 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
7914 delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
7915 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
7916 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
7917 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
7918 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
7919 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
7920 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
7921 delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
7922 create mode 100644 drivers/staging/rtl8192e/license
7923 delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.c
7924 delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.h
7925 create mode 100644 drivers/staging/rtl8192e/r8190P_def.h
7926 create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.c
7927 create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.h
7928 delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.c
7929 delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.h
7930 delete mode 100644 drivers/staging/rtl8192e/r8192E.h
7931 create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.c
7932 create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.h
7933 delete mode 100644 drivers/staging/rtl8192e/r8192E_core.c
7934 create mode 100644 drivers/staging/rtl8192e/r8192E_dev.c
7935 create mode 100644 drivers/staging/rtl8192e/r8192E_dev.h
7936 delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.c
7937 delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.h
7938 create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.c
7939 create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.h
7940 create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.c
7941 create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.h
7942 create mode 100644 drivers/staging/rtl8192e/r8192E_phy.c
7943 create mode 100644 drivers/staging/rtl8192e/r8192E_phy.h
7944 create mode 100644 drivers/staging/rtl8192e/r8192E_phyreg.h
7945 delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.c
7946 delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.h
7947 delete mode 100644 drivers/staging/rtl8192e/r8192_pm.c
7948 delete mode 100644 drivers/staging/rtl8192e/r8192_pm.h
7949 delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.c
7950 delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.h
7951 delete mode 100644 drivers/staging/rtl8192e/r819xE_firmware.c
7952 delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.c
7953 delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.h
7954 create mode 100644 drivers/staging/rtl8192e/rtl819x_BA.h
7955 create mode 100644 drivers/staging/rtl8192e/rtl819x_BAProc.c
7956 create mode 100644 drivers/staging/rtl8192e/rtl819x_HT.h
7957 create mode 100644 drivers/staging/rtl8192e/rtl819x_HTProc.c
7958 create mode 100644 drivers/staging/rtl8192e/rtl819x_Qos.h
7959 create mode 100644 drivers/staging/rtl8192e/rtl819x_TS.h
7960 create mode 100644 drivers/staging/rtl8192e/rtl819x_TSProc.c
7961 create mode 100644 drivers/staging/rtl8192e/rtl_cam.c
7962 create mode 100644 drivers/staging/rtl8192e/rtl_cam.h
7963 create mode 100644 drivers/staging/rtl8192e/rtl_core.c
7964 create mode 100644 drivers/staging/rtl8192e/rtl_core.h
7965 rename drivers/staging/rtl8192e/{ieee80211 => }/rtl_crypto.h (74%)
7966 create mode 100644 drivers/staging/rtl8192e/rtl_debug.c
7967 create mode 100644 drivers/staging/rtl8192e/rtl_debug.h
7968 create mode 100644 drivers/staging/rtl8192e/rtl_dm.c
7969 create mode 100644 drivers/staging/rtl8192e/rtl_dm.h
7970 create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.c
7971 create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.h
7972 create mode 100644 drivers/staging/rtl8192e/rtl_ethtool.c
7973 create mode 100644 drivers/staging/rtl8192e/rtl_pci.c
7974 create mode 100644 drivers/staging/rtl8192e/rtl_pci.h
7975 create mode 100644 drivers/staging/rtl8192e/rtl_pm.c
7976 create mode 100644 drivers/staging/rtl8192e/rtl_pm.h
7977 create mode 100644 drivers/staging/rtl8192e/rtl_ps.c
7978 create mode 100644 drivers/staging/rtl8192e/rtl_ps.h
7979 create mode 100644 drivers/staging/rtl8192e/rtl_wx.c
7980 create mode 100644 drivers/staging/rtl8192e/rtl_wx.h
7981 create mode 100644 drivers/staging/rtl8192e/rtllib.h
7982 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.c => rtllib_crypt.c} (63%)
7983 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.h => rtllib_crypt.h} (74%)
7984 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} (67%)
7985 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} (71%)
7986 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_wep.c => rtllib_crypt_wep.c} (71%)
7987 create mode 100644 drivers/staging/rtl8192e/rtllib_endianfree.h
7988 create mode 100644 drivers/staging/rtl8192e/rtllib_module.c
7989 create mode 100644 drivers/staging/rtl8192e/rtllib_rx.c
7990 create mode 100644 drivers/staging/rtl8192e/rtllib_softmac.c
7991 rename drivers/staging/rtl8192e/{ieee80211/ieee80211_softmac_wx.c => rtllib_softmac_wx.c} (50%)
7992 create mode 100644 drivers/staging/rtl8192e/rtllib_tx.c
7993 create mode 100644 drivers/staging/rtl8192e/rtllib_wx.c
7994 create mode 100644 drivers/staging/rts5139/Kconfig
7995 create mode 100644 drivers/staging/rts5139/Makefile
7996 create mode 100644 drivers/staging/rts5139/TODO
7997 create mode 100644 drivers/staging/rts5139/debug.h
7998 create mode 100644 drivers/staging/rts5139/ms.c
7999 create mode 100644 drivers/staging/rts5139/ms.h
8000 create mode 100644 drivers/staging/rts5139/ms_mg.c
8001 create mode 100644 drivers/staging/rts5139/ms_mg.h
8002 create mode 100644 drivers/staging/rts5139/rts51x.c
8003 create mode 100644 drivers/staging/rts5139/rts51x.h
8004 create mode 100644 drivers/staging/rts5139/rts51x_card.c
8005 create mode 100644 drivers/staging/rts5139/rts51x_card.h
8006 create mode 100644 drivers/staging/rts5139/rts51x_chip.c
8007 create mode 100644 drivers/staging/rts5139/rts51x_chip.h
8008 create mode 100644 drivers/staging/rts5139/rts51x_fop.c
8009 create mode 100644 drivers/staging/rts5139/rts51x_fop.h
8010 create mode 100644 drivers/staging/rts5139/rts51x_scsi.c
8011 create mode 100644 drivers/staging/rts5139/rts51x_scsi.h
8012 create mode 100644 drivers/staging/rts5139/rts51x_sys.h
8013 create mode 100644 drivers/staging/rts5139/rts51x_transport.c
8014 create mode 100644 drivers/staging/rts5139/rts51x_transport.h
8015 create mode 100644 drivers/staging/rts5139/sd.c
8016 create mode 100644 drivers/staging/rts5139/sd.h
8017 create mode 100644 drivers/staging/rts5139/sd_cprm.c
8018 create mode 100644 drivers/staging/rts5139/sd_cprm.h
8019 create mode 100644 drivers/staging/rts5139/trace.h
8020 create mode 100644 drivers/staging/rts5139/xd.c
8021 create mode 100644 drivers/staging/rts5139/xd.h
8022 create mode 100644 drivers/staging/usbip/usbip_protocol.txt
8023 Merging bkl-config/config
8024 $ git merge bkl-config/config
8026 Merging tmem/linux-next
8027 $ git merge tmem/linux-next
8028 Merge made by recursive.
8029 .../ABI/testing/sysfs-kernel-mm-frontswap | 16 +
8030 Documentation/vm/frontswap.txt | 215 ++++++++++++
8031 include/linux/frontswap.h | 125 +++++++
8032 include/linux/swap.h | 4 +
8033 include/linux/swapfile.h | 13 +
8036 mm/frontswap.c | 351 ++++++++++++++++++++
8038 mm/swapfile.c | 64 +++-
8039 10 files changed, 805 insertions(+), 13 deletions(-)
8040 create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
8041 create mode 100644 Documentation/vm/frontswap.txt
8042 create mode 100644 include/linux/frontswap.h
8043 create mode 100644 include/linux/swapfile.h
8044 create mode 100644 mm/frontswap.c
8045 Merging writeback/next
8046 $ git merge writeback/next
8047 Merge made by recursive.
8048 include/trace/events/writeback.h | 10 +++++-----
8049 1 files changed, 5 insertions(+), 5 deletions(-)
8050 Merging arm-dt/devicetree/arm-next
8051 $ git merge arm-dt/devicetree/arm-next
8053 Merging moduleh/module.h-split
8054 $ git merge moduleh/module.h-split
8055 Auto-merging arch/arm/common/scoop.c
8056 Auto-merging arch/arm/kernel/setup.c
8057 Auto-merging arch/arm/mach-bcmring/mm.c
8058 CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
8059 Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
8060 Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c
8061 Auto-merging arch/arm/mach-imx/mach-mx31lilly.c
8062 Auto-merging arch/arm/mach-imx/mach-mx31lite.c
8063 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
8064 Auto-merging arch/arm/mach-ixp2000/core.c
8065 Auto-merging arch/arm/mach-ixp4xx/common-pci.c
8066 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
8067 Auto-merging arch/arm/mach-omap1/board-sx1.c
8068 Auto-merging arch/arm/mach-omap1/board-voiceblue.c
8069 Auto-merging arch/arm/mach-omap2/board-omap3evm.c
8070 Auto-merging arch/arm/mach-s3c2410/mach-h1940.c
8071 Auto-merging arch/arm/mach-sa1100/jornada720.c
8072 Auto-merging arch/arm/mm/init.c
8073 Auto-merging arch/arm/plat-samsung/dev-ts.c
8074 Auto-merging arch/arm/plat-samsung/platformdata.c
8075 Auto-merging arch/blackfin/mach-bf518/boards/ezbrd.c
8076 Auto-merging arch/blackfin/mach-bf527/boards/ad7160eval.c
8077 Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c
8078 Auto-merging arch/blackfin/mach-bf527/boards/tll6527m.c
8079 Auto-merging arch/blackfin/mach-bf537/boards/dnp5370.c
8080 Auto-merging arch/mips/bcm47xx/gpio.c
8081 Auto-merging arch/mips/bcm47xx/setup.c
8082 Auto-merging arch/mips/kernel/traps.c
8083 Auto-merging arch/powerpc/sysdev/fsl_rio.c
8084 Auto-merging arch/sparc/kernel/pcic.c
8085 Auto-merging arch/sparc/kernel/setup_64.c
8086 Auto-merging arch/x86/kernel/cpu/amd.c
8087 Auto-merging block/ioctl.c
8088 Auto-merging drivers/ata/libata-eh.c
8089 Auto-merging drivers/base/power/main.c
8090 Auto-merging drivers/base/power/runtime.c
8091 Auto-merging drivers/bcma/core.c
8092 Auto-merging drivers/bcma/driver_chipcommon.c
8093 Auto-merging drivers/bcma/driver_pci.c
8094 Auto-merging drivers/bcma/main.c
8095 Auto-merging drivers/char/virtio_console.c
8096 Auto-merging drivers/clocksource/sh_cmt.c
8097 Auto-merging drivers/dma/ste_dma40.c
8098 Auto-merging drivers/firmware/google/gsmi.c
8099 Auto-merging drivers/gpio/gpio-ep93xx.c
8100 Auto-merging drivers/hid/hid-axff.c
8101 Auto-merging drivers/hid/hid-debug.c
8102 Auto-merging drivers/hid/hid-picolcd.c
8103 Auto-merging drivers/hid/hid-sjoy.c
8104 Auto-merging drivers/hid/usbhid/hid-quirks.c
8105 Auto-merging drivers/i2c/busses/i2c-pxa-pci.c
8106 Auto-merging drivers/i2c/busses/i2c-tegra.c
8107 Auto-merging drivers/input/input-mt.c
8108 Auto-merging drivers/input/input-polldev.c
8109 Auto-merging drivers/input/misc/ad714x.c
8110 Auto-merging drivers/leds/leds-asic3.c
8111 Auto-merging drivers/md/dm-raid.c
8112 Auto-merging drivers/md/md.c
8113 Auto-merging drivers/md/raid1.c
8114 Auto-merging drivers/md/raid10.c
8115 Auto-merging drivers/md/raid5.c
8116 Auto-merging drivers/mfd/ab3550-core.c
8117 Auto-merging drivers/mfd/asic3.c
8118 Auto-merging drivers/mfd/max8997.c
8119 Auto-merging drivers/mfd/twl6030-irq.c
8120 Auto-merging drivers/mfd/wm8400-core.c
8121 Auto-merging drivers/misc/ab8500-pwm.c
8122 Auto-merging drivers/misc/ti-st/st_kim.c
8123 Auto-merging drivers/mmc/core/debugfs.c
8124 Auto-merging drivers/mmc/core/host.c
8125 Auto-merging drivers/mmc/core/mmc_ops.c
8126 Auto-merging drivers/mmc/core/sd.c
8127 Auto-merging drivers/mmc/core/sd_ops.c
8128 Auto-merging drivers/mmc/host/sdhci-tegra.c
8129 Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
8130 Auto-merging drivers/mtd/ar7part.c
8131 Auto-merging drivers/mtd/cmdlinepart.c
8132 Auto-merging drivers/mtd/mtdsuper.c
8133 Auto-merging drivers/mtd/nand/cafe_nand.c
8134 Auto-merging drivers/mtd/nand/cmx270_nand.c
8135 Auto-merging drivers/mtd/nand/diskonchip.c
8136 Auto-merging drivers/mtd/nand/nand_bbt.c
8137 Auto-merging drivers/mtd/nand/omap2.c
8138 Auto-merging drivers/mtd/onenand/onenand_bbt.c
8139 Auto-merging drivers/mtd/redboot.c
8140 Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c
8141 Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
8142 Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
8143 Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c
8144 Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
8145 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
8146 Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c
8147 Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
8148 Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
8149 Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
8150 Auto-merginResolved 'arch/arm/mach-bcmring/mm.c' using previous resolution.
8151 Resolved 'drivers/scsi/libfc/fc_lport.c' using previous resolution.
8152 Resolved 'include/linux/dmaengine.h' using previous resolution.
8153 g drivers/net/ethernet/mellanox/mlx4/qp.c
8154 Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
8155 Auto-merging drivers/pci/hotplug/pcihp_slot.c
8156 Auto-merging drivers/pci/setup-res.c
8157 Auto-merging drivers/power/max17042_battery.c
8158 Auto-merging drivers/power/max8903_charger.c
8159 Auto-merging drivers/power/max8997_charger.c
8160 Auto-merging drivers/power/max8998_charger.c
8161 Auto-merging drivers/power/power_supply_sysfs.c
8162 Auto-merging drivers/regulator/88pm8607.c
8163 Auto-merging drivers/regulator/tps6586x-regulator.c
8164 Auto-merging drivers/rtc/interface.c
8165 Auto-merging drivers/s390/cio/qdio_debug.c
8166 Auto-merging drivers/s390/scsi/zfcp_dbf.c
8167 Auto-merging drivers/s390/scsi/zfcp_scsi.c
8168 Auto-merging drivers/scsi/device_handler/scsi_dh.c
8169 Auto-merging drivers/scsi/device_handler/scsi_dh_alua.c
8170 Auto-merging drivers/scsi/libfc/fc_exch.c
8171 Auto-merging drivers/scsi/libfc/fc_lport.c
8172 CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
8173 Auto-merging drivers/scsi/libsas/sas_scsi_host.c
8174 Auto-merging drivers/scsi/lpfc/lpfc_attr.c
8175 Auto-merging drivers/scsi/lpfc/lpfc_init.c
8176 Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
8177 Auto-merging drivers/ssb/main.c
8178 Auto-merging drivers/staging/brcm80211/brcmutil/wifi.c
8179 Auto-merging drivers/staging/iio/industrialio-ring.c
8180 Auto-merging drivers/tty/serial/jsm/jsm_driver.c
8181 Auto-merging drivers/tty/serial/max3107-aava.c
8182 Auto-merging drivers/tty/serial/max3107.c
8183 Auto-merging drivers/uio/uio_pdrv_genirq.c
8184 Auto-merging drivers/usb/core/driver.c
8185 Auto-merging drivers/usb/gadget/composite.c
8186 Auto-merging drivers/usb/gadget/file_storage.c
8187 Auto-merging drivers/usb/gadget/fusb300_udc.c
8188 Auto-merging drivers/usb/host/xhci-hub.c
8189 Auto-merging drivers/usb/wusbcore/wa-hc.c
8190 Auto-merging drivers/video/atmel_lcdfb.c
8191 Auto-merging drivers/video/backlight/ep93xx_bl.c
8192 Auto-merging drivers/video/carminefb.c
8193 Auto-merging drivers/video/mb862xx/mb862xx-i2c.c
8194 Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
8195 Auto-merging drivers/video/msm/mdp.c
8196 Auto-merging drivers/video/sh_mobile_lcdcfb.c
8197 Auto-merging drivers/w1/w1_family.c
8198 Auto-merging drivers/xen/balloon.c
8199 Auto-merging drivers/xen/swiotlb-xen.c
8200 Auto-merging drivers/xen/xen-selfballoon.c
8201 Auto-merging drivers/xen/xenbus/xenbus_probe.c
8202 Auto-merging fs/exofs/super.c
8203 Auto-merging fs/gfs2/ops_fstype.c
8204 Auto-merging fs/jfs/jfs_logmgr.c
8205 Auto-merging fs/logfs/super.c
8206 Auto-merging include/linux/bcma/bcma.h
8207 Auto-merging include/linux/blkdev.h
8208 Auto-merging include/linux/device.h
8209 Auto-merging include/linux/dmaengine.h
8210 CONFLICT (content): Merge conflict in include/linux/dmaengine.h
8211 Auto-merging include/linux/hid.h
8212 Auto-merging include/linux/mtd/mtd.h
8213 Auto-merging include/linux/pm_runtime.h
8214 Auto-merging include/linux/usb.h
8215 Auto-merging include/net/lib80211.h
8216 Auto-merging include/net/sock.h
8217 Auto-merging kernel/cgroup_freezer.c
8218 Auto-merging kernel/crash_dump.c
8219 Auto-merging kernel/cred.c
8220 Auto-merging kernel/events/core.c
8221 Auto-merging kernel/exit.c
8222 Auto-merging kernel/fork.c
8223 Auto-merging kernel/freezer.c
8224 Auto-merging kernel/kthread.c
8225 Auto-merging kernel/lockdep.c
8226 Auto-merging kernel/pid.c
8227 Auto-merging kernel/power/hibernate.c
8228 Auto-merging kernel/power/main.c
8229 Auto-merging kernel/power/suspend.c
8230 Auto-merging kernel/rcupdate.c
8231 Auto-merging kernel/rcutiny.c
8232 Auto-merging kernel/rcutorture.c
8233 Auto-merging kernel/rcutree.c
8234 Auto-merging kernel/rcutree_trace.c
8235 Auto-merging kernel/rtmutex.c
8236 Auto-merging kernel/sched.c
8237 Auto-merging kernel/signal.c
8238 Auto-merging kernel/sys.c
8239 Auto-merging kernel/trace/blktrace.c
8240 Auto-merging lib/dma-debug.c
8241 Auto-merging mm/memcontrol.c
8242 Auto-merging mm/swapfile.c
8243 Auto-merging sound/core/control.c
8244 Auto-merging sound/usb/midi.c
8245 Automatic merge failed; fix conflicts and then commit the result.
8247 [master a0a7466] Merge remote-tracking branch 'moduleh/module.h-split'
8248 $ git diff -M --stat --summary HEAD^..
8249 arch/alpha/kernel/core_irongate.c | 1 +
8250 arch/alpha/kernel/pci-sysfs.c | 1 +
8251 arch/alpha/kernel/pci_iommu.c | 1 +
8252 arch/alpha/kernel/setup.c | 1 +
8253 arch/arm/common/it8152.c | 1 +
8254 arch/arm/common/scoop.c | 1 +
8255 arch/arm/kernel/armksyms.c | 2 +-
8256 arch/arm/kernel/bios32.c | 2 +-
8257 arch/arm/kernel/devtree.c | 2 +-
8258 arch/arm/kernel/elf.c | 2 +-
8259 arch/arm/kernel/io.c | 2 +-
8260 arch/arm/kernel/irq.c | 1 -
8261 arch/arm/kernel/leds.c | 3 +-
8262 arch/arm/kernel/perf_event.c | 2 +-
8263 arch/arm/kernel/pj4-cp0.c | 1 -
8264 arch/arm/kernel/process.c | 2 +-
8265 arch/arm/kernel/ptrace.c | 1 +
8266 arch/arm/kernel/return_address.c | 2 +-
8267 arch/arm/kernel/setup.c | 2 +-
8268 arch/arm/kernel/stacktrace.c | 2 +-
8269 arch/arm/kernel/sys_arm.c | 2 +-
8270 arch/arm/kernel/time.c | 2 +-
8271 arch/arm/kernel/unwind.c | 2 +-
8272 arch/arm/kernel/xscale-cp0.c | 1 -
8273 arch/arm/mach-at91/cpuidle.c | 1 +
8274 arch/arm/mach-bcmring/dma.c | 1 +
8275 arch/arm/mach-bcmring/mm.c | 1 +
8276 arch/arm/mach-davinci/board-dm644x-evm.c | 1 +
8277 arch/arm/mach-davinci/board-dm646x-evm.c | 1 +
8278 arch/arm/mach-davinci/cdce949.c | 1 +
8279 arch/arm/mach-davinci/cpufreq.c | 1 +
8280 arch/arm/mach-davinci/cpuidle.c | 1 +
8281 arch/arm/mach-ep93xx/core.c | 1 +
8282 arch/arm/mach-exynos4/dev-sysmmu.c | 1 +
8283 arch/arm/mach-imx/mach-mx31lilly.c | 1 +
8284 arch/arm/mach-imx/mach-mx31lite.c | 1 +
8285 arch/arm/mach-imx/mach-mx31moboard.c | 1 +
8286 arch/arm/mach-iop13xx/pci.c | 1 +
8287 arch/arm/mach-ixp2000/core.c | 1 +
8288 arch/arm/mach-ixp4xx/common-pci.c | 1 +
8289 arch/arm/mach-ixp4xx/common.c | 1 +
8290 arch/arm/mach-kirkwood/cpuidle.c | 1 +
8291 arch/arm/mach-msm/io.c | 1 +
8292 arch/arm/mach-netx/xc.c | 1 +
8293 arch/arm/mach-omap1/board-ams-delta.c | 1 +
8294 arch/arm/mach-omap1/board-sx1.c | 1 +
8295 arch/arm/mach-omap1/board-voiceblue.c | 1 +
8296 arch/arm/mach-omap1/mailbox.c | 1 +
8297 arch/arm/mach-omap2/board-omap3evm.c | 1 +
8298 arch/arm/mach-omap2/clockdomain.c | 1 +
8299 arch/arm/mach-omap2/display.c | 1 +
8300 arch/arm/mach-omap2/gpmc-onenand.c | 1 +
8301 arch/arm/mach-omap2/pm.c | 1 +
8302 arch/arm/mach-omap2/prcm.c | 1 +
8303 arch/arm/mach-omap2/usb-tusb6010.c | 2 +
8304 arch/arm/mach-omap2/voltage.c | 1 +
8305 arch/arm/mach-pxa/corgi.c | 1 +
8306 arch/arm/mach-pxa/poodle.c | 1 +
8307 arch/arm/mach-pxa/spitz.c | 1 +
8308 arch/arm/mach-s3c2410/mach-h1940.c | 1 +
8309 arch/arm/mach-s3c64xx/dev-audio.c | 1 +
8310 arch/arm/mach-sa1100/collie.c | 1 +
8311 arch/arm/mach-sa1100/jornada720.c | 1 +
8312 arch/arm/mach-shmobile/clock.c | 1 +
8313 arch/arm/mach-tegra/pcie.c | 1 +
8314 arch/arm/mm/fault-armv.c | 1 -
8315 arch/arm/mm/init.c | 1 +
8316 arch/arm/plat-iop/gpio.c | 1 +
8317 arch/arm/plat-iop/time.c | 1 +
8318 arch/arm/plat-omap/clock.c | 1 +
8319 arch/arm/plat-omap/mailbox.c | 1 +
8320 arch/arm/plat-s3c24xx/devs.c | 1 +
8321 arch/arm/plat-s5p/dev-ehci.c | 1 +
8322 arch/arm/plat-s5p/dev-onenand.c | 2 +
8323 arch/arm/plat-samsung/dev-adc.c | 2 +
8324 arch/arm/plat-samsung/dev-asocdma.c | 1 +
8325 arch/arm/plat-samsung/dev-backlight.c | 1 +
8326 arch/arm/plat-samsung/dev-ide.c | 2 +
8327 arch/arm/plat-samsung/dev-nand.c | 1 +
8328 arch/arm/plat-samsung/dev-pwm.c | 1 +
8329 arch/arm/plat-samsung/dev-rtc.c | 1 +
8330 arch/arm/plat-samsung/dev-ts.c | 2 +
8331 arch/arm/plat-samsung/dev-usb.c | 1 +
8332 arch/arm/plat-samsung/dev-wdt.c | 3 +
8333 arch/arm/plat-samsung/platformdata.c | 1 +
8334 arch/arm/vfp/vfpmodule.c | 1 -
8335 arch/avr32/mach-at32ap/clock.c | 1 +
8336 arch/avr32/mach-at32ap/cpufreq.c | 1 +
8337 arch/avr32/mach-at32ap/intc.c | 1 +
8338 arch/avr32/mach-at32ap/pio.c | 1 +
8339 arch/avr32/mm/dma-coherent.c | 1 +
8340 arch/blackfin/kernel/dma-mapping.c | 1 +
8341 arch/blackfin/kernel/perf_event.c | 1 +
8342 arch/blackfin/kernel/sys_bfin.c | 1 +
8343 arch/blackfin/mach-bf518/boards/ezbrd.c | 1 +
8344 arch/blackfin/mach-bf527/boards/ad7160eval.c | 1 +
8345 arch/blackfin/mach-bf527/boards/ezkit.c | 1 +
8346 arch/blackfin/mach-bf527/boards/tll6527m.c | 1 +
8347 arch/blackfin/mach-bf537/boards/dnp5370.c | 1 +
8348 arch/blackfin/mach-common/cpufreq.c | 1 +
8349 arch/blackfin/mm/init.c | 1 +
8350 arch/ia64/hp/common/hwsw_iommu.c | 1 +
8351 arch/ia64/kernel/dma-mapping.c | 1 +
8352 arch/ia64/kernel/topology.c | 1 +
8353 arch/ia64/sn/kernel/io_init.c | 1 +
8354 arch/ia64/sn/pci/pcibr/pcibr_dma.c | 1 +
8355 arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 +
8356 arch/ia64/sn/pci/tioca_provider.c | 1 +
8357 arch/m68k/atari/time.c | 1 +
8358 arch/m68k/kernel/dma_mm.c | 1 +
8359 arch/m68k/kernel/dma_no.c | 1 +
8360 arch/mips/bcm47xx/gpio.c | 1 +
8361 arch/mips/bcm47xx/setup.c | 1 +
8362 arch/mips/cavium-octeon/csrc-octeon.c | 1 +
8363 arch/mips/cavium-octeon/dma-octeon.c | 1 +
8364 arch/mips/cavium-octeon/flash_setup.c | 1 +
8365 arch/mips/kernel/8250-platform.c | 1 -
8366 arch/mips/kernel/cpu-probe.c | 3 +-
8367 arch/mips/kernel/i8253.c | 2 +-
8368 arch/mips/kernel/init_task.c | 2 +-
8369 arch/mips/kernel/irq-msc01.c | 1 -
8370 arch/mips/kernel/irq.c | 1 -
8371 arch/mips/kernel/mips-mt.c | 2 +-
8372 arch/mips/kernel/mips_ksyms.c | 2 +-
8373 arch/mips/kernel/module.c | 1 -
8374 arch/mips/kernel/process.c | 2 +-
8375 arch/mips/kernel/prom.c | 2 +-
8376 arch/mips/kernel/reset.c | 2 +-
8377 arch/mips/kernel/rtlx.c | 1 -
8378 arch/mips/kernel/setup.c | 2 +-
8379 arch/mips/kernel/spinlock_test.c | 2 +-
8380 arch/mips/kernel/stacktrace.c | 2 +-
8381 arch/mips/kernel/time.c | 2 +-
8382 arch/mips/kernel/traps.c | 1 -
8383 arch/mips/kernel/unaligned.c | 1 -
8384 arch/mips/kernel/vpe.c | 1 -
8385 arch/mips/loongson/common/platform.c | 1 +
8386 arch/mips/pci/pci-ip27.c | 1 +
8387 arch/mips/pci/pci.c | 1 +
8388 arch/mips/powertv/pci/fixup-powertv.c | 1 +
8389 arch/mips/powertv/powertv-usb.c | 1 +
8390 arch/mips/rb532/gpio.c | 1 +
8391 arch/mips/rb532/setup.c | 1 +
8392 arch/mips/txx9/generic/spi_eeprom.c | 1 +
8393 arch/mips/txx9/rbtx4939/setup.c | 1 +
8394 arch/mips/vr41xx/common/giu.c | 1 +
8395 arch/mips/vr41xx/common/rtc.c | 1 +
8396 arch/parisc/kernel/drivers.c | 1 +
8397 arch/parisc/kernel/pci-dma.c | 1 +
8398 arch/parisc/kernel/setup.c | 1 +
8399 arch/parisc/lib/iomap.c | 1 +
8400 arch/powerpc/include/asm/lv1call.h | 1 +
8401 arch/powerpc/include/asm/machdep.h | 1 +
8402 arch/powerpc/include/asm/spu.h | 1 +
8403 arch/powerpc/kernel/btext.c | 2 +-
8404 arch/powerpc/kernel/clock.c | 2 +-
8405 arch/powerpc/kernel/cputable.c | 2 +-
8406 arch/powerpc/kernel/crash.c | 1 +
8407 arch/powerpc/kernel/dma-iommu.c | 1 +
8408 arch/powerpc/kernel/dma.c | 1 +
8409 arch/powerpc/kernel/firmware.c | 3 +-
8410 arch/powerpc/kernel/hw_breakpoint.c | 1 -
8411 arch/powerpc/kernel/ibmebus.c | 2 +
8412 arch/powerpc/kernel/init_task.c | 2 +-
8413 arch/powerpc/kernel/io-workarounds.c | 1 +
8414 arch/powerpc/kernel/io.c | 2 +-
8415 arch/powerpc/kernel/iomap.c | 1 +
8416 arch/powerpc/kernel/irq.c | 2 +-
8417 arch/powerpc/kernel/isa-bridge.c | 1 +
8418 arch/powerpc/kernel/kvm.c | 1 +
8419 arch/powerpc/kernel/module.c | 1 -
8420 arch/powerpc/kernel/of_platform.c | 2 +-
8421 arch/powerpc/kernel/paca.c | 2 +-
8422 arch/powerpc/kernel/pci-common.c | 1 +
8423 arch/powerpc/kernel/pci_32.c | 1 +
8424 arch/powerpc/kernel/pci_64.c | 1 +
8425 arch/powerpc/kernel/pci_dn.c | 1 +
8426 arch/powerpc/kernel/pci_of_scan.c | 1 +
8427 arch/powerpc/kernel/pmc.c | 2 +-
8428 arch/powerpc/kernel/ppc_ksyms.c | 2 +-
8429 arch/powerpc/kernel/process.c | 2 +-
8430 arch/powerpc/kernel/prom.c | 2 +-
8431 arch/powerpc/kernel/prom_parse.c | 1 -
8432 arch/powerpc/kernel/ptrace.c | 1 -
8433 arch/powerpc/kernel/rtas.c | 2 +-
8434 arch/powerpc/kernel/setup-common.c | 2 +-
8435 arch/powerpc/kernel/setup_64.c | 2 +-
8436 arch/powerpc/kernel/signal_64.c | 1 -
8437 arch/powerpc/kernel/smp.c | 2 +-
8438 arch/powerpc/kernel/stacktrace.c | 2 +-
8439 arch/powerpc/kernel/swsusp_64.c | 1 +
8440 arch/powerpc/kernel/sysfs.c | 2 +-
8441 arch/powerpc/kernel/time.c | 2 +-
8442 arch/powerpc/kernel/vdso.c | 1 -
8443 arch/powerpc/kernel/vio.c | 3 +-
8444 arch/powerpc/kvm/44x.c | 1 +
8445 arch/powerpc/kvm/book3s.c | 1 +
8446 arch/powerpc/kvm/book3s_exports.c | 2 +-
8447 arch/powerpc/kvm/book3s_hv.c | 1 +
8448 arch/powerpc/kvm/book3s_hv_builtin.c | 1 +
8449 arch/powerpc/kvm/book3s_pr.c | 1 +
8450 arch/powerpc/kvm/powerpc.c | 1 -
8451 arch/powerpc/lib/checksum_wrappers_64.c | 2 +-
8452 arch/powerpc/lib/devres.c | 2 +-
8453 arch/powerpc/lib/locks.c | 2 +-
8454 arch/powerpc/lib/rheap.c | 2 +-
8455 arch/powerpc/mm/dma-noncoherent.c | 1 +
8456 arch/powerpc/mm/hash_utils_64.c | 1 +
8457 arch/powerpc/mm/mem.c | 2 +-
8458 arch/powerpc/mm/mmu_context_hash32.c | 1 +
8459 arch/powerpc/mm/mmu_context_hash64.c | 2 +-
8460 arch/powerpc/mm/numa.c | 2 +-
8461 arch/powerpc/mm/pgtable_64.c | 1 +
8462 arch/powerpc/mm/slice.c | 2 +-
8463 arch/powerpc/mm/tlb_hash32.c | 1 +
8464 arch/powerpc/mm/tlb_nohash.c | 1 +
8465 arch/powerpc/platforms/44x/warp.c | 1 +
8466 arch/powerpc/platforms/512x/clock.c | 1 +
8467 arch/powerpc/platforms/52xx/mpc52xx_common.c | 1 +
8468 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 +
8469 arch/powerpc/platforms/83xx/suspend.c | 1 +
8470 arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 -
8471 arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 -
8472 arch/powerpc/platforms/85xx/sbc8548.c | 1 -
8473 arch/powerpc/platforms/86xx/gef_gpio.c | 1 +
8474 arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 -
8475 arch/powerpc/platforms/cell/axon_msi.c | 1 +
8476 arch/powerpc/platforms/cell/beat.c | 2 +-
8477 arch/powerpc/platforms/cell/beat_spu_priv1.c | 2 -
8478 arch/powerpc/platforms/cell/beat_wrapper.h | 1 +
8479 arch/powerpc/platforms/cell/cbe_cpufreq.c | 1 +
8480 arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c | 1 +
8481 arch/powerpc/platforms/cell/cbe_powerbutton.c | 1 +
8482 arch/powerpc/platforms/cell/cbe_regs.c | 2 +-
8483 arch/powerpc/platforms/cell/celleb_setup.c | 1 +
8484 arch/powerpc/platforms/cell/cpufreq_spudemand.c | 1 +
8485 arch/powerpc/platforms/cell/interrupt.c | 2 +-
8486 arch/powerpc/platforms/cell/pmu.c | 1 +
8487 arch/powerpc/platforms/cell/qpace_setup.c | 1 +
8488 arch/powerpc/platforms/cell/setup.c | 1 +
8489 arch/powerpc/platforms/cell/smp.c | 1 -
8490 arch/powerpc/platforms/cell/spu_callbacks.c | 2 +-
8491 arch/powerpc/platforms/cell/spu_fault.c | 2 +-
8492 arch/powerpc/platforms/cell/spu_manage.c | 2 +-
8493 arch/powerpc/platforms/cell/spu_notify.c | 3 +-
8494 arch/powerpc/platforms/cell/spu_priv1_mmio.c | 1 -
8495 arch/powerpc/platforms/cell/spufs/backing_ops.c | 1 -
8496 arch/powerpc/platforms/cell/spufs/context.c | 2 +-
8497 arch/powerpc/platforms/cell/spufs/coredump.c | 1 -
8498 arch/powerpc/platforms/cell/spufs/fault.c | 1 -
8499 arch/powerpc/platforms/cell/spufs/file.c | 2 +-
8500 arch/powerpc/platforms/cell/spufs/hw_ops.c | 1 -
8501 arch/powerpc/platforms/cell/spufs/sched.c | 1 -
8502 arch/powerpc/platforms/cell/spufs/switch.c | 2 +-
8503 arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +-
8504 arch/powerpc/platforms/embedded6xx/holly.c | 1 +
8505 arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 1 +
8506 arch/powerpc/platforms/iseries/hvlpconfig.c | 2 +-
8507 arch/powerpc/platforms/iseries/iommu.c | 2 +-
8508 arch/powerpc/platforms/iseries/ksyms.c | 2 +-
8509 arch/powerpc/platforms/iseries/lpardata.c | 1 -
8510 arch/powerpc/platforms/iseries/lpevents.c | 2 +-
8511 arch/powerpc/platforms/iseries/mf.c | 1 +
8512 arch/powerpc/platforms/iseries/pci.c | 1 -
8513 arch/powerpc/platforms/iseries/setup.c | 1 +
8514 arch/powerpc/platforms/iseries/smp.c | 1 -
8515 arch/powerpc/platforms/iseries/vio.c | 2 +-
8516 arch/powerpc/platforms/iseries/viopath.c | 2 +-
8517 arch/powerpc/platforms/maple/setup.c | 1 +
8518 arch/powerpc/platforms/pasemi/cpufreq.c | 1 +
8519 arch/powerpc/platforms/pasemi/dma_lib.c | 3 +-
8520 arch/powerpc/platforms/pasemi/setup.c | 1 +
8521 arch/powerpc/platforms/powermac/backlight.c | 1 +
8522 arch/powerpc/platforms/powermac/feature.c | 1 +
8523 arch/powerpc/platforms/powermac/low_i2c.c | 2 +-
8524 arch/powerpc/platforms/powermac/nvram.c | 2 +-
8525 arch/powerpc/platforms/powermac/pic.c | 1 -
8526 arch/powerpc/platforms/powermac/setup.c | 1 +
8527 arch/powerpc/platforms/ps3/exports.c | 2 -
8528 arch/powerpc/platforms/ps3/interrupt.c | 2 +-
8529 arch/powerpc/platforms/ps3/mm.c | 2 +-
8530 arch/powerpc/platforms/ps3/os-area.c | 1 +
8531 arch/powerpc/platforms/ps3/setup.c | 1 +
8532 arch/powerpc/platforms/ps3/spu.c | 1 +
8533 arch/powerpc/platforms/ps3/system-bus.c | 2 +-
8534 arch/powerpc/platforms/pseries/eeh.c | 2 +
8535 arch/powerpc/platforms/pseries/eeh_event.c | 1 +
8536 arch/powerpc/platforms/pseries/eeh_sysfs.c | 1 +
8537 arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 +
8538 arch/powerpc/platforms/pseries/hvconsole.c | 3 +-
8539 arch/powerpc/platforms/pseries/io_event_irq.c | 2 +-
8540 arch/powerpc/platforms/pseries/iommu.c | 1 +
8541 arch/powerpc/platforms/pseries/lpar.c | 1 +
8542 arch/powerpc/platforms/pseries/mobility.c | 1 +
8543 arch/powerpc/platforms/pseries/pci_dlpar.c | 1 +
8544 arch/powerpc/platforms/pseries/plpar_wrappers.h | 3 +
8545 arch/powerpc/platforms/pseries/setup.c | 2 +-
8546 arch/powerpc/platforms/pseries/smp.c | 1 -
8547 arch/powerpc/platforms/pseries/suspend.c | 1 +
8548 arch/powerpc/sysdev/bestcomm/sram.c | 2 +-
8549 arch/powerpc/sysdev/cpm_common.c | 1 +
8550 arch/powerpc/sysdev/dcr.c | 1 +
8551 arch/powerpc/sysdev/fsl_gtm.c | 1 +
8552 arch/powerpc/sysdev/fsl_lbc.c | 3 +-
8553 arch/powerpc/sysdev/fsl_pmc.c | 1 +
8554 arch/powerpc/sysdev/fsl_rio.c | 2 +-
8555 arch/powerpc/sysdev/fsl_soc.c | 2 +-
8556 arch/powerpc/sysdev/mpc5xxx_clocks.c | 1 +
8557 arch/powerpc/sysdev/mpc8xx_pic.c | 1 -
8558 arch/powerpc/sysdev/mv64x60_pci.c | 1 +
8559 arch/powerpc/sysdev/pmi.c | 1 +
8560 arch/powerpc/sysdev/ppc4xx_msi.c | 1 +
8561 arch/powerpc/sysdev/qe_lib/gpio.c | 1 +
8562 arch/powerpc/sysdev/qe_lib/ucc.c | 2 +-
8563 arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2 +-
8564 arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2 +-
8565 arch/powerpc/sysdev/qe_lib/usb.c | 1 +
8566 arch/powerpc/sysdev/rtc_cmos_setup.c | 1 +
8567 arch/powerpc/sysdev/scom.c | 1 +
8568 arch/powerpc/sysdev/simple_gpio.c | 1 -
8569 arch/powerpc/sysdev/tsi108_dev.c | 2 +-
8570 arch/powerpc/xmon/xmon.c | 2 +-
8571 arch/s390/crypto/sha_common.c | 1 +
8572 arch/s390/mm/init.c | 1 +
8573 arch/sh/drivers/dma/dma-sysfs.c | 1 +
8574 arch/sh/drivers/pci/pci.c | 1 +
8575 arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 +
8576 arch/sh/kernel/perf_event.c | 1 +
8577 arch/sh/kernel/topology.c | 1 +
8578 arch/sh/mm/init.c | 1 +
8579 arch/sparc/include/asm/termios.h | 1 -
8580 arch/sparc/kernel/auxio_32.c | 1 +
8581 arch/sparc/kernel/btext.c | 1 -
8582 arch/sparc/kernel/central.c | 1 +
8583 arch/sparc/kernel/cpu.c | 2 +-
8584 arch/sparc/kernel/cpumap.c | 2 +-
8585 arch/sparc/kernel/dma.c | 1 -
8586 arch/sparc/kernel/ebus.c | 2 +-
8587 arch/sparc/kernel/hvapi.c | 2 +-
8588 arch/sparc/kernel/idprom.c | 2 +-
8589 arch/sparc/kernel/iommu.c | 2 +-
8590 arch/sparc/kernel/irq_32.c | 1 +
8591 arch/sparc/kernel/irq_64.c | 1 -
8592 arch/sparc/kernel/ldc.c | 2 +-
8593 arch/sparc/kernel/leon_kernel.c | 1 -
8594 arch/sparc/kernel/leon_pci_grpci2.c | 1 -
8595 arch/sparc/kernel/nmi.c | 2 +-
8596 arch/sparc/kernel/of_device_32.c | 1 -
8597 arch/sparc/kernel/of_device_64.c | 3 +-
8598 arch/sparc/kernel/of_device_common.c | 2 +-
8599 arch/sparc/kernel/pci.c | 2 +-
8600 arch/sparc/kernel/pci_fire.c | 1 +
8601 arch/sparc/kernel/pci_psycho.c | 1 +
8602 arch/sparc/kernel/pci_sabre.c | 1 +
8603 arch/sparc/kernel/pci_schizo.c | 1 +
8604 arch/sparc/kernel/pci_sun4v.c | 1 +
8605 arch/sparc/kernel/pcic.c | 1 +
8606 arch/sparc/kernel/pcr.c | 3 +-
8607 arch/sparc/kernel/pmc.c | 1 +
8608 arch/sparc/kernel/power.c | 2 +-
8609 arch/sparc/kernel/process_64.c | 2 +-
8610 arch/sparc/kernel/prom_32.c | 1 -
8611 arch/sparc/kernel/prom_64.c | 1 -
8612 arch/sparc/kernel/prom_common.c | 2 +-
8613 arch/sparc/kernel/reboot.c | 2 +-
8614 arch/sparc/kernel/sbus.c | 1 +
8615 arch/sparc/kernel/setup_32.c | 1 +
8616 arch/sparc/kernel/setup_64.c | 1 +
8617 arch/sparc/kernel/smp_64.c | 2 +-
8618 arch/sparc/kernel/sparc_ksyms_64.c | 2 +-
8619 arch/sparc/kernel/stacktrace.c | 2 +-
8620 arch/sparc/kernel/sys_sparc32.c | 1 -
8621 arch/sparc/kernel/sys_sparc_64.c | 2 +-
8622 arch/sparc/kernel/time_64.c | 2 +-
8623 arch/sparc/kernel/traps_32.c | 1 +
8624 arch/sparc/kernel/unaligned_32.c | 1 -
8625 arch/sparc/kernel/vio.c | 1 +
8626 arch/sparc/kernel/viohs.c | 2 +-
8627 arch/sparc/mm/fault_32.c | 1 -
8628 arch/sparc/mm/generic_32.c | 1 +
8629 arch/sparc/mm/generic_64.c | 1 +
8630 arch/sparc/mm/highmem.c | 1 +
8631 arch/sparc/mm/hugetlbpage.c | 1 -
8632 arch/x86/crypto/aes_glue.c | 1 +
8633 arch/x86/crypto/aesni-intel_glue.c | 1 +
8634 arch/x86/kernel/cpu/amd.c | 1 +
8635 arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 +
8636 arch/x86/kernel/devicetree.c | 1 +
8637 arch/x86/kernel/e820.c | 1 +
8638 arch/x86/kernel/hpet.c | 1 +
8639 arch/x86/kernel/irq.c | 1 +
8640 arch/x86/kernel/pci-dma.c | 1 +
8641 arch/x86/kernel/probe_roms.c | 4 +-
8642 arch/x86/kernel/rtc.c | 1 +
8643 arch/x86/kernel/smp.c | 1 +
8644 arch/x86/kernel/time.c | 1 +
8645 arch/x86/kernel/topology.c | 1 +
8646 arch/x86/kernel/vsyscall_64.c | 1 +
8647 arch/x86/pci/i386.c | 1 +
8648 arch/x86/pci/legacy.c | 1 +
8649 arch/x86/platform/efi/efi.c | 1 +
8650 arch/x86/platform/efi/efi_32.c | 1 +
8651 arch/x86/platform/mrst/vrtc.c | 1 +
8652 arch/x86/platform/olpc/olpc-xo1-pm.c | 1 +
8653 arch/x86/platform/uv/bios_uv.c | 1 +
8654 arch/x86/power/cpu.c | 1 +
8655 arch/x86/video/fbdev.c | 1 +
8656 block/blk-integrity.c | 1 +
8658 crypto/async_tx/async_memcpy.c | 1 +
8659 crypto/async_tx/async_pq.c | 1 +
8660 crypto/async_tx/async_raid6_recov.c | 1 +
8661 crypto/async_tx/async_tx.c | 1 +
8662 crypto/async_tx/async_xor.c | 1 +
8663 crypto/async_tx/raid6test.c | 1 +
8664 crypto/crypto_wq.c | 1 +
8669 drivers/acpi/acpica/hwsleep.c | 1 +
8670 drivers/acpi/ec_sys.c | 1 +
8671 drivers/acpi/sbshc.c | 1 +
8672 drivers/acpi/sysfs.c | 2 +-
8673 drivers/ata/libata-eh.c | 1 +
8674 drivers/ata/libata-pmp.c | 1 +
8675 drivers/ata/libata-scsi.c | 1 +
8676 drivers/ata/libata-sff.c | 1 +
8677 drivers/base/base.h | 1 +
8678 drivers/base/dma-coherent.c | 1 +
8679 drivers/base/dma-mapping.c | 1 +
8680 drivers/base/hypervisor.c | 1 +
8681 drivers/base/power/generic_ops.c | 1 +
8682 drivers/base/power/main.c | 1 +
8683 drivers/base/power/runtime.c | 1 +
8684 drivers/base/power/sysfs.c | 1 +
8685 drivers/base/power/trace.c | 1 +
8686 drivers/base/power/wakeup.c | 1 +
8687 drivers/base/transport_class.c | 1 +
8688 drivers/bcma/core.c | 1 +
8689 drivers/bcma/driver_chipcommon.c | 1 +
8690 drivers/bcma/driver_pci.c | 1 +
8691 drivers/bcma/host_pci.c | 1 +
8692 drivers/bcma/main.c | 1 +
8693 drivers/block/aoe/aoechr.c | 1 +
8694 drivers/block/ps3disk.c | 1 +
8695 drivers/block/ps3vram.c | 1 +
8696 drivers/block/virtio_blk.c | 1 +
8697 drivers/char/hw_random/virtio-rng.c | 1 +
8698 drivers/char/ramoops.c | 1 +
8699 drivers/char/ttyprintk.c | 1 +
8700 drivers/char/virtio_console.c | 1 +
8701 drivers/clocksource/sh_cmt.c | 1 +
8702 drivers/clocksource/sh_mtu2.c | 1 +
8703 drivers/clocksource/sh_tmu.c | 1 +
8704 drivers/cpufreq/cpufreq_stats.c | 1 +
8705 drivers/cpufreq/s3c64xx-cpufreq.c | 1 +
8706 drivers/crypto/mv_cesa.c | 1 +
8707 drivers/dca/dca-core.c | 1 +
8708 drivers/dca/dca-sysfs.c | 1 +
8709 drivers/dma/intel_mid_dma.c | 1 +
8710 drivers/dma/ipu/ipu_idmac.c | 1 +
8711 drivers/dma/ste_dma40.c | 1 +
8712 drivers/edac/mce_amd_inj.c | 1 +
8713 drivers/firewire/core-iso.c | 1 +
8714 drivers/firmware/google/gsmi.c | 1 +
8715 drivers/firmware/sigma.c | 1 +
8716 drivers/gpio/gpio-74x164.c | 1 +
8717 drivers/gpio/gpio-ep93xx.c | 1 +
8718 drivers/gpio/gpio-mc33880.c | 1 +
8719 drivers/gpio/gpio-mcp23s08.c | 1 +
8720 drivers/gpio/gpio-ml-ioh.c | 1 +
8721 drivers/gpio/gpio-mpc5200.c | 1 +
8722 drivers/gpio/gpio-mxc.c | 1 +
8723 drivers/gpio/gpio-mxs.c | 1 +
8724 drivers/gpio/gpio-pcf857x.c | 1 +
8725 drivers/gpio/gpio-pch.c | 1 +
8726 drivers/gpio/gpio-xilinx.c | 1 +
8727 drivers/gpu/drm/ttm/ttm_tt.c | 1 +
8728 drivers/hid/hid-axff.c | 1 +
8729 drivers/hid/hid-debug.c | 1 +
8730 drivers/hid/hid-dr.c | 1 +
8731 drivers/hid/hid-emsff.c | 1 +
8732 drivers/hid/hid-gaff.c | 1 +
8733 drivers/hid/hid-holtekff.c | 1 +
8734 drivers/hid/hid-picolcd.c | 1 +
8735 drivers/hid/hid-pl.c | 1 +
8736 drivers/hid/hid-roccat-common.c | 1 +
8737 drivers/hid/hid-roccat.c | 1 +
8738 drivers/hid/hid-sjoy.c | 1 +
8739 drivers/hid/hid-tmff.c | 1 +
8740 drivers/hid/hid-zpff.c | 1 +
8741 drivers/hid/usbhid/hid-quirks.c | 1 +
8742 drivers/hwmon/ultra45_env.c | 1 +
8743 drivers/i2c/busses/i2c-pxa-pci.c | 1 +
8744 drivers/i2c/busses/i2c-sh7760.c | 1 +
8745 drivers/i2c/busses/i2c-tegra.c | 1 +
8746 drivers/i2c/i2c-boardinfo.c | 1 +
8747 drivers/ide/buddha.c | 1 +
8748 drivers/ide/cmd640.c | 1 +
8749 drivers/ide/ide-acpi.c | 1 +
8750 drivers/ide/ide-atapi.c | 1 +
8751 drivers/ide/ide-disk_proc.c | 1 +
8752 drivers/ide/ide-dma-sff.c | 1 +
8753 drivers/ide/ide-dma.c | 1 +
8754 drivers/ide/ide-eh.c | 1 +
8755 drivers/ide/ide-floppy_proc.c | 1 +
8756 drivers/ide/ide-io-std.c | 1 +
8757 drivers/ide/ide-ioctls.c | 1 +
8758 drivers/ide/ide-legacy.c | 1 +
8759 drivers/ide/ide-lib.c | 1 +
8760 drivers/ide/ide-pnp.c | 1 +
8761 drivers/ide/ide-taskfile.c | 1 +
8762 drivers/ide/ide-xfer-mode.c | 1 +
8763 drivers/ide/macide.c | 1 +
8764 drivers/ide/pmac.c | 1 +
8765 drivers/ide/q40ide.c | 1 +
8766 drivers/ide/setup-pci.c | 1 +
8767 drivers/ide/tc86c001.c | 1 +
8768 drivers/idle/intel_idle.c | 1 +
8769 drivers/infiniband/core/cm.c | 1 +
8770 drivers/infiniband/core/fmr_pool.c | 1 +
8771 drivers/infiniband/core/mad.c | 1 +
8772 drivers/infiniband/core/multicast.c | 1 +
8773 drivers/infiniband/core/packer.c | 1 +
8774 drivers/infiniband/core/sysfs.c | 1 +
8775 drivers/infiniband/core/ud_header.c | 1 +
8776 drivers/infiniband/core/umem.c | 1 +
8777 drivers/infiniband/core/uverbs_marshall.c | 1 +
8778 drivers/infiniband/core/verbs.c | 1 +
8779 drivers/infiniband/hw/ipath/ipath_diag.c | 1 +
8780 drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 +
8781 drivers/infiniband/hw/ipath/ipath_sysfs.c | 1 +
8782 drivers/infiniband/hw/ipath/ipath_verbs.c | 1 +
8783 drivers/infiniband/hw/mthca/mthca_catas.c | 1 +
8784 drivers/infiniband/hw/mthca/mthca_cmd.c | 1 +
8785 drivers/infiniband/hw/mthca/mthca_provider.c | 2 +
8786 drivers/infiniband/hw/qib/qib_diag.c | 1 +
8787 drivers/infiniband/hw/qib/qib_file_ops.c | 1 +
8788 drivers/infiniband/hw/qib/qib_iba7220.c | 1 +
8789 drivers/infiniband/hw/qib/qib_iba7322.c | 1 +
8790 drivers/infiniband/hw/qib/qib_pcie.c | 1 +
8791 drivers/infiniband/hw/qib/qib_sd7220.c | 1 +
8792 drivers/infiniband/hw/qib/qib_verbs.c | 1 +
8793 drivers/input/input-compat.c | 1 +
8794 drivers/input/input-mt.c | 1 +
8795 drivers/input/input-polldev.c | 1 +
8796 drivers/input/joystick/as5011.c | 1 +
8797 drivers/input/keyboard/nomadik-ske-keypad.c | 1 +
8798 drivers/input/keyboard/tnetv107x-keypad.c | 1 +
8799 drivers/input/misc/ad714x.c | 1 +
8800 drivers/input/misc/adxl34x.c | 1 +
8801 drivers/input/misc/ati_remote2.c | 1 +
8802 drivers/input/misc/cma3000_d0x.c | 1 +
8803 drivers/input/misc/dm355evm_keys.c | 1 +
8804 drivers/input/sparse-keymap.c | 1 +
8805 drivers/input/touchscreen/ad7877.c | 1 +
8806 drivers/input/touchscreen/ad7879-spi.c | 1 +
8807 drivers/input/touchscreen/ad7879.c | 1 +
8808 drivers/input/touchscreen/ads7846.c | 1 +
8809 drivers/input/touchscreen/bu21013_ts.c | 1 +
8810 drivers/isdn/capi/kcapi_proc.c | 1 +
8811 drivers/leds/dell-led.c | 1 +
8812 drivers/leds/leds-88pm860x.c | 1 +
8813 drivers/leds/leds-asic3.c | 1 +
8814 drivers/leds/leds-atmel-pwm.c | 1 +
8815 drivers/leds/leds-cobalt-raq.c | 1 +
8816 drivers/leds/leds-fsg.c | 1 +
8817 drivers/leds/leds-gpio.c | 1 +
8818 drivers/leds/leds-lm3530.c | 1 +
8819 drivers/leds/leds-locomo.c | 1 +
8820 drivers/leds/leds-lt3593.c | 1 +
8821 drivers/leds/leds-net48xx.c | 1 +
8822 drivers/leds/leds-net5501.c | 1 +
8823 drivers/leds/leds-ns2.c | 1 +
8824 drivers/leds/leds-s3c24xx.c | 1 +
8825 drivers/leds/leds-wm831x-status.c | 1 +
8826 drivers/leds/leds-wm8350.c | 1 +
8827 drivers/leds/leds-wrap.c | 1 +
8828 drivers/lguest/lguest_device.c | 1 +
8829 drivers/md/dm-exception-store.c | 1 +
8830 drivers/md/dm-log-userspace-base.c | 1 +
8831 drivers/md/dm-path-selector.c | 1 +
8832 drivers/md/dm-raid.c | 1 +
8833 drivers/md/dm-round-robin.c | 1 +
8834 drivers/md/dm-service-time.c | 1 +
8835 drivers/md/dm-snap-persistent.c | 1 +
8836 drivers/md/dm-snap-transient.c | 1 +
8837 drivers/md/dm-uevent.c | 1 +
8838 drivers/md/faulty.c | 1 +
8839 drivers/md/linear.c | 1 +
8840 drivers/md/md.c | 1 +
8841 drivers/md/multipath.c | 1 +
8842 drivers/md/raid0.c | 1 +
8843 drivers/md/raid1.c | 1 +
8844 drivers/md/raid10.c | 1 +
8845 drivers/md/raid5.c | 1 +
8846 drivers/media/common/saa7146_core.c | 1 +
8847 drivers/media/common/saa7146_fops.c | 1 +
8848 drivers/media/common/saa7146_hlp.c | 1 +
8849 drivers/media/common/saa7146_video.c | 1 +
8850 drivers/media/common/tuners/tuner-types.c | 1 +
8851 drivers/media/dvb/frontends/dibx000_common.c | 1 +
8852 drivers/media/dvb/siano/sms-cards.c | 1 +
8853 drivers/media/dvb/siano/smsendian.c | 1 +
8854 drivers/media/dvb/siano/smssdio.c | 1 +
8855 drivers/media/dvb/siano/smsusb.c | 1 +
8856 drivers/media/media-device.c | 1 +
8857 drivers/media/radio/radio-timb.c | 1 +
8858 drivers/media/radio/radio-wl1273.c | 1 +
8859 drivers/media/radio/si4713-i2c.c | 1 +
8860 drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +
8861 drivers/media/rc/ir-jvc-decoder.c | 1 +
8862 drivers/media/rc/ir-lirc-codec.c | 1 +
8863 drivers/media/rc/ir-nec-decoder.c | 1 +
8864 drivers/media/rc/ir-raw.c | 2 +
8865 drivers/media/rc/ir-rc5-decoder.c | 1 +
8866 drivers/media/rc/ir-rc5-sz-decoder.c | 1 +
8867 drivers/media/rc/ir-rc6-decoder.c | 1 +
8868 drivers/media/rc/ir-sony-decoder.c | 1 +
8869 drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 1 +
8870 drivers/media/rc/keymaps/rc-alink-dtu-m.c | 1 +
8871 drivers/media/rc/keymaps/rc-anysee.c | 1 +
8872 drivers/media/rc/keymaps/rc-apac-viewcomp.c | 1 +
8873 drivers/media/rc/keymaps/rc-asus-pc39.c | 1 +
8874 drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 1 +
8875 drivers/media/rc/keymaps/rc-avermedia-a16d.c | 1 +
8876 drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 1 +
8877 drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 1 +
8878 drivers/media/rc/keymaps/rc-avermedia-m135a.c | 1 +
8879 .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 1 +
8880 drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 1 +
8881 drivers/media/rc/keymaps/rc-avermedia.c | 1 +
8882 drivers/media/rc/keymaps/rc-avertv-303.c | 1 +
8883 drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | 1 +
8884 drivers/media/rc/keymaps/rc-behold-columbus.c | 1 +
8885 drivers/media/rc/keymaps/rc-behold.c | 1 +
8886 drivers/media/rc/keymaps/rc-budget-ci-old.c | 1 +
8887 drivers/media/rc/keymaps/rc-cinergy-1400.c | 1 +
8888 drivers/media/rc/keymaps/rc-cinergy.c | 1 +
8889 drivers/media/rc/keymaps/rc-dib0700-nec.c | 1 +
8890 drivers/media/rc/keymaps/rc-dib0700-rc5.c | 1 +
8891 drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | 1 +
8892 drivers/media/rc/keymaps/rc-digittrade.c | 1 +
8893 drivers/media/rc/keymaps/rc-dm1105-nec.c | 1 +
8894 drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 1 +
8895 drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 1 +
8896 drivers/media/rc/keymaps/rc-em-terratec.c | 1 +
8897 drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 1 +
8898 drivers/media/rc/keymaps/rc-encore-enltv.c | 1 +
8899 drivers/media/rc/keymaps/rc-encore-enltv2.c | 1 +
8900 drivers/media/rc/keymaps/rc-evga-indtube.c | 1 +
8901 drivers/media/rc/keymaps/rc-eztv.c | 1 +
8902 drivers/media/rc/keymaps/rc-flydvb.c | 1 +
8903 drivers/media/rc/keymaps/rc-flyvideo.c | 1 +
8904 drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 1 +
8905 drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 1 +
8906 drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 1 +
8907 drivers/media/rc/keymaps/rc-gotview7135.c | 1 +
8908 drivers/media/rc/keymaps/rc-hauppauge.c | 1 +
8909 drivers/media/rc/keymaps/rc-imon-mce.c | 1 +
8910 drivers/media/rc/keymaps/rc-imon-pad.c | 1 +
8911 drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 1 +
8912 drivers/media/rc/keymaps/rc-kaiomy.c | 1 +
8913 drivers/media/rc/keymaps/rc-kworld-315u.c | 1 +
8914 .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 1 +
8915 drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | 1 +
8916 drivers/media/rc/keymaps/rc-lirc.c | 1 +
8917 drivers/media/rc/keymaps/rc-lme2510.c | 1 +
8918 drivers/media/rc/keymaps/rc-manli.c | 1 +
8919 drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 1 +
8920 drivers/media/rc/keymaps/rc-msi-digivox-iii.c | 1 +
8921 drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 1 +
8922 drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 1 +
8923 drivers/media/rc/keymaps/rc-nebula.c | 1 +
8924 .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 1 +
8925 drivers/media/rc/keymaps/rc-norwood.c | 1 +
8926 drivers/media/rc/keymaps/rc-npgtech.c | 1 +
8927 drivers/media/rc/keymaps/rc-pctv-sedna.c | 1 +
8928 drivers/media/rc/keymaps/rc-pinnacle-color.c | 1 +
8929 drivers/media/rc/keymaps/rc-pinnacle-grey.c | 1 +
8930 drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 +
8931 drivers/media/rc/keymaps/rc-pixelview-002t.c | 1 +
8932 drivers/media/rc/keymaps/rc-pixelview-mk12.c | 1 +
8933 drivers/media/rc/keymaps/rc-pixelview-new.c | 1 +
8934 drivers/media/rc/keymaps/rc-pixelview.c | 1 +
8935 .../media/rc/keymaps/rc-powercolor-real-angel.c | 1 +
8936 drivers/media/rc/keymaps/rc-proteus-2309.c | 1 +
8937 drivers/media/rc/keymaps/rc-purpletv.c | 1 +
8938 drivers/media/rc/keymaps/rc-pv951.c | 1 +
8939 drivers/media/rc/keymaps/rc-rc6-mce.c | 1 +
8940 .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 1 +
8941 drivers/media/rc/keymaps/rc-streamzap.c | 1 +
8942 drivers/media/rc/keymaps/rc-tbs-nec.c | 1 +
8943 drivers/media/rc/keymaps/rc-technisat-usb2.c | 1 +
8944 drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 1 +
8945 drivers/media/rc/keymaps/rc-terratec-slim-2.c | 1 +
8946 drivers/media/rc/keymaps/rc-terratec-slim.c | 1 +
8947 drivers/media/rc/keymaps/rc-tevii-nec.c | 1 +
8948 drivers/media/rc/keymaps/rc-tivo.c | 1 +
8949 drivers/media/rc/keymaps/rc-total-media-in-hand.c | 1 +
8950 drivers/media/rc/keymaps/rc-trekstor.c | 1 +
8951 drivers/media/rc/keymaps/rc-tt-1500.c | 1 +
8952 drivers/media/rc/keymaps/rc-twinhan1027.c | 1 +
8953 drivers/media/rc/keymaps/rc-videomate-m1f.c | 1 +
8954 drivers/media/rc/keymaps/rc-videomate-s350.c | 1 +
8955 drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 1 +
8956 drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 1 +
8957 drivers/media/rc/keymaps/rc-winfast.c | 1 +
8958 drivers/media/rc/rc-main.c | 1 +
8959 drivers/media/video/adp1653.c | 1 +
8960 drivers/media/video/ak881x.c | 1 +
8961 drivers/media/video/cpia2/cpia2_usb.c | 1 +
8962 drivers/media/video/cx25840/cx25840-ir.c | 1 +
8963 drivers/media/video/davinci/dm355_ccdc.c | 1 +
8964 drivers/media/video/davinci/dm644x_ccdc.c | 1 +
8965 drivers/media/video/hdpvr/hdpvr-i2c.c | 1 +
8966 drivers/media/video/hexium_gemini.c | 1 +
8967 drivers/media/video/hexium_orion.c | 1 +
8968 drivers/media/video/imx074.c | 1 +
8969 drivers/media/video/m5mols/m5mols_core.c | 1 +
8970 drivers/media/video/mt9m001.c | 1 +
8971 drivers/media/video/mt9m111.c | 1 +
8972 drivers/media/video/mt9t031.c | 1 +
8973 drivers/media/video/mt9v011.c | 1 +
8974 drivers/media/video/mt9v022.c | 1 +
8975 drivers/media/video/mt9v032.c | 1 +
8976 drivers/media/video/mxb.c | 1 +
8977 drivers/media/video/noon010pc30.c | 1 +
8978 drivers/media/video/omap24xxcam.c | 1 +
8979 drivers/media/video/ov6650.c | 1 +
8980 drivers/media/video/pvrusb2/pvrusb2-devattr.c | 1 +
8981 drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 +
8982 drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 +
8983 drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 +
8984 drivers/media/video/rj54n1cb0c.c | 1 +
8985 drivers/media/video/sh_mobile_csi2.c | 1 +
8986 drivers/media/video/sh_vou.c | 1 +
8987 drivers/media/video/sr030pc30.c | 1 +
8988 drivers/media/video/tcm825x.c | 1 +
8989 drivers/media/video/timblogiw.c | 1 +
8990 drivers/media/video/tvp514x.c | 1 +
8991 drivers/media/video/tvp5150.c | 1 +
8992 drivers/media/video/tvp7002.c | 1 +
8993 drivers/media/video/usbvision/usbvision-cards.c | 1 +
8994 drivers/media/video/v4l2-ctrls.c | 1 +
8995 drivers/media/video/v4l2-device.c | 1 +
8996 drivers/media/video/v4l2-event.c | 1 +
8997 drivers/media/video/v4l2-fh.c | 1 +
8998 drivers/media/video/v4l2-int-device.c | 1 +
8999 drivers/media/video/v4l2-subdev.c | 1 +
9000 drivers/memstick/core/memstick.c | 1 +
9001 drivers/memstick/core/mspro_block.c | 1 +
9002 drivers/memstick/host/jmb38x_ms.c | 1 +
9003 drivers/memstick/host/tifm_ms.c | 1 +
9004 drivers/message/i2o/pci.c | 1 +
9005 drivers/mfd/ab3100-core.c | 1 +
9006 drivers/mfd/ab3550-core.c | 1 +
9007 drivers/mfd/ab8500-debugfs.c | 1 +
9008 drivers/mfd/ab8500-sysctrl.c | 1 +
9009 drivers/mfd/abx500-core.c | 1 +
9010 drivers/mfd/asic3.c | 1 +
9011 drivers/mfd/dm355evm_msp.c | 1 +
9012 drivers/mfd/max8997.c | 1 +
9013 drivers/mfd/mfd-core.c | 1 +
9014 drivers/mfd/pcf50633-irq.c | 1 +
9015 drivers/mfd/tmio_core.c | 1 +
9016 drivers/mfd/twl-core.c | 1 +
9017 drivers/mfd/twl6030-irq.c | 1 +
9018 drivers/mfd/wl1273-core.c | 1 +
9019 drivers/mfd/wm8400-core.c | 1 +
9020 drivers/misc/ab8500-pwm.c | 1 +
9021 drivers/misc/atmel-ssc.c | 1 +
9022 drivers/misc/atmel_tclib.c | 1 +
9023 drivers/misc/bh1780gli.c | 1 +
9024 drivers/misc/kgdbts.c | 1 +
9025 drivers/misc/ti-st/st_kim.c | 1 +
9026 drivers/misc/tifm_7xx1.c | 1 +
9027 drivers/misc/tifm_core.c | 1 +
9028 drivers/mmc/card/mmc_test.c | 1 +
9029 drivers/mmc/core/bus.c | 2 +
9030 drivers/mmc/core/debugfs.c | 1 +
9031 drivers/mmc/core/host.c | 1 +
9032 drivers/mmc/core/mmc.c | 1 +
9033 drivers/mmc/core/mmc_ops.c | 1 +
9034 drivers/mmc/core/quirks.c | 1 +
9035 drivers/mmc/core/sd.c | 1 +
9036 drivers/mmc/core/sd_ops.c | 1 +
9037 drivers/mmc/core/sdio_bus.c | 1 +
9038 drivers/mmc/core/sdio_io.c | 1 +
9039 drivers/mmc/core/sdio_irq.c | 1 +
9040 drivers/mmc/host/mmc_spi.c | 1 +
9041 drivers/mmc/host/mxs-mmc.c | 1 +
9042 drivers/mmc/host/sdhci-of-esdhc.c | 1 +
9043 drivers/mmc/host/sdhci-of-hlwd.c | 1 +
9044 drivers/mmc/host/sdhci-pci.c | 1 +
9045 drivers/mmc/host/sdhci-pltfm.c | 1 +
9046 drivers/mmc/host/sdhci-pxav2.c | 1 +
9047 drivers/mmc/host/sdhci-pxav3.c | 1 +
9048 drivers/mmc/host/sdhci-spear.c | 1 +
9049 drivers/mmc/host/sdhci-tegra.c | 1 +
9050 drivers/mmc/host/sdhci.c | 1 +
9051 drivers/mmc/host/sdricoh_cs.c | 1 +
9052 drivers/mmc/host/sh_mmcif.c | 1 +
9053 drivers/mmc/host/sh_mobile_sdhi.c | 1 +
9054 drivers/mmc/host/tifm_sd.c | 1 +
9055 drivers/mmc/host/via-sdmmc.c | 1 +
9056 drivers/mtd/ar7part.c | 1 +
9057 drivers/mtd/cmdlinepart.c | 1 +
9058 drivers/mtd/lpddr/lpddr_cmds.c | 1 +
9059 drivers/mtd/mtdblock_ro.c | 1 +
9060 drivers/mtd/mtdsuper.c | 1 +
9061 drivers/mtd/nand/cafe_nand.c | 1 +
9062 drivers/mtd/nand/cmx270_nand.c | 1 +
9063 drivers/mtd/nand/diskonchip.c | 1 +
9064 drivers/mtd/nand/nand_bbt.c | 1 +
9065 drivers/mtd/nand/omap2.c | 1 +
9066 drivers/mtd/nand/sm_common.c | 1 +
9067 drivers/mtd/onenand/onenand_bbt.c | 1 +
9068 drivers/mtd/redboot.c | 1 +
9069 drivers/mtd/rfd_ftl.c | 1 +
9070 drivers/mtd/ubi/vmt.c | 1 +
9071 drivers/net/ethernet/mellanox/mlx4/alloc.c | 1 +
9072 drivers/net/ethernet/mellanox/mlx4/catas.c | 1 +
9073 drivers/net/ethernet/mellanox/mlx4/cmd.c | 1 +
9074 drivers/net/ethernet/mellanox/mlx4/cq.c | 1 +
9075 drivers/net/ethernet/mellanox/mlx4/eq.c | 1 +
9076 drivers/net/ethernet/mellanox/mlx4/fw.c | 1 +
9077 drivers/net/ethernet/mellanox/mlx4/intf.c | 1 +
9078 drivers/net/ethernet/mellanox/mlx4/mr.c | 1 +
9079 drivers/net/ethernet/mellanox/mlx4/pd.c | 1 +
9080 drivers/net/ethernet/mellanox/mlx4/port.c | 1 +
9081 drivers/net/ethernet/mellanox/mlx4/qp.c | 1 +
9082 drivers/net/ethernet/mellanox/mlx4/srq.c | 1 +
9083 drivers/net/phy/realtek.c | 1 +
9084 drivers/net/wireless/b43/pcmcia.c | 1 +
9085 drivers/of/of_pci.c | 1 +
9086 drivers/of/of_pci_irq.c | 1 +
9087 drivers/of/of_spi.c | 1 +
9088 drivers/parisc/ccio-dma.c | 1 +
9089 drivers/parisc/sba_iommu.c | 1 +
9090 drivers/pci/hotplug-pci.c | 1 +
9091 drivers/pci/hotplug/pciehp_acpi.c | 1 +
9092 drivers/pci/hotplug/pcihp_slot.c | 1 +
9093 drivers/pci/hotplug/rpadlpar_core.c | 1 +
9094 drivers/pci/htirq.c | 1 +
9095 drivers/pci/iov.c | 1 +
9096 drivers/pci/irq.c | 1 +
9097 drivers/pci/msi.c | 1 +
9098 drivers/pci/pci-sysfs.c | 1 +
9099 drivers/pci/quirks.c | 1 +
9100 drivers/pci/rom.c | 1 +
9101 drivers/pci/setup-res.c | 1 +
9102 drivers/pci/slot.c | 1 +
9103 drivers/pci/vpd.c | 1 +
9104 drivers/pcmcia/db1xxx_ss.c | 1 +
9105 drivers/pcmcia/pxa2xx_cm_x255.c | 1 +
9106 drivers/pcmcia/pxa2xx_cm_x270.c | 1 +
9107 drivers/platform/x86/intel_scu_ipc.c | 1 +
9108 drivers/platform/x86/msi-wmi.c | 1 +
9109 drivers/platform/x86/wmi.c | 1 +
9110 drivers/power/max17042_battery.c | 1 +
9111 drivers/power/max8903_charger.c | 1 +
9112 drivers/power/max8997_charger.c | 1 +
9113 drivers/power/max8998_charger.c | 1 +
9114 drivers/power/power_supply_sysfs.c | 1 +
9115 drivers/ps3/ps3stor_lib.c | 1 +
9116 drivers/ps3/sys-manager-core.c | 1 +
9117 drivers/rapidio/switches/idt_gen2.c | 1 +
9118 drivers/regulator/88pm8607.c | 1 +
9119 drivers/regulator/ab8500.c | 1 +
9120 drivers/regulator/bq24022.c | 1 +
9121 drivers/regulator/da903x.c | 1 +
9122 drivers/regulator/db8500-prcmu.c | 1 +
9123 drivers/regulator/dummy.c | 1 +
9124 drivers/regulator/fixed.c | 1 +
9125 drivers/regulator/lp3971.c | 1 +
9126 drivers/regulator/lp3972.c | 1 +
9127 drivers/regulator/max8925-regulator.c | 1 +
9128 drivers/regulator/max8997.c | 1 +
9129 drivers/regulator/mc13783-regulator.c | 1 +
9130 drivers/regulator/mc13892-regulator.c | 1 +
9131 drivers/regulator/mc13xxx-regulator-core.c | 1 +
9132 drivers/regulator/tps6586x-regulator.c | 1 +
9133 drivers/regulator/userspace-consumer.c | 1 +
9134 drivers/regulator/virtual.c | 1 +
9135 drivers/regulator/wm8400-regulator.c | 1 +
9136 drivers/rtc/interface.c | 1 +
9137 drivers/rtc/rtc-dm355evm.c | 1 +
9138 drivers/rtc/rtc-ds1305.c | 1 +
9139 drivers/rtc/rtc-ds1511.c | 1 +
9140 drivers/rtc/rtc-ds1553.c | 1 +
9141 drivers/rtc/rtc-ds1672.c | 1 +
9142 drivers/rtc/rtc-ds1742.c | 1 +
9143 drivers/rtc/rtc-em3027.c | 1 +
9144 drivers/rtc/rtc-isl12022.c | 1 +
9145 drivers/rtc/rtc-mv.c | 1 +
9146 drivers/rtc/rtc-pcf2123.c | 1 +
9147 drivers/rtc/rtc-pcf8563.c | 1 +
9148 drivers/rtc/rtc-rs5c348.c | 1 +
9149 drivers/rtc/rtc-rs5c372.c | 1 +
9150 drivers/rtc/rtc-stk17ta8.c | 1 +
9151 drivers/rtc/rtc-tx4939.c | 1 +
9152 drivers/rtc/rtc-x1205.c | 1 +
9153 drivers/s390/char/fs3270.c | 1 +
9154 drivers/s390/char/sclp_cpi_sys.c | 1 +
9155 drivers/s390/char/vmur.c | 1 +
9156 drivers/s390/cio/chp.c | 2 +
9157 drivers/s390/cio/qdio_debug.c | 2 +
9158 drivers/s390/kvm/kvm_virtio.c | 1 +
9159 drivers/s390/scsi/zfcp_ccw.c | 1 +
9160 drivers/s390/scsi/zfcp_dbf.c | 1 +
9161 drivers/s390/scsi/zfcp_scsi.c | 1 +
9162 drivers/scsi/a2091.c | 1 +
9163 drivers/scsi/a3000.c | 1 +
9164 drivers/scsi/aacraid/aachba.c | 1 +
9165 drivers/scsi/bfa/bfad_debugfs.c | 1 +
9166 drivers/scsi/bfa/bfad_im.c | 2 +
9167 drivers/scsi/device_handler/scsi_dh.c | 1 +
9168 drivers/scsi/device_handler/scsi_dh_alua.c | 1 +
9169 drivers/scsi/device_handler/scsi_dh_emc.c | 1 +
9170 drivers/scsi/device_handler/scsi_dh_hp_sw.c | 1 +
9171 drivers/scsi/device_handler/scsi_dh_rdac.c | 1 +
9172 drivers/scsi/gvp11.c | 1 +
9173 drivers/scsi/libfc/fc_disc.c | 1 +
9174 drivers/scsi/libfc/fc_elsct.c | 1 +
9175 drivers/scsi/libfc/fc_exch.c | 1 +
9176 drivers/scsi/libfc/fc_libfc.c | 1 +
9177 drivers/scsi/libfc/fc_lport.c | 1 +
9178 drivers/scsi/libfc/fc_npiv.c | 1 +
9179 drivers/scsi/libfc/fc_rport.c | 1 +
9180 drivers/scsi/libsas/sas_scsi_host.c | 1 +
9181 drivers/scsi/libsas/sas_task.c | 1 +
9182 drivers/scsi/libsrp.c | 1 +
9183 drivers/scsi/lpfc/lpfc_attr.c | 1 +
9184 drivers/scsi/lpfc/lpfc_debugfs.c | 1 +
9185 drivers/scsi/lpfc/lpfc_init.c | 1 +
9186 drivers/scsi/lpfc/lpfc_scsi.c | 1 +
9187 drivers/scsi/mac53c94.c | 1 +
9188 drivers/scsi/megaraid/megaraid_mbox.c | 1 +
9189 drivers/scsi/osd/osd_initiator.c | 1 +
9190 drivers/scsi/ps3rom.c | 1 +
9191 drivers/scsi/scsi_lib.c | 1 +
9192 drivers/scsi/scsi_lib_dma.c | 1 +
9193 drivers/scsi/scsi_pm.c | 1 +
9194 drivers/scsi/sr_ioctl.c | 1 +
9195 drivers/sfi/sfi_core.h | 3 +
9196 drivers/sh/intc/core.c | 1 +
9197 drivers/sh/intc/virq.c | 1 +
9198 drivers/sh/maple/maple.c | 1 +
9199 drivers/spi/spi-altera.c | 1 +
9200 drivers/spi/spi-au1550.c | 1 +
9201 drivers/spi/spi-bitbang.c | 1 +
9202 drivers/spi/spi-butterfly.c | 1 +
9203 drivers/spi/spi-dw-mmio.c | 1 +
9204 drivers/spi/spi-dw-pci.c | 1 +
9205 drivers/spi/spi-dw.c | 1 +
9206 drivers/spi/spi-gpio.c | 1 +
9207 drivers/spi/spi-oc-tiny.c | 1 +
9208 drivers/spi/spi-omap-uwire.c | 1 +
9209 drivers/spi/spi-orion.c | 1 +
9210 drivers/spi/spi-pxa2xx-pci.c | 1 +
9211 drivers/spi/spi-s3c24xx.c | 1 +
9212 drivers/spi/spi-sh-msiof.c | 1 +
9213 drivers/spi/spi-sh-sci.c | 1 +
9214 drivers/spi/spi-ti-ssp.c | 1 +
9215 drivers/spi/spi-tle62x0.c | 1 +
9216 drivers/spi/spi-txx9.c | 1 +
9217 drivers/spi/spi.c | 1 +
9218 drivers/ssb/b43_pci_bridge.c | 1 +
9219 drivers/ssb/driver_chipcommon.c | 1 +
9220 drivers/ssb/driver_chipcommon_pmu.c | 1 +
9221 drivers/ssb/driver_gige.c | 1 +
9222 drivers/ssb/driver_pcicore.c | 1 +
9223 drivers/ssb/embedded.c | 1 +
9224 drivers/ssb/main.c | 1 +
9225 drivers/ssb/pcihost_wrapper.c | 1 +
9226 drivers/staging/brcm80211/brcmutil/wifi.c | 1 +
9227 drivers/staging/iio/industrialio-ring.c | 1 +
9228 .../staging/intel_sst/intel_sst_drv_interface.c | 1 +
9229 drivers/staging/line6/audio.c | 1 +
9230 drivers/staging/usbip/usbip_event.c | 1 +
9231 drivers/tty/hvc/hvc_iseries.c | 1 +
9232 drivers/tty/hvc/hvc_vio.c | 1 +
9233 drivers/tty/serial/jsm/jsm_driver.c | 2 +-
9234 drivers/tty/serial/kgdboc.c | 1 +
9235 drivers/tty/serial/max3100.c | 1 +
9236 drivers/tty/serial/max3107-aava.c | 1 +
9237 drivers/tty/serial/max3107.c | 1 +
9238 drivers/tty/serial/nwpserial.c | 1 +
9239 drivers/tty/serial/timbuart.c | 1 +
9240 drivers/tty/serial/xilinx_uartps.c | 1 +
9241 drivers/tty/vt/vc_screen.c | 1 +
9242 drivers/uio/uio_pdrv.c | 1 +
9243 drivers/uio/uio_pdrv_genirq.c | 1 +
9244 drivers/usb/c67x00/c67x00-drv.c | 1 +
9245 drivers/usb/core/driver.c | 1 +
9246 drivers/usb/core/notify.c | 1 +
9247 drivers/usb/gadget/cdc2.c | 1 +
9248 drivers/usb/gadget/composite.c | 1 +
9249 drivers/usb/gadget/dbgp.c | 1 +
9250 drivers/usb/gadget/f_fs.c | 1 +
9251 drivers/usb/gadget/f_obex.c | 1 +
9252 drivers/usb/gadget/f_sourcesink.c | 1 +
9253 drivers/usb/gadget/file_storage.c | 1 +
9254 drivers/usb/gadget/fusb300_udc.c | 1 +
9255 drivers/usb/gadget/gmidi.c | 1 +
9256 drivers/usb/gadget/u_serial.c | 1 +
9257 drivers/usb/host/fsl-mph-dr-of.c | 1 +
9258 drivers/usb/host/isp1760-if.c | 1 +
9259 drivers/usb/host/pci-quirks.c | 1 +
9260 drivers/usb/host/whci/debug.c | 1 +
9261 drivers/usb/host/whci/hcd.c | 1 +
9262 drivers/usb/host/xhci-hub.c | 1 +
9263 drivers/usb/host/xhci-pci.c | 1 +
9264 drivers/usb/mon/mon_bin.c | 1 +
9265 drivers/usb/mon/mon_stat.c | 1 +
9266 drivers/usb/mon/mon_text.c | 1 +
9267 drivers/usb/otg/gpio_vbus.c | 1 +
9268 drivers/usb/otg/otg.c | 1 +
9269 drivers/usb/otg/ulpi.c | 1 +
9270 drivers/usb/serial/aircable.c | 1 +
9271 drivers/usb/serial/qcserial.c | 1 +
9272 drivers/usb/storage/option_ms.c | 1 +
9273 drivers/usb/storage/protocol.c | 1 +
9274 drivers/usb/storage/sierra_ms.c | 1 +
9275 drivers/usb/storage/transport.c | 1 +
9276 drivers/usb/storage/uas.c | 1 +
9277 drivers/usb/wusbcore/devconnect.c | 1 +
9278 drivers/usb/wusbcore/mmc.c | 1 +
9279 drivers/usb/wusbcore/rh.c | 1 +
9280 drivers/usb/wusbcore/security.c | 1 +
9281 drivers/usb/wusbcore/wa-hc.c | 1 +
9282 drivers/usb/wusbcore/wa-rpipe.c | 1 +
9283 drivers/usb/wusbcore/wa-xfer.c | 1 +
9284 drivers/uwb/est.c | 1 +
9285 drivers/uwb/i1480/dfu/dfu.c | 1 +
9286 drivers/uwb/ie.c | 1 +
9287 drivers/uwb/lc-dev.c | 2 +
9288 drivers/uwb/neh.c | 1 +
9289 drivers/uwb/pal.c | 1 +
9290 drivers/uwb/radio.c | 1 +
9291 drivers/uwb/reset.c | 1 +
9292 drivers/uwb/rsv.c | 1 +
9293 drivers/uwb/scan.c | 1 +
9294 drivers/uwb/umc-bus.c | 1 +
9295 drivers/uwb/umc-dev.c | 1 +
9296 drivers/uwb/umc-drv.c | 1 +
9297 drivers/uwb/whci.c | 1 +
9298 drivers/video/atmel_lcdfb.c | 1 +
9299 drivers/video/backlight/88pm860x_bl.c | 1 +
9300 drivers/video/backlight/adp5520_bl.c | 1 +
9301 drivers/video/backlight/ams369fg06.c | 1 +
9302 drivers/video/backlight/da903x_bl.c | 1 +
9303 drivers/video/backlight/ep93xx_bl.c | 1 +
9304 drivers/video/backlight/l4f00242t03.c | 1 +
9305 drivers/video/backlight/ld9040.c | 1 +
9306 drivers/video/backlight/lms283gf05.c | 1 +
9307 drivers/video/backlight/max8925_bl.c | 1 +
9308 drivers/video/backlight/s6e63m0.c | 1 +
9309 drivers/video/backlight/wm831x_bl.c | 1 +
9310 drivers/video/carminefb.c | 1 +
9311 drivers/video/cobalt_lcdfb.c | 1 +
9312 drivers/video/ep93xx-fb.c | 1 +
9313 drivers/video/fb_ddc.c | 3 +-
9314 drivers/video/fb_notify.c | 1 +
9315 drivers/video/mb862xx/mb862xx-i2c.c | 1 +
9316 drivers/video/mb862xx/mb862xxfbdrv.c | 1 +
9317 drivers/video/msm/mdp.c | 1 +
9318 drivers/video/omap/lcd_mipid.c | 1 +
9319 drivers/video/omap/omapfb_main.c | 1 +
9320 drivers/video/omap2/dss/dispc.c | 1 +
9321 drivers/video/omap2/dss/dpi.c | 1 +
9322 drivers/video/omap2/dss/dsi.c | 1 +
9323 drivers/video/omap2/dss/dss.c | 1 +
9324 drivers/video/omap2/dss/rfbi.c | 1 +
9325 drivers/video/omap2/dss/sdi.c | 1 +
9326 drivers/video/omap2/omapfb/omapfb-ioctl.c | 1 +
9327 drivers/video/savage/savagefb_accel.c | 1 +
9328 drivers/video/sh_mipi_dsi.c | 1 +
9329 drivers/video/sh_mobile_lcdcfb.c | 1 +
9330 drivers/video/via/via-gpio.c | 1 +
9331 drivers/video/w100fb.c | 1 +
9332 drivers/virtio/virtio.c | 1 +
9333 drivers/virtio/virtio_balloon.c | 1 +
9334 drivers/virtio/virtio_ring.c | 1 +
9335 drivers/w1/w1_family.c | 1 +
9336 drivers/xen/balloon.c | 1 +
9337 drivers/xen/manage.c | 1 +
9338 drivers/xen/swiotlb-xen.c | 1 +
9339 drivers/xen/xen-pciback/conf_space.c | 1 +
9340 drivers/xen/xen-selfballoon.c | 2 +
9341 drivers/xen/xenbus/xenbus_client.c | 1 +
9342 drivers/xen/xenbus/xenbus_probe.c | 1 +
9343 drivers/xen/xenbus/xenbus_probe_backend.c | 1 +
9344 drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
9345 drivers/zorro/proc.c | 1 +
9346 fs/bio-integrity.c | 1 +
9347 fs/exofs/super.c | 1 +
9348 fs/gfs2/ops_fstype.c | 1 +
9350 fs/jfs/jfs_logmgr.c | 1 +
9351 fs/logfs/super.c | 1 +
9352 fs/nfsd/nfssvc.c | 1 +
9353 fs/proc/vmcore.c | 1 +
9354 include/acpi/platform/aclinux.h | 2 +-
9355 include/drm/drmP.h | 3 +-
9356 include/linux/bcma/bcma.h | 7 +-
9357 include/linux/blkdev.h | 2 +-
9358 include/linux/cpuidle.h | 3 +-
9359 include/linux/crypto.h | 6 --
9360 include/linux/device.h | 15 ++-
9361 include/linux/device_cgroup.h | 1 -
9362 include/linux/dmaengine.h | 2 +
9363 include/linux/export.h | 89 ++++++++++++++++++++
9364 include/linux/firmware.h | 2 +-
9365 include/linux/ftrace.h | 2 +-
9366 include/linux/gameport.h | 17 ++--
9367 include/linux/hid.h | 9 +-
9368 include/linux/i2c.h | 10 +-
9369 include/linux/ipmi.h | 3 +-
9370 include/linux/ipmi_smi.h | 1 -
9371 include/linux/mdio-bitbang.h | 3 +-
9372 include/linux/module.h | 68 +---------------
9373 include/linux/mtd/mtd.h | 3 +-
9374 include/linux/of_platform.h | 1 -
9375 include/linux/pci_hotplug.h | 10 +--
9376 include/linux/pm_runtime.h | 1 +
9377 include/linux/regulator/driver.h | 1 +
9378 include/linux/serio.h | 20 +++--
9379 include/linux/ssb/ssb.h | 7 +-
9380 include/linux/stop_machine.h | 1 +
9381 include/linux/sunrpc/svc_xprt.h | 3 +-
9382 include/linux/sysdev.h | 1 -
9383 include/linux/textsearch.h | 3 +-
9384 include/linux/uio_driver.h | 12 ++--
9385 include/linux/usb.h | 9 +-
9386 include/linux/uwb.h | 1 +
9387 include/linux/uwb/umc.h | 7 +-
9388 include/linux/vermagic.h | 1 -
9389 include/linux/vlynq.h | 3 +-
9390 include/media/saa7146.h | 3 +-
9391 include/media/v4l2-int-device.h | 3 +-
9392 include/net/inet_timewait_sock.h | 1 -
9393 include/net/lib80211.h | 3 +-
9394 include/net/sch_generic.h | 1 -
9395 include/net/sock.h | 2 +-
9396 include/sound/core.h | 2 +-
9397 include/trace/define_trace.h | 2 +-
9398 include/trace/events/module.h | 2 +-
9399 include/xen/xenbus.h | 1 +
9400 kernel/async.c | 2 +-
9401 kernel/audit.c | 2 +-
9402 kernel/auditsc.c | 2 +-
9403 kernel/capability.c | 2 +-
9404 kernel/cgroup_freezer.c | 2 +-
9405 kernel/compat.c | 1 +
9407 kernel/cpuset.c | 2 +-
9408 kernel/crash_dump.c | 2 +-
9409 kernel/cred.c | 2 +-
9410 kernel/debug/kdb/kdb_debugger.c | 1 +
9412 kernel/events/core.c | 1 +
9413 kernel/exit.c | 3 +-
9414 kernel/fork.c | 3 +-
9415 kernel/freezer.c | 2 +-
9416 kernel/futex.c | 2 +-
9417 kernel/groups.c | 2 +-
9418 kernel/hrtimer.c | 2 +-
9419 kernel/hung_task.c | 2 +-
9420 kernel/irq_work.c | 4 +-
9421 kernel/kfifo.c | 2 +-
9422 kernel/kprobes.c | 2 +-
9423 kernel/ksysfs.c | 3 +-
9424 kernel/kthread.c | 2 +-
9425 kernel/latencytop.c | 2 +-
9426 kernel/lockdep.c | 2 +-
9427 kernel/lockdep_proc.c | 2 +-
9428 kernel/module.c | 2 +-
9429 kernel/mutex-debug.c | 2 +-
9430 kernel/mutex.c | 2 +-
9431 kernel/notifier.c | 2 +-
9432 kernel/nsproxy.c | 2 +-
9433 kernel/padata.c | 2 +-
9434 kernel/params.c | 4 +-
9436 kernel/posix-timers.c | 2 +-
9437 kernel/power/hibernate.c | 1 +
9438 kernel/power/main.c | 1 +
9439 kernel/power/suspend.c | 2 +
9440 kernel/profile.c | 2 +-
9441 kernel/ptrace.c | 2 +-
9442 kernel/range.c | 2 +-
9443 kernel/rcupdate.c | 2 +-
9444 kernel/rcutiny.c | 4 +-
9445 kernel/rcutorture.c | 3 +-
9446 kernel/rcutree.c | 2 +-
9447 kernel/rcutree_trace.c | 3 +-
9448 kernel/relay.c | 2 +-
9449 kernel/resource.c | 2 +-
9450 kernel/rtmutex-debug.c | 2 +-
9451 kernel/rtmutex-tester.c | 2 +-
9452 kernel/rtmutex.c | 2 +-
9453 kernel/rwsem.c | 2 +-
9454 kernel/sched.c | 2 +-
9455 kernel/sched_clock.c | 2 +-
9456 kernel/semaphore.c | 2 +-
9457 kernel/signal.c | 2 +-
9459 kernel/softirq.c | 2 +-
9460 kernel/spinlock.c | 2 +-
9461 kernel/srcu.c | 2 +-
9462 kernel/stacktrace.c | 2 +-
9463 kernel/stop_machine.c | 2 +-
9465 kernel/sysctl.c | 2 +-
9466 kernel/time.c | 2 +-
9467 kernel/time/posix-clock.c | 1 +
9468 kernel/timer.c | 2 +-
9469 kernel/trace/blktrace.c | 1 +
9470 kernel/trace/ftrace.c | 1 +
9471 kernel/trace/trace_syscalls.c | 1 +
9473 kernel/user-return-notifier.c | 2 +-
9474 kernel/user.c | 2 +-
9475 kernel/user_namespace.c | 2 +-
9476 kernel/utsname.c | 2 +-
9477 kernel/utsname_sysctl.c | 2 +-
9478 kernel/wait.c | 2 +-
9479 kernel/watchdog.c | 3 +-
9480 kernel/workqueue.c | 2 +-
9481 lib/dma-debug.c | 1 +
9482 lib/raid6/algos.c | 1 +
9483 lib/raid6/mktables.c | 1 +
9484 lib/raid6/recov.c | 1 +
9486 mm/memcontrol.c | 1 +
9487 mm/memory-failure.c | 1 +
9489 mm/quicklist.c | 1 -
9490 mm/sparse-vmemmap.c | 1 -
9491 mm/swap_state.c | 1 -
9493 net/caif/cfpkt_skbuff.c | 1 +
9494 net/netfilter/ipset/pfxlen.c | 1 +
9495 net/rfkill/input.c | 1 +
9496 security/selinux/netlink.c | 1 +
9497 sound/core/control.c | 1 +
9498 sound/core/device.c | 1 +
9499 sound/core/hwdep.c | 1 +
9500 sound/core/info.c | 1 +
9501 sound/core/info_oss.c | 1 +
9502 sound/core/init.c | 1 +
9503 sound/core/isadma.c | 1 +
9504 sound/core/jack.c | 1 +
9505 sound/core/memory.c | 1 +
9506 sound/core/misc.c | 1 +
9507 sound/core/oss/mixer_oss.c | 1 +
9508 sound/core/rawmidi.c | 1 +
9509 sound/core/seq/oss/seq_oss.c | 2 +-
9510 sound/core/seq/oss/seq_oss_init.c | 2 +-
9511 sound/core/seq/oss/seq_oss_synth.c | 1 +
9512 sound/core/seq/seq.c | 2 +-
9513 sound/core/seq/seq_clientmgr.c | 1 +
9514 sound/core/seq/seq_device.c | 1 +
9515 sound/core/seq/seq_dummy.c | 2 +-
9516 sound/core/seq/seq_info.c | 1 +
9517 sound/core/seq/seq_lock.c | 1 +
9518 sound/core/seq/seq_memory.c | 1 +
9519 sound/core/seq/seq_midi.c | 2 +-
9520 sound/core/seq/seq_midi_emul.c | 1 +
9521 sound/core/seq/seq_midi_event.c | 1 +
9522 sound/core/seq/seq_ports.c | 1 +
9523 sound/core/seq/seq_system.c | 1 +
9524 sound/core/seq/seq_virmidi.c | 1 +
9525 sound/core/sound.c | 2 +-
9526 sound/core/sound_oss.c | 1 +
9527 sound/core/timer.c | 2 +-
9528 sound/core/vmaster.c | 1 +
9529 sound/drivers/mpu401/mpu401.c | 2 +-
9530 sound/drivers/mpu401/mpu401_uart.c | 1 +
9531 sound/drivers/mtpav.c | 1 +
9532 sound/drivers/mts64.c | 1 +
9533 sound/drivers/opl3/opl3_lib.c | 1 +
9534 sound/drivers/opl3/opl3_oss.c | 1 +
9535 sound/drivers/opl3/opl3_seq.c | 1 +
9536 sound/drivers/opl3/opl3_synth.c | 1 +
9537 sound/drivers/opl4/opl4_lib.c | 1 +
9538 sound/drivers/opl4/opl4_proc.c | 1 +
9539 sound/drivers/opl4/opl4_seq.c | 1 +
9540 sound/drivers/portman2x4.c | 1 +
9541 sound/drivers/serial-u16550.c | 2 +-
9542 sound/drivers/virmidi.c | 2 +-
9543 sound/firewire/iso-resources.c | 1 +
9544 sound/firewire/packets-buffer.c | 1 +
9545 sound/i2c/i2c.c | 1 +
9546 sound/i2c/other/ak4xxx-adda.c | 1 +
9547 sound/i2c/other/pt2258.c | 1 +
9548 sound/i2c/other/tea575x-tuner.c | 1 +
9549 sound/i2c/tea6330t.c | 1 +
9550 sound/isa/sb/emu8000.c | 1 +
9551 sound/isa/sb/emu8000_callback.c | 1 +
9552 sound/isa/sb/emu8000_patch.c | 1 +
9553 sound/isa/sb/emu8000_synth.c | 1 +
9554 sound/isa/wavefront/wavefront_fx.c | 1 +
9555 sound/isa/wavefront/wavefront_synth.c | 1 +
9556 sound/pci/als4000.c | 2 +-
9557 sound/pci/asihpi/hpioctl.c | 1 +
9558 sound/pci/ctxfi/xfi.c | 1 +
9559 sound/pci/oxygen/oxygen_io.c | 1 +
9560 sound/soc/blackfin/bf5xx-sport.c | 1 +
9561 sound/soc/tegra/tegra_asoc_utils.c | 1 +
9562 sound/synth/emux/emux.c | 1 +
9563 sound/synth/emux/emux_oss.c | 1 +
9564 sound/synth/emux/emux_seq.c | 2 +-
9565 sound/synth/emux/emux_synth.c | 1 +
9566 sound/synth/emux/soundfont.c | 1 +
9567 sound/synth/util_mem.c | 1 +
9568 sound/usb/6fire/firmware.c | 1 +
9569 sound/usb/midi.c | 1 +
9570 virt/kvm/iommu.c | 2 +
9571 1322 files changed, 1453 insertions(+), 424 deletions(-)
9572 create mode 100644 include/linux/export.h
9573 $ git am -3 ../patches/0001-dm-use-export.h-instead-of-module.h-where-possible.patch
9574 Applying: dm: use export.h instead of module.h where possible
9576 Unstaged changes after reset:
9577 M drivers/md/persistent-data/dm-btree-remove.c
9578 M drivers/md/persistent-data/dm-btree.c
9579 M drivers/md/persistent-data/dm-space-map-disk.c
9580 M drivers/md/persistent-data/dm-transaction-manager.c
9582 $ git commit -v -a --amend
9583 [master 79bb710] Merge remote-tracking branch 'moduleh/module.h-split'
9584 $ git am -3 ../patches/0001-block-bsg-lib.c-needs-export.h-not-module.h.patch
9585 Applying: block: bsg-lib.c needs export.h not module.h
9587 Unstaged changes after reset:
9590 $ git commit -v -a --amend
9591 [master af8eb8f] Merge remote-tracking branch 'moduleh/module.h-split'
9592 $ git am -3 ../patches/0001-PM-EXPORT_SYMBOL-needs-export.h.patch
9593 Applying: PM: EXPORT_SYMBOL needs export.h
9595 Unstaged changes after reset:
9596 M drivers/base/power/common.c
9598 $ git commit -v -a --amend
9599 [master 4f64311] Merge remote-tracking branch 'moduleh/module.h-split'
9600 Merging kvmtool/master
9601 $ git merge kvmtool/master
9602 Resolved 'include/net/9p/9p.h' using previous resolution.
9603 Auto-merging MAINTAINERS
9604 Auto-merging include/net/9p/9p.h
9605 CONFLICT (content): Merge conflict in include/net/9p/9p.h
9606 Automatic merge failed; fix conflicts and then commit the result.
9608 [master afee690] Merge remote-tracking branch 'kvmtool/master'
9609 $ git diff -M --stat --summary HEAD^..
9611 tools/kvm/.gitignore | 10 +
9612 tools/kvm/CREDITS-Git | 30 +
9613 tools/kvm/Documentation/kvm-balloon.txt | 24 +
9614 tools/kvm/Documentation/kvm-debug.txt | 16 +
9615 tools/kvm/Documentation/kvm-list.txt | 16 +
9616 tools/kvm/Documentation/kvm-pause.txt | 16 +
9617 tools/kvm/Documentation/kvm-resume.txt | 16 +
9618 tools/kvm/Documentation/kvm-run.txt | 62 ++
9619 tools/kvm/Documentation/kvm-setup.txt | 15 +
9620 tools/kvm/Documentation/kvm-stat.txt | 19 +
9621 tools/kvm/Documentation/kvm-stop.txt | 16 +
9622 tools/kvm/Documentation/kvm-version.txt | 21 +
9623 tools/kvm/Makefile | 285 +++++++
9624 tools/kvm/README | 109 +++
9625 tools/kvm/bios.c | 157 ++++
9626 tools/kvm/bios/.gitignore | 3 +
9627 tools/kvm/bios/bios-rom.S | 12 +
9628 tools/kvm/bios/e820.c | 73 ++
9629 tools/kvm/bios/entry.S | 90 +++
9630 tools/kvm/bios/gen-offsets.sh | 14 +
9631 tools/kvm/bios/int10.c | 151 ++++
9632 tools/kvm/bios/int15.c | 18 +
9633 tools/kvm/bios/local.S | 7 +
9634 tools/kvm/bios/macro.S | 25 +
9635 tools/kvm/bios/rom.ld.S | 17 +
9636 tools/kvm/builtin-balloon.c | 75 ++
9637 tools/kvm/builtin-debug.c | 66 ++
9638 tools/kvm/builtin-help.c | 61 ++
9639 tools/kvm/builtin-list.c | 66 ++
9640 tools/kvm/builtin-pause.c | 66 ++
9641 tools/kvm/builtin-resume.c | 66 ++
9642 tools/kvm/builtin-run.c | 902 ++++++++++++++++++++++
9643 tools/kvm/builtin-setup.c | 211 +++++
9644 tools/kvm/builtin-stat.c | 79 ++
9645 tools/kvm/builtin-stop.c | 66 ++
9646 tools/kvm/builtin-version.c | 15 +
9647 tools/kvm/code16gcc.h | 15 +
9648 tools/kvm/command-list.txt | 14 +
9649 tools/kvm/config/feature-tests.mak | 148 ++++
9650 tools/kvm/config/utilities.mak | 188 +++++
9651 tools/kvm/cpuid.c | 51 ++
9652 tools/kvm/disk/blk.c | 39 +
9653 tools/kvm/disk/core.c | 222 ++++++
9654 tools/kvm/disk/qcow.c | 1099 +++++++++++++++++++++++++++
9655 tools/kvm/disk/raw.c | 82 ++
9656 tools/kvm/framebuffer.c | 68 ++
9657 tools/kvm/guest/init.c | 44 ++
9658 tools/kvm/guest/setnet.sh | 22 +
9659 tools/kvm/guest_compat.c | 104 +++
9660 tools/kvm/hw/i8042.c | 348 +++++++++
9661 tools/kvm/hw/pci-shmem.c | 264 +++++++
9662 tools/kvm/hw/rtc.c | 87 +++
9663 tools/kvm/hw/serial.c | 358 +++++++++
9664 tools/kvm/hw/vesa.c | 77 ++
9665 tools/kvm/include/asm/hweight.h | 8 +
9666 tools/kvm/include/kvm/8250-serial.h | 10 +
9667 tools/kvm/include/kvm/apic.h | 17 +
9668 tools/kvm/include/kvm/assembly.h | 24 +
9669 tools/kvm/include/kvm/barrier.h | 15 +
9670 tools/kvm/include/kvm/bios-export.h | 13 +
9671 tools/kvm/include/kvm/bios.h | 83 ++
9672 tools/kvm/include/kvm/boot-protocol.h | 16 +
9673 tools/kvm/include/kvm/brlock.h | 41 +
9674 tools/kvm/include/kvm/builtin-balloon.h | 7 +
9675 tools/kvm/include/kvm/builtin-debug.h | 7 +
9676 tools/kvm/include/kvm/builtin-help.h | 6 +
9677 tools/kvm/include/kvm/builtin-list.h | 7 +
9678 tools/kvm/include/kvm/builtin-pause.h | 7 +
9679 tools/kvm/include/kvm/builtin-resume.h | 7 +
9680 tools/kvm/include/kvm/builtin-run.h | 7 +
9681 tools/kvm/include/kvm/builtin-setup.h | 7 +
9682 tools/kvm/include/kvm/builtin-stat.h | 7 +
9683 tools/kvm/include/kvm/builtin-stop.h | 7 +
9684 tools/kvm/include/kvm/builtin-version.h | 6 +
9685 tools/kvm/include/kvm/compiler.h | 6 +
9686 tools/kvm/include/kvm/cpufeature.h | 41 +
9687 tools/kvm/include/kvm/disk-image.h | 73 ++
9688 tools/kvm/include/kvm/e820.h | 12 +
9689 tools/kvm/include/kvm/framebuffer.h | 34 +
9690 tools/kvm/include/kvm/guest_compat.h | 9 +
9691 tools/kvm/include/kvm/i8042.h | 12 +
9692 tools/kvm/include/kvm/interrupt.h | 26 +
9693 tools/kvm/include/kvm/ioeventfd.h | 27 +
9694 tools/kvm/include/kvm/ioport.h | 65 ++
9695 tools/kvm/include/kvm/irq.h | 29 +
9696 tools/kvm/include/kvm/kvm-cmd.h | 17 +
9697 tools/kvm/include/kvm/kvm-cpu.h | 44 ++
9698 tools/kvm/include/kvm/kvm.h | 112 +++
9699 tools/kvm/include/kvm/mptable.h | 8 +
9700 tools/kvm/include/kvm/mutex.h | 33 +
9701 tools/kvm/include/kvm/parse-options.h | 213 ++++++
9702 tools/kvm/include/kvm/pci-shmem.h | 28 +
9703 tools/kvm/include/kvm/pci.h | 75 ++
9704 tools/kvm/include/kvm/qcow.h | 122 +++
9705 tools/kvm/include/kvm/rbtree-interval.h | 27 +
9706 tools/kvm/include/kvm/read-write.h | 32 +
9707 tools/kvm/include/kvm/rtc.h | 6 +
9708 tools/kvm/include/kvm/rwsem.h | 39 +
9709 tools/kvm/include/kvm/sdl.h | 17 +
9710 tools/kvm/include/kvm/segment.h | 16 +
9711 tools/kvm/include/kvm/strbuf.h | 6 +
9712 tools/kvm/include/kvm/symbol.h | 22 +
9713 tools/kvm/include/kvm/term.h | 17 +
9714 tools/kvm/include/kvm/threadpool.h | 37 +
9715 tools/kvm/include/kvm/types.h | 7 +
9716 tools/kvm/include/kvm/uip.h | 356 +++++++++
9717 tools/kvm/include/kvm/util.h | 78 ++
9718 tools/kvm/include/kvm/vesa.h | 18 +
9719 tools/kvm/include/kvm/virtio-9p.h | 75 ++
9720 tools/kvm/include/kvm/virtio-balloon.h | 8 +
9721 tools/kvm/include/kvm/virtio-blk.h | 12 +
9722 tools/kvm/include/kvm/virtio-console.h | 9 +
9723 tools/kvm/include/kvm/virtio-net.h | 21 +
9724 tools/kvm/include/kvm/virtio-pci-dev.h | 27 +
9725 tools/kvm/include/kvm/virtio-pci.h | 59 ++
9726 tools/kvm/include/kvm/virtio-rng.h | 9 +
9727 tools/kvm/include/kvm/virtio.h | 65 ++
9728 tools/kvm/include/kvm/vnc.h | 14 +
9729 tools/kvm/include/linux/bitops.h | 33 +
9730 tools/kvm/include/linux/byteorder.h | 7 +
9731 tools/kvm/include/linux/kernel.h | 39 +
9732 tools/kvm/include/linux/module.h | 6 +
9733 tools/kvm/include/linux/prefetch.h | 6 +
9734 tools/kvm/include/linux/types.h | 50 ++
9735 tools/kvm/interrupt.c | 27 +
9736 tools/kvm/ioeventfd.c | 128 ++++
9737 tools/kvm/ioport.c | 192 +++++
9738 tools/kvm/irq.c | 193 +++++
9739 tools/kvm/kvm-cmd.c | 91 +++
9740 tools/kvm/kvm-cpu.c | 509 +++++++++++++
9741 tools/kvm/kvm.c | 749 ++++++++++++++++++
9742 tools/kvm/main.c | 14 +
9743 tools/kvm/mmio.c | 132 ++++
9744 tools/kvm/mptable.c | 284 +++++++
9745 tools/kvm/net/uip/arp.c | 30 +
9746 tools/kvm/net/uip/buf.c | 114 +++
9747 tools/kvm/net/uip/core.c | 190 +++++
9748 tools/kvm/net/uip/csum.c | 92 +++
9749 tools/kvm/net/uip/dhcp.c | 195 +++++
9750 tools/kvm/net/uip/icmp.c | 29 +
9751 tools/kvm/net/uip/ipv4.c | 29 +
9752 tools/kvm/net/uip/tcp.c | 317 ++++++++
9753 tools/kvm/net/uip/udp.c | 236 ++++++
9754 tools/kvm/pci.c | 169 ++++
9755 tools/kvm/read-write.c | 318 ++++++++
9756 tools/kvm/symbol.c | 98 +++
9757 tools/kvm/term.c | 127 +++
9758 tools/kvm/tests/Makefile | 19 +
9759 tools/kvm/tests/boot/Makefile | 13 +
9760 tools/kvm/tests/boot/init.c | 11 +
9761 tools/kvm/tests/kernel/.gitignore | 2 +
9762 tools/kvm/tests/kernel/Makefile | 20 +
9763 tools/kvm/tests/kernel/README | 16 +
9764 tools/kvm/tests/kernel/kernel.S | 8 +
9765 tools/kvm/tests/pit/.gitignore | 2 +
9766 tools/kvm/tests/pit/Makefile | 20 +
9767 tools/kvm/tests/pit/README | 16 +
9768 tools/kvm/tests/pit/tick.S | 109 +++
9769 tools/kvm/threadpool.c | 146 ++++
9770 tools/kvm/ui/sdl.c | 158 ++++
9771 tools/kvm/ui/vnc.c | 218 ++++++
9772 tools/kvm/util.c | 101 +++
9773 tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
9774 tools/kvm/util/generate-cmdlist.sh | 23 +
9775 tools/kvm/util/kvm-ifup-vbr0 | 6 +
9776 tools/kvm/util/parse-options.c | 631 +++++++++++++++
9777 tools/kvm/util/rbtree-interval.c | 90 +++
9778 tools/kvm/util/set_private_br.sh | 51 ++
9779 tools/kvm/util/strbuf.c | 13 +
9780 tools/kvm/virtio/9p-pdu.c | 287 +++++++
9781 tools/kvm/virtio/9p.c | 1263 +++++++++++++++++++++++++++++++
9782 tools/kvm/virtio/balloon.c | 288 +++++++
9783 tools/kvm/virtio/blk.c | 247 ++++++
9784 tools/kvm/virtio/console.c | 196 +++++
9785 tools/kvm/virtio/core.c | 123 +++
9786 tools/kvm/virtio/net.c | 406 ++++++++++
9787 tools/kvm/virtio/pci.c | 313 ++++++++
9788 tools/kvm/virtio/rng.c | 183 +++++
9789 179 files changed, 17821 insertions(+), 0 deletions(-)
9790 create mode 100644 tools/kvm/.gitignore
9791 create mode 100644 tools/kvm/CREDITS-Git
9792 create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
9793 create mode 100644 tools/kvm/Documentation/kvm-debug.txt
9794 create mode 100644 tools/kvm/Documentation/kvm-list.txt
9795 create mode 100644 tools/kvm/Documentation/kvm-pause.txt
9796 create mode 100644 tools/kvm/Documentation/kvm-resume.txt
9797 create mode 100644 tools/kvm/Documentation/kvm-run.txt
9798 create mode 100644 tools/kvm/Documentation/kvm-setup.txt
9799 create mode 100644 tools/kvm/Documentation/kvm-stat.txt
9800 create mode 100644 tools/kvm/Documentation/kvm-stop.txt
9801 create mode 100644 tools/kvm/Documentation/kvm-version.txt
9802 create mode 100644 tools/kvm/Makefile
9803 create mode 100644 tools/kvm/README
9804 create mode 100644 tools/kvm/bios.c
9805 create mode 100644 tools/kvm/bios/.gitignore
9806 create mode 100644 tools/kvm/bios/bios-rom.S
9807 create mode 100644 tools/kvm/bios/e820.c
9808 create mode 100644 tools/kvm/bios/entry.S
9809 create mode 100644 tools/kvm/bios/gen-offsets.sh
9810 create mode 100644 tools/kvm/bios/int10.c
9811 create mode 100644 tools/kvm/bios/int15.c
9812 create mode 100644 tools/kvm/bios/local.S
9813 create mode 100644 tools/kvm/bios/macro.S
9814 create mode 100644 tools/kvm/bios/rom.ld.S
9815 create mode 100644 tools/kvm/builtin-balloon.c
9816 create mode 100644 tools/kvm/builtin-debug.c
9817 create mode 100644 tools/kvm/builtin-help.c
9818 create mode 100644 tools/kvm/builtin-list.c
9819 create mode 100644 tools/kvm/builtin-pause.c
9820 create mode 100644 tools/kvm/builtin-resume.c
9821 create mode 100644 tools/kvm/builtin-run.c
9822 create mode 100644 tools/kvm/builtin-setup.c
9823 create mode 100644 tools/kvm/builtin-stat.c
9824 create mode 100644 tools/kvm/builtin-stop.c
9825 create mode 100644 tools/kvm/builtin-version.c
9826 create mode 100644 tools/kvm/code16gcc.h
9827 create mode 100644 tools/kvm/command-list.txt
9828 create mode 100644 tools/kvm/config/feature-tests.mak
9829 create mode 100644 tools/kvm/config/utilities.mak
9830 create mode 100644 tools/kvm/cpuid.c
9831 create mode 100644 tools/kvm/disk/blk.c
9832 create mode 100644 tools/kvm/disk/core.c
9833 create mode 100644 tools/kvm/disk/qcow.c
9834 create mode 100644 tools/kvm/disk/raw.c
9835 create mode 100644 tools/kvm/framebuffer.c
9836 create mode 100644 tools/kvm/guest/init.c
9837 create mode 100755 tools/kvm/guest/setnet.sh
9838 create mode 100644 tools/kvm/guest_compat.c
9839 create mode 100644 tools/kvm/hw/i8042.c
9840 create mode 100644 tools/kvm/hw/pci-shmem.c
9841 create mode 100644 tools/kvm/hw/rtc.c
9842 create mode 100644 tools/kvm/hw/serial.c
9843 create mode 100644 tools/kvm/hw/vesa.c
9844 create mode 100644 tools/kvm/include/asm/hweight.h
9845 create mode 100644 tools/kvm/include/kvm/8250-serial.h
9846 create mode 100644 tools/kvm/include/kvm/apic.h
9847 create mode 100644 tools/kvm/include/kvm/assembly.h
9848 create mode 100644 tools/kvm/include/kvm/barrier.h
9849 create mode 100644 tools/kvm/include/kvm/bios-export.h
9850 create mode 100644 tools/kvm/include/kvm/bios.h
9851 create mode 100644 tools/kvm/include/kvm/boot-protocol.h
9852 create mode 100644 tools/kvm/include/kvm/brlock.h
9853 create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
9854 create mode 100644 tools/kvm/include/kvm/builtin-debug.h
9855 create mode 100644 tools/kvm/include/kvm/builtin-help.h
9856 create mode 100644 tools/kvm/include/kvm/builtin-list.h
9857 create mode 100644 tools/kvm/include/kvm/builtin-pause.h
9858 create mode 100644 tools/kvm/include/kvm/builtin-resume.h
9859 create mode 100644 tools/kvm/include/kvm/builtin-run.h
9860 create mode 100644 tools/kvm/include/kvm/builtin-setup.h
9861 create mode 100644 tools/kvm/include/kvm/builtin-stat.h
9862 create mode 100644 tools/kvm/include/kvm/builtin-stop.h
9863 create mode 100644 tools/kvm/include/kvm/builtin-version.h
9864 create mode 100644 tools/kvm/include/kvm/compiler.h
9865 create mode 100644 tools/kvm/include/kvm/cpufeature.h
9866 create mode 100644 tools/kvm/include/kvm/disk-image.h
9867 create mode 100644 tools/kvm/include/kvm/e820.h
9868 create mode 100644 tools/kvm/include/kvm/framebuffer.h
9869 create mode 100644 tools/kvm/include/kvm/guest_compat.h
9870 create mode 100644 tools/kvm/include/kvm/i8042.h
9871 create mode 100644 tools/kvm/include/kvm/interrupt.h
9872 create mode 100644 tools/kvm/include/kvm/ioeventfd.h
9873 create mode 100644 tools/kvm/include/kvm/ioport.h
9874 create mode 100644 tools/kvm/include/kvm/irq.h
9875 create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
9876 create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
9877 create mode 100644 tools/kvm/include/kvm/kvm.h
9878 create mode 100644 tools/kvm/include/kvm/mptable.h
9879 create mode 100644 tools/kvm/include/kvm/mutex.h
9880 create mode 100644 tools/kvm/include/kvm/parse-options.h
9881 create mode 100644 tools/kvm/include/kvm/pci-shmem.h
9882 create mode 100644 tools/kvm/include/kvm/pci.h
9883 create mode 100644 tools/kvm/include/kvm/qcow.h
9884 create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
9885 create mode 100644 tools/kvm/include/kvm/read-write.h
9886 create mode 100644 tools/kvm/include/kvm/rtc.h
9887 create mode 100644 tools/kvm/include/kvm/rwsem.h
9888 create mode 100644 tools/kvm/include/kvm/sdl.h
9889 create mode 100644 tools/kvm/include/kvm/segment.h
9890 create mode 100644 tools/kvm/include/kvm/strbuf.h
9891 create mode 100644 tools/kvm/include/kvm/symbol.h
9892 create mode 100644 tools/kvm/include/kvm/term.h
9893 create mode 100644 tools/kvm/include/kvm/threadpool.h
9894 create mode 100644 tools/kvm/include/kvm/types.h
9895 create mode 100644 tools/kvm/include/kvm/uip.h
9896 create mode 100644 tools/kvm/include/kvm/util.h
9897 create mode 100644 tools/kvm/include/kvm/vesa.h
9898 create mode 100644 tools/kvm/include/kvm/virtio-9p.h
9899 create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
9900 create mode 100644 tools/kvm/include/kvm/virtio-blk.h
9901 create mode 100644 tools/kvm/include/kvm/virtio-console.h
9902 create mode 100644 tools/kvm/include/kvm/virtio-net.h
9903 create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
9904 create mode 100644 tools/kvm/include/kvm/virtio-pci.h
9905 create mode 100644 tools/kvm/include/kvm/virtio-rng.h
9906 create mode 100644 tools/kvm/include/kvm/virtio.h
9907 create mode 100644 tools/kvm/include/kvm/vnc.h
9908 create mode 100644 tools/kvm/include/linux/bitops.h
9909 create mode 100644 tools/kvm/include/linux/byteorder.h
9910 create mode 100644 tools/kvm/include/linux/kernel.h
9911 create mode 100644 tools/kvm/include/linux/module.h
9912 create mode 100644 tools/kvm/include/linux/prefetch.h
9913 create mode 100644 tools/kvm/include/linux/types.h
9914 create mode 100644 tools/kvm/interrupt.c
9915 create mode 100644 tools/kvm/ioeventfd.c
9916 create mode 100644 tools/kvm/ioport.c
9917 create mode 100644 tools/kvm/irq.c
9918 create mode 100644 tools/kvm/kvm-cmd.c
9919 create mode 100644 tools/kvm/kvm-cpu.c
9920 create mode 100644 tools/kvm/kvm.c
9921 create mode 100644 tools/kvm/main.c
9922 create mode 100644 tools/kvm/mmio.c
9923 create mode 100644 tools/kvm/mptable.c
9924 create mode 100644 tools/kvm/net/uip/arp.c
9925 create mode 100644 tools/kvm/net/uip/buf.c
9926 create mode 100644 tools/kvm/net/uip/core.c
9927 create mode 100644 tools/kvm/net/uip/csum.c
9928 create mode 100644 tools/kvm/net/uip/dhcp.c
9929 create mode 100644 tools/kvm/net/uip/icmp.c
9930 create mode 100644 tools/kvm/net/uip/ipv4.c
9931 create mode 100644 tools/kvm/net/uip/tcp.c
9932 create mode 100644 tools/kvm/net/uip/udp.c
9933 create mode 100644 tools/kvm/pci.c
9934 create mode 100644 tools/kvm/read-write.c
9935 create mode 100644 tools/kvm/symbol.c
9936 create mode 100644 tools/kvm/term.c
9937 create mode 100644 tools/kvm/tests/Makefile
9938 create mode 100644 tools/kvm/tests/boot/Makefile
9939 create mode 100644 tools/kvm/tests/boot/init.c
9940 create mode 100644 tools/kvm/tests/kernel/.gitignore
9941 create mode 100644 tools/kvm/tests/kernel/Makefile
9942 create mode 100644 tools/kvm/tests/kernel/README
9943 create mode 100644 tools/kvm/tests/kernel/kernel.S
9944 create mode 100644 tools/kvm/tests/pit/.gitignore
9945 create mode 100644 tools/kvm/tests/pit/Makefile
9946 create mode 100644 tools/kvm/tests/pit/README
9947 create mode 100644 tools/kvm/tests/pit/tick.S
9948 create mode 100644 tools/kvm/threadpool.c
9949 create mode 100644 tools/kvm/ui/sdl.c
9950 create mode 100644 tools/kvm/ui/vnc.c
9951 create mode 100644 tools/kvm/util.c
9952 create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
9953 create mode 100755 tools/kvm/util/generate-cmdlist.sh
9954 create mode 100755 tools/kvm/util/kvm-ifup-vbr0
9955 create mode 100644 tools/kvm/util/parse-options.c
9956 create mode 100644 tools/kvm/util/rbtree-interval.c
9957 create mode 100755 tools/kvm/util/set_private_br.sh
9958 create mode 100644 tools/kvm/util/strbuf.c
9959 create mode 100644 tools/kvm/virtio/9p-pdu.c
9960 create mode 100644 tools/kvm/virtio/9p.c
9961 create mode 100644 tools/kvm/virtio/balloon.c
9962 create mode 100644 tools/kvm/virtio/blk.c
9963 create mode 100644 tools/kvm/virtio/console.c
9964 create mode 100644 tools/kvm/virtio/core.c
9965 create mode 100644 tools/kvm/virtio/net.c
9966 create mode 100644 tools/kvm/virtio/pci.c
9967 create mode 100644 tools/kvm/virtio/rng.c
9968 Merging scsi-post-merge/merge-base:master
9969 $ git clone -s -l -n -q . ../rebase-tmp
9971 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
9973 * [new branch] quilt/akpm -> akpm
9974 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
9976 * [new branch] quilt/akpm-base -> akpm-base
9978 Switched to branch 'akpm'
9979 $ git rebase --onto master akpm-base
9980 First, rewinding head to replay your work on top of it...
9981 Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
9982 Applying: When no floppy is found the module code can be released while a timer
9983 Applying: Fix kconfig unmet dependency warning. BACKLIGHT_CLASS_DEVICE depends on
9984 Applying: Fix the following memory leak:
9985 Using index info to reconstruct a base tree...
9986 Falling back to patching base and 3-way merge...
9987 No changes -- Patch already applied.
9988 Applying: The parameter's origin type is long. On an i386 architecture, it can
9989 Applying: Since the commit below which added O_PATH support to the *at() calls, the
9990 Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
9991 Applying: This makes the iris driver use the platform API, so it is properly exposed
9992 Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
9993 Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
9994 Applying: Cc: Ed Wildgoose <git@wildgooses.com>
9995 Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
9996 Applying: The x86 timer interrupt handler is the only handler not traced in the
9997 Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
9998 Applying: Don't allow everybody to use a modem.
9999 Applying: The address limit is already set in flush_old_exec() so this
10000 Applying: A call to va_copy() should always be followed by a call to va_end() in the
10001 Applying: Don't dereference em if it's NULL or an error pointer.
10002 Applying: Some messing with error codes to return 0 on out id's and match
10003 Applying: kbuf is a buffer that is local to this function, so all of the error paths
10004 Applying: fb_set_suspend() must be called with the console semaphore held, which
10005 Applying: hwmon was using an idr with a NULL pointer, so convert to an
10006 Applying: A straightforward looking use of idr for a device id.
10007 Applying: This patchset aims at addressing /proc/stat issue which has been
10008 Applying: update_ts_time_stat currently updates idle time even if we are in iowait
10009 Applying: get_cpu_{idle,iowait}_time_us update idle/iowait counters unconditionally
10010 Applying: show_stat handler of the /proc/stat file relies on kstat_cpu(cpu)
10011 Applying: The address limit is already set in flush_old_exec() so this
10012 Applying: The address limit is already set in flush_old_exec() so this
10013 Applying: Add new check (assert_init) to make sure objects are initialized and
10014 Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
10015 Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
10016 Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
10017 Applying: The address limit is already set in flush_old_exec() so those calls to
10018 Applying: When do pci remove/rescan on system that have more iommus, got
10019 Applying: The current implementation of dmi_name_in_vendors() is an invitation to
10020 Applying: For headers that get exported to userland and make use of u32 style
10021 Applying: Fix sparse warnings of right shift bigger than source value size:
10022 Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
10023 Applying: Some mangling of errors was necessary to maintain current interface.
10024 Applying: This does involve additional use of the spin lock in idr.c. Is this an
10025 Applying: Instead of open coding this function use kstrtoul_from_user() directly.
10026 Applying: brd_make_request() always returns 0, which doesn't make much sense.
10027 Applying: The address limit is already set in flush_old_exec() so this assignment of
10028 Applying: Unbreak the alpha build.
10029 Applying: Unbreak alpha build.
10030 Applying: Unbreak alpha build.
10031 Applying: When we get corruption reports, it's useful to see if the kernel was
10032 Applying: When we get corruption reports, it's useful to see if the kernel was
10033 Applying: The basic idea behind cross memory attach is to allow MPI programs doing
10034 Applying: - Add x86_64 specific wire up
10035 Applying: > You might get some speed benefit by optimising for the small copies
10036 Applying: acct_isolated of compaction uses page_lru_base_type which returns only
10037 Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally,
10038 Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So,
10039 Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless,
10040 Applying: unmap_and_move() is one a big messy function. Clean it up.
10041 Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
10042 Applying: per-task block plug can reduce block queue lock contention and increase
10043 Applying: The tracing ring-buffer used this function briefly, but not anymore.
10044 Applying: After selecting a task to kill, the oom killer iterates all processes and
10045 Applying: Add the leading word "tmpfs" to the Kconfig string to make it blindingly
10046 Applying: When we get a bad_page bug report, it's useful to see what modules the
10047 Applying: Without swap, anonymous pages are not scanned. As such, they should not
10048 Applying: fix comment
10049 Applying: The nr_force_scan[] tuple holds the effective scan numbers for anon and
10050 Applying: Some kernel components pin user space memory (infiniband and perf) (by
10051 Applying: Add comments to explain the page statistics field in the mm_struct.
10052 Applying: add missing ;
10053 Applying: Testing from the XFS folk revealed that there is still too much I/O from
10054 Applying: Lumpy reclaim worked with two passes - the first which queued pages for IO
10055 Applying: Direct reclaim should never writeback pages. For now, handle the
10056 Applying: Direct reclaim should never writeback pages. Warn if an attempt is made.
10057 Applying: It is preferable that no dirty pages are dispatched for cleaning from the
10058 Applying: Workloads that are allocating frequently and writing files place a large
10059 Applying: When direct reclaim encounters a dirty page, it gets recycled around the
10060 Applying: It's possible a zone watermark is ok when entering the balance_pgdat()
10061 Applying: printk_ratelimit() should not be used, because it shares ratelimiting
10062 Applying: memchr_inv() is mainly used to check whether the whole buffer is filled
10063 Applying: Use newly introduced memchr_inv() for page verification.
10064 Applying: A shrinker function can return -1, means that it cannot do anything
10065 Applying: Use atomic-long operations instead of looping around cmpxchg().
10066 Applying: massage atomic.h inclusions
10067 Applying: The /proc/vmallocinfo shows information about vmalloc allocations in
10068 Applying: Commit 645747462435 ("vmscan: detect mapped file pages used only once")
10069 Applying: Logic added in commit 8cab4754d24a0 ("vmscan: make mapped executable pages
10070 Applying: SPARC32 require access to the start address. Add a new helper
10071 Applying: With the NO_BOOTMEM symbol added architectures may now use the following
10072 Applying: Using "- 1" relies on the old_end to be page aligned and PAGE_SIZE > 1,
10073 Applying: This replaces ptep_clear_flush() with ptep_get_and_clear() and a single
10074 Applying: This adds THP support to mremap (decreases the number of split_huge_page()
10075 Applying: coding-style nitpicking
10076 Applying: Cc: Andrea Arcangeli <aarcange@redhat.com>
10077 Applying: Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10078 Applying: vmstat_text is only available when PROC_FS or SYSFS is enabled. This
10079 Applying: reduce ifdeffery
10080 Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
10081 Applying: Make the security_inode_init_security() initxattrs arg const, to match the
10082 Applying: The current implementation of the /dev/hpet driver couples opening the
10083 Applying: smp_call_function() only lets all other CPUs execute a specific function,
10084 Applying: auto_demotion_disable is called only for online CPUs. For hotplugged
10085 Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
10086 Applying: Strict user copy checks are only really supported on x86_32 even though
10087 Applying: The help text for this config is duplicated across the x86, parisc, and
10088 Applying: s/lib-/obj-/ for usercopy.o
10089 Applying: After an "unexpected" reboot, I found this Oops in my logs:
10090 Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
10091 Applying: Add axis correction for HP EliteBook 2730p.
10092 Applying: Add axis correction for HP EliteBook 8540w.
10093 Applying: Add axis correction for HP ProBook 6555b.
10094 Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
10095 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
10096 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
10097 Applying: Change exported functions to use the device given as parameter
10098 Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
10099 Applying: We are enabling some power features on medfield. To test suspend-2-RAM
10100 Applying: We are enabling some power features on medfield. To test suspend-2-RAM
10101 Applying: We are enabling some power features on medfield. To test suspend-2-RAM
10102 Applying: Cc: Al Viro <viro@zeniv.linux.org.uk>
10103 Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
10104 Applying: include linux/module.h
10105 Applying: The memory for struct led_trigger should be kfreed in the
10106 Applying: Currently termination logic (\0 or \n\0) is hardcoded in _kstrtoull(),
10107 Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify
10108 Applying: don't include asm/msr.h
10109 Applying: epoll can acquire recursively acquire ep->mtx on multiple "struct
10110 Applying: Currently in oprofilefs, files that use ulong_fops mis-handle writes of
10111 Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
10112 Applying: One can get this information from minix/inode.c, but adding the
10113 Applying: The memcg code sometimes uses "struct mem_cgroup *mem" and sometimes uses
10114 Applying: Before calling schedule_timeout(), task state should be changed.
10115 Applying: Signed-off-by: Bob Liu <lliubbo@gmail.com>
10116 Applying: While back-porting Johannes Weiner's patch "mm: memcg-aware global
10117 Applying: If somebody is touching data too early, it might be easier to diagnose a
10118 Applying: Both mem_cgroup_charge_statistics() and mem_cgroup_move_account() were
10119 Applying: On reading sysctl dirs we should return -EISDIR instead of -EINVAL.
10120 Applying: Force this on for -next/mm testing purposes.
10121 Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
10122 Applying: After merging the akpm tree, today's linux-next build (lost of them)
10123 Applying: The discovered bit in PGCCSR register indicates if the device has been
10124 Applying: Add RapidIO mport driver for IDT TSI721 PCI Express-to-SRIO bridge device.
10125 Applying: When I tried to send a patch to remove it, Andi told me we still need to
10126 Applying: A default echo function has been provided so it is no longer an error when
10127 Applying: This client driver allows you to use a GPIO pin as a source for PPS
10128 Applying: remove unneeded cast of void*
10129 Applying: Straightforward. As an aside, the ida_init calls are not needed as far as
10130 Applying: Simply creates one point to call the w1 interface.
10131 Applying: Adds a nolock function to the w1 interface to avoid locking the
10132 Applying: Fixes the deadlock when inserting and removing the ds2780.
10134 $ git fetch -f ../rebase-tmp akpm:akpm
10136 + a053e51...a2ea491 akpm -> akpm (forced update)
10137 $ rm -rf ../rebase-tmp
10139 $ git merge --no-ff akpm
10140 Removing arch/sparc/lib/usercopy.c
10141 Removing drivers/leds/leds-alix2.c
10142 Merge made by recursive.
10143 Documentation/DocBook/debugobjects.tmpl | 50 +
10144 Documentation/feature-removal-schedule.txt | 35 -
10145 Documentation/kernel-parameters.txt | 8 +
10146 Documentation/rapidio/tsi721.txt | 49 +
10147 .../trace/postprocess/trace-vmscan-postprocess.pl | 8 +-
10149 arch/arm/include/asm/processor.h | 1 -
10150 arch/arm/mach-ux500/mbox-db5500.c | 2 +-
10151 arch/ia64/include/asm/processor.h | 1 -
10152 arch/parisc/Kconfig | 1 +
10153 arch/parisc/Kconfig.debug | 14 -
10154 arch/parisc/include/asm/processor.h | 2 -
10155 arch/parisc/kernel/process.c | 1 -
10156 arch/powerpc/include/asm/systbl.h | 2 +
10157 arch/powerpc/include/asm/unistd.h | 4 +-
10158 arch/s390/Kconfig | 1 +
10159 arch/s390/Kconfig.debug | 14 -
10160 arch/s390/lib/Makefile | 1 -
10161 arch/sparc/kernel/process_32.c | 3 +-
10162 arch/sparc/kernel/process_64.c | 3 -
10163 arch/sparc/lib/Makefile | 1 -
10164 arch/sparc/lib/usercopy.c | 8 -
10165 arch/tile/Kconfig | 8 +-
10166 arch/tile/include/asm/uaccess.h | 7 +-
10167 arch/tile/lib/uaccess.c | 8 -
10168 arch/unicore32/include/asm/processor.h | 1 -
10169 arch/x86/Kconfig | 15 +
10170 arch/x86/Kconfig.debug | 14 -
10171 arch/x86/ia32/ia32entry.S | 2 +
10172 arch/x86/include/asm/irq_vectors.h | 50 +
10173 arch/x86/include/asm/uaccess_64.h | 12 +-
10174 arch/x86/include/asm/unistd_32.h | 4 +-
10175 arch/x86/include/asm/unistd_64.h | 4 +
10176 arch/x86/kernel/apic/apic.c | 7 +
10177 arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 +
10178 arch/x86/kernel/cpu/mcheck/threshold.c | 3 +
10179 arch/x86/kernel/e820.c | 59 +-
10180 arch/x86/kernel/irq.c | 6 +-
10181 arch/x86/kernel/irq_work.c | 3 +
10182 arch/x86/kernel/smp.c | 7 +
10183 arch/x86/kernel/syscall_table_32.S | 2 +
10184 arch/x86/kernel/time.c | 15 +-
10185 arch/x86/kernel/traps.c | 3 +
10186 arch/x86/lib/usercopy_32.c | 6 -
10187 arch/x86/mm/mmap.c | 4 +-
10188 arch/x86/mm/tlb.c | 3 +
10189 arch/x86/platform/Makefile | 1 +
10190 arch/x86/platform/geode/Makefile | 1 +
10191 arch/x86/platform/geode/alix.c | 142 ++
10192 arch/x86/platform/iris/iris.c | 67 +-
10193 drivers/base/node.c | 6 +-
10194 drivers/block/brd.c | 2 +-
10195 drivers/block/floppy.c | 8 +-
10196 drivers/char/hpet.c | 56 +-
10197 drivers/cpufreq/cpufreq_conservative.c | 4 +-
10198 drivers/cpufreq/cpufreq_ondemand.c | 4 +-
10199 drivers/firmware/dmi_scan.c | 6 +-
10200 drivers/gpu/drm/Kconfig | 1 +
10201 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 34 +-
10202 drivers/gpu/vga/vgaarb.c | 18 +-
10203 drivers/hwmon/hwmon.c | 32 +-
10204 drivers/hwmon/ibmaem.c | 47 +-
10205 drivers/idle/intel_idle.c | 59 +-
10206 drivers/infiniband/core/umem.c | 6 +-
10207 drivers/infiniband/hw/ipath/ipath_user_pages.c | 6 +-
10208 drivers/infiniband/hw/qib/qib_user_pages.c | 4 +-
10209 drivers/iommu/dmar.c | 7 +-
10210 drivers/iommu/intel-iommu.c | 177 ++-
10211 drivers/leds/Kconfig | 20 +-
10212 drivers/leds/Makefile | 2 +-
10213 drivers/leds/led-triggers.c | 5 +-
10214 drivers/leds/leds-alix2.c | 239 --
10215 drivers/leds/leds-renesas-tpu.c | 344 +++
10216 drivers/misc/lis3lv02d/lis3lv02d.c | 389 ++--
10217 drivers/misc/lis3lv02d/lis3lv02d.h | 9 +-
10218 drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 11 +-
10219 drivers/misc/lis3lv02d/lis3lv02d_spi.c | 2 +-
10220 drivers/oprofile/oprofilefs.c | 5 +-
10221 drivers/platform/x86/Kconfig | 2 +-
10222 drivers/platform/x86/acerhdf.c | 1 +
10223 drivers/platform/x86/hp_accel.c | 10 +-
10224 drivers/power/ds2780_battery.c | 86 +-
10225 drivers/pps/clients/Kconfig | 9 +
10226 drivers/pps/clients/Makefile | 1 +
10227 drivers/pps/clients/pps-gpio.c | 227 ++
10228 drivers/pps/clients/pps-ktimer.c | 12 -
10229 drivers/pps/clients/pps_parport.c | 9 -
10230 drivers/pps/kapi.c | 20 +-
10231 drivers/rapidio/Kconfig | 6 +-
10232 drivers/rapidio/Makefile | 1 +
10233 drivers/rapidio/devices/Kconfig | 10 +
10234 drivers/rapidio/devices/Makefile | 5 +
10235 drivers/rapidio/devices/tsi721.c | 2337 ++++++++++++++++++++
10236 drivers/rapidio/devices/tsi721.h | 762 +++++++
10237 drivers/rapidio/rio-scan.c | 4 +-
10238 drivers/rtc/class.c | 32 +-
10239 drivers/scsi/aacraid/commctrl.c | 1 +
10240 drivers/scsi/megaraid.c | 8 +-
10241 drivers/scsi/osd/osd_uld.c | 22 +-
10242 drivers/scsi/sd.c | 32 +-
10243 drivers/scsi/sg.c | 25 +-
10244 drivers/staging/rts5139/ms.c | 1 +
10245 drivers/staging/rts5139/rts51x_scsi.c | 1 +
10246 drivers/staging/rts5139/xd.c | 1 +
10247 drivers/video/fbmem.c | 24 +-
10248 drivers/w1/slaves/w1_ds2760.c | 48 +-
10249 drivers/w1/slaves/w1_ds2780.c | 96 +-
10250 drivers/w1/slaves/w1_ds2780.h | 2 +
10253 fs/btrfs/inode.c | 3 +-
10255 fs/eventpoll.c | 25 +-
10256 fs/ext4/ext4.h | 7 +-
10257 fs/ext4/ialloc.c | 4 +-
10258 fs/ext4/inode.c | 6 +-
10259 fs/logfs/logfs.h | 1 -
10260 fs/logfs/super.c | 22 -
10262 fs/ocfs2/ocfs2.h | 47 +
10263 fs/ocfs2/quota_local.c | 10 +-
10264 fs/proc/proc_sysctl.c | 1 +
10265 fs/proc/stat.c | 41 +-
10266 fs/proc/task_mmu.c | 2 +
10267 fs/read_write.c | 8 +-
10269 fs/xfs/xfs_aops.c | 8 +-
10270 include/asm-generic/cputime.h | 4 +-
10271 include/linux/cgroup.h | 2 +-
10272 include/linux/compat.h | 3 +-
10273 include/linux/debugobjects.h | 6 +
10274 include/linux/dmar.h | 5 +
10275 include/linux/fs.h | 9 +-
10276 include/linux/hpet.h | 1 +
10277 include/linux/huge_mm.h | 5 +
10278 include/linux/jiffies.h | 2 +-
10279 include/linux/leds-renesas-tpu.h | 14 +
10280 include/linux/magic.h | 10 +-
10281 include/linux/memblock.h | 1 +
10282 include/linux/memcontrol.h | 37 +-
10283 include/linux/mm.h | 1 +
10284 include/linux/mm_types.h | 11 +-
10285 include/linux/mmzone.h | 13 +
10286 include/linux/namei.h | 1 +
10287 include/linux/pps-gpio.h | 32 +
10288 include/linux/rio_ids.h | 1 +
10289 include/linux/security.h | 2 +-
10290 include/linux/shrinker.h | 2 +-
10291 include/linux/string.h | 1 +
10292 include/linux/swap.h | 7 +-
10293 include/linux/syscalls.h | 13 +
10294 include/linux/sysdev.h | 14 +
10295 include/linux/vmalloc.h | 1 +
10296 include/linux/writeback.h | 2 -
10297 include/scsi/scsi_netlink.h | 2 +-
10298 include/trace/events/irq_vectors.h | 56 +
10299 include/trace/events/vmscan.h | 8 +-
10300 init/Kconfig | 4 +-
10301 init/do_mounts.c | 48 +-
10303 kernel/audit.c | 5 +-
10304 kernel/cgroup.c | 18 +-
10305 kernel/events/core.c | 6 +-
10306 kernel/kprobes.c | 2 +-
10307 kernel/printk.c | 7 +
10308 kernel/sys_ni.c | 4 +
10309 kernel/time.c | 2 +-
10310 kernel/time/tick-sched.c | 45 +-
10311 kernel/timer.c | 54 +-
10312 lib/Kconfig.debug | 18 +
10314 lib/crc32.c | 370 +++-
10315 lib/crc32defs.h | 16 +-
10316 lib/debugobjects.c | 33 +
10317 lib/gen_crc32table.c | 59 +-
10318 lib/kstrtox.c | 75 +-
10319 lib/kstrtox.h | 8 +
10320 lib/radix-tree.c | 10 +-
10321 lib/string.c | 54 +
10322 {arch/s390/lib => lib}/usercopy.c | 0
10323 lib/vsprintf.c | 33 +-
10326 mm/compaction.c | 24 +-
10327 mm/debug-pagealloc.c | 12 +-
10328 mm/huge_memory.c | 45 +
10329 mm/memblock.c | 6 +
10330 mm/memcontrol.c | 994 +++++-----
10331 mm/mempolicy.c | 4 +-
10332 mm/migrate.c | 75 +-
10333 mm/mremap.c | 42 +-
10334 mm/oom_kill.c | 5 +-
10335 mm/page-writeback.c | 122 +-
10336 mm/page_alloc.c | 1 +
10337 mm/page_cgroup.c | 3 +-
10338 mm/process_vm_access.c | 496 +++++
10341 mm/vmalloc.c | 65 +-
10342 mm/vmscan.c | 225 ++-
10344 security/keys/compat.c | 2 +-
10345 security/keys/keyctl.c | 2 +-
10346 security/selinux/selinuxfs.c | 14 +-
10347 204 files changed, 7359 insertions(+), 2169 deletions(-)
10348 create mode 100644 Documentation/rapidio/tsi721.txt
10349 delete mode 100644 arch/sparc/lib/usercopy.c
10350 create mode 100644 arch/x86/platform/geode/Makefile
10351 create mode 100644 arch/x86/platform/geode/alix.c
10352 delete mode 100644 drivers/leds/leds-alix2.c
10353 create mode 100644 drivers/leds/leds-renesas-tpu.c
10354 create mode 100644 drivers/pps/clients/pps-gpio.c
10355 create mode 100644 drivers/rapidio/devices/Kconfig
10356 create mode 100644 drivers/rapidio/devices/Makefile
10357 create mode 100644 drivers/rapidio/devices/tsi721.c
10358 create mode 100644 drivers/rapidio/devices/tsi721.h
10359 create mode 100644 include/linux/leds-renesas-tpu.h
10360 create mode 100644 include/linux/pps-gpio.h
10361 create mode 100644 include/trace/events/irq_vectors.h
10362 create mode 100644 lib/kstrtox.h
10363 rename {arch/s390/lib => lib}/usercopy.c (100%)
10364 create mode 100644 mm/process_vm_access.c
projects / karo-tx-linux.git / blob