• Linus Torvalds's avatar
    Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · a44f99c7
    Linus Torvalds authored
    * '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
    a44f99c7