all: merge branch 'jk/device-types'
authorThomas Haller <thaller@redhat.com>
Tue, 23 Feb 2016 14:52:56 +0000 (15:52 +0100)
committerThomas Haller <thaller@redhat.com>
Tue, 23 Feb 2016 14:52:56 +0000 (15:52 +0100)
commita1eb5eba303dea77524c9b890de805cf247f5f34
tree113e01268f3147a5f590f3d7e4625c89f4298122
parentb875ac34bea05eac0132c7d1420443e8b3f42b07
parent8852b219a25025cb9f4e0623bda819bfb615005c
all: merge branch 'jk/device-types'

Resurrect old branch by Jirka, rebase it and
merge some parts.