David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/linux/netdevice.h net/core/sock.c Trivial merge issues. Removal of "extern" for functions declaration in netdevice.h at the same time "const" was added to an argument. Two parallel line additions in net/core/sock.c Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-08 23:07:53 -04:00
..
ABI	- factor out common code from MTD tests	2013-09-09 10:33:19 -07:00
accounting	Documentation/accounting/getdelays.c: avoid strncpy in accounting tool	2013-07-03 16:08:06 -07:00
acpi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-09-06 09:36:28 -07:00
aoe	aoe: remove do-nothing NAME="%k" term from example udev rules	2013-09-11 15:59:28 -07:00
arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-09-06 09:36:28 -07:00
arm64	arm64: documentation: tighten up tagged pointer documentation	2013-09-20 09:56:06 +01:00
auxdisplay
backlight
blackfin
block	block: change config option name for cmdline partition parsing	2013-09-30 14:31:02 -07:00
blockdev
bus-devices
cdrom
cgroups	memcg: document cgroup dirty/writeback memory statistics	2013-09-12 15:38:02 -07:00
connector	connector - documentation: simplify netlink message length assignment	2013-10-02 16:03:51 -04:00
console
cpu-freq	cpufreq: Drop the owner field from struct cpufreq_driver	2013-08-10 03:24:47 +02:00
cpuidle
cris
crypto	drivers/dma: remove unused support for MEMSET operations	2013-07-03 16:07:42 -07:00
development-process	Documentation: development-process: Update -mm and -next URLs	2013-07-25 12:37:24 +02:00
device-mapper	dm: add statistics support	2013-09-05 20:46:06 -04:00
devicetree	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
DocBook	- factor out common code from MTD tests	2013-09-09 10:33:19 -07:00
driver-model	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2013-09-10 13:37:36 -07:00
dvb
early-userspace	Documentation: remove reference to 2.7 kernel in early-userspace	2013-08-20 12:47:28 +02:00
EDID
extcon
fault-injection
fb	Documentation/fb/viafb.modes fix a typo	2013-08-20 12:41:11 +02:00
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-09-18 19:22:22 -05:00
firmware_class
fmc	doc: Fix typo "is is" in Documentations	2013-08-27 10:50:52 +02:00
frv
hid	HID: uhid: use generic hidinput_input_event()	2013-07-31 10:33:05 +02:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2013-09-07 10:54:19 -07:00
i2c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-09-06 09:36:28 -07:00
i2o
ia64
ide
infiniband
input	Merge branch 'master' into for-3.12/upstream	2013-09-04 10:49:57 +02:00
ioctl	s390/sclp: Add SCLP character device driver	2013-06-26 21:10:13 +02:00
isdn
ja_JP	HOWTO ja_JP sync	2013-07-24 22:06:34 -07:00
kbuild	kconfig: do not allow more than one symbol to have 'option modules'	2013-09-05 11:10:08 +02:00
kdump	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
ko_KR	Correct unfaithful translation on HOWTO in ko_KR	2013-08-12 17:43:13 -07:00
laptops	platform / thinkpad: Remove deprecated hotkey_report_mode parameter	2013-07-15 13:57:00 +02:00
leds	Documentation: leds-lp5521,lp5523: update device attribute information	2013-08-26 17:22:13 -07:00
m68k
make
memory-devices
metag
mips
misc-devices
mmc
mn10300
mtd	doc: Fix typo "is is" in Documentations	2013-08-27 10:50:52 +02:00
namespaces
netlabel
networking	bonding: document the new xmit policy modes and update the changed ones	2013-10-03 15:36:38 -04:00
nfc
parisc	parisc: document the shadow registers	2013-07-09 22:09:19 +02:00
PCI
pcmcia
power	power: Documentation: Update s2ram link	2013-08-27 10:54:52 +02:00
powerpc	powerpc: Update the 00-Index in Documentation/powerpc	2013-08-27 14:44:27 +10:00
pps
prctl
pti
ptp	ptp: add the PTP_SYS_OFFSET ioctl to the testptp program	2013-09-23 16:46:17 -04:00
rapidio	doc: Fix typo in doucmentations	2013-07-25 12:34:15 +02:00
RCU	Merge branches 'doc.2013.08.19a', 'fixes.2013.08.20a', 'sysidle.2013.08.31a' and 'torture.2013.08.20a' into HEAD	2013-08-31 14:44:45 -07:00
s390
scheduler	sched/Documentation: Update sched-design-CFS.txt documentation	2013-09-12 19:14:17 +02:00
scsi	SCSI misc on 20130915	2013-09-15 17:41:30 -04:00
security
serial
sh
sound	ALSA: hda - Add documentation for CS4208 fixups	2013-09-27 10:19:31 +02:00
spi	spi/documentation: Fix usage of __initdata	2013-08-20 12:52:28 +02:00
sysctl	coredump: add new %P variable in core_pattern	2013-09-11 15:59:01 -07:00
target	Documentation: replace strict_strtoul() with kstrtoul()	2013-08-20 12:56:26 +02:00
thermal	thermal: thermal_core: allow binding with limits on bind_params	2013-09-03 09:10:24 -04:00
timers	nohz_full: Add testing information to documentation	2013-08-18 18:06:55 -07:00
tpm	drivers/tpm: add xen tpmfront interface	2013-08-09 10:57:06 -04:00
trace	Documentation/trace: Correcting and extending tracepoint documentation	2013-08-27 10:57:11 +02:00
usb	proc_usb_info.txt: Correct documentation about endianness of config descriptors	2013-08-12 12:24:27 -07:00
vDSO
video4linux	[media] V4L: Add support for integer menu controls with standard menu items	2013-08-18 07:12:59 -03:00
virtual	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-09-06 09:36:28 -07:00
vm	mm: track vma changes with VM_SOFTDIRTY bit	2013-09-11 15:57:56 -07:00
w1	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
watchdog	watchdog: delete mpcore_wdt driver	2013-07-11 21:47:58 +02:00
wimax
x86	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-09-06 09:36:28 -07:00
xtensa
zh_CN	Documentation/zh_CN/SubmittingPatches fix a typo	2013-08-20 12:41:25 +02:00
.gitignore
00-INDEX	doc: fix a typo in Documentation/00-INDEX	2013-08-27 10:53:07 +02:00
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
bcache.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt	Documentation: fix typo and update version in cachetlb.txt	2013-08-20 12:46:52 +02:00
Changes
circular-buffers.txt
clk.txt	clk: add support for clock reparent on set_rate	2013-08-19 12:27:17 -07:00
coccinelle.txt	Coccinelle: Update information about the minimal version required	2013-07-03 22:58:20 +02:00
CodingStyle	Documentation/CodingStyle: allow multiple return statements per function	2013-07-03 16:08:01 -07:00
cpu-hotplug.txt	kernel: delete __cpuinit usage from all core kernel files	2013-07-14 19:36:59 -04:00
cpu-load.txt
cputopology.txt	doc: Documentation/cputopology.txt fix typo	2013-09-04 12:59:47 +02:00
crc32.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt	/dev/oldmem: Remove the interface	2013-07-03 16:08:03 -07:00
digsig.txt
DMA-API-HOWTO.txt
DMA-API.txt
DMA-attributes.txt
dma-buf-sharing.txt	dma-buf: Expose buffer size to userspace (v2)	2013-09-10 11:36:45 +05:30
DMA-ISA-LPC.txt
dmaengine.txt
dmatest.txt	dmatest: make module parameters writable	2013-08-22 22:57:32 -07:00
dontdiff
dynamic-debug-howto.txt
edac.txt
eisa.txt
email-clients.txt
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt
highuid.txt
HOWTO
hw_random.txt
hwspinlock.txt	doc: documentation/hwspinlock.txt fix typo	2013-08-27 10:46:02 +02:00
init.txt
initrd.txt
Intel-IOMMU.txt
intel_txt.txt
io-mapping.txt
io_ordering.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt	doc: fix a typo about irq affinity	2013-08-20 12:59:18 +02:00
IRQ-domain.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt
kernel-parameters.txt	block: change config option name for cmdline partition parsing	2013-09-30 14:31:02 -07:00
kernel-per-CPU-kthreads.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
kmemcheck.txt	Documentation/kmemcheck: update kmemcheck documentation	2013-08-27 10:47:05 +02:00
kmemleak.txt
kobject.txt
kprobes.txt
kref.txt
ldm.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
lockup-watchdogs.txt
logo.gif
logo.txt
magic-number.txt
Makefile
ManagementStyle
md.txt	md: remove doubled description for sync_max, merging it within sync_min/sync_max	2013-07-03 09:43:28 +10:00
media-framework.txt	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-07-13 12:09:57 -07:00
memory-barriers.txt	doc: Fix memory-barrier control-dependency example	2013-08-19 21:39:42 -07:00
memory-hotplug.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-09-06 09:36:28 -07:00
mono.txt
mutex-design.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt
parport-lowlevel.txt
parport.txt
percpu-rw-semaphore.txt
pi-futex.txt
pinctrl.txt	Documentation: pinctrl: Fix example code for pinctrl_register	2013-08-23 08:56:28 +02:00
pnp.txt
preempt-locking.txt
printk-formats.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-09-06 09:36:28 -07:00
pwm.txt	pwm: Add sysfs interface	2013-06-21 11:32:51 +02:00
ramoops.txt
rbtree.txt
remoteproc.txt
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rpmsg.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt	rtc: add ability to push out an existing wakealarm using sysfs	2013-07-03 16:07:54 -07:00
SAK.txt
SecurityBugs
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
smsc_ece1099.txt
sparse.txt
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
static-keys.txt
SubmitChecklist
SubmittingDrivers
SubmittingPatches	Documentation/SubmittingPatches: Request summaries for commit references	2013-08-20 12:58:15 +02:00
svga.txt
sysfs-rules.txt	doc: Fix typo in doucmentations	2013-07-25 12:34:15 +02:00
sysrq.txt
this_cpu_ops.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
vfio.txt	vfio: fix documentation	2013-09-05 16:36:21 -06:00
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
vme_api.txt
volatile-considered-harmful.txt
workqueue.txt	workqueue: Correct/Drop references to gcwq in Documentation	2013-08-21 10:32:09 -04:00
ww-mutex-design.txt	mutex: Add support for wound/wait style locks	2013-06-26 12:10:56 +02:00
xz.txt
zorro.txt