Linus Torvalds 0df0914d41 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 ... * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits) omap: zoom: host should not pull up wl1271's irq line arm: plat-omap: iommu: fix request_mem_region() error path OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430 omap4: mux: Remove duplicate mux modes omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected omap4: board-omap4panda: Initialise the serial pads omap3: board-3430sdp: Initialise the serial pads omap4: board-4430sdp: Initialise the serial pads omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init omap2+: mux: Remove the use of IDLE flag omap2+: Add separate list for dynamic pads to mux perf: add OMAP support for the new power events OMAP4: Add IVA OPP enteries. OMAP4: Update Voltage Rail Values for MPU, IVA and CORE OMAP4: Enable 800 MHz and 1 GHz MPU-OPP OMAP3+: OPP: Replace voltage values with Macros OMAP3: wdtimer: Fix CORE idle transition Watchdog: omap_wdt: add fine grain runtime-pm ... Fix up various conflicts in - arch/arm/mach-omap2/board-omap3evm.c - arch/arm/mach-omap2/clock3xxx_data.c - arch/arm/mach-omap2/usb-musb.c - arch/arm/plat-omap/include/plat/usb.h - drivers/usb/musb/musb_core.h		2011-03-17 19:28:15 -07:00
..
ABI	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2011-03-16 19:01:29 -07:00
accounting	taskstats: pad taskstats netlink response for aligment issues on ia64	2010-12-22 19:43:34 -08:00
acpi	ACPI, APEI, Add APEI generic error status printing support	2010-12-13 23:42:12 -05:00
aoe
arm	Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:05:40 -07:00
auxdisplay
blackfin
block	Documentation: remove anticipatory scheduler info	2010-11-11 12:09:59 +01:00
blockdev
cdrom
cgroups	Documentation: update cgroup pid and cpuset information	2011-03-16 10:47:04 -07:00
connector
console
cpu-freq	[CPUFREQ] Add documentation for sampling_down_factor	2011-03-16 17:54:31 -04:00
cpuidle
cris
crypto
development-process	Documentation/development-process: more staging info	2010-11-18 15:00:47 -08:00
device-mapper	dm: raid456 basic support	2011-01-13 20:00:02 +00:00
devicetree	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
DocBook	Docbook: add fs/eventfd.c and fix typos in it	2011-02-21 15:07:04 -08:00
driver-model	driver core: prune docs about device_interface	2010-11-10 16:57:11 -08:00
dvb	[media] Documentation/lmedm04: Fix firmware extract information	2010-12-29 08:16:30 -02:00
early-userspace
fault-injection
fb	Merge branch 'fbdev/udlfb'	2011-01-06 18:10:09 +09:00
filesystems	Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6	2011-03-17 17:40:00 -07:00
firmware_class
frv
hwmon	hwmon/f71882fg: Add support for f71869f and f71869e	2011-03-14 22:39:26 -07:00
i2c	i2c: Add generic I2C multiplexer using GPIO API	2011-01-10 22:11:23 +01:00
i2o
ia64
ide
infiniband
input	Input: fix force feedback capability query example	2011-01-11 01:07:55 -08:00
ioctl	pps: add kernel consumer support	2011-01-13 08:03:21 -08:00
isdn
ja_JP
kbuild	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
kdump	kdump: update kexec-tools URL and Vivek's email	2010-11-25 14:36:38 +01:00
ko_KR	Docs/Kconfig: Update: osdl.org -> linuxfoundation.org	2010-11-15 23:50:13 +01:00
kvm	KVM: Start lock documentation	2011-03-17 13:08:31 -03:00
laptops
leds	Documentation: led drivers lp5521 and lp5523	2010-11-12 07:55:32 -08:00
lguest	lguest: document --rng in example Launcher	2011-01-20 21:37:29 +10:30
m68k
make	kbuild: introduce HDR_ARCH_LIST for headers_install_all	2010-12-14 22:16:19 +01:00
mips
misc-devices	Documentation: short descriptions for bh1770glc and apds990x drivers	2010-10-26 16:52:14 -07:00
mmc
mn10300
mtd
namespaces
netlabel
networking	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-15 15:15:17 -07:00
nfc	NFC: Driver for NXP Semiconductors PN544 NFC chip.	2011-01-13 08:03:19 -08:00
parisc
PCI
pcmcia
power	PM: Documentation/power/states.txt: fix repetition	2011-03-15 00:43:17 +01:00
powerpc	Documentation: add devicetree docs index file	2011-03-16 10:47:03 -07:00
pps	pps: add parallel port PPS signal generator	2011-01-13 08:03:21 -08:00
prctl
RCU	rcu: add documentation saying which RCU flavor to choose	2011-03-04 08:05:25 -08:00
s390
scheduler	sched, docs: Update schedstats documentation to version 15	2011-02-01 09:07:13 +01:00
scsi	[SCSI] hpsa: export resettable host attribute	2011-03-14 18:44:41 -05:00
serial	n_gsm: add a documentation	2011-03-09 15:43:38 -08:00
sh	sh: clkfwk: Kill off unused clk_set_rate_ex().	2010-11-15 18:25:12 +09:00
sound	ALSA: HDA: Add a new model "asus" for Conexant 5066/205xx	2011-01-22 17:29:22 +01:00
sparc
spi	arm/pxa2xx: reorgazine SSP and SPI header files	2010-12-01 12:18:33 +01:00
sysctl	Documentation: file handles are now freed	2011-03-16 10:47:03 -07:00
target	[SCSI] target: Add LIO target core v4.0.0-rc6	2011-01-14 10:12:29 -06:00
telephony
thermal	thermal: Add event notification to thermal framework	2011-01-12 00:08:35 -05:00
timers	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
trace	tracing: Add an 'overwrite' trace_option.	2011-03-09 13:52:27 -05:00
uml
usb	USB: usbmon: fix-up docs and text API for sparse ISO	2011-02-04 11:46:57 -08:00
video4linux	[media] v4l2-ctrls: v4l2_ctrl_handler_setup must set is_new to 1	2011-01-19 11:45:32 -02:00
vm	thp: transparent hugepage support documentation	2011-01-13 17:32:38 -08:00
w1	w1: DS2423 counter driver and documentation	2011-01-13 08:03:22 -08:00
watchdog
wimax
x86	x86: support XZ-compressed kernel	2011-01-13 08:03:25 -08:00
zh_CN	Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches	2011-02-28 19:30:48 -08:00
.gitignore
00-INDEX	Documentation: remove obsolete files from 00-INDEX	2011-03-16 10:47:03 -07:00
apparmor.txt
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
coccinelle.txt	scripts/coccinelle: update for compatability with Coccinelle 0.2.4	2010-12-03 12:27:01 +01:00
CodingStyle	Documentation: update header filename in CodingStyle	2011-03-16 10:47:03 -07:00
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
credentials.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-10-28 09:35:11 -07:00
DMA-API-HOWTO.txt
DMA-API.txt
DMA-attributes.txt
DMA-ISA-LPC.txt
dmaengine.txt
dontdiff	Documentation/dontdiff: add further autogenerated files to ignore list	2011-01-06 09:59:37 -08:00
dynamic-debug-howto.txt	Dynamic debug: Add more flags	2011-02-03 15:39:16 -08:00
edac.txt	EDAC: Fix typos in Documentation/edac.txt	2010-11-25 17:32:47 +01:00
eisa.txt
email-clients.txt	Documentation/email-clients.txt: update Thunderbird docs with wordwrap plugin	2011-01-13 08:03:15 -08:00
feature-removal-schedule.txt	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-03-16 16:29:25 -07:00
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt	Revert "gpiolib: annotate gpio-intialization with __must_check"	2011-01-13 17:26:46 -08:00
highuid.txt
HOWTO
hw_random.txt
hwspinlock.txt	drivers: hwspinlock: add framework	2011-02-17 09:52:03 -08:00
init.txt
initrd.txt
intel_txt.txt
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
iostats.txt	remove extraneous 'is' from Documentation/iostats.txt	2011-01-03 14:00:28 +01:00
IPMI.txt	IPMI: Add the document description of ipmi_get_smi_info	2010-12-14 00:22:00 -05:00
IRQ-affinity.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt	Documentation: update kernel-docs.txt	2011-01-06 09:59:38 -08:00
kernel-parameters.txt	Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6	2011-03-17 17:40:00 -07:00
keys-request-key.txt	KEYS: Add a new keyctl op to reject a key with a specified error code	2011-03-08 11:17:18 +11:00
keys-trusted-encrypted.txt	keys: add new trusted key-type	2010-11-29 08:55:25 +11:00
keys.txt	KEYS: Add an iovec version of KEYCTL_INSTANTIATE	2011-03-08 11:17:22 +11:00
kmemcheck.txt
kmemleak.txt
kobject.txt
kprobes.txt	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
kref.txt	kref: Fix typo in kref documentation	2011-03-07 13:20:05 -08:00
ldm.txt
leds-class.txt	led-class: always implement blinking	2010-11-12 07:55:32 -08:00
leds-lp3944.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
logo.gif
logo.txt
magic-number.txt	take coda-private headers out of include/linux	2011-01-12 20:02:48 -05:00
Makefile	[media] Remove the old V4L1 v4lgrab.c file	2010-12-29 08:17:12 -02:00
ManagementStyle
mca.txt
md.txt
memory-barriers.txt	smp: Document transitivity for memory barriers.	2011-03-04 08:05:49 -08:00
memory-hotplug.txt	memory hotplug: Allow memory blocks to span multiple memory sections	2011-02-03 16:08:57 -08:00
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt	Documentation: remove anticipatory scheduler info	2010-11-11 12:09:59 +01:00
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt	RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer	2011-03-09 11:25:10 -08:00
SAK.txt
SecurityBugs
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
Smack.txt
sparse.txt
spinlocks.txt	locking: Remove deprecated lock initializers	2011-01-27 12:30:38 +01:00
stable_api_nonsense.txt
stable_kernel_rules.txt
SubmitChecklist
SubmittingDrivers
SubmittingPatches
svga.txt
sysfs-rules.txt
sysrq.txt	documentation: update sysrq.txt magic sysrq keys	2010-10-26 17:32:41 -07:00
tomoyo.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
volatile-considered-harmful.txt
workqueue.txt	workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'	2011-02-16 17:48:59 +01:00
xz.txt	decompressors: add XZ decompressor module	2011-01-13 08:03:24 -08:00
zorro.txt