David S. Miller 0c1072ae02 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/freescale/fec_main.c drivers/net/ethernet/renesas/sh_eth.c net/ipv4/gre.c The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list) and the splitting of the gre.c code into seperate files. The FEC conflict was two sets of changes adding ethtool support code in an "!CONFIG_M5272" CPP protected block. Finally the sh_eth.c conflict was between one commit add bits set in the .eesr_err_check mask whilst another commit removed the .tx_error_check member and assignments. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-07-03 14:55:13 -07:00
..
media	[media] DocBook/media/v4l: update version number	2013-06-08 20:24:00 -03:00
.gitignore	[media] DocBook: Add a chapter to describe media errors	2011-07-27 17:53:35 -03:00
80211.tmpl	wireless: fix kernel-doc	2013-06-05 09:33:32 +02:00
alsa-driver-api.tmpl	ALSA: Move ALSA docbooks to be with the rest of the kernel docbooks	2009-03-09 15:22:59 +01:00
debugobjects.tmpl	debugobjects: Extend to assert that an object is initialized	2011-11-23 18:49:22 +01:00
device-drivers.tmpl	tty: Documentation: fix a path in a DocBook template	2013-04-03 11:45:38 -07:00
deviceiobook.tmpl	docbook: change iomap source filename in deviceiobook	2012-01-23 08:44:54 -08:00
drm.tmpl	Merge branch 'drm/hdmi-for-3.9' of git://anongit.freedesktop.org/tegra/linux into drm-next	2013-02-24 12:39:42 +10:00
filesystems.tmpl	Documentation: get rid of write_super	2012-08-04 01:25:20 +04:00
gadget.tmpl	usb: gadget: Remove File-backed Storage Gadget (g_file_storage).	2012-11-08 16:01:04 +02:00
genericirq.tmpl	genirq: Update DocBook comments	2011-04-23 15:56:23 +02:00
kernel-api.tmpl	kstrto*: add documentation	2012-12-17 17:15:22 -08:00
kernel-hacking.tmpl	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-02-21 17:40:58 -08:00
kernel-locking.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03: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	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
media_api.tmpl	[media] soc_camera: Add RGB666 & RGB888 formats	2013-04-04 19:40:08 -03:00
mtdnand.tmpl	mtd: nand: remove NAND_BBT_SEARCH option	2012-07-06 18:17:04 +01: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	docbook: fix s390 fatal error after header files moved	2008-08-05 16:56:29 -07:00
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
writing_usb_driver.tmpl	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00
writing-an-alsa-driver.tmpl	ALSA: Make snd_BUG_ON() always evaluate and return the conditional expression	2013-03-11 09:33:34 +01:00
z8530book.tmpl	Rationalise Randy's address a bit	2008-10-30 11:38:47 -07:00