Mauro Carvalho Chehab 69ecdbac14 Merge remote-tracking branch 'linus/master' into staging/for_v3.5 ... * linus/master: (805 commits) tty: Fix LED error return openvswitch: checking wrong variable in queue_userspace_packet() bonding: Fix LACPDU rx_dropped commit. Linux 3.4-rc7 ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1 ARM: EXYNOS: use s5p-timer for UniversalC210 board ARM / mach-shmobile: Invalidate caches when booting secondary cores ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper MAINTAINERS: Add myself as the cpufreq maintainer dm mpath: check if scsi_dh module already loaded before trying to load dm thin: correct module description dm thin: fix unprotected use of prepared_discards list dm thin: reinstate missing mempool_free in cell_release_singleton gpio/exynos: Fix compiler warnings when non-exynos machines are selected gpio: pch9: Use proper flow type handlers powerpc/irq: Fix another case of lazy IRQ state getting out of sync ks8851: Update link status during link change interrupt ... Conflicts: drivers/media/common/tuners/xc5000.c drivers/media/common/tuners/xc5000.h drivers/usb/gadget/uvc_queue.c		2012-05-15 08:39:25 -03:00
..
media	Merge remote-tracking branch 'linus/master' into staging/for_v3.5	2012-05-15 08:39:25 -03:00
.gitignore	[media] DocBook: Add a chapter to describe media errors	2011-07-27 17:53:35 -03:00
80211.tmpl	cfg80211: stop tracking authenticated state	2012-02-06 14:50:37 -05:00
alsa-driver-api.tmpl
debugobjects.tmpl	debugobjects: Extend to assert that an object is initialized	2011-11-23 18:49:22 +01:00
device-drivers.tmpl	Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi	2012-04-02 09:50:40 -07:00
deviceiobook.tmpl	docbook: change iomap source filename in deviceiobook	2012-01-23 08:44:54 -08:00
drm.tmpl	DocBook/drm: Clean up a todo-note	2011-08-29 20:00:37 +00:00
filesystems.tmpl	Documentation: broken URL in filesystems.tmpl	2012-02-28 15:56:09 +01:00
gadget.tmpl
genericirq.tmpl
kernel-api.tmpl
kernel-hacking.tmpl	sched: Generalize sleep inside spinlock detection	2011-06-23 00:44:38 +02:00
kernel-locking.tmpl
kgdb.tmpl	kgdb,debug_core: add the ability to control the reboot notifier	2012-03-22 15:07:16 -05:00
libata.tmpl	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
librs.tmpl
lsm.tmpl
Makefile	[media] DocBook: Use base64 for gif/png files	2011-07-27 17:52:59 -03:00
mcabook.tmpl
media_api.tmpl	[media] DVB: Point to the generic error chapter	2011-07-27 17:53:37 -03:00
mtdnand.tmpl	mtd: doc: remove mention of MEMSETOOBSEL	2011-09-11 15:02:18 +03:00
networking.tmpl
rapidio.tmpl
regulator.tmpl
s390-drivers.tmpl
scsi.tmpl
sh.tmpl
stylesheet.xsl
tracepoint.tmpl
uio-howto.tmpl	uio: documentation fixups	2011-11-15 11:14:01 -08:00
usb.tmpl
writing-an-alsa-driver.tmpl	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
writing_usb_driver.tmpl
z8530book.tmpl