Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

Browse source

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/staging/bcm/headers.h
	drivers/staging/brcm80211/brcmfmac/dhd_linux.c
	drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
	drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
	drivers/staging/et131x/et131x_netdev.c
	drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
	drivers/staging/rtl8192e/r8192E.h
	drivers/staging/usbip/userspace/src/utils.h

...

This commit is contained in:

Larry Finger 2011-08-01 12:33:12 -05:00

parent 48d67fe035 5f66d2b58c

commit 275d38585c

3307 changed files with 231309 additions and 94818 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

17

CREDITS

View file

23

Documentation/ABI/testing/sysfs-module

View file

12

Documentation/DMA-API-HOWTO.txt

View file

5

Documentation/DocBook/.gitignore vendored

View file

31

Documentation/DocBook/Makefile

View file

590

Documentation/DocBook/dvb/dvbproperty.xml

View file

BIN

Documentation/DocBook/dvb/dvbstb.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 22 KiB

428

Documentation/DocBook/dvb/frontend.h.xml

View file

464

Documentation/DocBook/media-entities.tmpl

View file

89

Documentation/DocBook/media-indices.tmpl

View file

386

Documentation/DocBook/media/Makefile

View file

171

Documentation/DocBook/media/bayer.png.b64

View file

105

Documentation/DocBook/media/crop.gif.b64

View file

0

Documentation/DocBook/dvb/.gitignore → Documentation/DocBook/media/dvb/.gitignore vendored

View file

498

Documentation/DocBook/dvb/audio.xml → Documentation/DocBook/media/dvb/audio.xml

View file

112

Documentation/DocBook/dvb/ca.xml → Documentation/DocBook/media/dvb/ca.xml

View file

333

Documentation/DocBook/dvb/demux.xml → Documentation/DocBook/media/dvb/demux.xml

View file

20

Documentation/DocBook/dvb/dvbapi.xml → Documentation/DocBook/media/dvb/dvbapi.xml

View file

859

Documentation/DocBook/media/dvb/dvbproperty.xml

View file

0

Documentation/DocBook/dvb/dvbstb.pdf → Documentation/DocBook/media/dvb/dvbstb.pdf

View file

0

Documentation/DocBook/dvb/examples.xml → Documentation/DocBook/media/dvb/examples.xml

View file

772

Documentation/DocBook/dvb/frontend.xml → Documentation/DocBook/media/dvb/frontend.xml

View file

23

Documentation/DocBook/dvb/intro.xml → Documentation/DocBook/media/dvb/intro.xml

View file

0

Documentation/DocBook/dvb/kdapi.xml → Documentation/DocBook/media/dvb/kdapi.xml

View file

17

Documentation/DocBook/dvb/net.xml → Documentation/DocBook/media/dvb/net.xml

View file

638

Documentation/DocBook/dvb/video.xml → Documentation/DocBook/media/dvb/video.xml

View file

398

Documentation/DocBook/media/dvbstb.png.b64

View file

447

Documentation/DocBook/media/fieldseq_bt.gif.b64

View file

445

Documentation/DocBook/media/fieldseq_tb.gif.b64

View file

37

Documentation/DocBook/media/nv12mt.gif.b64

View file

121

Documentation/DocBook/media/nv12mt_example.gif.b64

View file

213

Documentation/DocBook/media/pipeline.png.b64

View file

0

Documentation/DocBook/v4l/.gitignore → Documentation/DocBook/media/v4l/.gitignore vendored

View file

0

Documentation/DocBook/v4l/biblio.xml → Documentation/DocBook/media/v4l/biblio.xml

View file

0

Documentation/DocBook/v4l/capture.c.xml → Documentation/DocBook/media/v4l/capture.c.xml

View file

10

Documentation/DocBook/v4l/common.xml → Documentation/DocBook/media/v4l/common.xml

View file

30

Documentation/DocBook/v4l/compat.xml → Documentation/DocBook/media/v4l/compat.xml

View file

1267

Documentation/DocBook/v4l/controls.xml → Documentation/DocBook/media/v4l/controls.xml

View file

0

Documentation/DocBook/v4l/crop.pdf → Documentation/DocBook/media/v4l/crop.pdf

View file

0

Documentation/DocBook/v4l/dev-capture.xml → Documentation/DocBook/media/v4l/dev-capture.xml

View file

0

Documentation/DocBook/v4l/dev-codec.xml → Documentation/DocBook/media/v4l/dev-codec.xml

View file

0

Documentation/DocBook/v4l/dev-effect.xml → Documentation/DocBook/media/v4l/dev-effect.xml

View file

51

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

View file

0

Documentation/DocBook/v4l/dev-osd.xml → Documentation/DocBook/media/v4l/dev-osd.xml

View file

0

Documentation/DocBook/v4l/dev-output.xml → Documentation/DocBook/media/v4l/dev-output.xml

View file

0

Documentation/DocBook/v4l/dev-overlay.xml → Documentation/DocBook/media/v4l/dev-overlay.xml

View file

0

Documentation/DocBook/v4l/dev-radio.xml → Documentation/DocBook/media/v4l/dev-radio.xml

View file

0

Documentation/DocBook/v4l/dev-raw-vbi.xml → Documentation/DocBook/media/v4l/dev-raw-vbi.xml

View file

0

Documentation/DocBook/v4l/dev-rds.xml → Documentation/DocBook/media/v4l/dev-rds.xml

View file

0

Documentation/DocBook/v4l/dev-sliced-vbi.xml → Documentation/DocBook/media/v4l/dev-sliced-vbi.xml

View file

0

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

View file

0

Documentation/DocBook/v4l/dev-teletext.xml → Documentation/DocBook/media/v4l/dev-teletext.xml

View file

0

Documentation/DocBook/v4l/driver.xml → Documentation/DocBook/media/v4l/driver.xml

View file

0

Documentation/DocBook/v4l/fdl-appendix.xml → Documentation/DocBook/media/v4l/fdl-appendix.xml

View file

0

Documentation/DocBook/v4l/fieldseq_bt.pdf → Documentation/DocBook/media/v4l/fieldseq_bt.pdf

View file

0

Documentation/DocBook/v4l/fieldseq_tb.pdf → Documentation/DocBook/media/v4l/fieldseq_tb.pdf

View file

0

Documentation/DocBook/v4l/func-close.xml → Documentation/DocBook/media/v4l/func-close.xml

View file

79

Documentation/DocBook/media/v4l/func-ioctl.xml

View file

0

Documentation/DocBook/v4l/func-mmap.xml → Documentation/DocBook/media/v4l/func-mmap.xml

View file

0

Documentation/DocBook/v4l/func-munmap.xml → Documentation/DocBook/media/v4l/func-munmap.xml

View file

0

Documentation/DocBook/v4l/func-open.xml → Documentation/DocBook/media/v4l/func-open.xml

View file

0

Documentation/DocBook/v4l/func-poll.xml → Documentation/DocBook/media/v4l/func-poll.xml

View file

0

Documentation/DocBook/v4l/func-read.xml → Documentation/DocBook/media/v4l/func-read.xml

View file

0

Documentation/DocBook/v4l/func-select.xml → Documentation/DocBook/media/v4l/func-select.xml

View file

0

Documentation/DocBook/v4l/func-write.xml → Documentation/DocBook/media/v4l/func-write.xml

View file

78

Documentation/DocBook/media/v4l/gen-errors.xml

View file

0

Documentation/DocBook/v4l/io.xml → Documentation/DocBook/media/v4l/io.xml

View file

0

Documentation/DocBook/v4l/keytable.c.xml → Documentation/DocBook/media/v4l/keytable.c.xml

View file

0

Documentation/DocBook/v4l/libv4l.xml → Documentation/DocBook/media/v4l/libv4l.xml

View file

4

Documentation/DocBook/v4l/lirc_device_interface.xml → Documentation/DocBook/media/v4l/lirc_device_interface.xml

View file

0

Documentation/DocBook/v4l/media-controller.xml → Documentation/DocBook/media/v4l/media-controller.xml

View file

0

Documentation/DocBook/v4l/media-func-close.xml → Documentation/DocBook/media/v4l/media-func-close.xml

View file

47

Documentation/DocBook/v4l/media-func-ioctl.xml → Documentation/DocBook/media/v4l/media-func-ioctl.xml

View file

0

Documentation/DocBook/v4l/media-func-open.xml → Documentation/DocBook/media/v4l/media-func-open.xml

View file

3

Documentation/DocBook/v4l/media-ioc-device-info.xml → Documentation/DocBook/media/v4l/media-ioc-device-info.xml

View file

0

Documentation/DocBook/v4l/media-ioc-enum-entities.xml → Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml

View file

2

Documentation/DocBook/v4l/media-ioc-enum-links.xml → Documentation/DocBook/media/v4l/media-ioc-enum-links.xml

View file

9

Documentation/DocBook/v4l/media-ioc-setup-link.xml → Documentation/DocBook/media/v4l/media-ioc-setup-link.xml

View file

0

Documentation/DocBook/v4l/pipeline.pdf → Documentation/DocBook/media/v4l/pipeline.pdf

View file

0

Documentation/DocBook/v4l/pixfmt-grey.xml → Documentation/DocBook/media/v4l/pixfmt-grey.xml

View file

0

Documentation/DocBook/v4l/pixfmt-m420.xml → Documentation/DocBook/media/v4l/pixfmt-m420.xml

View file

0

Documentation/DocBook/v4l/pixfmt-nv12.xml → Documentation/DocBook/media/v4l/pixfmt-nv12.xml

View file

0

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

View file

0

Documentation/DocBook/v4l/pixfmt-nv12mt.xml → Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml

View file

0

Documentation/DocBook/v4l/pixfmt-nv16.xml → Documentation/DocBook/media/v4l/pixfmt-nv16.xml

View file

0

Documentation/DocBook/v4l/pixfmt-packed-rgb.xml → Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml

View file

0

Documentation/DocBook/v4l/pixfmt-packed-yuv.xml → Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml

View file

0

Documentation/DocBook/v4l/pixfmt-sbggr16.xml → Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml

View file

0

Documentation/DocBook/v4l/pixfmt-sbggr8.xml → Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml

View file

0

Documentation/DocBook/v4l/pixfmt-sgbrg8.xml → Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml

View file

0

Documentation/DocBook/v4l/pixfmt-sgrbg8.xml → Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml

View file

0

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

View file

0

Documentation/DocBook/v4l/pixfmt-srggb12.xml → Documentation/DocBook/media/v4l/pixfmt-srggb12.xml

View file

0

Documentation/DocBook/v4l/pixfmt-srggb8.xml → Documentation/DocBook/media/v4l/pixfmt-srggb8.xml

View file

0

Documentation/DocBook/v4l/pixfmt-uyvy.xml → Documentation/DocBook/media/v4l/pixfmt-uyvy.xml

View file

0

Documentation/DocBook/v4l/pixfmt-vyuy.xml → Documentation/DocBook/media/v4l/pixfmt-vyuy.xml

View file

0

Documentation/DocBook/v4l/pixfmt-y10.xml → Documentation/DocBook/media/v4l/pixfmt-y10.xml

View file

0

Documentation/DocBook/v4l/pixfmt-y10b.xml → Documentation/DocBook/media/v4l/pixfmt-y10b.xml

View file

0

Documentation/DocBook/v4l/pixfmt-y12.xml → Documentation/DocBook/media/v4l/pixfmt-y12.xml

View file

0

Documentation/DocBook/v4l/pixfmt-y16.xml → Documentation/DocBook/media/v4l/pixfmt-y16.xml

View file

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