summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_nl.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-06 00:33:19 +0200
committerOlof Johansson <olof@lixom.net>2012-09-06 00:33:19 +0200
commit301fd5c13257862df66c81c48d963d474e63e0ef (patch)
tree128af89336dd8b1ee62696c4588057b2eb0b445e /drivers/block/drbd/drbd_nl.c
parentMerge branch 'ux500/asic-id' into next/soc (diff)
parentARM: shmobile: kzm9g: enable restarting (diff)
downloadlinux-301fd5c13257862df66c81c48d963d474e63e0ef.tar.xz
linux-301fd5c13257862df66c81c48d963d474e63e0ef.zip
Merge branch 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
* 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: kzm9g: enable restarting + sync to 3.6-rc3
Diffstat (limited to 'drivers/block/drbd/drbd_nl.c')
0 files changed, 0 insertions, 0 deletions