aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/include/asm/ds1287.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-04 10:11:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-04 10:11:38 -0700
commit14c1b7c212de7c7c9231d5a676eb96f28c088338 (patch)
tree13085d717d706db544b57be348820501bc670db9 /arch/mips/include/asm/ds1287.h
parent4806626782b4408e468ef686229556899be345c8 (diff)
parent033a666ccb842ab4134fcd0c861d5ba9f5d6bf3a (diff)
Merge branch 'for-2.6.31' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.31' of git://linux-nfs.org/~bfields/linux: NFSD: Don't hold unrefcounted creds over call to nfsd_setuser()
Diffstat (limited to 'arch/mips/include/asm/ds1287.h')
0 files changed, 0 insertions, 0 deletions