diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-21 15:16:14 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-21 15:16:14 (GMT) |
| commit | 81ca98036985559c49480007371af94aa6e85dc0 (patch) | |
| tree | 1d4f400a40b573d1405ccd0a7d869e9859a30408 /block/ioctl.c | |
| parent | 9a41fe3415bbef2c0c08ac232dc3a17add0dee58 (diff) | |
| parent | 4db25d496c09fdf094d52d11a90ae51f9ee473c6 (diff) | |
| download | linux-fsl-qoriq-81ca98036985559c49480007371af94aa6e85dc0.tar.xz | |
Merge branch 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix mmap2 for handling differing PAGE_SIZEs.
sh: sh7723: Don't default enable the RTC clock.
sh: sh7722: Don't default enable the RTC clock.
rtc: rtc-sh: clock framework support.
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions