Patch from Deepak Saxena

Patch from Lennert Buytenhek

Signed-off-by: Lennert Buytenhek

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King