]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
Merge branch 'old_next' into next
authorVinod Koul <vinod.koul@intel.com>
Wed, 6 Apr 2011 06:21:12 +0000 (11:51 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 6 Apr 2011 06:21:12 +0000 (11:51 +0530)
1  2 
drivers/dma/ppc4xx/adma.c

Simple merge