tree 47bf7600f5e96a6ae1dd069a056fc85e73e2b671
parent 1c1e436269fe840cdbecfaf397b21778dd276f26
parent 2e919f76e31309d441021f73b4bd9bb2ccfb3972
author David Howells <dhowells@redhat.com> 1349368621 +0100
committer David Howells <dhowells@redhat.com> 1349368621 +0100

Merge remote-tracking branch 'c6x/for-linux-next' into uapi-prep

Avoid later problems with c6x's asm/signal.h lacking __KERNEL__ guards.

Signed-off-by: David Howells <dhowells@redhat.com>