linux/drivers/dma
Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
  video: change to new flag variable
  scsi: change to new flag variable
  rtc: change to new flag variable
  rapidio: change to new flag variable
  pps: change to new flag variable
  net: change to new flag variable
  misc: change to new flag variable
  message: change to new flag variable
  memstick: change to new flag variable
  isdn: change to new flag variable
  ieee802154: change to new flag variable
  ide: change to new flag variable
  hwmon: change to new flag variable
  dma: change to new flag variable
  char: change to new flag variable
  fs: change to new flag variable
  xtensa: change to new flag variable
  um: change to new flag variables
  s390: change to new flag variable
  mips: change to new flag variable
  ...

Fix up trivial conflict in drivers/hwmon/Makefile
2011-03-20 18:14:55 -07:00
..
ioat
ipu
ppc4xx
amba-pl08x.c
at_hdmac_regs.h
at_hdmac.c
coh901318_lli.c
coh901318_lli.h
coh901318.c
dmaengine.c
dmatest.c
dw_dmac_regs.h
dw_dmac.c
fsldma.c
fsldma.h
imx-dma.c
imx-sdma.c
intel_mid_dma_regs.h
intel_mid_dma.c
iop-adma.c
iovlock.c
Kconfig
Makefile
mpc512x_dma.c
mv_xor.c
mv_xor.h
pch_dma.c
pl330.c
shdma.c
shdma.h
ste_dma40_ll.c
ste_dma40_ll.h
ste_dma40.c
timb_dma.c
txx9dmac.c
txx9dmac.h