summaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/device.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-10-11 00:45:21 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-10-11 00:45:21 -0700
commit0cc8d6a9d23d6662da91eeb6bb8e7d1c559850f0 (patch)
tree7187a6807ff5bd6e8f8dac7c53e2de28759a8354 /drivers/s390/cio/device.c
parentdde3ada3d0069855eeb353707b2b0f946191cfd6 (diff)
parent7f8d4cad1e4e11a45d02bd6e024cc2812963c38a (diff)
downloadblackbird-op-linux-0cc8d6a9d23d6662da91eeb6bb8e7d1c559850f0.tar.gz
blackbird-op-linux-0cc8d6a9d23d6662da91eeb6bb8e7d1c559850f0.zip
Merge branch 'next' into for-linus
Prepare second set of updates for 3.7 merge window (Wacom driver update and patches extending number of input minors).
Diffstat (limited to 'drivers/s390/cio/device.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud