diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:04:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:04:42 -0700 |
commit | e72a68fc26887d2097fd7f14794aeb7c17851a5d (patch) | |
tree | d7e6b740bf3c01cfc4b089653da7c16411ec6187 /security/security.c | |
parent | 1cce92aef225171705c3f53a871938abca2177de (diff) | |
parent | 58005b325394b18b8b6a737e06b4128deb2c4e63 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5255/1: Update jornada ssp to remove build errors/warnings
[ARM] omap: back out 'internal_clock' support
[ARM] 5249/1: davinci: remove redundant check in davinci_psc_config()
Diffstat (limited to 'security/security.c')
0 files changed, 0 insertions, 0 deletions