David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
media	Documentation: fix DOCBOOKS=... building	2014-05-23 09:37:30 -07:00
.gitignore	doc: Add "*.svg" to DocBook/.gitignore	2013-12-02 14:49:19 +01:00
80211.tmpl	cfg80211: refactor cfg80211_can_use_iftype_chan()	2014-04-09 10:55:39 +02:00
alsa-driver-api.tmpl
debugobjects.tmpl	debugobjects: Extend to assert that an object is initialized	2011-11-23 18:49:22 +01:00
device-drivers.tmpl	fbdev: move fbdev core files to separate directory	2014-04-17 08:10:19 +03:00
deviceiobook.tmpl	docbook: change iomap source filename in deviceiobook	2012-01-23 08:44:54 -08:00
drm.tmpl	drm: Split out drm_probe_helper.c from drm_crtc_helper.c	2014-04-18 13:21:17 +10:00
filesystems.tmpl	sysfs: merge regular and bin file handling	2013-10-05 17:27:40 -07:00
gadget.tmpl	usb: gadget: Remove File-backed Storage Gadget (g_file_storage).	2012-11-08 16:01:04 +02:00
genericirq.tmpl	irq: DocBook/genericirq.tmpl: Correct various typos	2013-10-19 10:25:17 +02:00
kernel-api.tmpl	DocBook: include !Emm/util.c in kernel-api to include, kzfree and more	2013-12-02 14:42:57 +01:00
kernel-hacking.tmpl	Merge branch 'akpm' (incoming from Andrew)	2014-04-07 16:38:06 -07:00
kernel-locking.tmpl	locking/doc: Update references to kernel/mutex.c	2013-11-11 12:41:33 +01:00
kgdb.tmpl	Documentation: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:03 -08:00
libata.tmpl	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
librs.tmpl
lsm.tmpl
Makefile	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2014-04-07 17:52:31 -07:00
media_api.tmpl	doc: DocBook: Fix typos in xml and template file	2014-03-13 00:14:22 +01:00
mtdnand.tmpl	mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES	2013-11-06 23:33:14 -08:00
networking.tmpl	docbook: networking: fix file paths for uapi headers	2012-10-15 08:04:41 -07:00
rapidio.tmpl	docbook: fix rapidio warning	2011-03-27 19:30:19 -07:00
regulator.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03:00
s390-drivers.tmpl
scsi.tmpl	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
sh.tmpl	sh: clkfwk: Kill off unused clk_set_rate_ex().	2010-11-15 18:25:12 +09:00
stylesheet.xsl	docbook: use IDs as filenames to support multiple books	2010-08-05 13:21:24 -07:00
tracepoint.tmpl	workqueue: Add a workqueue chapter to the tracepoint docbook	2010-08-27 12:27:36 +02:00
uio-howto.tmpl	uio-howto: example bug	2013-01-17 10:19:51 -08:00
usb.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03:00
w1.tmpl	w1: format for DocBook and fixes	2014-02-07 15:40:18 -08:00
writing_usb_driver.tmpl	doc: fix misspellings with 'codespell' tool	2013-05-28 12:02:12 +02:00
writing-an-alsa-driver.tmpl	ALSA: Mandate to pass a device pointer at card creation time	2014-02-12 10:58:20 +01:00
z8530book.tmpl