Jens Axboe b4b7a4ef09 Merge branch 'master' into for-linus ... Conflicts: block/Kconfig Signed-off-by: Jens Axboe <jens.axboe@oracle.com>		2010-03-19 08:05:10 +01:00
..
dvb	V4L/DVB (13164): DocBook/dvb: Starts documenting DVBS2API ioctls	2009-12-05 18:40:40 -02:00
v4l	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
.gitignore
alsa-driver-api.tmpl
debugobjects.tmpl
device-drivers.tmpl	docbook: fix errors from x86 headers merger	2010-03-03 07:32:39 -08:00
deviceiobook.tmpl	docbook: fix errors from x86 headers merger	2010-03-03 07:32:39 -08:00
filesystems.tmpl
gadget.tmpl
genericirq.tmpl	doc: Fix IRQ chip docs	2009-12-04 15:39:57 +01:00
kernel-api.tmpl
kernel-hacking.tmpl	docbook: fix signal_pending() argument	2009-12-09 18:59:52 -08:00
kernel-locking.tmpl
kgdb.tmpl
libata.tmpl
librs.tmpl
lsm.tmpl
mac80211.tmpl	mac80211: remove get_tx_stats() driver op	2010-02-08 16:51:01 -05:00
Makefile	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2009-12-16 10:09:16 -08:00
mcabook.tmpl
media-entities.tmpl	V4L/DVB (13572): v4l2-spec: Digital Video Timings API documentation	2009-12-16 00:18:04 -02:00
media-indices.tmpl	V4L/DVB (13572): v4l2-spec: Digital Video Timings API documentation	2009-12-16 00:18:04 -02:00
media.tmpl	DocBook/media: renamed xml documents to tmpl	2009-09-19 00:14:14 -03:00
mtdnand.tmpl	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
networking.tmpl
rapidio.tmpl
regulator.tmpl
s390-drivers.tmpl
scsi.tmpl	trivial: fix typos "man[ae]g?ment" -> "management"	2009-09-21 15:14:56 +02:00
sh.tmpl
stylesheet.xsl	DocBook: Don't use graphics callouts	2009-09-19 00:14:17 -03:00
tracepoint.tmpl	Add DocBook documentation for the block tracepoints.	2010-03-09 09:26:04 +01:00
uio-howto.tmpl	uio: add generic driver for PCI 2.3 devices	2009-09-15 09:50:48 -07:00
usb.tmpl
writing_usb_driver.tmpl
writing-an-alsa-driver.tmpl	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
z8530book.tmpl