sugar/linux
1
0
Fork 0
Code Activity
Files
ed4e9c1d46980e76254573ccd59efb3e8aec77d2
linux/Documentation
History
Daniel Vetter 0f9e9cd61f Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next 
Backmerge because of numerous and interleaving conflicts and git
rerere getting confused a bit too often.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

All conflicts are because of -next patches backported to -fixes, so
just go with the code in -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-03-20 11:44:34 +01:00
..
ABI
Merge tag 'platform-drivers-x86-v3.20-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
2015-02-19 10:56:51 -08:00
accounting
…
acpi
ACPI / Documentation: add a missing '='
2015-01-22 01:21:45 +01:00
aoe
…
arm
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-02-17 09:27:54 -08:00
arm64
arm64: Emulate SETEND for AArch32 tasks
2015-01-23 17:11:44 +00:00
auxdisplay
…
backlight
…
blackfin
Documentation: fix blackfin gptimers-example build errors
2015-01-28 12:07:58 -07:00
block
Merge branch 'for-3.19/core' of git://git.kernel.dk/linux-block
2014-12-13 14:14:23 -08:00
blockdev
…
bus-devices
…
cdrom
…
cgroups
mm: memcontrol: use "max" instead of "infinity" in control knobs
2015-02-28 09:57:51 -08:00
connector
…
console
…
cpu-freq
intel_pstate: Add num_pstates to sysfs
2015-01-30 01:52:17 +01:00
cpuidle
…
cris
…
crypto
…
development-process
…
device-mapper
dm crypt: add 'submit_from_crypt_cpus' option
2015-02-16 11:11:15 -05:00
devicetree
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-03-15 10:49:38 -07:00
dmaengine
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-02-18 08:49:20 -08:00
DocBook
Merge tag 'drm-intel-next-2015-02-27' of git://anongit.freedesktop.org/drm-intel into drm-next
2015-03-09 19:41:15 +10:00
driver-model
Merge tag 'staging-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2015-02-15 11:30:39 -08:00
dvb
…
early-userspace
…
EDID
…
extcon
…
fault-injection
…
fb
…
filesystems
ocfs2: update web page + git tree in documentation
2015-02-28 09:57:50 -08:00
firmware_class
…
fmc
…
frv
…
gpio
gpio: board.txt: Fix the gpio name example
2015-01-28 11:14:00 -07:00
hid
…
hwmon
hwmon: (ina2xx) Add ina231 compatible string
2015-01-25 21:23:59 -08:00
i2c
i2c: fix reference to functionality constants definition
2015-02-19 16:57:48 +01:00
i2o
…
ia64
virtual: Documentation: simplify and generalize paravirt_ops.txt
2015-02-13 17:15:44 +10:30
ide
…
infiniband
…
input
Input: ALPS - move v7 packet info to Documentation and v6 packet info
2015-02-15 16:04:23 -08:00
ioctl
…
isdn
…
ja_JP
…
kbuild
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:31:37 -08:00
kdump
kernel: add panic_on_warn
2014-12-10 17:41:10 -08:00
ko_KR
…
laptops
…
leds
…
locking
Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6
2015-02-11 13:03:11 -08:00
m68k
…
memory-devices
…
metag
…
mic
…
mips
…
misc-devices
Documentation/misc-devices/mei: Fix indentation of embedded code.
2015-01-29 12:56:20 -07:00
mmc
…
mn10300
…
mtd
…
namespaces
…
netlabel
…
networking
Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6
2015-02-11 13:03:11 -08:00
nfc
…
nios2
…
parisc
…
PCI
…
pcmcia
…
phy
…
platform
…
power
genirq / PM: describe IRQF_COND_SUSPEND
2015-03-06 01:28:14 +01:00
powerpc
…
pps
…
prctl
…
pti
…
ptp
…
rapidio
…
RCU
Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.16a' and 'torture.2015.01.11a' into HEAD
2015-01-15 23:34:34 -08:00
s390
s390/docs: Remove section about script debugging from Debugging390.txt
2015-01-15 11:11:14 +01:00
scheduler
doc: brief user documentation for completion
2015-01-30 11:19:25 -07:00
scsi
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-12-12 10:08:06 -08:00
security
KEYS: Make /proc/keys unconditional if CONFIG_KEYS=y
2015-01-22 22:34:32 +00:00
serial
…
sh
…
sound
ALSA: hda - Add "eapd" model string for AD1986A codec
2014-12-10 14:00:13 +01:00
spi
…
sysctl
Merge branch 'akpm' (patches from Andrew)
2015-02-11 18:23:28 -08:00
target
Documentation/target: Update fabric_ops to latest code
2015-01-06 13:46:49 -08:00
thermal
Documentation: thermal: document of_cpufreq_cooling_register()
2015-01-06 14:39:17 -04:00
timers
…
tpm
…
trace
Merge tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2015-02-15 10:48:44 -08:00
usb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-02-10 18:57:15 -08:00
vDSO
…
video4linux
MODULE_DEVICE_TABLE: fix some callsites
2015-02-13 21:21:40 -08:00
virtual
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2015-02-18 09:24:01 -08:00
vm
mm:add KPF_ZERO_PAGE flag for /proc/kpageflags
2015-02-11 17:06:00 -08:00
w1
…
watchdog
…
wimax
…
x86
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-21 10:41:29 -08:00
xtensa
…
zh_CN
…
00-INDEX
Update of Documentation/dmaengine/00-INDEX
2014-12-29 15:28:24 -07:00
applying-patches.txt
…
assoc_array.txt
…
atomic_ops.txt
…
bad_memory.txt
…
basic_profiling.txt
…
bcache.txt
…
binfmt_misc.txt
…
braille-console.txt
…
bt8xxgpio.txt
…
btmrvl.txt
…
BUG-HUNTING
…
bus-virt-phys-mapping.txt
…
cachetlb.txt
rmap: drop support of non-linear mappings
2015-02-10 14:30:31 -08:00
Changes
Documentation: GNU is frequently spelled Gnu
2014-12-29 15:33:17 -07:00
circular-buffers.txt
…
clk.txt
clk: Add rate constraints to clocks
2015-02-02 14:23:42 -08:00
coccinelle.txt
…
CodeOfConflict
Code of Conflict
2015-02-27 11:44:24 -08:00
CodingStyle
CodingStyle: enable emacs display of trailing whitespace
2015-01-28 12:05:46 -07:00
cpu-hotplug.txt
…
cpu-load.txt
…
cputopology.txt
…
crc32.txt
…
dcdbas.txt
…
debugging-modules.txt
…
debugging-via-ohci1394.txt
…
dell_rbu.txt
…
devices.txt
…
digsig.txt
…
DMA-API-HOWTO.txt
…
DMA-API.txt
…
DMA-attributes.txt
…
dma-buf-sharing.txt
…
DMA-ISA-LPC.txt
…
dontdiff
…
dynamic-debug-howto.txt
…
edac.txt
…
efi-stub.txt
…
eisa.txt
…
email-clients.txt
…
flexible-arrays.txt
…
futex-requeue-pi.txt
doc: Fix misnamed FUTEX_CMP_REQUEUE_PI op constants
2015-01-19 12:05:32 +01:00
gcov.txt
…
gdb-kernel-debugging.txt
scripts/gdb: add basic documentation
2015-02-17 14:34:54 -08:00
highuid.txt
…
HOWTO
…
hsi.txt
…
hw_random.txt
…
hwspinlock.txt
…
init.txt
…
initrd.txt
…
intel_txt.txt
…
Intel-IOMMU.txt
…
io_ordering.txt
…
io-mapping.txt
…
iostats.txt
…
IPMI.txt
ipmi: Add SMBus interface driver (SSIF)
2014-12-11 15:04:11 -06:00
IRQ-affinity.txt
…
IRQ-domain.txt
…
IRQ.txt
…
irqflags-tracing.txt
…
isapnp.txt
…
java.txt
…
kasan.txt
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kernel-doc-nano-HOWTO.txt
…
kernel-docs.txt
…
kernel-parameters.txt
Merge tag 'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2015-02-15 11:37:02 -08:00
kernel-per-CPU-kthreads.txt
…
kmemcheck.txt
…
kmemleak.txt
…
kobject.txt
…
kprobes.txt
Documentation: add description for FTRACE probe status
2015-02-04 16:05:44 -05:00
kref.txt
…
kselftest.txt
…
ldm.txt
…
local_ops.txt
percpu: update local_ops.txt to reflect this_cpu operations
2014-12-13 12:42:53 -08:00
lockup-watchdogs.txt
…
logo.gif
…
logo.txt
…
lzo.txt
…
magic-number.txt
…
mailbox.txt
…
Makefile
…
ManagementStyle
…
md.txt
…
media-framework.txt
…
memory-barriers.txt
documentation: Fix smp typo in memory-barriers.txt
2015-01-07 08:59:32 -08:00
memory-hotplug.txt
…
module-signing.txt
…
mono.txt
…
nommu-mmap.txt
fs: introduce f_op->mmap_capabilities for nommu mmap support
2015-01-20 14:02:58 -07:00
numastat.txt
…
oops-tracing.txt
livepatch: kernel: add TAINT_LIVEPATCH
2014-12-22 15:40:48 +01:00
padata.txt
…
parport-lowlevel.txt
…
parport.txt
…
percpu-rw-semaphore.txt
…
phy.txt
…
pi-futex.txt
…
pinctrl.txt
…
pnp.txt
…
preempt-locking.txt
…
printk-formats.txt
…
pwm.txt
…
ramoops.txt
pstore-ram: Allow optional mapping with pgprot_noncached
2014-12-11 13:38:31 -08:00
rbtree.txt
…
remoteproc.txt
…
rfkill.txt
rfkill: document rfkill module parameters
2015-01-09 23:22:12 +01:00
robust-futex-ABI.txt
…
robust-futexes.txt
…
rpmsg.txt
…
rtc.txt
…
SAK.txt
…
SecurityBugs
…
serial-console.txt
…
sgi-ioc4.txt
…
SM501.txt
…
smsc_ece1099.txt
…
sparse.txt
…
stable_api_nonsense.txt
…
stable_kernel_rules.txt
stable_kernel_rules: reorganize and update submission options
2015-01-12 05:04:12 -08:00
static-keys.txt
…
SubmitChecklist
…
SubmittingDrivers
…
SubmittingPatches
Merge branch 'doc/sp-update' into docs-next
2015-01-29 13:11:58 -07:00
svga.txt
…
sysfs-rules.txt
…
sysrq.txt
…
this_cpu_ops.txt
…
unaligned-memory-access.txt
…
unicode.txt
…
unshare.txt
…
vfio.txt
…
VGA-softcursor.txt
…
vgaarbiter.txt
…
video-output.txt
…
vme_api.txt
…
volatile-considered-harmful.txt
…
workqueue.txt
…
xillybus.txt
…
xz.txt
…
zorro.txt
…