summaryrefslogtreecommitdiff
path: root/drivers/mfd/asic3.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-02 12:17:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-02 12:17:29 -0700
commitadadfe48df3858c3c1ba52963502f38885ab2f3c (patch)
treef6e6388f5dff08878c0888ab42122fbe81710783 /drivers/mfd/asic3.c
parent625a3b6057e86d5079976db5648bd42289c8b6cc (diff)
parent52c6e6f990669deac3f370f1603815adb55a1dbd (diff)
Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6
* 'for-linus' of git://git.infradead.org/ubifs-2.6: UBIFS: seek journal heads to the latest bud in replay UBIFS: do not free write-buffers when in R/O mode
Diffstat (limited to 'drivers/mfd/asic3.c')
0 files changed, 0 insertions, 0 deletions