iowatcher: Merge branch 'jan'
authorChris Mason <chris.mason@fusionio.com>
Tue, 11 Sep 2012 01:01:02 +0000 (21:01 -0400)
committerChris Mason <chris.mason@oracle.com>
Tue, 11 Sep 2012 01:01:02 +0000 (21:01 -0400)
commita78b574c36dbcf35ad0f950f02b8b5729edeba68
treec3cf94d85233a2198d60e562e91a1a89fc6c2555
parent1e1e3f04296420c0e3cb46ffad56f247f6a17963
parentf2e40ddd2b405fb22bd93ca61160e3505921d59e
iowatcher: Merge branch 'jan'

Jan Kara's updates for xzoom and yzoom

Conflicts:
main.c

Signed-off-by: Chris Mason <chris.mason@fusionio.com>
iowatcher/main.c