diff options
| author |   Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-04-24 13:18:48 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-04-24 13:18:48 +0000 |
| commit | f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1 (patch) | |
| tree | 5074abce8a7cffd69519194c8b5b627de1099dca /fs/jbd2/commit.c | |
| parent | Merge branch 'viafb-cleanup' into viafb-next (diff) | |
| parent | viafb: add X server compatibility mode (diff) | |
| download | linux-rng-f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1.tar.xz linux-rng-f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1.zip | |
Merge branch 'viafb-pll' into viafb-next
Conflicts:
drivers/video/via/viamode.c
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions