git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 007dfe5 4b660a7)
Merge 3.15-rc6 into staging-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 May 2014 14:27:17 +0000 (23:27 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 May 2014 14:27:17 +0000 (23:27 +0900)
This resolves the conflicts in the files:
drivers/iio/adc/Kconfig
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Trivial merge
Pandora Kernel Repository