David S. Miller 7e52b33bd5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv6/route.c This deals with a merge conflict between the net-next addition of the inetpeer network namespace ops, and Thomas Graf's bug fix in 2a0c451ade which makes sure we don't register /proc/net/ipv6_route before it is actually safe to do so. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-15 15:51:55 -07:00
..
ABI	- More robust parsing especially of xattr data in JFFS2	2012-06-01 16:55:42 -07:00
DocBook	- More robust parsing especially of xattr data in JFFS2	2012-06-01 16:55:42 -07:00
EDID	drm: allow loading an EDID as firmware to override broken monitor	2012-03-20 10:09:28 +00:00
PCI	…
RCU	rcu: Introduce rcutorture testing for rcu_barrier()	2012-04-30 10:48:18 -07:00
accounting	…
acpi	Update documentation for parameter *notrigger* in einj.txt	2012-03-30 03:30:19 -04:00
aoe	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
arm	fbdev updates for 3.5	2012-06-01 16:57:51 -07:00
auxdisplay	…
backlight	backlight: new backlight driver for LP855x devices	2012-03-23 16:58:33 -07:00
blackfin	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
block	…
blockdev	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
cdrom	…
cgroups	memcg: move charges to root cgroup if use_hierarchy=0	2012-05-29 16:22:27 -07:00
connector	…
console	…
cpu-freq	…
cpuidle	cpuidle: add a sysfs entry to disable specific C state for debug purpose.	2012-03-30 01:52:58 -04:00
cris	CRIS: Update documentation	2012-04-03 13:09:18 +02:00
crypto	…
development-process	Documentation: Update stable address	2011-12-12 14:14:31 -08:00
device-mapper	dm thin: provide userspace access to pool metadata	2012-06-03 00:30:01 +01:00
devicetree	i2c: Add generic I2C multiplexer using pinctrl API	2012-06-04 16:49:43 +02:00
driver-model	Pin control subsystem changes for kernel 3.5:	2012-05-21 16:58:23 -07:00
dvb	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-05-24 10:21:51 -07:00
early-userspace	…
extcon	Documentation/extcon: porting guide for Android kernel switch driver.	2012-04-20 09:24:27 -07:00
fault-injection	…
fb	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-06-01 10:34:35 -07:00
firmware_class	…
frv	…
hid	…
hwmon	hwmon updates for 3.5-rc1	2012-05-23 14:15:09 -07:00
i2c	i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING	2012-05-30 10:55:34 +02:00
i2o	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
ia64	…
ide	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
infiniband	…
input	Documentation: input.txt: clarify mousedev 'cat' command syntax	2012-03-30 16:03:15 -07:00
ioctl	mei: update Documentation/ioctl/ioctl-number.txt	2012-05-09 14:00:31 -07:00
isdn	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
ja_JP	…
kbuild	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-05-28 10:37:56 -07:00
kdump	[S390] Add s390x description to Documentation/kdump/kdump.txt	2011-12-27 11:27:13 +01:00
ko_KR	driver-core: documentation: fix up Greg's email address	2012-02-15 14:48:01 -08:00
laptops	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
leds	leds: add new transient trigger for one shot timer activation	2012-05-29 16:22:32 -07:00
m68k	…
make	…
memory-devices	memory: emif: add basic infrastructure for EMIF driver	2012-05-02 00:10:49 -07:00
mips	…
misc-devices	mei: Documentation: add generated example binary into .gitignore file	2012-05-14 15:43:44 -07:00
mmc	mmc: core: Fixup delayed work clock gating patch	2012-01-11 23:58:43 -05:00
mn10300	…
mtd	…
namespaces	…
netlabel	…
networking	ipv4: Add interface option to enable routing of 127.0.0.0/8	2012-06-12 15:25:46 -07:00
nfc	NFC: Update Documentation/nfc-hci.txt	2012-05-15 17:28:01 -04:00
parisc	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
pcmcia	…
power	A bunch of fixes for v3.5, nothing extraordinary.	2012-05-31 12:10:15 -07:00
powerpc	Revert "powerpc/hw-breakpoint: Use generic hw-breakpoint interfaces for new PPC ptrace flags"	2012-05-22 14:37:24 +10:00
pps	…
prctl	Documentation: prctl/seccomp_filter	2012-04-14 11:13:22 +10:00
pti	…
ptp	…
rapidio	…
s390	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
scheduler	sched: Remove stale power aware scheduling remnants and dysfunctional knobs	2012-05-17 13:48:56 +02:00
scsi	Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2012-05-23 17:12:06 -07:00
security	Smack: allow for significantly longer Smack labels v4	2012-05-14 22:48:38 -07:00
serial	serial: delete the MCA specific 8250 support.	2012-05-17 19:02:14 -04:00
sh	…
sound	Sound updates for 3.5-rc1	2012-05-23 13:05:43 -07:00
spi	spi: create a message queueing infrastructure	2012-03-07 19:19:48 -07:00
sysctl	mqueue: separate mqueue default value from maximum value	2012-05-31 17:49:31 -07:00
target	Documentation: Fix typo in tcm_mod_builder.py	2012-02-10 09:52:18 +01:00
telephony	…
thermal	thermal: Rename generate_netlink_event	2012-01-23 03:15:25 -05:00
timers	…
trace	tracing: Fix kconfig warning due to a typo	2012-05-08 14:17:25 +02:00
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-05-22 19:22:50 -07:00
vDSO	…
video4linux	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-05-24 10:21:51 -07:00
virtual	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
vm	Frontswap provides a "transcendent memory" interface for swap pages.	2012-06-04 12:28:45 -07:00
w1	…
watchdog	Watchdog: DA9052/53 PMIC watchdog support	2012-05-30 07:56:12 +02:00
wimax	…
x86	x86, efi: Add EFI boot stub documentation	2012-06-01 09:11:41 -07:00
zh_CN	Fix a mistake sentence in the file 'Documentation/zh_CN/magic-number.txt'	2012-05-07 17:20:27 -07:00
.gitignore	…
00-INDEX	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
BUG-HUNTING	…
Changes	…
CodingStyle	CodingStyle: add kmalloc_array() to memory allocators	2012-05-31 17:49:26 -07:00
DMA-API-HOWTO.txt	…
DMA-API.txt	…
DMA-ISA-LPC.txt	…
DMA-attributes.txt	common: DMA-mapping: add NON-CONSISTENT attribute	2012-03-28 16:36:44 +02:00
HOWTO	docs: update HOWTO for 2.6.x -> 3.x versioning	2012-04-19 19:13:08 -07:00
IPMI.txt	…
IRQ-affinity.txt	…
IRQ-domain.txt	irq_domain: add documentation and MAINTAINERS entry.	2012-02-14 14:06:47 -07:00
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	mei: move doc files Documentation/misc-devices/mei	2012-05-09 13:59:09 -07:00
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	…
SubmittingPatches	Documentation/SubmittingPatches: suggested the use of scripts/get_maintainer.pl	2012-05-25 16:18:30 +02:00
VGA-softcursor.txt	…
applying-patches.txt	…
atomic_ops.txt	doc: Add load/store guarantees to Documentation/atomic-ops.txt	2011-12-11 10:31:58 -08:00
bad_memory.txt	…
basic_profiling.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	…
circular-buffers.txt	…
clk.txt	Documentation: common clk API	2012-03-16 20:35:01 +00:00
coccinelle.txt	coccinelle.txt: update documentation to include M= option	2012-01-14 22:25:56 +01:00
cpu-hotplug.txt	documentation: remove references to cpu_*_map.	2012-03-29 15:38:31 +10:30
cpu-load.txt	…
cputopology.txt	…
crc32.txt	crc32: move long comment about crc32 fundamentals to Documentation/	2012-03-23 16:58:37 -07:00
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	…
devices.txt	Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2012-05-23 17:12:06 -07:00
digsig.txt	…
dma-buf-sharing.txt	dma-buf: add initial vmap documentation	2012-05-25 12:51:11 +05:30
dmaengine.txt	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
dontdiff	Documentation: remove 'mach' from dontdiff file	2012-03-30 16:03:15 -07:00
dynamic-debug-howto.txt	dynamic_debug: update Documentation/*, Kconfig.debug	2012-04-30 16:26:30 -04:00
edac.txt	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
eisa.txt	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
email-clients.txt	…
feature-removal-schedule.txt	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-06-12 14:25:04 -04:00
flexible-arrays.txt	…
futex-requeue-pi.txt	…
gcov.txt	…
gpio.txt	gpio: add flags to export GPIOs when requesting	2012-04-05 21:24:06 -07:00
highuid.txt	…
hw_random.txt	…
hwspinlock.txt	…
init.txt	…
initrd.txt	Documentation/initrd.txt: Change the location of util-linux	2012-05-25 16:18:34 +02:00
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	…
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	…
kernel-docs.txt	…
kernel-parameters.txt	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-06-04 11:25:31 -07:00
kmemcheck.txt	…
kmemleak.txt	…
kobject.txt	driver-core: documentation: fix up Greg's email address	2012-02-15 14:48:01 -08:00
kprobes.txt	…
kref.txt	…
ldm.txt	…
local_ops.txt	…
lockdep-design.txt	…
lockstat.txt	…
lockup-watchdogs.txt	watchdog: Update documentation	2012-02-11 15:11:28 +01:00
logo.gif	…
logo.txt	…
magic-number.txt	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
md.txt	md: create externally visible flags for supporting hot-replace.	2011-12-23 10:17:51 +11:00
media-framework.txt	[media] media: Add link_validate() op to check links to the sink pad	2012-05-14 08:44:11 -03:00
memory-barriers.txt	…
memory-hotplug.txt	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
memory.txt	…
mono.txt	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
mutex-design.txt	…
nommu-mmap.txt	…
numastat.txt	Doc: Update numastat.txt	2012-02-28 16:05:06 +01:00
oops-tracing.txt	…
padata.txt	…
parport-lowlevel.txt	…
parport.txt	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
pi-futex.txt	…
pinctrl.txt	pinctrl: implement devm_pinctrl_get()/put()	2012-04-18 13:53:13 +02:00
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	…
prio_tree.txt	…
ramoops.txt	pstore/ram: Add ECC support	2012-05-17 08:51:59 -07:00
rbtree.txt	…
remoteproc.txt	remoteproc: remove the single rpmsg vdev limitation	2012-03-06 19:14:12 +02:00
rfkill.txt	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rpmsg.txt	rpmsg: add virtio-based remote processor messaging bus	2012-02-08 22:53:58 +02:00
rt-mutex-design.txt	…
rt-mutex.txt	…
rtc.txt	…
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
sparse.txt	…
spinlocks.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	stable: update documentation to ask for kernel version	2012-01-24 10:50:22 -08:00
static-keys.txt	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	Documentation: sysrq: Crutcher Dunnavant is unavailable	2012-03-30 16:03:15 -07:00
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vgaarbiter.txt	misc latin1 to utf8 conversions	2012-01-02 13:04:55 +01:00
video-output.txt	…
vme_api.txt	VME: Move API documentation to Documentation folder	2012-05-08 16:01:34 -07:00
volatile-considered-harmful.txt	…
workqueue.txt	…
xz.txt	…
zorro.txt	…