From: Jiri Kosina Date: Thu, 4 Jul 2013 13:01:01 +0000 (+0200) Subject: Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11... X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~10604^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=db58316892a5e9034efe718d4c1630788db7528f;p=mirror_ubuntu-zesty-kernel.git Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11/i2c-hid-fixed' into for-linus --- db58316892a5e9034efe718d4c1630788db7528f