summaryrefslogtreecommitdiffstats
path: root/security/security.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-19 16:04:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-19 16:04:42 -0700
commite72a68fc26887d2097fd7f14794aeb7c17851a5d (patch)
treed7e6b740bf3c01cfc4b089653da7c16411ec6187 /security/security.c
parent1cce92aef225171705c3f53a871938abca2177de (diff)
parent58005b325394b18b8b6a737e06b4128deb2c4e63 (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