diff options
| author | Colin Cross <ccross@android.com> | 2011-01-08 14:47:29 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-08 14:47:29 -0800 |
| commit | c07aee9df0e40fe9621db66ec00857228090e46c (patch) | |
| tree | 4341741c051eec917955f652d889d6609492ef42 /drivers/rtc | |
| parent | 351516118103c6c7bb5321aa9d5866eb3dc0d5ca (diff) | |
| parent | db23c5ae580ea8bba4bd10449c5571939aef8086 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile
Change-Id: I826244513f799fdd2fb0269abad3271c96661293
Diffstat (limited to 'drivers/rtc')
0 files changed, 0 insertions, 0 deletions