Linus Torvalds 0e51793e16 Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm ... Pull ARM updates from Russell King: "This is the first chunk of ARM updates for this merge window. Conflicts are expected in two files - asm/timex.h and mach-integrator/integrator_cp.c. Nothing particularly stands out more than anything else. Most of the growth is down to the opcodes stuff from Dave Martin, which is countered by Rob's patches to use more of the asm-generic headers on ARM." (A few more conflicts grew since then, but it all looked fairly trivial) * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (44 commits) ARM: 7548/1: include linux/sched.h in syscall.h ARM: 7541/1: Add ARM ERRATA 775420 workaround ARM: ensure vm_struct has its phys_addr member filled in ARM: 7540/1: kexec: Check segment memory addresses ARM: 7539/1: kexec: scan for dtb magic in segments ARM: 7538/1: delay: add registration mechanism for delay timer sources ARM: 7536/1: smp: Formalize an IPI for wakeup ARM: 7525/1: ptrace: use updated syscall number for syscall auditing ARM: 7524/1: support syscall tracing ARM: 7519/1: integrator: convert platform devices to Device Tree ARM: 7518/1: integrator: convert AMBA devices to device tree ARM: 7517/1: integrator: initial device tree support ARM: 7516/1: plat-versatile: add DT support to FPGA IRQ ARM: 7515/1: integrator: check PL010 base address from resource ARM: 7514/1: integrator: call common init function from machine ARM: 7522/1: arch_timers: register a time/cycle counter ARM: 7523/1: arch_timers: enable the use of the virtual timer ARM: 7531/1: mark kernelmode mem{cpy,set} non-experimental ARM: 7520/1: Build dtb files in all target ARM: Fix build warning in arch/arm/mm/alignment.c ...		2012-10-07 21:20:57 +09:00
..
ABI	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-10-02 21:38:48 -07:00
accounting	doc: getdelays.c: remember to close() socket on error in create_nl_socket()	2012-09-01 09:58:59 -07:00
acpi	Update documentation for parameter *notrigger* in einj.txt	2012-03-30 03:30:19 -04:00
aoe	aoe: update documentation to better reflect aoe-plus-udev usage	2012-10-06 03:05:30 +09:00
arm	ARM: soc: documentation updates	2012-10-01 18:56:31 -07:00
arm64	arm64: MMU definitions	2012-09-17 13:41:56 +01: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	Documentation: update tunable options in block/cfq-iosched.txt	2012-08-09 15:28:05 +02:00
blockdev	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
cdrom
cgroups	cgroup: trivial fixes for Documentation/cgroups/cgroups.txt	2012-09-13 11:10:54 -07:00
connector	connector: Move cn_test.c away from NLMSG_PUT().	2012-06-26 21:19:02 -07:00
console
cpu-freq	acpi-cpufreq: Add support for disabling dynamic overclocking	2012-09-09 22:05:12 +02:00
cpuidle	Honor state disabling in the cpuidle ladder governor	2012-09-04 01:35:44 +02:00
cris	CRIS: Update documentation	2012-04-03 13:09:18 +02:00
crypto
development-process
device-mapper	Merge branch 'for-next' of git://neil.brown.name/md	2012-08-01 09:02:01 -07:00
devicetree	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-10-07 21:20:57 +09:00
DocBook	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-10-07 17:49:05 +09:00
driver-model	Pin control subsystem changes for kernel 3.5:	2012-05-21 16:58:23 -07:00
dvb	get_dvb_firmware: fix download site for tda10046 firmware	2012-09-28 16:16:00 -03:00
early-userspace
EDID	drm: allow loading an EDID as firmware to override broken monitor	2012-03-20 10:09:28 +00:00
extcon	Documentation/extcon: porting guide for Android kernel switch driver.	2012-04-20 09:24:27 -07:00
fault-injection	fault-injection: add tool to run command with failslab or fail_page_alloc	2012-07-30 17:25:22 -07:00
fb	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
filesystems	JFS TRIM support and some minor fixes	2012-10-03 08:48:21 -07:00
firmware_class
frv
hid	HID: sensors: add documentation	2012-09-06 19:11:04 +01:00
hwmon	hwmon: (mcp3021) Add MCP3221 support	2012-09-23 21:08:36 -07:00
i2c	i2c-i801: Add Device IDs for Intel Lynx Point-LP PCH	2012-09-10 10:14:02 +02:00
i2o	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
ia64	doc: aliasing-test: close fd on write error	2012-09-01 09:57:10 -07:00
ide	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
infiniband	IB/ipoib: Add rtnl_link_ops support	2012-09-20 16:49:17 -04:00
input	Input: add driver for FT5x06 based EDT displays	2012-07-24 23:55:03 -07:00
ioctl	ioctl-number.txt: Remove legacy private ioctl's from media drivers	2012-08-14 00:07:39 -03:00
isdn	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
ja_JP
kbuild	UAPI: Remove the objhdr-y export list	2012-10-02 18:01:56 +01:00
kdump	kexec: update URL of kexec homepage	2012-07-18 18:35:57 -07:00
ko_KR	driver-core: documentation: fix up Greg's email address	2012-02-15 14:48:01 -08:00
laptops	Documentation: fix the VM knobs descritpion WRT pdflush	2012-08-04 12:15:09 +04:00
leds	LEDS: add BlinkM RGB LED driver, documentation and update MAINTAINERS	2012-07-24 16:00:51 +08:00
m68k
make
memory-devices	memory: emif: add basic infrastructure for EMIF driver	2012-05-02 00:10:49 -07:00
mips
misc-devices	lis3lv02d: Add STMicroelectronics lis331dlh digital accelerometer	2012-09-05 13:44:04 -07:00
mmc	mmc: core: Fixup delayed work clock gating patch	2012-01-11 23:58:43 -05:00
mn10300
mtd
namespaces
netlabel
networking	vxlan: virtual extensible lan	2012-10-01 18:39:45 -04:00
nfc	NFC: Error management documentation	2012-07-09 16:42:11 -04:00
parisc	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
PCI
pcmcia
power	1. New drivers:	2012-10-07 17:29:24 +09: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	security: Minor improvements to no_new_privs documentation	2012-07-08 00:25:48 +10:00
pti
ptp
rapidio
RCU	Merge branches 'bigrt.2012.09.23a', 'doctorture.2012.09.23a', 'fixes.2012.09.23a', 'hotplug.2012.09.23a' and 'idlechop.2012.09.23a' into HEAD	2012-09-24 20:02:22 -07:00
s390	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
scheduler	sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW	2012-09-13 16:52:04 +02:00
scsi	[SCSI] qla4xxx: update copyrights in LICENSE.qla4xxx	2012-09-24 12:41:34 +04:00
security	Documentation: Update git repository URL for Smack userland tools	2012-09-26 09:24:06 -07:00
serial	firmware: remove computone driver firmware and documentation	2012-08-16 12:31:18 -07:00
sh
sound	Sound fixes for 3.6-rc1	2012-08-01 10:42:26 -07:00
spi	spi: Updates for v3.7	2012-10-02 17:26:42 -07:00
sysctl	coredump: add support for %d=__get_dumpable() in core name	2012-10-06 03:05:15 +09:00
target	Documentation: Fix typo in tcm_mod_builder.py	2012-02-10 09:52:18 +01:00
telephony
thermal	Thermal: Documentation update	2012-07-24 23:20:40 -04:00
timers
trace	doc: fix old config name of kprobetrace	2012-09-27 12:11:29 +02:00
usb	usb: add decriptor of persist fail for some morph usb devices	2012-08-10 12:06:39 -07:00
vDSO
video4linux	[media] v4l2-ctrls: add a filter function to v4l2_ctrl_add_handler	2012-10-01 17:07:07 -03:00
virtual	KVM: Add resampling irqfds for level triggered interrupts	2012-09-23 13:50:15 +02:00
vm	hugetlb: update hugetlbpage.txt	2012-08-21 16:45:03 -07:00
w1	1-Wire: Add support for the maxim ds1825 temperature sensor	2012-08-16 12:33:59 -07:00
watchdog	watchdog: fix watchdog-test.c build warning	2012-08-29 17:12:58 +02:00
wimax
x86	x86/mce: Provide boot argument to honour bios-set CMCI threshold	2012-09-27 10:08:00 -07:00
zh_CN	Documentation: Fixes some translation error in Documentation/zh_CN/gpio.txt	2012-09-26 13:12:32 -07:00
.gitignore
00-INDEX	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt
Changes
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
CodingStyle	CodingStyle: add networking specific block comment style	2012-10-06 03:04:59 +09: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	Doc: document max raw dev number	2012-06-03 12:05:50 +02:00
digsig.txt
DMA-API-HOWTO.txt
DMA-API.txt
DMA-attributes.txt	common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute	2012-07-30 12:25:47 +02:00
dma-buf-sharing.txt	dma-buf: add initial vmap documentation	2012-05-25 12:51:11 +05:30
DMA-ISA-LPC.txt
dmaengine.txt	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
dontdiff	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
dynamic-debug-howto.txt	dynamic_debug: update Documentation/*, Kconfig.debug	2012-04-30 16:26:30 -04:00
edac.txt	Merge branch 'devel'	2012-07-29 21:11:05 -03:00
eisa.txt	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
email-clients.txt
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
HOWTO	docs: update HOWTO for 2.6.x -> 3.x versioning	2012-04-19 19:13:08 -07:00
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-IOMMU.txt
intel_txt.txt
io-mapping.txt
io_ordering.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ-domain.txt	irq_domain: Standardise legacy/linear domain selection	2012-07-11 14:59:17 +01:00
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt
kernel-parameters.txt	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-10-02 21:38:48 -07:00
kmemcheck.txt
kmemleak.txt
kobject.txt	Documentation: Fix "struct kobj_type" to include newer members.	2012-09-04 16:06:34 -07: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
Makefile	mei: move doc files Documentation/misc-devices/mei	2012-05-09 13:59:09 -07:00
ManagementStyle	Documentation: ManagementStyle: fixed typo	2012-06-28 12:03:15 +02:00
md.txt
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: document semantics vs GPIO	2012-09-17 10:53:57 +02:00
pnp.txt
preempt-locking.txt
printk-formats.txt	lib/vsprintf: update documentation to cover all of %p[Mm][FR]	2012-10-06 03:04:50 +09:00
prio_tree.txt
pwm.txt	pwm: Add table-based lookup for static mappings	2012-06-15 12:56:53 +02:00
ramoops.txt	pstore/ftrace: Convert to its own enable/disable debugfs knob	2012-09-06 22:16:58 -07:00
rbtree.txt
remoteproc.txt	remoteproc: add rproc_report_crash function to notify rproc crashes	2012-09-18 12:53:22 +03: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	rtc-proc: permit the /proc/driver/rtc device to use other devices	2012-10-06 03:05:01 +09:00
SAK.txt
SecurityBugs
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
smsc_ece1099.txt	mfd: smsc: Add support for smsc gpio io/keypad driver	2012-10-01 15:27:48 +02:00
sparse.txt
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt	stable: Allow merging of backports for serious user-visible performance issues	2012-06-25 12:11:58 -07:00
static-keys.txt	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
SubmitChecklist
SubmittingDrivers
SubmittingPatches	Documentation/SubmittingPatches: suggested the use of scripts/get_maintainer.pl	2012-05-25 16:18:30 +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
vfio.txt	vfio: Trivial Documentation correction	2012-09-21 10:48:03 -06:00
VGA-softcursor.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	workqueue: reimplement WQ_HIGHPRI using a separate worker_pool	2012-07-13 22:24:45 -07:00
xz.txt
zorro.txt