commit a44f99c7efdb88fa41128065c9a9445c19894e34
author Linus Torvalds <torvalds@linux-foundation.org> Sun Mar 20 18:14:55 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Mar 20 18:14:55 2011 -0700
tree 9d9dc6026b2c0409eca05e360c98b8a688ccdb1e
parent b87a2d3e3147bd140da2eae584772c353d11421b
parent 22942c00a6ad6e9e93b53811a6de72c821c15d22

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