Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / arch / arm / mach-bcmring / include / mach / csp / cap_inline.h
2009-08-15 Leo ChenARM: 5651/1: bcmring: csp capability header files