黄涛 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
..
events	Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android+android-common-3.10' into develop-3.10	2013-12-10 12:14:30 +08:00
define_trace.h
ftrace.h	tracing: Fix array size mismatch in format string	2014-03-31 09:58:12 -07:00
syscall.h	tracing: Cleanup unnecessary function declarations	2012-10-31 16:45:34 -04:00