Merge branch 'devel3'
commit59f941c54c6d95d84362bb0c35df7b474d58bd0b
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 13 Feb 2015 10:54:58 +0000 (13 13:54 +0300)
committerDan Carpenter <dan.carpenter@oracle.com>
Fri, 13 Feb 2015 10:54:58 +0000 (13 13:54 +0300)
treef27716eb88c2d53a0e604e920dbb9fe1ba33cda0
parent5ceaae86dbee37589a1c2be927aef38a31559bd4
parent69e38336b1b16300300eccc81b432b3437d90f0b
Merge branch 'devel3'

Conflicts:
check_kernel_printf.c

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>