Dave Airlie 93bb70e0c0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next ... There was some merge conflicts in -next and they weren't so pretty, so backmerge now to avoid them. Conflicts: drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_modes.c		2012-08-27 16:22:20 +10:00
..
ABI	ideapad: add Lenovo IdeaPad Z570 support (part 3)	2012-08-20 12:44:41 -04:00
DocBook	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next	2012-08-27 16:22:20 +10:00
EDID	drm: allow loading an EDID as firmware to override broken monitor	2012-03-20 10:09:28 +00:00
PCI	doc: fix broken references	2011-09-27 18:08:04 +02:00
RCU	rcu: Update documentation to cover call_srcu() and srcu_barrier().	2012-07-02 12:34:03 -07:00
accounting	Documentation: update cgroupfs mount point	2011-06-15 21:52:50 -07:00
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	[media] Documentation: Add newline at end-of-file to files lacking one	2012-07-30 20:37:01 -03:00
auxdisplay	includecheck fix: Documentation, cfag12864b-example.c	2009-09-24 07:20:57 -07:00
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	doc: fix broken references	2011-09-27 18:08:04 +02:00
cgroups	mm/memcg: complete documentation for tcp memcg files	2012-07-31 18:42:43 -07:00
connector	connector: Move cn_test.c away from NLMSG_PUT().	2012-06-26 21:19:02 -07:00
console	doc: fix console doc typo	2010-02-24 13:51:32 +01:00
cpu-freq	Doc: cpufreq: Fix typo and outdated line	2011-11-08 10:23:29 +01:00
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	Merge branch 'for-next' of git://neil.brown.name/md	2012-08-01 09:02:01 -07:00
devicetree	arm-soc fixes for v3.6-rc3	2012-08-25 17:33:33 -07: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-07-30 19:03:41 -07:00
early-userspace	…
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	Documentation: update mount option in filesystem/vfat.txt	2012-08-21 16:45:02 -07:00
firmware_class	firmware: Update hotplug script	2010-08-05 13:53:34 -07:00
frv	doc: fix broken references	2011-09-27 18:08:04 +02:00
hid	HID: uhid: add documentation	2012-06-18 13:42:03 +02:00
hwmon	hwmon: Honeywell Humidicon HIH-6130/HIH-6131 humidity and temperature sensor driver	2012-07-21 21:48:44 -07:00
i2c	i2c-i801: Enable IRQ for SMBus transactions	2012-07-24 14:13:58 +02:00
i2o	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
ia64	Fix common misspellings	2011-03-31 11:26:23 -03:00
ide	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
infiniband	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
input	Input: add driver for FT5x06 based EDT displays	2012-07-24 23:55:03 -07:00
ioctl	vfio: VFIO core	2012-07-31 08:16:22 -06:00
isdn	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
ja_JP	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-07-25 23:06:24 -07:00
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	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	Documentation: add pointer to name_to_dev_t for root= values	2011-08-03 14:25:21 -10:00
make	kbuild: introduce HDR_ARCH_LIST for headers_install_all	2010-12-14 22:16:19 +01:00
memory-devices	memory: emif: add basic infrastructure for EMIF driver	2012-05-02 00:10:49 -07:00
mips	Fix common misspellings	2011-03-31 11:26:23 -03:00
misc-devices	mei: mei.txt: minor grammar fixes	2012-06-13 13:38:25 -07:00
mmc	mmc: core: Fixup delayed work clock gating patch	2012-01-11 23:58:43 -05:00
mn10300	…
mtd	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
namespaces	…
netlabel	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
networking	netconsole.txt: revision of examples for the receiver of kernel messages	2012-08-14 14:33:33 -07: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
pcmcia	pcmcia: use autoconfiguration feature for ioports and iomem	2010-09-29 17:20:24 +02:00
power	The tag contains just a few battery-related changes for v3.6. It's is	2012-07-31 18:08:25 -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	pps: add parallel port PPS signal generator	2011-01-13 08:03:21 -08:00
prctl	security: Minor improvements to no_new_privs documentation	2012-07-08 00:25:48 +10:00
pti	Kernel documentation for the PTI feature.	2011-05-13 16:31:00 -07:00
ptp	ptp: Added a brand new class driver for ptp clocks.	2011-05-23 13:01:00 -07:00
rapidio	RapidIO: documentation update	2011-11-02 16:07:02 -07:00
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	Yama: higher restrictions should block PTRACE_TRACEME	2012-08-10 19:58:07 +10:00
serial	serial: delete the MCA specific 8250 support.	2012-05-17 19:02:14 -04:00
sh	sh: clkfwk: Kill off unused clk_set_rate_ex().	2010-11-15 18:25:12 +09:00
sound	Sound fixes for 3.6-rc1	2012-08-01 10:42:26 -07:00
spi	spi: create a message queueing infrastructure	2012-03-07 19:19:48 -07:00
sysctl	Documentation: fix the VM knobs descritpion WRT pdflush	2012-08-04 12:15:09 +04:00
target	Documentation: Fix typo in tcm_mod_builder.py	2012-02-10 09:52:18 +01:00
telephony	Fix common misspellings	2011-03-31 11:26:23 -03:00
thermal	Thermal: Documentation update	2012-07-24 23:20:40 -04:00
timers	doc: fix broken references	2011-09-27 18:08:04 +02:00
trace	tracing: Fix kconfig warning due to a typo	2012-05-08 14:17:25 +02:00
usb	usb: gadget: mass_storage: add documentation	2012-06-15 14:32:30 +03:00
vDSO	Document the vDSO and add a reference parser	2011-07-14 17:57:09 -07:00
video4linux	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
virtual	KVM updates for the 3.6 merge window	2012-07-24 12:01:20 -07: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: DA9052/53 PMIC watchdog support	2012-05-30 07:56:12 +02:00
wimax	…
x86	Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-07-26 13:13:25 -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	add random binaries to .gitignore	2010-04-08 11:34:34 +02:00
00-INDEX	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
BUG-HUNTING	…
Changes	Documentation/Changes: remove some really obsolete text	2011-07-11 16:48:38 -07:00
CodingStyle	CodingStyle: add kmalloc_array() to memory allocators	2012-05-31 17:49:26 -07:00
DMA-API-HOWTO.txt	Documentation/DMA-API-HOWTO.txt: fix misleading example	2011-07-26 16:49:45 -07:00
DMA-API.txt	include/linux/dma-mapping.h: add dma_zalloc_coherent()	2011-11-02 16:07:02 -07:00
DMA-ISA-LPC.txt	…
DMA-attributes.txt	common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute	2012-07-30 12:25:47 +02:00
HOWTO	docs: update HOWTO for 2.6.x -> 3.x versioning	2012-04-19 19:13:08 -07:00
IPMI.txt	IPMI: Add the document description of ipmi_get_smi_info	2010-12-14 00:22:00 -05:00
IRQ-affinity.txt	bitmap, irq: add smp_affinity_list interface to /proc/irq	2011-05-25 08:39:45 -07:00
IRQ-domain.txt	irq_domain: Standardise legacy/linear domain selection	2012-07-11 14:59:17 +01:00
IRQ.txt	…
Intel-IOMMU.txt	intel-iommu: Kill DMAR_BROKEN_GFX_WA option.	2009-09-19 09:37:23 -07: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
SAK.txt	…
SM501.txt	…
SecurityBugs	Fix common misspellings	2011-03-31 11:26:23 -03:00
SubmitChecklist	Documentation/SubmitChecklist: add RCU debug config options	2011-07-25 20:57:17 -07:00
SubmittingDrivers	Documentation: SubmittingDrivers: fix Linus's git tree URL	2011-08-13 18:34:03 -07:00
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	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
cachetlb.txt	mm: convert mm->cpu_vm_cpumask into cpumask_var_t	2011-05-25 08:39:21 -07:00
circular-buffers.txt	Document Linux's circular buffering capabilities	2010-03-24 16:31:22 -07:00
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	topology/sysfs: Provide book id and siblings attributes	2010-09-09 20:41:25 +02:00
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	ieee1394: update URLs in debugging-via-ohci1394.txt	2009-10-03 09:28:11 +02:00
dell_rbu.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
devices.txt	Doc: document max raw dev number	2012-06-03 12:05:50 +02:00
digsig.txt	crypto: digital signature verification support	2011-11-09 12:10:37 +02:00
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	kconfig: remove lkc_defs.h from .gitignore and dontdiff	2012-07-13 15:08:25 +02: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	Documentation: email-clients: Add better Thunderbird information	2011-08-13 18:34:03 -07:00
feature-removal-schedule.txt	Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm	2012-08-01 16:41:07 -07:00
flexible-arrays.txt	flex_array: flex_array_prealloc takes a number of elements, not an end	2011-04-28 16:12:47 -04:00
futex-requeue-pi.txt	…
gcov.txt	trivial: fix typo in CONFIG_DEBUG_FS in gcov doc	2009-09-21 15:14:56 +02:00
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	hwspinlock/core: register a bank of hwspinlocks in a single API call	2011-09-21 19:45:34 +03:00
init.txt	init/main.c: improve usability in case of init binary failure	2010-03-06 11:26:29 -08:00
initrd.txt	Documentation/initrd.txt: Change the location of util-linux	2012-05-25 16:18:34 +02:00
intel_txt.txt	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	Documentation/iostats.txt: bit-size reference etc.	2011-03-23 20:44:18 +01:00
irqflags-tracing.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	docbook: warn on unused doc entries	2010-09-11 16:49:21 -07:00
kernel-docs.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
kernel-parameters.txt	Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-07-30 10:11:31 -07:00
kmemcheck.txt	…
kmemleak.txt	kmemleak: Handle percpu memory allocation	2011-12-02 16:12:42 +00:00
kobject.txt	driver-core: documentation: fix up Greg's email address	2012-02-15 14:48:01 -08:00
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	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
local_ops.txt	…
lockdep-design.txt	lockdep: Update documentation for lock-class leak detection	2011-12-11 10:31:23 -08:00
lockstat.txt	Documentation: Add statistics about nested locks	2011-05-28 17:03:29 +02:00
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	doc: fix broken references	2011-09-27 18:08:04 +02:00
memory-hotplug.txt	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
memory.txt	Documentation/memory.txt: remove some very outdated recommendations	2009-09-22 07:17:26 -07:00
mono.txt	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
mutex-design.txt	mutex: Fix annotations to include it in kernel-locking docbook	2010-09-03 08:19:51 +02:00
nommu-mmap.txt	nommu: fix malloc performance by adding uninitialized flag	2009-12-15 08:53:24 -08:00
numastat.txt	Doc: Update numastat.txt	2012-02-28 16:05:06 +01:00
oops-tracing.txt	module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree	2011-11-07 07:54:42 +10:30
padata.txt	Documentation/padata.txt: fix typos etc.	2010-08-11 08:59:18 -07:00
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	Documentation/pinctrl.txt: Fix some misspelled macros	2012-08-17 11:09:58 +02:00
pnp.txt	doc: capitalization and other minor fixes in pnp doc	2010-02-05 12:22:44 +01:00
preempt-locking.txt	…
printk-formats.txt	vsprintf: add support of '%*ph[CDN]'	2012-07-30 17:25:14 -07: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/ram: Add ftrace messages handling	2012-07-17 10:14:17 -07:00
rbtree.txt	Documentation: Update augmented rbtree documentation	2011-07-24 10:03:05 -07:00
remoteproc.txt	remoteproc: adopt the driver core's alloc/add/del/put naming	2012-07-06 00:53:27 +03:00
rfkill.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
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	variable name fix to Documentation/rt-mutex-design.txt	2010-06-05 17:39:09 +02:00
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
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
sparse.txt	update email address	2010-07-19 10:56:54 +02:00
spinlocks.txt	Documentation/spinlocks.txt: Remove reference to sti()/cli()	2011-07-11 12:45:04 -07:00
stable_api_nonsense.txt	doc: stable_api_nonsense.txt: fix paragraph to make more sense.	2011-03-30 12:02:05 +02:00
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
svga.txt	…
sysfs-rules.txt	Fix typos in comments	2010-03-16 11:47:56 +01:00
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: Add documentation	2012-07-31 08:16:23 -06:00
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	Documentation/volatile-considered-harmful.txt: correct cpu_relax() documentation	2010-03-24 16:31:20 -07:00
workqueue.txt	workqueue: reimplement WQ_HIGHPRI using a separate worker_pool	2012-07-13 22:24:45 -07:00
xz.txt	decompressors: add XZ decompressor module	2011-01-13 08:03:24 -08:00
zorro.txt	…