diff options
| author | Arnd Bergmann <[email protected]> | 2012-03-15 16:11:36 +0000 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2012-03-15 16:11:40 +0000 |
| commit | 86a30bece9ad4cc91c393a829a7b128291e0fb65 (patch) | |
| tree | 6cb3e6ad413d74118535f77436056c8d3cfae0eb /include/linux/timerqueue.h | |
| parent | 243d58ec5792299fa212d05a4113c0ebac2df6a3 (diff) | |
| parent | a323f66439c04d1c3ae4dc20cc2d44d52ee43c9f (diff) | |
Merge branch 'fixes-non-critical' of git://github.com/hzhuang1/linux into next/maintainers
* 'fixes-non-critical' of git://github.com/hzhuang1/linux:
MAINTAINERS: update MAINTAINERS email entry
MAINTAINERS: update maintainer entry for pxa/hx4700
(update to v3.3-rc7)
Signed-off-by: Arnd Bergmann <[email protected]>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions