diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 11:51:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 11:51:07 -0700 |
| commit | eb08d8ff476ad39a149e1044c7d3fd742a168864 (patch) | |
| tree | fb3b442e8b601ea9c8987a553433c8bfaa188159 /drivers/video/riva/rivafb.h | |
| parent | 9f22aae04631ec90eeab804b024de3c658dae406 (diff) | |
| parent | 56e46742e846e4de167dde0e1e1071ace1c882a5 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6: (52 commits)
UBIFS: switch to dynamic printks
UBIFS: fix kernel-doc comments
UBIFS: fix extremely rare mount failure
UBIFS: simplify LEB recovery function further
UBIFS: always cleanup the recovered LEB
UBIFS: clean up LEB recovery function
UBIFS: fix-up free space on mount if flag is set
UBIFS: add the fixup function
UBIFS: add a superblock flag for free space fix-up
UBIFS: share the next_log_lnum helper
UBIFS: expect corruption only in last journal head LEBs
UBIFS: synchronize write-buffer before switching to the next bud
UBIFS: remove BUG statement
UBIFS: change bud replay function conventions
UBIFS: substitute the replay tree with a replay list
UBIFS: simplify replay
UBIFS: store free and dirty space in the bud replay entry
UBIFS: remove unnecessary stack variable
UBIFS: double check that buds are replied in order
UBIFS: make 2 functions static
...
Diffstat (limited to 'drivers/video/riva/rivafb.h')
0 files changed, 0 insertions, 0 deletions