Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux/Documentation
History
Greg Kroah-Hartman bfe24b9cbe Merge branch 'imx-drm-staging' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-next 
Russell writes:

This set of changes reorganises imx-drm's DT bindings by re-using the OF
graph parsing code which was located in drivers/media, removing the
temporary bindings.

The result is that more TODO entries are now removed.  While we're not
quite done with this yet as there's a few straggling updates to imx-ldb
to come, but leaving these out is not detrimental at this point in time
- they are more an enhancement.

However, this pull has the additional complication that we're sharing
seven commits with Mauro's V4L git tree, which move the OF graph parsing
code out of drivers/media into drivers/of.  Philipp's imx-drm changes
depend on these and my previously committed round of imx-drm commits.
Hence, the diffstat below is from a test merge with your tree head
(17b02809cf).

Mauro merged those seven commits earlier today as a git pull, so both
trees will be sharing exactly the same commit IDs.

I've given these changes a spin here on both my Hummingboard and Cubox-i4
(one is iMX6Solo, the other is iMX6Quad based), which includes Xorg using
the DRM device directly, and I find nothing wrong.

The diffstat does look a little scarey - this is because we're having to
update the ARM DT files along with this change, and obviously the
dependency on the OF graph parsing code.
 		2014-03-07 14:23:34 -08:00
..
ABI Revert "tty: Set correct tty name in 'active' sysfs attribute" 2014-02-22 14:31:04 -08:00
DocBook Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2014-01-31 09:31:14 -08:00
EDID
…
PCI PCI/MSI: Add pci_enable_msi_exact() and pci_enable_msix_exact() 2014-02-13 10:48:02 -07:00
RCU Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
accounting
…
acpi
…
aoe
…
arm Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
arm64
…
auxdisplay
…
backlight
…
blackfin Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
block Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
blockdev zram: remove old private project comment 2014-01-30 16:56:55 -08:00
bus-devices
…
cdrom
…
cgroups Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2014-01-31 09:31:14 -08:00
connector
…
console
…
cpu-freq
…
cpuidle
…
cris
…
crypto
…
development-process
…
device-mapper
…
devicetree Merge branch 'imx-drm-staging' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-next 2014-03-07 14:23:34 -08:00
driver-model
…
dvb [media] update Michael Krufky's email address 2014-02-04 06:34:21 -02:00
early-userspace
…
extcon
…
fault-injection
…
fb Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
filesystems Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
firmware_class
…
fmc
…
frv
…
gpio
…
hid
…
hwmon Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
i2c Documentation: i2c: mention ACPI method for instantiating devices 2014-02-15 19:46:34 +01:00
i2o
…
ia64
…
ide Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
infiniband
…
input
…
ioctl
…
isdn
…
ja_JP
…
kbuild
…
kdump
…
ko_KR
…
laptops Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
leds Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
m68k Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
make
…
memory-devices
…
metag
…
mic
…
mips
…
misc-devices Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 2014-01-29 18:56:27 -08:00
mmc
…
mn10300
…
mtd
…
namespaces
…
netlabel
…
networking Documentation/networking: delete orphaned 3c505.txt file. 2014-02-13 17:08:29 -05:00
nfc
…
parisc
…
pcmcia
…
power Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
powerpc
…
pps
…
prctl
…
pti
…
ptp ptp: Allow selecting trigger/event index in testptp 2014-02-04 20:26:46 -08:00
rapidio
…
s390 Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
scheduler Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
scsi Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
security
…
serial Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
sh
…
sound
…
spi spi: Fixes for v3.14 2014-02-12 09:11:24 -08:00
sysctl Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-01-31 08:59:46 -08:00
target
…
thermal
…
timers Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
tpm
…
trace
…
usb
…
vDSO
…
video4linux
…
virtual Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
vm Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
w1 Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
watchdog
…
wimax
…
x86 Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
xtensa
…
zh_CN Documentation:Update Documentation/zh_CN/arm64/memory.txt 2014-02-07 15:24:31 -08:00
.gitignore
…
00-INDEX Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
BUG-HUNTING
…
Changes
…
CodingStyle
…
DMA-API-HOWTO.txt
…
DMA-API.txt
…
DMA-ISA-LPC.txt
…
DMA-attributes.txt
…
HOWTO
…
IPMI.txt
…
IRQ-affinity.txt
…
IRQ-domain.txt
…
IRQ.txt
…
Intel-IOMMU.txt
…
Makefile
…
ManagementStyle
…
SAK.txt
…
SM501.txt
…
SecurityBugs
…
SubmitChecklist
…
SubmittingDrivers
…
SubmittingPatches
…
VGA-softcursor.txt
…
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
…
bus-virt-phys-mapping.txt
…
cachetlb.txt
…
circular-buffers.txt
…
clk.txt
…
coccinelle.txt
…
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-buf-sharing.txt
…
dmaengine.txt
…
dmatest.txt
…
dontdiff
…
dynamic-debug-howto.txt
…
edac.txt
…
efi-stub.txt
…
eisa.txt
…
email-clients.txt
…
flexible-arrays.txt
…
futex-requeue-pi.txt
…
gcov.txt
…
highuid.txt
…
hw_random.txt
…
hwspinlock.txt
…
init.txt
…
initrd.txt
…
intel_txt.txt
…
io-mapping.txt
…
io_ordering.txt
…
iostats.txt
…
irqflags-tracing.txt
…
isapnp.txt
…
java.txt
…
kernel-doc-nano-HOWTO.txt
…
kernel-docs.txt
…
kernel-parameters.txt Documentation/kernel-parameters.txt: fix memmap= language 2014-02-06 13:48:51 -08:00
kernel-per-CPU-kthreads.txt
…
kmemcheck.txt
…
kmemleak.txt
…
kobject.txt
…
kprobes.txt
…
kref.txt
…
ldm.txt
…
local_ops.txt
…
lockdep-design.txt
…
lockstat.txt
…
lockup-watchdogs.txt
…
logo.gif
…
logo.txt
…
magic-number.txt
…
md.txt
…
media-framework.txt
…
memory-barriers.txt
…
memory-hotplug.txt
…
module-signing.txt
…
mono.txt
…
mutex-design.txt
…
nommu-mmap.txt
…
numastat.txt
…
oops-tracing.txt
…
padata.txt
…
parport-lowlevel.txt
…
parport.txt
…
percpu-rw-semaphore.txt
…
phy.txt drivers: phy: Add support for optional phys 2014-02-05 05:48:43 +00:00
pi-futex.txt
…
pinctrl.txt
…
pnp.txt
…
preempt-locking.txt
…
printk-formats.txt
…
pwm.txt
…
ramoops.txt
…
rbtree.txt
…
remoteproc.txt
…
rfkill.txt
…
robust-futex-ABI.txt
…
robust-futexes.txt
…
rpmsg.txt
…
rt-mutex-design.txt
…
rt-mutex.txt
…
rtc.txt
…
serial-console.txt
…
sgi-ioc4.txt
…
sgi-visws.txt
…
smsc_ece1099.txt
…
sparse.txt
…
spinlocks.txt
…
stable_api_nonsense.txt
…
stable_kernel_rules.txt
…
static-keys.txt
…
svga.txt
…
sysfs-rules.txt
…
sysrq.txt
…
this_cpu_ops.txt
…
unaligned-memory-access.txt
…
unicode.txt
…
unshare.txt
…
vfio.txt
…
vgaarbiter.txt
…
video-output.txt
…
vme_api.txt
…
volatile-considered-harmful.txt
…
workqueue.txt
…
ww-mutex-design.txt
…
xz.txt
…
zorro.txt
…