Merge remote branch 'wireless-next/master' into ath6kl-next

Browse source

Conflicts:
	drivers/net/wireless/ath/ath6kl/cfg80211.c

...

This commit is contained in:

Kalle Valo 2012-06-14 14:20:18 +03:00

parent c85251f856 211c17aaee

commit d987dd137b

12155 changed files with 765736 additions and 501890 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

.mailmap

View file

4

CREDITS

View file

2

Documentation/00-INDEX

View file

9

Documentation/ABI/removed/ip_queue

View file

16

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

View file

16

Documentation/ABI/testing/debugfs-olpc

View file

45

Documentation/ABI/testing/debugfs-pfo-nx-crypto

View file

90

Documentation/ABI/testing/dev-kmsg

View file

25

Documentation/ABI/testing/sysfs-block-dm

View file

26

Documentation/ABI/testing/sysfs-block-rssd

View file

14

Documentation/ABI/testing/sysfs-bus-event_source-devices-format

View file

77

Documentation/ABI/testing/sysfs-bus-fcoe

View file

19

Documentation/ABI/testing/sysfs-bus-hsi

View file

15

Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533

View file

52

drivers/staging/iio/Documentation/sysfs-bus-iio → Documentation/ABI/testing/sysfs-bus-iio

View file

4

Documentation/ABI/testing/sysfs-bus-rbd

View file

19

Documentation/ABI/testing/sysfs-bus-usb

View file

8

Documentation/ABI/testing/sysfs-cfq-target-latency

View file

48

Documentation/ABI/testing/sysfs-class-backlight-driver-lm3533

View file

97

Documentation/ABI/testing/sysfs-class-extcon

View file

65

Documentation/ABI/testing/sysfs-class-led-driver-lm3533

View file

51

Documentation/ABI/testing/sysfs-class-mtd

View file

9

Documentation/ABI/testing/sysfs-class-net-mesh

View file

35

Documentation/ABI/testing/sysfs-devices-power

View file

25

Documentation/ABI/testing/sysfs-devices-system-cpu

View file

18

Documentation/ABI/testing/sysfs-driver-samsung-laptop

View file

23

Documentation/ABI/testing/sysfs-driver-wacom

View file

20

Documentation/ABI/testing/sysfs-firmware-acpi

View file

59

Documentation/ABI/testing/sysfs-power

View file

45

Documentation/CodingStyle

View file

18

Documentation/DMA-attributes.txt

View file

2

Documentation/DocBook/Makefile

View file

17

Documentation/DocBook/device-drivers.tmpl

View file

13

Documentation/DocBook/kernel-api.tmpl

View file

2

Documentation/DocBook/kernel-hacking.tmpl

View file

2

Documentation/DocBook/libata.tmpl

View file

107

Documentation/DocBook/mcabook.tmpl

View file

4

Documentation/DocBook/media/Makefile

View file

160

Documentation/DocBook/media/dvb/dvbproperty.xml

View file

29

Documentation/DocBook/media/v4l/biblio.xml

View file

38

Documentation/DocBook/media/v4l/common.xml

View file

75

Documentation/DocBook/media/v4l/compat.xml

View file

714

Documentation/DocBook/media/v4l/controls.xml

View file

198

Documentation/DocBook/media/v4l/dev-subdev.xml

View file

12

Documentation/DocBook/media/v4l/io.xml

View file

2

Documentation/DocBook/media/v4l/pixfmt-nv12m.xml

View file

2

Documentation/DocBook/media/v4l/pixfmt-srggb10.xml

View file

29

Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml

View file

2

Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml

View file

6

Documentation/DocBook/media/v4l/pixfmt.xml

View file

614

Documentation/DocBook/media/v4l/subdev-image-processing-crop.dia

View file

63

Documentation/DocBook/media/v4l/subdev-image-processing-crop.svg

View file

Side by side After Width:  |  Height:  |  Size: 4.5 KiB

1588

Documentation/DocBook/media/v4l/subdev-image-processing-full.dia

View file

163

Documentation/DocBook/media/v4l/subdev-image-processing-full.svg

View file

Side by side After Width:  |  Height:  |  Size: 12 KiB

1152

Documentation/DocBook/media/v4l/subdev-image-processing-scaling-multi-source.dia

View file

116

Documentation/DocBook/media/v4l/subdev-image-processing-scaling-multi-source.svg

View file

Side by side After Width:  |  Height:  |  Size: 8.8 KiB

44

Documentation/DocBook/media/v4l/v4l2.xml

View file

16

Documentation/DocBook/media/v4l/vidioc-create-bufs.xml

View file

4

Documentation/DocBook/media/v4l/vidioc-cropcap.xml

View file

211

Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml

View file

4

Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml

View file

119

Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml

View file

4

Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml

View file

2

Documentation/DocBook/media/v4l/vidioc-enuminput.xml

View file

2

Documentation/DocBook/media/v4l/vidioc-enumoutput.xml

View file

4

Documentation/DocBook/media/v4l/vidioc-g-crop.xml

View file

6

Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml

View file

130

Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml

View file

26

Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

View file

2

Documentation/DocBook/media/v4l/vidioc-g-fmt.xml

View file

6

Documentation/DocBook/media/v4l/vidioc-g-frequency.xml

View file

5

Documentation/DocBook/media/v4l/vidioc-g-parm.xml

View file

2

Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml

View file

2

Documentation/DocBook/media/v4l/vidioc-g-tuner.xml

View file

6

Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml

View file

4

Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml

View file

104

Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml

View file

41

Documentation/DocBook/media/v4l/vidioc-queryctrl.xml

View file

7

Documentation/DocBook/media/v4l/vidioc-reqbufs.xml

View file

5

Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml

View file

9

Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml

View file

228

Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml

View file

2

Documentation/DocBook/mtdnand.tmpl

View file

32

Documentation/HOWTO

View file

2

Documentation/Makefile

View file

15

Documentation/RCU/torture.txt

View file

3

Documentation/SubmittingPatches

View file

8

Documentation/acpi/apei/einj.txt

View file

2

Documentation/aoe/aoe.txt

View file

4

Documentation/aoe/autoload.sh

View file

2

Documentation/arm/00-INDEX

View file

69

Documentation/arm/IXP2000

View file

46

Documentation/arm/OMAP/DSS

View file

41

Documentation/arm/SPEAr/overview.txt

View file

2

Documentation/blackfin/bfin-gpio-notes.txt

View file

2

Documentation/blockdev/floppy.txt

View file

2

Documentation/cgroups/cpusets.txt

View file

42

Documentation/cgroups/memory.txt

View file

12

Documentation/cgroups/resource_counter.txt

View file

233

Documentation/clk.txt

View file

Some files were not shown because too many files have changed in this diff Show more