05e2a56e62
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJVWMcgAAoJEDjbvchgkmk+4U8P/igSasv2dyXng2KXt4RiRydE
MRUqooKfKD8X040D3KXT+O64GA3QSH96FZHN7qcvHzmfIvU13qtuvlWhJpnZ+K6U
IcTtN7Ak65rsM7EF7xm/DzA2xQMZFEzfIWHOgNvBNKATuMvvkhVFSkz00X+lqW4e
5IdqBP5fjfuCYY6SfPVXNGvMOuRmOzjhzVZoqta/pDNmAGuxIKSCF0FSg4rMYHuO
sd924Mgm1i8ekYH2hCAjBHboXa8A/RkQBKIUOIvynYhkN5sjSGLcnK5FdoGSHke3
lix7IDjdtKY181RDgPISY35cTuR1cK7Asxmm2O4I91QwqkYK24+dyElhmB9TCtyc
KPILKgivPT8liCnsY2pvd6uiNOwVcgEne0bGmz+J7jB96J3R7iIvvL6PT6Gb3FQQ
JIOyNgO6S1/nxBm+51t6Ztp3nw2nAThAxjxyS0ylJ7NtEqQWUeYzpVdjknlc2Z8t
o3dsKTTU3PP7ww24lbn0jyM7mHYOX0mBqom0o1X2PcVwivNkpN/J/vxRI36uPmGM
wWOSuO9yJACpwQPIs7X/gv8QhbjTuIJ1f/WfNZ5BdJyIWY7YPQPGF+RJBZdoBmMM
drGiGHnBHhlCo0tYC3/FlkugFYjbKqfUzWw25FDDFL+4Zvow+2GnfRrPaz6nlKPX
WrcUAnQJeTrjt6CEpFNi
=RgUJ
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEJDfLduVEy2qz2d/TmXOSYMtstxYFAlpqbAsACgkQmXOSYMts
txaIXhAAhRVHFBgRCPb8xwbfXGXm7X6uM1GWBU76nsBTTNwT9vTlUr/9OPnpLK/a
m6Kxu8pvMs/5KD4APWVYTdQ+jV6TRgYFSh6P6gUGOcfBCKqWG5u7M8rLbOt6dDhh
yX1tROhmjvvGCd+CHDQkWy0XW/cdUkHYYoj5H0Mjh2GO5kwy6Q9VQd6oCCapvzQp
pcVF61ksmBP5MxHpsID45NDVv+23vAfKNMGJDOK8+MJnB6F1U3VTZHalqaCdbrjF
o7DuGxwf5ABYLDw8ibD3WmnXPHJkkfhhvbI0Pctf8pvd+t5qigARPQPwi6oq1X9K
zzFOIToBcJyXZXuLtPPXNf0oIyfQIstSz3fz34Mbq+p+qYadVfzLAhk/xViE0Oiv
ArKbW/KeeNDaW/PBOZZx8g75k9KhAtPVckYaf/E+YgO+ceqxwKlsaaJtVJvqz1l/
PDolTW3nXWrc55fD2OG0kMTWhfg1pWyRWW1ghbj4hHpwuuT1jAXfqKZQiRr0z+PO
CZPT2b3EYCJOUE0VH3/3GHs3i8vj/8B1Yok5pm2qP56PsnCg2oDVqer67KEdh7Vm
o8+rQ6Ir/rCI+bioDh0PBJdPgRFQm4AbnC0eEO6SusaPlHLEU+Zrf/+dVlYyQ6qr
cR6pQhaj+/w7weTpocv2k79LlzbPe8dd0Te4uN+iOi7AaIKD8FQ=
=taSb
-----END PGP SIGNATURE-----
Merge 3.10.79 into android-msm-bullhead-3.10-oreo-m5
Changes in 3.10.79: (18 commits)
ocfs2: dlm: fix race between purge and get lock resource
nilfs2: fix sanity check of btree level in nilfs_btree_root_broken()
mm/memory-failure: call shake_page() when error hits thp tail page
xen/console: Update console event channel on resume
gpio: unregister gpiochip device before removing it
gpio: sysfs: fix memory leaks and device hotplug
ARM: dts: imx25: Add #pwm-cells to pwm4
ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name
ARM: dts: imx23-olinuxino: Fix dr_mode of usb0
ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
drm/i915: Add missing MacBook Pro models with dual channel LVDS
pinctrl: Don't just pretend to protect pinctrl_maps, do it for real
mmc: card: Don't access RPMB partitions for normal read/write
sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)
revert "softirq: Add support for triggering softirq work on softirqs"
ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address.
ACPICA: Utilities: Cleanup to enforce ACPI_PHYSADDR_TO_PTR()/ACPI_PTR_TO_PHYSADDR().
Linux 3.10.79
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Conflicts:
drivers/mmc/card/queue.h
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| hvc_beat.c | ||
| hvc_bfin_jtag.c | ||
| hvc_console.c | ||
| hvc_console.h | ||
| hvc_dcc.c | ||
| hvc_irq.c | ||
| hvc_iucv.c | ||
| hvc_opal.c | ||
| hvc_rtas.c | ||
| hvc_tile.c | ||
| hvc_udbg.c | ||
| hvc_vio.c | ||
| hvc_xen.c | ||
| hvcs.c | ||
| hvsi.c | ||
| hvsi_lib.c | ||