黄涛 7fe47454f2 lsk-android 14.04 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTWERtAAoJELSic+t+oim9JWYP/0QCExvsT5PIzWueVqblD8Kz QlJ/fnFd5xHlVUtF7EJJHlJP6psANlF3ol7UJSofS+V7DFKKU460c5qEqC6XpuXD 9JdAByrHBfxhOolg0BCSTqSEM7KoZE6LDuEN+ZcDvR5mplHOfTPdtQIjNt2ZQ1A4 IToz1gAc8yZLzsBSBY7lijLZ3cZAXG3EFwi6imHgdBn2YfK2W/A4qjVTOSdV/ntq ISSHDN30EI0dcJJP74pzP5c7S5M9liMDVaEwvzs9+8jYO7TkMqsUz37d2d1u91av HyXKMjp07dO4Ym0/iaONv44c3tmVfHrnJDTLZHU2V142KPgpmoplbvouqb9i6DmM Euv20a5f8IridDPsIYk1nfmMOP42DVeND2YGgdUFOvSMThE2S5dfhOSgxHeHqXms LKXC9ocYYugzDi8rwSCr85K/3rTueR9GUL5730W5ObEq/A8MladQSxtqybroE3uP VctJOlrLU2mxfzYU99pybU9CmUz5aZRQP0IUVUgRwK+NxpLhYevhbc22oOR8F/Fu qJ9sqNDohHWKH8MCN1NVfsad1CmefQbl5STffQuu1GpRx7elV+/Ri39P6J/0m1UI rNbTpGxhHD+0nEMCuxqMS/sknV/vIz4ht9WCAUTcLyUIaFiuihzWnaVo2n3//nDp hwg7gOS0O3m0VWxhSh9U =+kRa -----END PGP SIGNATURE----- Merge tag 'lsk-android-14.04' into develop-3.10 lsk-android 14.04 Conflicts: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt drivers/pinctrl/pinconf-generic.c include/linux/pinctrl/consumer.h include/linux/pinctrl/pinconf-generic.h		2014-04-24 19:04:10 +08:00
..
acpi	ACPI / hotplug: Fix conflicted PCI bridge notify handlers	2013-12-04 10:57:04 -08:00
asm-generic	Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into develop-3.10	2014-02-10 16:23:36 +08:00
clocksource	Revert "clocksource: arch_timer: use virtual counters"	2014-03-28 18:04:43 +08:00
crypto	crypto: scatterwalk - Use sg_chain_ptr on chain entries	2013-12-11 22:36:29 -08:00
drm	rk3288 chromium: drm grafic fb support for x11 mali gpu	2014-03-26 12:41:08 +08:00
dt-bindings	lsk-android 14.04	2014-04-24 19:04:10 +08:00
keys
linux	lsk-android 14.04	2014-04-24 19:04:10 +08:00
math-emu
media	isp:camsys_head ver:v0.0.5	2014-03-27 11:26:25 +08:00
memory
misc
net	Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android	2014-04-15 09:59:04 +08:00
pcmcia
ras
rdma
rxrpc
scsi	ore: Fix wrong math in allocation of per device BIO	2014-02-13 13:48:00 -08:00
sound	ALSA: memalloc.h - fix wrong truncation of dma_addr_t	2013-12-20 07:45:06 -08:00
target	iscsi/iser-target: Fix isert_conn->state hung shutdown issues	2014-03-23 21:38:21 -07:00
trace	lsk-android 14.04	2014-04-24 19:04:10 +08:00
uapi	lsk-android 14.04	2014-04-24 19:04:10 +08:00
video	lsk-android 14.04	2014-04-24 19:04:10 +08:00
xen	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00
Kbuild