Skip to content
Commit 12fa8a27 authored by James Morris's avatar James Morris
Browse files

Merge branch 'for-1205' of http://git.gitorious.org/smack-next/kernel into next 

Pull request from Casey.
parents b404aef7 f7112e6c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment