diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-05 18:33:19 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-05 18:33:19 -0400 |
| commit | 301fd5c13257862df66c81c48d963d474e63e0ef (patch) | |
| tree | 128af89336dd8b1ee62696c4588057b2eb0b445e /fs/btrfs/locking.c | |
| parent | daa56a06b5a592ceb69130a1d15c067a078f2701 (diff) | |
| parent | 7952717adb69efc1d2443a1858f96d23c2fb93e0 (diff) | |
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 'fs/btrfs/locking.c')
0 files changed, 0 insertions, 0 deletions