[lnst/f19: 3/3] Merge branch 'master' into f19

[Jiří Pírko]

commit 9203348387235833cfa7b0bdb58971f6bd5eef69
Merge: 1c581b8 0124e17
Author: Jiri Pirko <jiri at resnulli.us>
Date:   Fri Dec 5 12:41:39 2014 +0100

    Merge branch 'master' into f19

 .gitignore |    1 +
 lnst.spec  |   18 +++++++++++++++++-
 sources    |    2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
---