Linus Torvalds 2cf4d4514d Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits) MAINTAINERS: EB110ATX is not ebsa110 MAINTAINERS: update Eric Miao's email address and status fb: add support of LCD display controller on pxa168/910 (base layer) [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines [ARM] 5544/1: Trust PrimeCell resource sizes [ARM] pxa/sharpsl_pm: cleanup of gpio-related code. [ARM] pxa/sharpsl_pm: drop set_irq_type calls [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific [ARM] sa1100: remove unused collie_pm.c [ARM] pxa: fix the conflicting non-static declarations of global_gpios[] [ARM] 5550/1: Add default configure file for w90p910 platform [ARM] 5549/1: Add clock api for w90p910 platform. [ARM] 5548/1: Add gpio api for w90p910 platform [ARM] 5551/1: Add multi-function pin api for w90p910 platform. [ARM] Make ARM_VIC_NR depend on ARM_VIC [ARM] 5546/1: ARM PL022 SSP/SPI driver v3 ARM: OMAP4: SMP: Update defconfig for OMAP4430 ARM: OMAP4: SMP: Enable SMP support for OMAP4430 ...		2009-06-14 13:42:43 -07:00
..
ABI	Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block	2009-06-11 11:10:35 -07:00
accounting	Documentation/accounting/getdelays.c: fix endless loop	2009-01-15 16:39:37 -08:00
acpi	ACPI: update debug parameter documentation	2008-11-07 21:45:29 -05:00
aoe
arm	[ARM] S3C24XX: GPIO: Change to macros for GPIO numbering	2009-05-18 16:26:03 +01:00
auxdisplay	.gitignore updates	2008-10-30 11:38:45 -07:00
blackfin	Blackfin arch: Add document about bfin-gpio	2009-01-07 23:14:38 +08:00
block	Removed reference to non-existing file Documentation/PCI/PCI-DMA-mapping.txt	2009-06-02 14:52:32 +02:00
blockdev	mflash: initial support	2009-04-07 08:12:38 +02:00
cdrom	doc/cdrom: Trvial documentation error, file not present	2008-10-10 08:22:44 +02:00
cgroups	memcg: fix documentation	2009-04-13 15:04:33 -07:00
connector	Documentation/connector/cn_test.c: don't use gfp_any()	2009-02-12 16:47:01 -08:00
console
cpu-freq	[CPUFREQ] ondemand/conservative: sanitize sampling_rate restrictions	2009-02-24 22:47:31 -05:00
cpuidle
cris	fix random typos	2008-10-16 11:21:30 -07:00
crypto	async_tx, dmaengine: document channel allocation and api rework	2009-01-05 18:10:19 -07:00
development-process	docs: Encourage better changelogs in the development process document	2009-06-04 10:32:49 -06:00
device-mapper	dm crypt: add documentation	2008-04-25 13:27:03 +01:00
DocBook	Merge commit 'v2.6.30-rc6' into tracing/core	2009-05-18 10:15:35 +02:00
driver-model	Driver Core: early platform driver	2009-04-16 16:17:10 -07:00
dvb	V4L/DVB (11138): get_dvb_firmware: add support for downloading the cx2584x firmware for pvrusb2	2009-03-30 12:43:31 -03:00
early-userspace	Documentation: Remove last references to BitKeeper.	2008-04-21 22:19:05 +00:00
fault-injection
fb	uvesafb: documentation update	2009-04-07 08:31:09 -07:00
filesystems	Merge branch 'docs-next' of git://git.lwn.net/linux-2.6	2009-06-13 13:08:34 -07:00
firmware_class	firmware_sample_driver.c: fix coding style	2008-04-21 22:23:30 +00:00
frv
hwmon	hwmon: Update documentation on fan_max	2009-06-01 13:46:50 +02:00
i2c	i2c-ocores: Can add I2C devices to the bus	2009-06-13 10:39:28 +01:00
i2o
ia64	trivial: Fix misspelling of firmware	2009-03-30 15:21:59 +02:00
ide	ide: preserve Host Protected Area by default (v2)	2009-06-07 13:52:52 +02:00
infiniband	IPoIB: Document newish features	2009-04-08 13:52:01 -07:00
input	Input: multitouch - augment event semantics documentation	2009-05-23 09:53:26 -07:00
ioctl	V4L/DVB (10870a): remove all references for video_decoder.h	2009-03-30 12:43:15 -03:00
isdn	Add reference to CAPI 2.0 standard	2009-04-27 05:37:39 -07:00
ja_JP	Sync patch for jp_JP/stable_kernel_rules.txt	2009-01-28 15:55:48 -08:00
kbuild	kbuild: introduce subdir-ccflags-y	2009-04-19 11:12:12 +02:00
kdump	powerpc: Support for relocatable kdump kernel	2008-10-22 15:01:22 +11:00
ko_KR
laptops	thinkpad-acpi: bump up version to 0.23	2009-04-18 01:19:54 -04:00
lguest	lguest: add support for indirect ring entries	2009-06-12 22:27:13 +09:30
m68k
make
mips	ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ	2009-01-14 19:19:03 +01:00
misc-devices	drivers/misc/isl29003.c: driver for the ISL29003 ambient light sensor	2009-04-01 08:59:18 -07:00
mn10300
mtd	[MTD] [NAND] nand_ecc.c: rewrite for improved performance	2008-08-16 10:55:33 +01:00
namespaces
netlabel
networking	Doc: fixed descriptions on /proc/sys/net/core/* and /proc/sys/net/unix/*	2009-05-17 21:19:31 -07:00
parisc
PCI	PCI MSI: Add example request loop to MSI-HOWTO.txt	2009-03-20 11:35:04 -07:00
pcmcia	.gitignore updates	2008-10-30 11:38:45 -07:00
power	PM: Remove bus_type suspend_late()/resume_early() V2	2009-06-12 21:32:31 +02:00
powerpc	Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge	2009-04-22 13:02:09 +10:00
prctl	generic, x86: add tests for prctl PR_GET_TSC and PR_SET_TSC	2008-04-19 19:19:55 +02:00
RCU	rcu: Update RCU tracing documentation for __rcu_pending	2009-04-14 11:33:43 +02:00
s390	documentation: update s390 header file paths	2009-01-06 15:59:28 -08:00
scheduler	sched: fix typo in sched-rt-group.txt file	2009-05-29 16:21:09 +02:00
scsi	[SCSI] aacraid driver update	2009-04-03 09:23:11 -05:00
serial	Create/use more directory structure in the Documentation/ tree.	2008-11-14 17:28:53 +00:00
sh	sh: Kill off remaining CONFIG_SH_KGDB bits.	2008-12-22 18:44:05 +09:00
sound	Merge branch 'topic/pcm-jiffies-check' into for-linus	2009-06-12 20:03:15 +02:00
sparc	sparc: Remove Documentation/sparc/sbus_drivers.txt	2008-08-29 02:15:25 -07:00
spi	spi: documentation: emphasise spi_master.setup() semantics	2009-04-21 13:41:50 -07:00
sysctl	Merge branch 'master' into next	2009-05-22 18:40:59 +10:00
telephony	remove mention of CONFIG_KMOD from documentation	2008-07-22 19:24:29 +10:00
thermal	thermal: update the documentation	2008-04-29 02:49:47 -04:00
timers	hpet: /dev/hpet - fixes and cleanup	2008-07-31 18:45:41 +02:00
trace	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 19:53:40 -07:00
uml
usb	USB: usbmon: Add binary API v1	2009-03-24 16:20:36 -07:00
video4linux	V4L/DVB (11373): v4l2-common: add explicit v4l2_device pointer as first arg to new_(probed)_subdev	2009-04-06 21:44:24 -03:00
vm	mm: add documentation describing what tsk->active_mm means vs tsk->mm	2009-04-13 15:04:32 -07:00
w1	w1: send status messages after command processing	2009-01-08 08:31:14 -08:00
watchdog	.gitignore updates	2008-10-30 11:38:45 -07:00
wimax	i2400m: documentation and instructions for usage	2009-01-07 10:00:18 -08:00
x86	Merge branch 'linus' into x86/mce3	2009-06-11 23:31:52 +02:00
zh_CN
00-INDEX	trivial: fix where cgroup documentation is not correctly referred to	2009-03-30 15:22:02 +02:00
applying-patches.txt
atomic_ops.txt
bad_memory.txt	Document handling of bad memory	2008-12-03 16:09:53 -07:00
basic_profiling.txt
binfmt_misc.txt
braille-console.txt	Basic braille screen reader support	2008-04-30 08:29:52 -07:00
bt8xxgpio.txt	gpio: add bt8xxgpio driver	2008-07-25 10:53:30 -07:00
BUG-HUNTING
c2port.txt	Add c2 port support	2008-11-12 17:17:18 -08:00
cachetlb.txt
Changes	x86, mce: document new 32bit mcelog requirement in Documentation/Changes	2009-05-28 09:24:13 -07:00
CodingStyle	fix emacs indenting howto filename expansion	2009-01-29 18:19:29 -08:00
cpu-hotplug.txt	x86: use possible_cpus=NUM to extend the possible cpus allowed	2008-12-18 12:08:05 +01:00
cpu-load.txt
cputopology.txt	cpumask: Use topology_core_cpumask()/topology_thread_cpumask()	2009-01-11 19:12:49 +01:00
credentials.txt	CRED: Documentation	2008-11-14 10:39:26 +11:00
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt	firewire: fw-ohci: add option for remote debugging	2008-04-18 17:55:33 +02:00
dell_rbu.txt	trivial: fix an -> a typos in documentation and comments	2009-01-06 11:28:07 +01:00
devices.txt	lanana: assign a device name and numbering for MAX3100	2009-04-07 08:44:05 -07:00
DMA-API.txt	dma-debug: add documentation for the driver filter	2009-06-02 16:21:42 +02:00
DMA-attributes.txt	powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU code	2008-07-22 10:39:36 +10:00
DMA-ISA-LPC.txt
DMA-mapping.txt	dma-mapping: update the old macro DMA_nBIT_MASK related documentations	2009-04-07 08:31:12 -07:00
dmaengine.txt	async_tx, dmaengine: document channel allocation and api rework	2009-01-05 18:10:19 -07:00
dontdiff	dontdiff: Fix asm exclude	2009-03-26 15:45:43 -07:00
dynamic-debug-howto.txt	Dynamic debug: allow simple quoting of words	2009-03-24 16:38:27 -07:00
edac.txt	Documentation cleanup: trivial misspelling, punctuation, and grammar corrections.	2008-07-26 12:00:06 -07:00
eisa.txt
email-clients.txt	Documentation/email-clients.txt: add some info about gmail	2008-11-06 15:41:19 -08:00
exception.txt
feature-removal-schedule.txt	x86, mce: deprecate old 32bit machine check code	2009-05-28 09:24:13 -07:00
futex-requeue-pi.txt	futex: add requeue-pi documentation	2009-05-09 07:12:50 +02:00
gpio.txt	gpio: gpio_{request,free}() now required (feature removal)	2009-04-02 19:04:51 -07:00
highuid.txt	[SPARC]: Remove SunOS and Solaris binary support.	2008-04-21 15:10:15 -07:00
HOWTO	Remove Andrew Morton's http://www.zip.com.au/~akpm/	2008-10-16 11:21:32 -07:00
hw_random.txt
ics932s401	ics932s401: new clock generator chip driver	2008-11-12 17:17:18 -08:00
initrd.txt
Intel-IOMMU.txt	Documentation cleanup: trivial misspelling, punctuation, and grammar corrections.	2008-07-26 12:00:06 -07:00
io-mapping.txt	io mapping: improve documentation	2008-11-03 18:21:44 +01:00
IO-mapping.txt	Documentation: move DMA-mapping.txt to Doc/PCI/	2009-01-29 18:19:29 -08:00
io_ordering.txt
iostats.txt	Documentation cleanup: trivial misspelling, punctuation, and grammar corrections.	2008-07-26 12:00:06 -07:00
IPMI.txt
IRQ-affinity.txt	genirq: Expose default irq affinity mask (take 3)	2008-06-05 15:18:30 +02:00
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	kernel-doc: restrict syntax for private: and public:	2009-05-02 15:36:10 -07:00
kernel-docs.txt	doc: update to URL and status of kernel-docs.txt entry	2008-06-06 11:29:10 -07:00
kernel-parameters.txt	Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6	2009-06-12 09:29:42 -07:00
keys-request-key.txt	keys: allow the callout data to be passed as a blob rather than a string	2008-04-29 08:06:16 -07:00
keys.txt	Documentation cleanup: trivial misspelling, punctuation, and grammar corrections.	2008-07-26 12:00:06 -07:00
kmemleak.txt	kmemleak: Add documentation on the memory leak detector	2009-06-11 17:03:29 +01:00
kobject.txt	kobject: Make Documentation/kobject.txt a little more coherent.	2009-01-06 10:44:32 -08:00
kprobes.txt	kprobes: support kretprobe and jprobe per-probe disabling	2009-04-07 08:31:08 -07:00
kref.txt
ldm.txt
leds-class.txt	Documentation cleanup: trivial misspelling, punctuation, and grammar corrections.	2008-07-26 12:00:06 -07:00
local_ops.txt	documentation: local_ops fix on_each_cpu	2008-12-01 13:51:26 +01:00
lockdep-design.txt	locking: Documentation: lockdep-design.txt, fix note of state bits	2009-04-26 18:21:24 +02:00
lockstat.txt	lockstat: contend with points	2008-10-20 15:43:10 +02:00
logo.gif	Revert "linux.conf.au 2009: Tuz"	2009-04-27 12:00:27 -07:00
logo.txt	Revert "linux.conf.au 2009: Tuz"	2009-04-27 12:00:27 -07:00
magic-number.txt	documentation: update header file paths	2009-01-06 15:59:28 -08:00
Makefile	docsrc: build Documentation/ sources	2008-08-12 16:07:30 -07:00
ManagementStyle	docs: fix ManagementStyle book name	2008-10-30 11:38:46 -07:00
markers.txt	markers: comment marker_synchronize_unregister() on data dependency	2008-11-28 16:47:41 +01:00
mca.txt
md.txt	Documentation/md.txt update	2009-03-31 15:18:37 +11:00
memory-barriers.txt	sched: Document memory barriers implied by sleep/wake-up primitives	2009-04-29 14:15:55 +02:00
memory-hotplug.txt	mm: show node to memory section relationship with symlinks in sysfs	2009-01-06 15:59:00 -08:00
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt	x86, nmi-watchdog: update procfs nmi_watchdog file documentation v2	2008-10-30 19:07:04 +01:00
nommu-mmap.txt	NOMMU: Make mmap allocation page trimming behaviour configurable.	2009-01-08 12:04:47 +00:00
numastat.txt
oops-tracing.txt	Taint kernel after WARN_ON(condition)	2008-04-29 08:05:59 -07:00
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt	DOC: add printk-formats.txt	2008-11-12 17:17:17 -08:00
prio_tree.txt
rbtree.txt
rfkill.txt	rfkill: add master_switch_mode and EPO lock to rfkill and rfkill-input	2008-10-31 19:00:09 -04:00
robust-futex-ABI.txt
robust-futexes.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt
SAK.txt	Remove Andrew Morton's old email accounts	2008-10-16 11:21:32 -07:00
SecurityBugs
SELinux.txt	selinux: add support for installing a dummy policy (v2)	2008-08-27 08:54:08 +10:00
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
slow-work.txt	Document the slow work thread pool	2009-04-03 16:42:35 +01:00
SM501.txt
Smack.txt	smack: implement logging V3	2009-04-14 09:00:23 +10:00
sparse.txt	Documentation: explain the difference between __bitwise and __bitwise__	2009-04-11 08:18:11 +02:00
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt	Update stable tree documentation	2008-10-29 15:03:49 -07:00
SubmitChecklist	documentation: explain memory barriers	2008-10-16 11:21:32 -07:00
SubmittingDrivers	Remove Andrew Morton's old email accounts	2008-10-16 11:21:32 -07:00
SubmittingPatches	Documentation: Add "how to write a good patch summary" to SubmittingPatches	2009-06-04 10:34:33 -06:00
svga.txt
sysfs-rules.txt	Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense	2009-05-08 19:22:20 -07:00
sysrq.txt	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
tomoyo.txt	tomoyo: add Documentation/tomoyo.txt	2009-04-14 09:14:58 +10:00
unaligned-memory-access.txt	introduce HAVE_EFFICIENT_UNALIGNED_ACCESS Kconfig symbol	2008-07-25 10:53:27 -07:00
unicode.txt
unshare.txt
VGA-softcursor.txt
video-output.txt
volatile-considered-harmful.txt	Documentation cleanup: trivial misspelling, punctuation, and grammar corrections.	2008-07-26 12:00:06 -07:00
voyager.txt
zorro.txt