diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 17:52:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 17:52:35 -0500 |
commit | b9a0d06a35c382c02f471a0815e2e27cdfe1c7f9 (patch) | |
tree | 368ce644cc63a1a377b9254b440bfa73fd970919 /net/nonet.c | |
parent | 62568510b8e2679cbc331d7de10ea9ba81ae8b3d (diff) | |
parent | e6b50c8d58bde1cdc5c9c9520be7ed8921d26aab (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
TWL4030: fix clk API usage
[ARM] 5364/1: allow flush_ioremap_region() to be used from modules
[ARM] w90x900: fix build errors and warnings
[ARM] i.MX add missing include
[ARM] i.MX: fix breakage from commit 278892736e99330195c8ae5861bcd9d791bbf19e
[ARM] i.MX: remove LCDC controller register definitions from imx-regs.h
Diffstat (limited to 'net/nonet.c')
0 files changed, 0 insertions, 0 deletions