OSDN Git Service

(root) / android-x86 / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71f882f 364ed2f)
Merge branch 'staging-linus' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Jun 2012 23:57:09 +0000 (16:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Jun 2012 23:57:09 +0000 (16:57 -0700)
commit89a86a2da30a6a90dda719874092905cd762b7ef
tree140a289a990e7810e9c365bce304af1e065ca649tree | snapshot
parent71f882fe71823c54ae095ce29ce050f814eefdbccommit | diff
parent364ed2f4653d7c86ebedcc116a9cb34fd272867ccommit | diff
Merge branch 'staging-linus' into staging-next

We need this for the pstore fixes that went into the staging-linus branch, so
that things apply properly for the pstore/android code merge.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Documentation/ABI/testing/sysfs-bus-iio diff1 | diff2 | blob | history
drivers/iio/industrialio-core.c diff1 | diff2 | blob | history
drivers/staging/comedi/drivers.c diff1 | diff2 | blob | history
kernel
About OSDN
Find Software
Develop Software
Help